[cmake-commits] andy committed cmCPackZIPGenerator.cxx 1.4 1.5
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Sep 21 15:09:36 EDT 2006
Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv31793/Source/CPack
Modified Files:
cmCPackZIPGenerator.cxx
Log Message:
ENH: Handle zip (command line was too long)
Index: cmCPackZIPGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackZIPGenerator.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmCPackZIPGenerator.cxx 11 May 2006 13:37:48 -0000 1.4
+++ cmCPackZIPGenerator.cxx 21 Sep 2006 19:09:34 -0000 1.5
@@ -91,20 +91,22 @@
const char* toplevel, const std::vector<std::string>& files)
{
std::string tempFileName;
+ tempFileName = toplevel;
+ tempFileName += "/winZip.filelist";
+ bool needQuotesInFile = false;
cmOStringStream dmgCmd;
switch ( this->ZipStyle )
{
case cmCPackZIPGenerator::StyleWinZip:
- tempFileName = toplevel;
- tempFileName += "/winZip.filelist";
dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
<< "\" -P \"" << outFileName
<< "\" @\"" << tempFileName.c_str() << "\"";
+ needQuotesInFile = true;
break;
case cmCPackZIPGenerator::StyleUnixZip:
dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
- << "\" \"" << outFileName
- << "\"";
+ << "\" -r \"" << outFileName
+ << "\" . -i at winZip.filelist";
break;
default:
cmCPackLogger(cmCPackLog::LOG_ERROR, "Unknown ZIP style"
@@ -117,9 +119,16 @@
std::vector<std::string>::const_iterator fileIt;
for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
{
- out << "\""
- << cmSystemTools::RelativePath(toplevel, fileIt->c_str())
- << "\"" << std::endl;
+ if ( needQuotesInFile )
+ {
+ out << "\"";
+ }
+ out << cmSystemTools::RelativePath(toplevel, fileIt->c_str());
+ if ( needQuotesInFile )
+ {
+ out << "\"";
+ }
+ out << std::endl;
}
}
else
More information about the Cmake-commits
mailing list