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

Refactor: cmCPackDebGenerator::PackageComponents handle else first

Browse Source 
Also, return early to reduce nesting level of the function body.
This commit is contained in:
Alex Turbov
2021-07-13 01:48:38 +03:00
committed by Brad King
parent 008321595a
commit 7fd3134ea1
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackDebGenerator.cxx
+26 -26
View File
@@ -565,40 +565,40 @@ int cmCPackDebGenerator::PackageOnePack(std::string const& initialTopLevel,
int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
{ {
int retval = 1; // Reset package file name list it will be populated during the
/* Reset package file name list it will be populated during the // component packaging run
* component packaging run*/
this->packageFileNames.clear(); this->packageFileNames.clear();
std::string initialTopLevel(this->GetOption("CPACK_TEMPORARY_DIRECTORY")); std::string initialTopLevel(this->GetOption("CPACK_TEMPORARY_DIRECTORY"));
int retval = 1;
// The default behavior is to have one package by component group // The default behavior is to have one package by component group
// unless CPACK_COMPONENTS_IGNORE_GROUP is specified. // unless CPACK_COMPONENTS_IGNORE_GROUP is specified.
if (!ignoreGroup) { if (ignoreGroup) {
for (auto const& compG : this->ComponentGroups) { // CPACK_COMPONENTS_IGNORE_GROUPS is set
cmCPackLogger(cmCPackLog::LOG_VERBOSE, // We build 1 package per component
"Packaging component group: " << compG.first << std::endl);
// Begin the archive for this group
retval &= this->PackageOnePack(initialTopLevel, compG.first);
}
// Handle Orphan components (components not belonging to any groups)
for (auto const& comp : this->Components) { for (auto const& comp : this->Components) {
// Does the component belong to a group? retval &= this->PackageOnePack(initialTopLevel, comp.first);
if (comp.second.Group == nullptr) {
cmCPackLogger(
cmCPackLog::LOG_VERBOSE,
"Component <"
<< comp.second.Name
<< "> does not belong to any group, package it separately."
<< std::endl);
// Begin the archive for this orphan component
retval &= this->PackageOnePack(initialTopLevel, comp.first);
}
} }
return retval;
} }
// CPACK_COMPONENTS_IGNORE_GROUPS is set
// We build 1 package per component for (auto const& compG : this->ComponentGroups) {
else { cmCPackLogger(cmCPackLog::LOG_VERBOSE,
for (auto const& comp : this->Components) { "Packaging component group: " << compG.first << std::endl);
// Begin the archive for this group
retval &= this->PackageOnePack(initialTopLevel, compG.first);
}
// Handle Orphan components (components not belonging to any groups)
for (auto const& comp : this->Components) {
// Does the component belong to a group?
if (comp.second.Group == nullptr) {
cmCPackLogger(
cmCPackLog::LOG_VERBOSE,
"Component <"
<< comp.second.Name
<< "> does not belong to any group, package it separately."
<< std::endl);
// Begin the archive for this orphan component
retval &= this->PackageOnePack(initialTopLevel, comp.first); retval &= this->PackageOnePack(initialTopLevel, comp.first);
} }
} }