mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 18:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmCPackGenerator: Clean up and simplify function DoPackage

Browse Source
This commit is contained in:
Deniz Bahadir
2024-04-30 18:36:25 +02:00
parent d26eed4c75
commit 1350ed96ff
1 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackGenerator.cxx
+48 -33
View File
@@ -1094,6 +1094,7 @@ int cmCPackGenerator::DoPackage()
return 0; return 0;
} }
// Possibly remove the top-level packaging-directory.
if (this->GetOption("CPACK_REMOVE_TOPLEVEL_DIRECTORY").IsOn()) { if (this->GetOption("CPACK_REMOVE_TOPLEVEL_DIRECTORY").IsOn()) {
cmValue toplevelDirectory = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); cmValue toplevelDirectory = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
if (toplevelDirectory && cmSystemTools::FileExists(*toplevelDirectory)) { if (toplevelDirectory && cmSystemTools::FileExists(*toplevelDirectory)) {
@@ -1108,55 +1109,68 @@ int cmCPackGenerator::DoPackage()
} }
} }
} }
// Install the project (to the temporary install-directory).
cmCPackLogger(cmCPackLog::LOG_DEBUG, cmCPackLogger(cmCPackLog::LOG_DEBUG,
"About to install project " << std::endl); "About to install project " << std::endl);
if (!this->InstallProject()) { if (!this->InstallProject()) {
return 0; return 0;
} }
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Done install project " << std::endl); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Done install project " << std::endl);
cmValue tempPackageFileName = // Determine the temporary directory whose content shall be packaged.
this->GetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME");
cmValue tempDirectory = this->GetOption("CPACK_TEMPORARY_DIRECTORY"); cmValue tempDirectory = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
// Determine and store internally the list of files to be installed.
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl);
cmsys::Glob gl; {
std::string findExpr = cmStrCat(tempDirectory, "/*"); cmsys::Glob gl;
gl.RecurseOn(); std::string findExpr = cmStrCat(tempDirectory, "/*");
gl.SetRecurseListDirs(true); gl.RecurseOn();
gl.SetRecurseThroughSymlinks(false); gl.SetRecurseListDirs(true);
if (!gl.FindFiles(findExpr)) { gl.SetRecurseThroughSymlinks(false);
cmCPackLogger(cmCPackLog::LOG_ERROR, if (!gl.FindFiles(findExpr)) {
"Cannot find any files in the packaging tree" << std::endl); cmCPackLogger(cmCPackLog::LOG_ERROR,
return 0; "Cannot find any files in the packaging tree"
<< std::endl);
return 0;
}
this->files = gl.GetFiles();
} }
cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Create package" << std::endl); // Determine and store internally the directory that shall be packaged.
cmCPackLogger(cmCPackLog::LOG_VERBOSE,
"Package files to: "
<< (tempPackageFileName ? *tempPackageFileName : "(NULL)")
<< std::endl);
if (tempPackageFileName && cmSystemTools::FileExists(*tempPackageFileName)) {
cmCPackLogger(cmCPackLog::LOG_VERBOSE,
"Remove old package file" << std::endl);
cmSystemTools::RemoveFile(*tempPackageFileName);
}
if (this->GetOption("CPACK_INCLUDE_TOPLEVEL_DIRECTORY").IsOn()) { if (this->GetOption("CPACK_INCLUDE_TOPLEVEL_DIRECTORY").IsOn()) {
tempDirectory = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); tempDirectory = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
} }
// The files to be installed
this->files = gl.GetFiles();
this->packageFileNames.clear();
/* Put at least one file name into the list of
* wanted packageFileNames. The specific generator
* may update this during PackageFiles.
* (either putting several names or updating the provided one)
*/
this->packageFileNames.emplace_back(tempPackageFileName);
this->toplevel = *tempDirectory; this->toplevel = *tempDirectory;
cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Create package" << std::endl);
// Determine and store internally the list of packages to create.
// Note: Initially, this only contains a single package.
{
cmValue tempPackageFileName =
this->GetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME");
cmCPackLogger(cmCPackLog::LOG_VERBOSE,
"Package files to: "
<< (tempPackageFileName ? *tempPackageFileName : "(NULL)")
<< std::endl);
if (tempPackageFileName &&
cmSystemTools::FileExists(*tempPackageFileName)) {
cmCPackLogger(cmCPackLog::LOG_VERBOSE,
"Remove old package file" << std::endl);
cmSystemTools::RemoveFile(*tempPackageFileName);
}
this->packageFileNames.clear();
/* Put at least one file name into the list of
* wanted packageFileNames. The specific generator
* may update this during PackageFiles.
* (either putting several names or updating the provided one)
*/
this->packageFileNames.emplace_back(tempPackageFileName);
}
// Do package the files (using the derived CPack generators.
{ // scope that enables package generators to run internal scripts with { // scope that enables package generators to run internal scripts with
// latest CMake policies enabled // latest CMake policies enabled
cmMakefile::ScopePushPop pp{ this->MakefileMap }; cmMakefile::ScopePushPop pp{ this->MakefileMap };
@@ -1169,6 +1183,7 @@ int cmCPackGenerator::DoPackage()
return 0; return 0;
} }
} }
// Run post-build actions // Run post-build actions
cmValue postBuildScripts = this->GetOption("CPACK_POST_BUILD_SCRIPTS"); cmValue postBuildScripts = this->GetOption("CPACK_POST_BUILD_SCRIPTS");
if (postBuildScripts) { if (postBuildScripts) {