kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPack fix CPackDeb crash when CPackDeb.cmake ends with a FATAL_ERROR

This commit is contained in:
Eric NOULARD 2011-03-19 11:12:31 +01:00
parent 96453cea6a
commit 21007f8989
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -96,6 +96,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error while execution CPackDeb.cmake" << std::endl); "Error while execution CPackDeb.cmake" << std::endl);
retval = 0; retval = 0;
return retval;
} }
cmsys::Glob gl; cmsys::Glob gl;
@ -105,7 +106,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
if ( !gl.FindFiles(findExpr) ) if ( !gl.FindFiles(findExpr) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Cannot find any files in the installed directory" << std::endl); "Cannot find any files in the installed directory" << std::endl);
return 0; return 0;
} }
packageFiles = gl.GetFiles(); packageFiles = gl.GetFiles();
@ -152,8 +153,8 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error while execution CPackDeb.cmake" << std::endl); "Error while execution CPackDeb.cmake" << std::endl);
retval = 0; retval = 0;
return retval;
} }
cmsys::Glob gl; cmsys::Glob gl;
std::string findExpr(this->GetOption("WDIR")); std::string findExpr(this->GetOption("WDIR"));
findExpr += "/*"; findExpr += "/*";
@ -230,6 +231,7 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(bool allComponent)
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error while execution CPackDeb.cmake" << std::endl); "Error while execution CPackDeb.cmake" << std::endl);
retval = 0; retval = 0;
return retval;
} }
cmsys::Glob gl; cmsys::Glob gl;
@ -288,8 +290,11 @@ int cmCPackDebGenerator::PackageFiles()
"Error while execution CPackDeb.cmake" << std::endl); "Error while execution CPackDeb.cmake" << std::endl);
retval = 0; retval = 0;
} }
packageFiles = files; else
return createDeb(); {
packageFiles = files;
return createDeb();
}
} }
return retval; return retval;
} }

6
Source/CPack/cmCPackGenerator.cxx
View File

@ -885,8 +885,12 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCPackGenerator::ReadListFile(const char* moduleName) bool cmCPackGenerator::ReadListFile(const char* moduleName)
{ {
bool retval;
std::string fullPath = this->MakefileMap->GetModulesFile(moduleName); std::string fullPath = this->MakefileMap->GetModulesFile(moduleName);
return this->MakefileMap->ReadListFile(0, fullPath.c_str()); retval = this->MakefileMap->ReadListFile(0, fullPath.c_str());
// include FATAL_ERROR and ERROR in the return status
retval = retval && (! cmSystemTools::GetErrorOccuredFlag());
return retval;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------