[cmake-commits] hoffman committed cmCPackGenericGenerator.cxx
1.25.2.6 1.25.2.7 cmCPackPackageMakerGenerator.cxx 1.16.2.2
1.16.2.3 cmCPackTGZGenerator.cxx 1.13.2.2 1.13.2.3
cmCPackTarBZip2Generator.cxx 1.1.2.1 1.1.2.2
cmCPackTarCompressGenerator.cxx 1.3.2.3 1.3.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Oct 30 11:36:12 EST 2006
Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv28717
Modified Files:
Tag: CMake-2-4
cmCPackGenericGenerator.cxx cmCPackPackageMakerGenerator.cxx
cmCPackTGZGenerator.cxx cmCPackTarBZip2Generator.cxx
cmCPackTarCompressGenerator.cxx
Log Message:
ENH: merge fix for cpack crash into main tree
Index: cmCPackGenericGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenericGenerator.cxx,v
retrieving revision 1.25.2.6
retrieving revision 1.25.2.7
diff -u -d -r1.25.2.6 -r1.25.2.7
--- cmCPackGenericGenerator.cxx 27 Oct 2006 20:01:49 -0000 1.25.2.6
+++ cmCPackGenericGenerator.cxx 30 Oct 2006 16:36:06 -0000 1.25.2.7
@@ -99,10 +99,10 @@
"Look for: CPACK_PACKAGE_DESCRIPTION_FILE" << std::endl);
const char* descFileName
= this->GetOption("CPACK_PACKAGE_DESCRIPTION_FILE");
- cmCPackLogger(cmCPackLog::LOG_DEBUG,
- "Look for: " << descFileName << std::endl);
if ( descFileName )
{
+ cmCPackLogger(cmCPackLog::LOG_DEBUG,
+ "Look for: " << descFileName << std::endl);
if ( !cmSystemTools::FileExists(descFileName) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -158,7 +158,8 @@
if ( !cmsys::SystemTools::MakeDirectory(tempInstallDirectory))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
- "Problem creating temporary directory: " << tempInstallDirectory
+ "Problem creating temporary directory: "
+ << (tempInstallDirectory ? tempInstallDirectory : "(NULL}")
<< std::endl);
return 0;
}
@@ -409,10 +410,10 @@
= this->GetOption("CPACK_INSTALL_SCRIPT");
std::string currentWorkingDirectory =
cmSystemTools::GetCurrentWorkingDirectory();
- cmCPackLogger(cmCPackLog::LOG_OUTPUT,
- "- Install scripts: " << cmakeScripts << std::endl);
if ( cmakeScripts && *cmakeScripts )
{
+ cmCPackLogger(cmCPackLog::LOG_OUTPUT,
+ "- Install scripts: " << cmakeScripts << std::endl);
std::vector<std::string> cmakeScriptsVector;
cmSystemTools::ExpandListArgument(cmakeScripts,
cmakeScriptsVector);
@@ -667,7 +668,7 @@
cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Compress package" << std::endl);
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Compress files to: "
- << tempPackageFileName << std::endl);
+ << (tempPackageFileName ? tempPackageFileName : "(NULL)") << std::endl);
if ( cmSystemTools::FileExists(tempPackageFileName) )
{
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Remove old package file"
@@ -689,16 +690,23 @@
cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Finalize package" << std::endl);
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Copy final package: "
- << tempPackageFileName << " to " << packageFileName << std::endl);
+ << (tempPackageFileName ? tempPackageFileName : "(NULL)" )
+ << " to "
+ << (packageFileName ? packageFileName : "(NULL)")
+ << std::endl);
if ( !cmSystemTools::CopyFileIfDifferent(tempPackageFileName,
packageFileName) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying the package: "
- << tempPackageFileName << " to " << packageFileName << std::endl);
+ << (tempPackageFileName ? tempPackageFileName : "(NULL)" )
+ << " to "
+ << (packageFileName ? packageFileName : "(NULL)")
+ << std::endl);
return 0;
}
- cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Package " << packageFileName
+ cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Package "
+ << (packageFileName ? packageFileName : "(NULL)")
<< " generated." << std::endl);
return 1;
}
@@ -939,7 +947,7 @@
std::string cmCPackGenericGenerator::FindTemplate(const char* name)
{
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: "
- << name << std::endl);
+ << (name ? name : "(NULL)") << std::endl);
std::string ffile = this->MakefileMap->GetModulesFile(name);
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Found template: "
<< ffile.c_str() << std::endl);
Index: cmCPackTarBZip2Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarBZip2Generator.cxx,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- cmCPackTarBZip2Generator.cxx 7 May 2006 14:55:39 -0000 1.1.2.1
+++ cmCPackTarBZip2Generator.cxx 30 Oct 2006 16:36:07 -0000 1.1.2.2
@@ -108,7 +108,7 @@
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem renaming: \""
<< compressOutFile.c_str() << "\" to \""
- << outFileName << std::endl);
+ << (outFileName ? outFileName : "(NULL)") << std::endl);
return 0;
}
}
Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -d -r1.13.2.2 -r1.13.2.3
--- cmCPackTGZGenerator.cxx 27 Oct 2006 20:01:49 -0000 1.13.2.2
+++ cmCPackTGZGenerator.cxx 30 Oct 2006 16:36:07 -0000 1.13.2.3
@@ -208,7 +208,8 @@
int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
const char* toplevel, const std::vector<std::string>& files)
{
- cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: " << toplevel << std::endl);
+ cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: "
+ << (toplevel ? toplevel : "(NULL)") << std::endl);
cmCPackTGZ_Data mydata(this, this->Compress);
TAR *t;
char buf[TAR_MAXPATHLEN];
Index: cmCPackPackageMakerGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackPackageMakerGenerator.cxx,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- cmCPackPackageMakerGenerator.cxx 14 May 2006 19:22:47 -0000 1.16.2.2
+++ cmCPackPackageMakerGenerator.cxx 30 Oct 2006 16:36:06 -0000 1.16.2.3
@@ -236,13 +236,16 @@
if ( !inFileName )
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack option: " << cpackVar.c_str()
- << " not specified. It should point to " << name << ".rtf, " << name
+ << " not specified. It should point to "
+ << (name ? name : "(NULL)")
+ << ".rtf, " << name
<< ".html, or " << name << ".txt file" << std::endl);
return false;
}
if ( !cmSystemTools::FileExists(inFileName) )
{
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find " << name
+ cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find "
+ << (name ? name : "(NULL)")
<< " resource file: " << inFileName << std::endl);
return false;
}
@@ -260,7 +263,8 @@
destFileName += name + ext;
- cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << inFileName
+ cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: "
+ << (inFileName ? inFileName : "(NULL)")
<< " to " << destFileName.c_str() << std::endl);
this->ConfigureFile(inFileName, destFileName.c_str());
return true;
Index: cmCPackTarCompressGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.cxx,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- cmCPackTarCompressGenerator.cxx 13 Oct 2006 14:52:06 -0000 1.3.2.3
+++ cmCPackTarCompressGenerator.cxx 30 Oct 2006 16:36:07 -0000 1.3.2.4
@@ -155,7 +155,8 @@
int cmCPackTarCompressGenerator::CompressFiles(const char* outFileName,
const char* toplevel, const std::vector<std::string>& files)
{
- cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: " << toplevel << std::endl);
+ cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: "
+ << (toplevel ? toplevel : "(NULL)") << std::endl);
cmCPackTarCompress_Data mydata(this);
TAR *t;
char buf[TAR_MAXPATHLEN];
More information about the Cmake-commits
mailing list