mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 23:00:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmCPackGenerator: Refactor copying of package files into own function

Browse Source
This commit is contained in:
Deniz Bahadir
2024-04-30 18:36:25 +02:00
parent d488efa0b4
commit 12123b5b6b
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Source/CPack/cmCPackGenerator.cxx
View File

@@ -993,6 +993,29 @@ bool cmCPackGenerator::GenerateChecksumFile(cmCryptoHash& crypto,
return true;
}
bool cmCPackGenerator::CopyPackageFile(const std::string& srcFilePath,
cm::string_view filename) const
{
std::string destFilePath =
cmStrCat(this->GetOption("CPACK_OUTPUT_FILE_PREFIX"), "/", filename);
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"Copy final package(s): "
<< (!srcFilePath.empty() ? srcFilePath : "(NULL)") << " to "
<< (!destFilePath.empty() ? destFilePath : "(NULL)")
<< std::endl);
if (!cmSystemTools::CopyFileIfDifferent(srcFilePath, destFilePath)) {
cmCPackLogger(
cmCPackLog::LOG_ERROR,
"Problem copying the package: "
<< (!srcFilePath.empty() ? srcFilePath : "(NULL)") << " to "
<< (!destFilePath.empty() ? destFilePath : "(NULL)") << std::endl);
return false;
}
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- package: " << destFilePath << " generated." << std::endl);
return true;
}
bool cmCPackGenerator::ReadListFile(const char* moduleName)
{
bool retval;
@@ -1172,28 +1195,10 @@ int cmCPackGenerator::DoPackage()
<< "]:" << std::endl);
/* now copy package one by one */
for (std::string const& pkgFileName : this->packageFileNames) {
std::string tmpPF(this->GetOption("CPACK_OUTPUT_FILE_PREFIX"));
std::string filename(cmSystemTools::GetFilenameName(pkgFileName));
tempPackageFileName = cmValue(pkgFileName);
tmpPF += "/" + filename;
const char* packageFileName = tmpPF.c_str();
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"Copy final package(s): "
<< (tempPackageFileName ? *tempPackageFileName : "(NULL)")
<< " to " << (packageFileName ? packageFileName : "(NULL)")
<< std::endl);
if (!cmSystemTools::CopyFileIfDifferent(pkgFileName, tmpPF)) {
cmCPackLogger(
cmCPackLog::LOG_ERROR,
"Problem copying the package: "
<< (tempPackageFileName ? *tempPackageFileName : "(NULL)") << " to "
<< (packageFileName ? packageFileName : "(NULL)") << std::endl);
if (!this->CopyPackageFile(pkgFileName, filename)) {
return 0;
}
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- package: " << packageFileName << " generated."
<< std::endl);
/* Generate checksum file */
if (crypto) {
if (!this->GenerateChecksumFile(*crypto, filename)) {

2
Source/CPack/cmCPackGenerator.h
View File

@@ -185,6 +185,8 @@ protected:
bool GenerateChecksumFile(cmCryptoHash& crypto,
cm::string_view filename) const;
bool CopyPackageFile(const std::string& srcFilePath,
cm::string_view filename) const;
std::string FindTemplate(cm::string_view name,
cm::optional<cm::string_view> alt = cm::nullopt);