[Cmake-commits] [cmake-commits] hoffman committed cmCPackArchiveGenerator.cxx NONE 1.1 cmCPackArchiveGenerator.h NONE 1.1 cmCPackTGZGenerator.cxx 1.23 1.24 cmCPackTGZGenerator.h 1.12 1.13 cmCPackTarBZip2Generator.cxx 1.5 1.6 cmCPackTarBZip2Generator.h 1.3 1.4 cmCPackTarCompressGenerator.cxx 1.11 1.12 cmCPackTarCompressGenerator.h 1.5 1.6 cmCPackZIPGenerator.cxx 1.12 1.13 cmCPackZIPGenerator.h 1.7 1.8
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 30 13:08:29 EDT 2009
Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv26614/Source/CPack
Modified Files:
cmCPackTGZGenerator.cxx cmCPackTGZGenerator.h
cmCPackTarBZip2Generator.cxx cmCPackTarBZip2Generator.h
cmCPackTarCompressGenerator.cxx cmCPackTarCompressGenerator.h
cmCPackZIPGenerator.cxx cmCPackZIPGenerator.h
Added Files:
cmCPackArchiveGenerator.cxx cmCPackArchiveGenerator.h
Log Message:
Switch to using libarchive from libtar for cpack and cmake -E tar
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers. The cmake -E tar xf should be
able to handle all compression types now as well.
Index: cmCPackTarCompressGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** cmCPackTarCompressGenerator.cxx 30 Oct 2009 14:31:54 -0000 1.11
--- cmCPackTarCompressGenerator.cxx 30 Oct 2009 17:08:26 -0000 1.12
***************
*** 13,42 ****
#include "cmCPackTarCompressGenerator.h"
- #include "cmake.h"
- #include "cmGlobalGenerator.h"
- #include "cmLocalGenerator.h"
- #include "cmSystemTools.h"
- #include "cmMakefile.h"
- #include "cmGeneratedFileStream.h"
- #include "cmCPackLog.h"
-
- #include <cmsys/SystemTools.hxx>
- #include <cmcompress/cmcompress.h>
- #include <libtar/libtar.h>
- #include <fcntl.h>
- #include <errno.h>
-
//----------------------------------------------------------------------
! class cmCPackTarCompressGeneratorForward
! {
! public:
! static int GenerateHeader(cmCPackTarCompressGenerator* gg, std::ostream* os)
! {
! return gg->GenerateHeader(os);
! }
! };
!
! //----------------------------------------------------------------------
! cmCPackTarCompressGenerator::cmCPackTarCompressGenerator()
{
}
--- 13,20 ----
#include "cmCPackTarCompressGenerator.h"
//----------------------------------------------------------------------
! cmCPackTarCompressGenerator::cmCPackTarCompressGenerator()
! :cmCPackArchiveGenerator(cmCPackArchiveGenerator::COMPRESS,
! cmCPackArchiveGenerator::TAR)
{
}
***************
*** 47,251 ****
}
- //----------------------------------------------------------------------
- class cmCPackTarCompress_Data
- {
- public:
- cmCPackTarCompress_Data(cmCPackTarCompressGenerator* gen) :
- OutputStream(0), Generator(gen) {}
- std::ostream* OutputStream;
- cmCPackTarCompressGenerator* Generator;
- cmcompress_stream CMCompressStream;
- };
-
- //----------------------------------------------------------------------
- extern "C" {
- // For cmTar
- int cmCPackTarCompress_Data_Open(void *client_data, const char* name,
- int oflags, mode_t mode);
- ssize_t cmCPackTarCompress_Data_Write(void *client_data, void *buff,
- size_t n);
- int cmCPackTarCompress_Data_Close(void *client_data);
-
- // For cmCompress
- int cmCPackTarCompress_Compress_Output(void* cdata, const char* data,
- int len);
- }
-
-
- //----------------------------------------------------------------------
- int cmCPackTarCompress_Data_Open(void *client_data, const char* pathname,
- int, mode_t)
- {
- cmCPackTarCompress_Data *mydata = (cmCPackTarCompress_Data*)client_data;
-
- if ( !cmcompress_compress_initialize(&mydata->CMCompressStream) )
- {
- return -1;
- }
-
- mydata->CMCompressStream.client_data = mydata;
- mydata->CMCompressStream.output_stream = cmCPackTarCompress_Compress_Output;
-
- cmGeneratedFileStream* gf = new cmGeneratedFileStream;
- // Open binary
- gf->Open(pathname, false, true);
- mydata->OutputStream = gf;
- if ( !*mydata->OutputStream )
- {
- return -1;
- }
-
- if ( !cmcompress_compress_start(&mydata->CMCompressStream) )
- {
- return -1;
- }
-
-
- if ( !cmCPackTarCompressGeneratorForward::GenerateHeader(
- mydata->Generator,gf))
- {
- return -1;
- }
-
- return 0;
- }
-
- //----------------------------------------------------------------------
- ssize_t cmCPackTarCompress_Data_Write(void *client_data, void *buff, size_t n)
- {
- cmCPackTarCompress_Data *mydata = (cmCPackTarCompress_Data*)client_data;
-
- if ( !cmcompress_compress(&mydata->CMCompressStream, buff, n) )
- {
- return 0;
- }
- return n;
- }
-
- //----------------------------------------------------------------------
- int cmCPackTarCompress_Data_Close(void *client_data)
- {
- cmCPackTarCompress_Data *mydata = (cmCPackTarCompress_Data*)client_data;
-
- if ( !cmcompress_compress_finalize(&mydata->CMCompressStream) )
- {
- delete mydata->OutputStream;
- return -1;
- }
-
- delete mydata->OutputStream;
- mydata->OutputStream = 0;
- return (0);
- }
-
- //----------------------------------------------------------------------
- int cmCPackTarCompressGenerator::InitializeInternal()
- {
- this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1");
- return this->Superclass::InitializeInternal();
- }
-
- //----------------------------------------------------------------------
- int cmCPackTarCompressGenerator::CompressFiles(const char* outFileName,
- const char* toplevel, const std::vector<std::string>& files)
- {
- cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: "
- << (toplevel ? toplevel : "(NULL)") << std::endl);
- cmCPackTarCompress_Data mydata(this);
- TAR *t;
- char buf[TAR_MAXPATHLEN];
- char pathname[TAR_MAXPATHLEN];
-
- tartype_t compressType = {
- (openfunc_t)cmCPackTarCompress_Data_Open,
- (closefunc_t)cmCPackTarCompress_Data_Close,
- (readfunc_t)0,
- (writefunc_t)cmCPackTarCompress_Data_Write,
- &mydata
- };
-
- // This libtar is not const safe. Make a non-const copy of outFileName
- char* realName = new char[ strlen(outFileName) + 1 ];
- strcpy(realName, outFileName);
- int flags = O_WRONLY | O_CREAT;
- int options = 0;
- if(this->GeneratorVerbose)
- {
- options |= TAR_VERBOSE;
- }
- #ifdef __CYGWIN__
- options |= TAR_GNU;
- #endif
- if (tar_open(&t, realName,
- &compressType,
- flags, 0644,
- options) == -1)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): "
- << strerror(errno) << std::endl);
- delete [] realName;
- return 0;
- }
-
- delete [] realName;
-
- std::vector<std::string>::const_iterator fileIt;
- for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
- {
- std::string rp = cmSystemTools::RelativePath(toplevel, fileIt->c_str());
- strncpy(pathname, fileIt->c_str(), sizeof(pathname));
- pathname[sizeof(pathname)-1] = 0;
- strncpy(buf, rp.c_str(), sizeof(buf));
- buf[sizeof(buf)-1] = 0;
- if (tar_append_tree(t, pathname, buf) != 0)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR,
- "Problem with tar_append_tree(\"" << buf << "\", \""
- << pathname << "\"): "
- << strerror(errno) << std::endl);
- tar_close(t);
- return 0;
- }
- }
- if (tar_append_eof(t) != 0)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_append_eof(): "
- << strerror(errno) << std::endl);
- tar_close(t);
- return 0;
- }
-
- if (tar_close(t) != 0)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_close(): "
- << strerror(errno) << std::endl);
- return 0;
- }
- return 1;
- }
-
- //----------------------------------------------------------------------
- int cmCPackTarCompress_Compress_Output(void* client_data,
- const char* data, int data_length)
- {
- if(!client_data)
- {
- return 0;
- }
- cmcompress_stream *cstream = static_cast<cmcompress_stream*>(client_data);
- cmCPackTarCompress_Data *mydata
- = static_cast<cmCPackTarCompress_Data*>(cstream->client_data);
- if ( !mydata->OutputStream )
- {
- return 0;
- }
- mydata->OutputStream->write(data, data_length);
- return data_length;
- }
-
- //----------------------------------------------------------------------
- int cmCPackTarCompressGenerator::GenerateHeader(std::ostream* os)
- {
- (void)os;
- return 1;
- }
--- 25,26 ----
Index: cmCPackTarCompressGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmCPackTarCompressGenerator.h 28 Sep 2009 15:42:53 -0000 1.5
--- cmCPackTarCompressGenerator.h 30 Oct 2009 17:08:26 -0000 1.6
***************
*** 19,28 ****
* \brief A generator for TarCompress files
*/
! class cmCPackTarCompressGenerator : public cmCPackTGZGenerator
{
public:
! friend class cmCPackTarCompressGeneratorForward;
! cmCPackTypeMacro(cmCPackTarCompressGenerator, cmCPackTGZGenerator);
!
/**
* Construct generator
--- 19,26 ----
* \brief A generator for TarCompress files
*/
! class cmCPackTarCompressGenerator : public cmCPackArchiveGenerator
{
public:
! cmCPackTypeMacro(cmCPackTarCompressGenerator, cmCPackArchiveGenerator);
/**
* Construct generator
***************
*** 32,42 ****
protected:
- virtual int InitializeInternal();
- int CompressFiles(const char* outFileName, const char* toplevel,
- const std::vector<std::string>& files);
virtual const char* GetOutputExtension() { return ".tar.Z"; }
-
- int RenameFile(const char* oldname, const char* newname);
- int GenerateHeader(std::ostream* os);
};
--- 30,34 ----
--- NEW FILE: cmCPackArchiveGenerator.cxx ---
/*============================================================================
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#include "cmCPackArchiveGenerator.h"
#include "cmake.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
#include "cmSystemTools.h"
#include "cmMakefile.h"
#include "cmGeneratedFileStream.h"
#include "cmCPackLog.h"
#include <errno.h>
#include <cmsys/SystemTools.hxx>
#include <cmlibarchive/libarchive/archive.h>
#include <cmlibarchive/libarchive/archive_entry.h>
//----------------------------------------------------------------------
cmCPackArchiveGenerator::cmCPackArchiveGenerator(CompressType t,
ArchiveType at)
{
this->Compress = t;
this->Archive = at;
}
//----------------------------------------------------------------------
cmCPackArchiveGenerator::~cmCPackArchiveGenerator()
{
}
static const size_t cmCPackTGZ_Data_BlockSize = 16384;
// make this an anonymous namespace so that archive.h does not
// have to be included in the .h file for this class
namespace
{
bool SetArchiveType(struct archive* a,
cmCPackArchiveGenerator::CompressType ct,
cmCPackArchiveGenerator::ArchiveType at)
{
// pick a compression type
int res;
switch(ct)
{
case cmCPackArchiveGenerator::GZIP:
res = archive_write_set_compression_gzip(a);
break;
case cmCPackArchiveGenerator::BZIP2:
res = archive_write_set_compression_bzip2(a);
break;
case cmCPackArchiveGenerator::COMPRESS:
res = archive_write_set_compression_compress(a);
break;
case cmCPackArchiveGenerator::LZMA:
res = archive_write_set_compression_lzma(a);
break;
case cmCPackArchiveGenerator::NONE:
default:
res = archive_write_set_compression_none(a);
}
if(res != ARCHIVE_OK)
{
return false;
}
// pick the archive type
switch(at)
{
case cmCPackArchiveGenerator::TAR:
// maybe this:
// archive_write_set_format_pax(a);
res = archive_write_set_format_ustar(a); // is this what we want?
break;
case cmCPackArchiveGenerator::ZIP:
res = archive_write_set_format_zip(a);
break;
}
if(res != ARCHIVE_OK)
{
return false;
}
return true;
}
struct StreamData
{
StreamData(cmGeneratedFileStream* gfs,
cmCPackArchiveGenerator* ag)
{
this->GeneratedFileStream = gfs;
this->Generator = ag;
}
cmGeneratedFileStream* GeneratedFileStream;
cmCPackArchiveGenerator* Generator;
};
extern "C"
{
int OpenArchive(struct archive *a, void *client_data)
{
struct StreamData *data = (StreamData*)client_data;
if(data->GeneratedFileStream &&
data->GeneratedFileStream->is_open())
{
if(data->Generator->
GenerateHeader(data->GeneratedFileStream))
{
return ARCHIVE_OK;
}
}
return (ARCHIVE_FATAL);
}
__LA_SSIZE_T WriteArchive(struct archive *a,
void *client_data,
const void *buff,
size_t n)
{
struct StreamData *data = (StreamData*)client_data;
data->GeneratedFileStream->
write(reinterpret_cast<const char*>(buff),n);
if(!data->GeneratedFileStream->bad())
{
return n;
}
return 0;
}
int CloseArchive(struct archive *a, void *client_data)
{
struct StreamData *data = (StreamData*)client_data;
if(data->GeneratedFileStream->Close())
{
delete data->GeneratedFileStream;
return ARCHIVE_OK;
}
return ARCHIVE_FATAL;
}
} //extern C
} // anon name space
//----------------------------------------------------------------------
int cmCPackArchiveGenerator::InitializeInternal()
{
this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1");
return this->Superclass::InitializeInternal();
}
int cmCPackArchiveGenerator::CompressFiles(const char* outFileName,
const char* toplevel, const std::vector<std::string>& files)
{
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: "
<< (toplevel ? toplevel : "(NULL)") << std::endl);
// create a new archive
struct archive* a = archive_write_new();
// Set the compress and archive types for the archive
SetArchiveType(a, this->Compress, this->Archive);
// Open binary stream
cmGeneratedFileStream* gf = new cmGeneratedFileStream;
gf->Open(outFileName, false, true);
StreamData data(gf, this);
// pass callbacks to archive_write_open to handle stream
archive_write_open(a,
&data,
OpenArchive,
WriteArchive,
CloseArchive);
// create a new disk struct
struct archive* disk = archive_read_disk_new();
archive_read_disk_set_standard_lookup(disk);
std::vector<std::string>::const_iterator fileIt;
for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
{
// create a new entry for each file
struct archive_entry *entry = archive_entry_new();
// Get the relative path to the file
std::string rp = cmSystemTools::RelativePath(toplevel, fileIt->c_str());
// Set the name of the entry to the file name
archive_entry_set_pathname(entry, rp.c_str());
// get the information about the file from stat
struct stat s;
stat(fileIt->c_str(), &s);
archive_read_disk_entry_from_file(disk, entry, -1, &s);
// write entry header
archive_write_header(a, entry);
// now copy contents of file into archive a
FILE* file = fopen(fileIt->c_str(), "rb");
if(!file)
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with fopen(): "
<< file
<< strerror(errno)
<< std::endl);
return 0;
}
char buff[cmCPackTGZ_Data_BlockSize];
int len = fread(buff, 1, sizeof(buff), file);
while (len > 0)
{
archive_write_data(a, buff, len);
len = fread(buff, 1, sizeof(buff), file);
}
// close the file and free the entry
fclose(file);
archive_entry_free(entry);
}
// close the archive and finish the write
archive_write_close(a);
archive_write_finish(a);
return 1;
}
//----------------------------------------------------------------------
int cmCPackArchiveGenerator::GenerateHeader(std::ostream*)
{
return 1;
}
Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** cmCPackTGZGenerator.cxx 30 Oct 2009 14:31:53 -0000 1.23
--- cmCPackTGZGenerator.cxx 30 Oct 2009 17:08:23 -0000 1.24
***************
*** 13,44 ****
#include "cmCPackTGZGenerator.h"
- #include "cmake.h"
- #include "cmGlobalGenerator.h"
- #include "cmLocalGenerator.h"
- #include "cmSystemTools.h"
- #include "cmMakefile.h"
- #include "cmGeneratedFileStream.h"
- #include "cmCPackLog.h"
-
- #include <cmsys/SystemTools.hxx>
- #include <cm_zlib.h>
- #include <libtar/libtar.h>
- #include <fcntl.h>
- #include <errno.h>
-
- //----------------------------------------------------------------------
- class cmCPackTGZGeneratorForward
- {
- public:
- static int GenerateHeader(cmCPackTGZGenerator* gg, std::ostream* os)
- {
- return gg->GenerateHeader(os);
- }
- };
-
//----------------------------------------------------------------------
cmCPackTGZGenerator::cmCPackTGZGenerator()
{
- this->Compress = true;
}
--- 13,21 ----
#include "cmCPackTGZGenerator.h"
//----------------------------------------------------------------------
cmCPackTGZGenerator::cmCPackTGZGenerator()
+ :cmCPackArchiveGenerator(cmCPackArchiveGenerator::GZIP,
+ cmCPackArchiveGenerator::TAR)
{
}
***************
*** 48,294 ****
}
- static const size_t cmCPackTGZ_Data_BlockSize = 16384;
-
- //----------------------------------------------------------------------
- class cmCPackTGZ_Data
- {
- public:
- cmCPackTGZ_Data(cmCPackTGZGenerator* gen, bool compress) :
- OutputStream(0), Generator(gen),
- CompressionLevel(Z_DEFAULT_COMPRESSION),
- Compress(compress) {}
- std::ostream* OutputStream;
- cmCPackTGZGenerator* Generator;
- char CompressedBuffer[cmCPackTGZ_Data_BlockSize];
- int CompressionLevel;
- z_stream ZLibStream;
- uLong CRC;
- bool Compress;
- };
-
- //----------------------------------------------------------------------
- extern "C" {
- int cmCPackTGZ_Data_Open(void *client_data, const char* name, int oflags,
- mode_t mode);
- ssize_t cmCPackTGZ_Data_Write(void *client_data, void *buff, size_t n);
- int cmCPackTGZ_Data_Close(void *client_data);
- }
-
-
- //----------------------------------------------------------------------
- int cmCPackTGZ_Data_Open(void *client_data, const char* pathname,
- int, mode_t)
- {
- cmCPackTGZ_Data *mydata = (cmCPackTGZ_Data*)client_data;
-
- if ( mydata->Compress )
- {
- mydata->ZLibStream.zalloc = Z_NULL;
- mydata->ZLibStream.zfree = Z_NULL;
- mydata->ZLibStream.opaque = Z_NULL;
- int strategy = Z_DEFAULT_STRATEGY;
- if ( deflateInit2(&mydata->ZLibStream, mydata->CompressionLevel,
- Z_DEFLATED, -MAX_WBITS, 8, strategy) != Z_OK )
- {
- return -1;
- }
- }
-
- cmGeneratedFileStream* gf = new cmGeneratedFileStream;
- // Open binary
- gf->Open(pathname, false, true);
- mydata->OutputStream = gf;
- if ( !*mydata->OutputStream )
- {
- return -1;
- }
-
- if ( !cmCPackTGZGeneratorForward::GenerateHeader(mydata->Generator,gf))
- {
- return -1;
- }
-
- if ( mydata->Compress )
- {
- mydata->CRC = crc32(0L, Z_NULL, 0);
- }
-
- return 0;
- }
-
- //----------------------------------------------------------------------
- ssize_t cmCPackTGZ_Data_Write(void *client_data, void *buff, size_t n)
- {
- cmCPackTGZ_Data *mydata = (cmCPackTGZ_Data*)client_data;
-
- if ( mydata->Compress )
- {
- mydata->ZLibStream.avail_in = static_cast<uInt>(n);
- mydata->ZLibStream.next_in = reinterpret_cast<Bytef*>(buff);
-
- do {
- mydata->ZLibStream.avail_out = cmCPackTGZ_Data_BlockSize;
- mydata->ZLibStream.next_out
- = reinterpret_cast<Bytef*>(mydata->CompressedBuffer);
- // no bad return value
- int ret = deflate(&mydata->ZLibStream, (n?Z_NO_FLUSH:Z_FINISH));
- if(ret == Z_STREAM_ERROR)
- {
- return 0;
- }
-
- size_t compressedSize
- = cmCPackTGZ_Data_BlockSize - mydata->ZLibStream.avail_out;
-
- mydata->OutputStream->write(
- reinterpret_cast<const char*>(mydata->CompressedBuffer),
- compressedSize);
- } while ( mydata->ZLibStream.avail_out == 0 );
-
- if ( !*mydata->OutputStream )
- {
- return 0;
- }
- if ( n )
- {
- mydata->CRC = crc32(mydata->CRC, reinterpret_cast<Bytef *>(buff),
- static_cast<uInt>(n));
- }
- }
- else
- {
- mydata->OutputStream->write(reinterpret_cast<char*>(buff), n);
- }
- return n;
- }
-
- //----------------------------------------------------------------------
- int cmCPackTGZ_Data_Close(void *client_data)
- {
- cmCPackTGZ_Data *mydata = (cmCPackTGZ_Data*)client_data;
-
- if ( mydata->Compress )
- {
- cmCPackTGZ_Data_Write(client_data, 0, 0);
-
- char buffer[8];
- int n;
- uLong x = mydata->CRC;
- for (n = 0; n < 4; n++) {
- buffer[n] = static_cast<char>(x & 0xff);
- x >>= 8;
- }
- x = mydata->ZLibStream.total_in;
- for (n = 0; n < 4; n++) {
- buffer[n+4] = static_cast<char>(x & 0xff);
- x >>= 8;
- }
-
- mydata->OutputStream->write(buffer, 8);
- (void)deflateEnd(&mydata->ZLibStream);
- }
- delete mydata->OutputStream;
- mydata->OutputStream = 0;
- return (0);
- }
-
- //----------------------------------------------------------------------
- int cmCPackTGZGenerator::InitializeInternal()
- {
- this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1");
- return this->Superclass::InitializeInternal();
- }
-
- //----------------------------------------------------------------------
- int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
- const char* toplevel, const std::vector<std::string>& files)
- {
- cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: "
- << (toplevel ? toplevel : "(NULL)") << std::endl);
- cmCPackTGZ_Data mydata(this, this->Compress);
- TAR *t;
- char buf[TAR_MAXPATHLEN];
- char pathname[TAR_MAXPATHLEN];
-
- tartype_t gztype = {
- (openfunc_t)cmCPackTGZ_Data_Open,
- (closefunc_t)cmCPackTGZ_Data_Close,
- (readfunc_t)0,
- (writefunc_t)cmCPackTGZ_Data_Write,
- &mydata
- };
-
- // This libtar is not const safe. Make a non-const copy of outFileName
- char* realName = new char[ strlen(outFileName) + 1 ];
- strcpy(realName, outFileName);
- int flags = O_WRONLY | O_CREAT;
- int options = 0;
- if(this->GeneratorVerbose)
- {
- options |= TAR_VERBOSE;
- }
- #ifdef __CYGWIN__
- options |= TAR_GNU;
- #endif
- if (tar_open(&t, realName,
- &gztype,
- flags, 0644,
- options) == -1)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): "
- << strerror(errno) << std::endl);
- delete [] realName;
- return 0;
- }
-
- delete [] realName;
-
- std::vector<std::string>::const_iterator fileIt;
- for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
- {
- std::string rp = cmSystemTools::RelativePath(toplevel, fileIt->c_str());
- strncpy(pathname, fileIt->c_str(), sizeof(pathname));
- pathname[sizeof(pathname)-1] = 0;
- strncpy(buf, rp.c_str(), sizeof(buf));
- buf[sizeof(buf)-1] = 0;
- if (tar_append_tree(t, pathname, buf) != 0)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR,
- "Problem with tar_append_tree(\"" << buf << "\", \""
- << pathname << "\"): "
- << strerror(errno) << std::endl);
- tar_close(t);
- return 0;
- }
- }
- if (tar_append_eof(t) != 0)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_append_eof(): "
- << strerror(errno) << std::endl);
- tar_close(t);
- return 0;
- }
-
- if (tar_close(t) != 0)
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_close(): "
- << strerror(errno) << std::endl);
- return 0;
- }
- return 1;
- }
-
- //----------------------------------------------------------------------
- int cmCPackTGZGenerator::GenerateHeader(std::ostream* os)
- {
- if ( this->Compress )
- {
- const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
- char header[11];
- sprintf(header, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
- Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/,
- 3 /* zlib os code for UNIX, not really used anyway */);
- os->write(header, 10);
- }
- return 1;
- }
--- 25,26 ----
Index: cmCPackTarBZip2Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarBZip2Generator.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmCPackTarBZip2Generator.cxx 28 Sep 2009 15:42:50 -0000 1.5
--- cmCPackTarBZip2Generator.cxx 30 Oct 2009 17:08:25 -0000 1.6
***************
*** 12,38 ****
#include "cmCPackTarBZip2Generator.h"
-
- #include "cmake.h"
- #include "cmGlobalGenerator.h"
- #include "cmLocalGenerator.h"
- #include "cmSystemTools.h"
- #include "cmMakefile.h"
- #include "cmGeneratedFileStream.h"
- #include "cmCPackLog.h"
-
- #include <cmsys/SystemTools.hxx>
-
- // Includes needed for implementation of RenameFile. This is not in
- // system tools because it is not implemented robustly enough to move
- // files across directories.
- #ifdef _WIN32
- # include <windows.h>
- # include <sys/stat.h>
- #endif
-
//----------------------------------------------------------------------
! cmCPackTarBZip2Generator::cmCPackTarBZip2Generator()
{
- this->Compress = false;
}
--- 12,20 ----
#include "cmCPackTarBZip2Generator.h"
//----------------------------------------------------------------------
! cmCPackTarBZip2Generator::cmCPackTarBZip2Generator()
! :cmCPackArchiveGenerator(cmCPackArchiveGenerator::BZIP2,
! cmCPackArchiveGenerator::TAR)
{
}
***************
*** 42,175 ****
}
- //----------------------------------------------------------------------
- int cmCPackTarBZip2Generator::InitializeInternal()
- {
- this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1");
- std::vector<std::string> path;
- std::string pkgPath = cmSystemTools::FindProgram("bzip2", path, false);
- if ( pkgPath.empty() )
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find BZip2" << std::endl);
- return 0;
- }
- this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM", pkgPath.c_str());
- cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Found Compress program: "
- << pkgPath.c_str()
- << std::endl);
-
- return this->Superclass::InitializeInternal();
- }
-
- //----------------------------------------------------------------------
- int cmCPackTarBZip2Generator::BZip2File(const char* packageDirFileName)
- {
- int retVal = 0;
- cmOStringStream dmgCmd1;
- dmgCmd1 << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
- << "\" \"" << packageDirFileName
- << "\"";
- retVal = -1;
- std::string output;
- int res = cmSystemTools::RunSingleCommand(dmgCmd1.str().c_str(), &output,
- &retVal, 0, this->GeneratorVerbose, 0);
- if ( !res || retVal )
- {
- std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
- tmpFile += "/CompressBZip2.log";
- cmGeneratedFileStream ofs(tmpFile.c_str());
- ofs << "# Run command: " << dmgCmd1.str().c_str() << std::endl
- << "# Output:" << std::endl
- << output.c_str() << std::endl;
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running BZip2 command: "
- << dmgCmd1.str().c_str() << std::endl
- << "Please check " << tmpFile.c_str() << " for errors" << std::endl);
- return 0;
- }
- return 1;
- }
-
- //----------------------------------------------------------------------
- int cmCPackTarBZip2Generator::CompressFiles(const char* outFileName,
- const char* toplevel, const std::vector<std::string>& files)
- {
- std::string packageDirFileName
- = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
- packageDirFileName += ".tar";
- std::string output;
- if ( !this->Superclass::CompressFiles(packageDirFileName.c_str(),
- toplevel, files) )
- {
- return 0;
- }
-
- if(!this->BZip2File(packageDirFileName.c_str()))
- {
- return 0;
- }
-
- std::string compressOutFile = packageDirFileName + ".bz2";
- if ( !cmSystemTools::SameFile(compressOutFile.c_str(), outFileName ) )
- {
- if ( !this->RenameFile(compressOutFile.c_str(), outFileName) )
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem renaming: \""
- << compressOutFile.c_str() << "\" to \""
- << (outFileName ? outFileName : "(NULL)") << std::endl);
- return 0;
- }
- }
-
- return 1;
- }
-
- //----------------------------------------------------------------------------
- int cmCPackTarBZip2Generator::RenameFile(const char* oldname,
- const char* newname)
- {
- #ifdef _WIN32
- /* On Windows the move functions will not replace existing files.
- Check if the destination exists. */
- struct stat newFile;
- if(stat(newname, &newFile) == 0)
- {
- /* The destination exists. We have to replace it carefully. The
- MoveFileEx function does what we need but is not available on
- Win9x. */
- OSVERSIONINFO osv;
- DWORD attrs;
-
- /* Make sure the destination is not read only. */
- attrs = GetFileAttributes(newname);
- if(attrs & FILE_ATTRIBUTE_READONLY)
- {
- SetFileAttributes(newname, attrs & ~FILE_ATTRIBUTE_READONLY);
- }
-
- /* Check the windows version number. */
- osv.dwOSVersionInfoSize = sizeof(osv);
- GetVersionEx(&osv);
- if(osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
- {
- /* This is Win9x. There is no MoveFileEx implementation. We
- cannot quite rename the file atomically. Just delete the
- destination and then move the file. */
- DeleteFile(newname);
- return MoveFile(oldname, newname);
- }
- else
- {
- /* This is not Win9x. Use the MoveFileEx implementation. */
- return MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING);
- }
- }
- else
- {
- /* The destination does not exist. Just move the file. */
- return MoveFile(oldname, newname);
- }
- #else
- /* On UNIX we have an OS-provided call to do this atomically. */
- return rename(oldname, newname) == 0;
- #endif
- }
-
--- 24,25 ----
--- NEW FILE: cmCPackArchiveGenerator.h ---
/*============================================================================
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc.
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#ifndef cmCPackArchiveGenerator_h
#define cmCPackArchiveGenerator_h
#include "cmCPackGenerator.h"
/** \class cmCPackArchiveGenerator
* \brief A generator base for libarchive generation
*
*/
class cmCPackArchiveGenerator : public cmCPackGenerator
{
public:
enum CompressType{ GZIP, BZIP2, COMPRESS, LZMA, NONE};
enum ArchiveType{ TAR, ZIP};
cmTypeMacro(cmCPackArchiveGenerator, cmCPackGenerator);
/**
* Construct generator
*/
cmCPackArchiveGenerator(CompressType, ArchiveType);
virtual ~cmCPackArchiveGenerator();
// Used to add a header to the archive
virtual int GenerateHeader(std::ostream* os);
protected:
virtual int InitializeInternal();
int CompressFiles(const char* outFileName, const char* toplevel,
const std::vector<std::string>& files);
virtual const char* GetOutputExtension() = 0;
CompressType Compress;
ArchiveType Archive;
};
#endif
Index: cmCPackTGZGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmCPackTGZGenerator.h 28 Sep 2009 15:42:50 -0000 1.12
--- cmCPackTGZGenerator.h 30 Oct 2009 17:08:23 -0000 1.13
***************
*** 14,32 ****
#define cmCPackTGZGenerator_h
! #include "cmCPackGenerator.h"
!
! class cmCPackTGZGeneratorForward;
/** \class cmCPackTGZGenerator
* \brief A generator for TGZ files
*
- * http://people.freebsd.org/~kientzle/libarchive/
*/
! class cmCPackTGZGenerator : public cmCPackGenerator
{
public:
! friend class cmCPackTGZGeneratorForward;
! cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackGenerator);
!
/**
* Construct generator
--- 14,27 ----
#define cmCPackTGZGenerator_h
! #include "cmCPackArchiveGenerator.h"
/** \class cmCPackTGZGenerator
* \brief A generator for TGZ files
*
*/
! class cmCPackTGZGenerator : public cmCPackArchiveGenerator
{
public:
! cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackArchiveGenerator);
/**
* Construct generator
***************
*** 34,46 ****
cmCPackTGZGenerator();
virtual ~cmCPackTGZGenerator();
-
protected:
- virtual int InitializeInternal();
- virtual int GenerateHeader(std::ostream* os);
- int CompressFiles(const char* outFileName, const char* toplevel,
- const std::vector<std::string>& files);
virtual const char* GetOutputExtension() { return ".tar.gz"; }
-
- bool Compress;
};
--- 29,34 ----
Index: cmCPackZIPGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackZIPGenerator.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmCPackZIPGenerator.cxx 28 Sep 2009 15:42:54 -0000 1.12
--- cmCPackZIPGenerator.cxx 30 Oct 2009 17:08:26 -0000 1.13
***************
*** 13,24 ****
#include "cmCPackZIPGenerator.h"
- #include "cmSystemTools.h"
- #include "cmGeneratedFileStream.h"
- #include "cmCPackLog.h"
-
- #include <cmsys/SystemTools.hxx>
-
//----------------------------------------------------------------------
cmCPackZIPGenerator::cmCPackZIPGenerator()
{
}
--- 13,20 ----
#include "cmCPackZIPGenerator.h"
//----------------------------------------------------------------------
cmCPackZIPGenerator::cmCPackZIPGenerator()
+ :cmCPackArchiveGenerator(cmCPackArchiveGenerator::NONE,
+ cmCPackArchiveGenerator::ZIP)
{
}
***************
*** 29,98 ****
}
- //----------------------------------------------------------------------
- int cmCPackZIPGenerator::InitializeInternal()
- {
- this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1");
- this->ReadListFile("CPackZIP.cmake");
- if ((!this->IsSet("ZIP_EXECUTABLE"))
- || (!this->IsSet("CPACK_ZIP_COMMAND")))
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find a suitable ZIP program"
- << std::endl);
- return 0;
- }
- return this->Superclass::InitializeInternal();
- }
-
- //----------------------------------------------------------------------
- int cmCPackZIPGenerator::CompressFiles(const char* outFileName,
- const char* toplevel, const std::vector<std::string>& files)
- {
- std::string tempFileName;
- tempFileName = toplevel;
- tempFileName += "/winZip.filelist";
- bool needQuotesInFile = cmSystemTools::IsOn(
- this->GetOption("CPACK_ZIP_NEED_QUOTES"));
-
- std::string cmd = this->GetOption("CPACK_ZIP_COMMAND");
- cmsys::SystemTools::ReplaceString(cmd, "<ARCHIVE>", outFileName);
- cmsys::SystemTools::ReplaceString(cmd, "<FILELIST>", "winZip.filelist");
-
- { // the scope is needed for cmGeneratedFileStream
- cmGeneratedFileStream out(tempFileName.c_str());
- std::vector<std::string>::const_iterator fileIt;
- for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
- {
- if ( needQuotesInFile )
- {
- out << "\"";
- }
- out << cmSystemTools::RelativePath(toplevel, fileIt->c_str());
- if ( needQuotesInFile )
- {
- out << "\"";
- }
- out << std::endl;
- }
- }
-
-
- std::string output;
- int retVal = -1;
- int res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
- &retVal, toplevel, this->GeneratorVerbose, 0);
-
- if ( !res || retVal )
- {
- std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
- tmpFile += "/CompressZip.log";
- cmGeneratedFileStream ofs(tmpFile.c_str());
- ofs << "# Run command: " << cmd.c_str() << std::endl
- << "# Output:" << std::endl
- << output.c_str() << std::endl;
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running zip command: "
- << cmd.c_str() << std::endl
- << "Please check " << tmpFile.c_str() << " for errors" << std::endl);
- return 0;
- }
- return 1;
- }
--- 25,26 ----
Index: cmCPackZIPGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackZIPGenerator.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmCPackZIPGenerator.h 28 Sep 2009 15:42:56 -0000 1.7
--- cmCPackZIPGenerator.h 30 Oct 2009 17:08:27 -0000 1.8
***************
*** 14,29 ****
#define cmCPackZIPGenerator_h
! #include "cmCPackGenerator.h"
!
! class cmCPackZIPGeneratorForward;
/** \class cmCPackZIPGenerator
* \brief A generator for ZIP files
*/
! class cmCPackZIPGenerator : public cmCPackGenerator
{
public:
! friend class cmCPackZIPGeneratorForward;
! cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackGenerator);
/**
--- 14,26 ----
#define cmCPackZIPGenerator_h
! #include "cmCPackArchiveGenerator.h"
/** \class cmCPackZIPGenerator
* \brief A generator for ZIP files
*/
! class cmCPackZIPGenerator : public cmCPackArchiveGenerator
{
public:
! cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackArchiveGenerator);
/**
***************
*** 34,43 ****
protected:
- virtual int InitializeInternal();
- int CompressFiles(const char* outFileName, const char* toplevel,
- const std::vector<std::string>& files);
virtual const char* GetOutputExtension() { return ".zip"; }
-
- int ZipStyle;
};
--- 31,35 ----
Index: cmCPackTarBZip2Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarBZip2Generator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmCPackTarBZip2Generator.h 28 Sep 2009 15:42:50 -0000 1.3
--- cmCPackTarBZip2Generator.h 30 Oct 2009 17:08:25 -0000 1.4
***************
*** 14,28 ****
#define cmCPackTarBZip2Generator_h
! #include "cmCPackTGZGenerator.h"
/** \class cmCPackTarBZip2Generator
* \brief A generator for TarBZip2 files
*/
! class cmCPackTarBZip2Generator : public cmCPackTGZGenerator
{
public:
! friend class cmCPackTarBZip2GeneratorForward;
! cmCPackTypeMacro(cmCPackTarBZip2Generator, cmCPackTGZGenerator);
!
/**
* Construct generator
--- 14,26 ----
#define cmCPackTarBZip2Generator_h
! #include "cmCPackArchiveGenerator.h"
/** \class cmCPackTarBZip2Generator
* \brief A generator for TarBZip2 files
*/
! class cmCPackTarBZip2Generator : public cmCPackArchiveGenerator
{
public:
! cmCPackTypeMacro(cmCPackTarBZip2Generator, cmCPackArchiveGenerator);
/**
* Construct generator
***************
*** 30,41 ****
cmCPackTarBZip2Generator();
virtual ~cmCPackTarBZip2Generator();
-
protected:
- virtual int InitializeInternal();
- int CompressFiles(const char* outFileName, const char* toplevel,
- const std::vector<std::string>& files);
virtual const char* GetOutputExtension() { return ".tar.bz2"; }
- int BZip2File(const char* filename);
- int RenameFile(const char* oldname, const char* newname);
};
--- 28,33 ----
More information about the Cmake-commits
mailing list