diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-10-01 13:04:27 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-10-01 13:04:27 (GMT) |
commit | ecf312ccc87ae455267df27ad5cbe2c031e9ef18 (patch) | |
tree | 4aa28cac73526043f0e7886cc993f0c773ad87c2 /Source/CPack | |
parent | 8a704d5686280ab804f03e48a180ff871422609f (diff) | |
download | CMake-ecf312ccc87ae455267df27ad5cbe2c031e9ef18.zip CMake-ecf312ccc87ae455267df27ad5cbe2c031e9ef18.tar.gz CMake-ecf312ccc87ae455267df27ad5cbe2c031e9ef18.tar.bz2 |
STYLE: fix line length stuff for KWStyle
Diffstat (limited to 'Source/CPack')
-rw-r--r-- | Source/CPack/cmCPackBundleGenerator.cxx | 16 | ||||
-rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 25 | ||||
-rw-r--r-- | Source/CPack/cmCPackGenerator.h | 9 | ||||
-rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 33 | ||||
-rw-r--r-- | Source/CPack/cmCPackNSISGenerator.h | 4 | ||||
-rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 31 |
6 files changed, 78 insertions, 40 deletions
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx index 066efc8..710c412 100644 --- a/Source/CPack/cmCPackBundleGenerator.cxx +++ b/Source/CPack/cmCPackBundleGenerator.cxx @@ -80,7 +80,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName, (void) files; // Get required arguments ... - const std::string cpack_bundle_name = this->GetOption("CPACK_BUNDLE_NAME") ? this->GetOption("CPACK_BUNDLE_NAME") : ""; + const std::string cpack_bundle_name = this->GetOption("CPACK_BUNDLE_NAME") + ? this->GetOption("CPACK_BUNDLE_NAME") : ""; if(cpack_bundle_name.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, @@ -90,7 +91,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName, return 0; } - const std::string cpack_bundle_plist = this->GetOption("CPACK_BUNDLE_PLIST") ? this->GetOption("CPACK_BUNDLE_PLIST") : ""; + const std::string cpack_bundle_plist = this->GetOption("CPACK_BUNDLE_PLIST") + ? this->GetOption("CPACK_BUNDLE_PLIST") : ""; if(cpack_bundle_plist.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, @@ -100,7 +102,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName, return 0; } - const std::string cpack_bundle_icon = this->GetOption("CPACK_BUNDLE_ICON") ? this->GetOption("CPACK_BUNDLE_ICON") : ""; + const std::string cpack_bundle_icon = this->GetOption("CPACK_BUNDLE_ICON") + ? this->GetOption("CPACK_BUNDLE_ICON") : ""; if(cpack_bundle_icon.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, @@ -110,7 +113,9 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName, return 0; } - const std::string cpack_bundle_startup_command = this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") ? this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") : ""; + const std::string cpack_bundle_startup_command = + this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") ? + this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") : ""; if(cpack_bundle_startup_command.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, @@ -121,7 +126,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName, } // Get optional arguments ... - const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON") ? this->GetOption("CPACK_PACKAGE_ICON") : ""; + const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON") + ? this->GetOption("CPACK_PACKAGE_ICON") : ""; // The staging directory contains everything that will end-up inside the // final disk image ... diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index b68be5b..ab2ae32 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -661,9 +661,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( return 0; } - cmCPackLogger(cmCPackLog::LOG_DEBUG, - "- Using DESTDIR + CPACK_INSTALL_PREFIX... (mf->AddDefinition)" - << std::endl); + cmCPackLogger( + cmCPackLog::LOG_DEBUG, + "- Using DESTDIR + CPACK_INSTALL_PREFIX... (mf->AddDefinition)" + << std::endl); cmCPackLogger(cmCPackLog::LOG_DEBUG, "- Setting CMAKE_INSTALL_PREFIX to '" << dir << "'" << std::endl); @@ -681,9 +682,11 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( } cmCPackLogger(cmCPackLog::LOG_DEBUG, - "- Using non-DESTDIR install... (mf->AddDefinition)" << std::endl); + "- Using non-DESTDIR install... (mf->AddDefinition)" + << std::endl); cmCPackLogger(cmCPackLog::LOG_DEBUG, - "- Setting CMAKE_INSTALL_PREFIX to '" << tempInstallDirectory + "- Setting CMAKE_INSTALL_PREFIX to '" + << tempInstallDirectory << "'" << std::endl); } @@ -770,7 +773,8 @@ int cmCPackGenerator::DoPackage() = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); if ( cmSystemTools::FileExists(toplevelDirectory) ) { - cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Remove toplevel directory: " + cmCPackLogger(cmCPackLog::LOG_VERBOSE, + "Remove toplevel directory: " << toplevelDirectory << std::endl); if ( !cmSystemTools::RemoveADirectory(toplevelDirectory) ) { @@ -1077,7 +1081,8 @@ bool cmCPackGenerator::SupportsComponentInstallation() const //---------------------------------------------------------------------- cmCPackInstallationType* -cmCPackGenerator::GetInstallationType(const char *projectName, const char *name) +cmCPackGenerator::GetInstallationType(const char *projectName, + const char *name) { (void) projectName; bool hasInstallationType = this->InstallationTypes.count(name) != 0; @@ -1138,7 +1143,8 @@ cmCPackGenerator::GetComponent(const char *projectName, const char *name) = this->IsSet((macroPrefix + "_DOWNLOADED").c_str()) || cmSystemTools::IsOn(this->GetOption("CPACK_DOWNLOAD_ALL")); - const char* archiveFile = this->GetOption((macroPrefix + "_ARCHIVE_FILE").c_str()); + const char* archiveFile = this->GetOption((macroPrefix + + "_ARCHIVE_FILE").c_str()); if (archiveFile && *archiveFile) { component->ArchiveFile = archiveFile; @@ -1190,7 +1196,8 @@ cmCPackGenerator::GetComponent(const char *projectName, const char *name) dependIt != dependsVector.end(); ++dependIt) { - cmCPackComponent *child = GetComponent(projectName, dependIt->c_str()); + cmCPackComponent *child = GetComponent(projectName, + dependIt->c_str()); component->Dependencies.push_back(child); child->ReverseDependencies.push_back(component); } diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index 0a4bfa7..98002c4 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -127,9 +127,12 @@ protected: bool setDestDir, const char* tempInstallDirectory); virtual bool SupportsComponentInstallation() const; - virtual cmCPackInstallationType* GetInstallationType(const char *projectName, const char* name); - virtual cmCPackComponent* GetComponent(const char *projectName, const char* name); - virtual cmCPackComponentGroup* GetComponentGroup(const char *projectName, const char* name); + virtual cmCPackInstallationType* GetInstallationType(const char *projectName, + const char* name); + virtual cmCPackComponent* GetComponent(const char *projectName, + const char* name); + virtual cmCPackComponentGroup* GetComponentGroup(const char *projectName, + const char* name); bool GeneratorVerbose; std::string Name; diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 7be5cb2..3072419 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -111,7 +111,8 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName, std::string::size_type slash = fileN.find('/'); if (slash != std::string::npos) { - // If this is a component installation, determine which component it is. + // If this is a component installation, determine which component it + // is. componentName = fileN.substr(0, slash); // Strip off the component part of the path. @@ -284,12 +285,17 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName, } } - this->SetOptionIfNotSet("CPACK_NSIS_INSTALLATION_TYPES", installTypesCode.c_str()); - this->SetOptionIfNotSet("CPACK_NSIS_PAGE_COMPONENTS", "!insertmacro MUI_PAGE_COMPONENTS"); + this->SetOptionIfNotSet("CPACK_NSIS_INSTALLATION_TYPES", + installTypesCode.c_str()); + this->SetOptionIfNotSet("CPACK_NSIS_PAGE_COMPONENTS", + "!insertmacro MUI_PAGE_COMPONENTS"); this->SetOptionIfNotSet("CPACK_NSIS_FULL_INSTALL", ""); - this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTIONS", componentCode.c_str()); - this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTION_LIST", sectionList.c_str()); - this->SetOptionIfNotSet("CPACK_NSIS_SECTION_SELECTED_VARS", selectedVarsList.c_str()); + this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTIONS", + componentCode.c_str()); + this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTION_LIST", + sectionList.c_str()); + this->SetOptionIfNotSet("CPACK_NSIS_SECTION_SELECTED_VARS", + selectedVarsList.c_str()); this->SetOption("CPACK_NSIS_DEFINES", defines.c_str()); } @@ -590,7 +596,8 @@ bool cmCPackNSISGenerator::SupportsComponentInstallation() const //---------------------------------------------------------------------- std::string cmCPackNSISGenerator:: -CreateComponentDescription(cmCPackComponent *component, cmOStringStream& macrosOut) +CreateComponentDescription(cmCPackComponent *component, + cmOStringStream& macrosOut) { // Basic description of the component std::string componentCode = "Section "; @@ -640,7 +647,8 @@ CreateComponentDescription(cmCPackComponent *component, cmOStringStream& macrosO } // Create the directory for the upload area - const char* userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY"); + const char* userUploadDirectory = + this->GetOption("CPACK_UPLOAD_DIRECTORY"); std::string uploadDirectory; if (userUploadDirectory && *userUploadDirectory) { @@ -770,7 +778,8 @@ CreateComponentDescription(cmCPackComponent *component, cmOStringStream& macrosO } else { - componentCode += " File /r \"${INST_DIR}\\" + component->Name + "\\*.*\"\n"; + componentCode += " File /r \"${INST_DIR}\\" + + component->Name + "\\*.*\"\n"; } componentCode += " noinstall_" + component->Name + ":\n"; componentCode += "SectionEnd\n"; @@ -837,7 +846,8 @@ std::string cmCPackNSISGenerator::CreateSelectionDependenciesDescription out << " SectionGetFlags ${" << (*dependIt)->Name << "} $0\n"; out << " IntOp $0 $0 | ${SF_SELECTED}\n"; out << " SectionSetFlags ${" << (*dependIt)->Name << "} $0\n"; - out << " IntOp $" << (*dependIt)->Name << "_selected 0 + ${SF_SELECTED}\n"; + out << " IntOp $" << (*dependIt)->Name + << "_selected 0 + ${SF_SELECTED}\n"; // Recurse out << CreateSelectionDependenciesDescription(*dependIt, visited).c_str(); } @@ -872,7 +882,8 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription out << " IntOp $" << (*dependIt)->Name << "_selected 0 + 0\n"; // Recurse - out << CreateDeselectionDependenciesDescription(*dependIt, visited).c_str(); + out << + CreateDeselectionDependenciesDescription(*dependIt, visited).c_str(); } return out.str(); diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index 5299a91..aa44728 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -65,8 +65,8 @@ protected: (cmCPackComponent *component, std::set<cmCPackComponent *>& visited); - /// Produce NSIS code that de-selects all of the components that are dependent - /// on this component, recursively. + /// Produce NSIS code that de-selects all of the components that are + /// dependent on this component, recursively. std::string CreateDeselectionDependenciesDescription (cmCPackComponent *component, std::set<cmCPackComponent *>& visited); diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 049a6e4..96a60c8 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -179,7 +179,8 @@ int cmCPackPackageMakerGenerator::CompressFiles(const char* outFileName, // Create the directory where downloaded component packages will // be placed. - const char* userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY"); + const char* userUploadDirectory = + this->GetOption("CPACK_UPLOAD_DIRECTORY"); std::string uploadDirectory; if (userUploadDirectory && *userUploadDirectory) { @@ -222,15 +223,20 @@ int cmCPackPackageMakerGenerator::CompressFiles(const char* outFileName, { if (this->PackageCompatibilityVersion < 10.5) { - cmCPackLogger(cmCPackLog::LOG_WARNING, - "CPack warning: please set CPACK_OSX_PACKAGE_VERSION to 10.5 or greater enable downloaded packages. CPack will build a non-downloaded package." - << std::endl); + cmCPackLogger( + cmCPackLog::LOG_WARNING, + "CPack warning: please set CPACK_OSX_PACKAGE_VERSION to 10.5 " + "or greater enable downloaded packages. CPack will build a " + "non-downloaded package." + << std::endl); } if (this->PackageMakerVersion < 3) { cmCPackLogger(cmCPackLog::LOG_WARNING, - "CPack warning: unable to build downloaded packages with PackageMaker versions prior to 3.0. CPack will build a non-downloaded package." + "CPack warning: unable to build downloaded " + "packages with PackageMaker versions prior " + "to 3.0. CPack will build a non-downloaded package." << std::endl); } @@ -605,7 +611,8 @@ GenerateComponentPackage(const char *packageFile, const cmCPackComponent& component) { cmCPackLogger(cmCPackLog::LOG_OUTPUT, - "- Building component package: " << packageFile << std::endl); + "- Building component package: " << + packageFile << std::endl); // The command that will be used to run PackageMaker cmOStringStream pkgCmd; @@ -638,7 +645,8 @@ GenerateComponentPackage(const char *packageFile, // Create the Info.plist file for this component std::string moduleVersionSuffix = "."; moduleVersionSuffix += component.Name; - this->SetOption("CPACK_MODULE_VERSION_SUFFIX", moduleVersionSuffix.c_str()); + this->SetOption("CPACK_MODULE_VERSION_SUFFIX", + moduleVersionSuffix.c_str()); std::string infoFileName = component.Name; infoFileName += "-Info.plist"; if (!this->CopyResourcePlistFile("Info.plist", infoFileName.c_str())) @@ -801,7 +809,8 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, out << "<choice id=\"" << component.Name << "Choice\" " << "title=\"" << component.DisplayName << "\" " << "start_selected=\"" - << (component.IsDisabledByDefault && !component.IsRequired? "false" : "true") + << (component.IsDisabledByDefault && + !component.IsRequired? "false" : "true") << "\" " << "start_enabled=\"" << (component.IsRequired? "false" : "true") @@ -812,7 +821,8 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, out << "description=\"" << EscapeForXML(component.Description) << "\" "; } - if (!component.Dependencies.empty() || !component.ReverseDependencies.empty()) + if (!component.Dependencies.empty() || + !component.ReverseDependencies.empty()) { // The "selected" expression is evaluated each time any choice is // selected, for all choices *except* the one that the user @@ -885,7 +895,8 @@ AddDependencyAttributes(const cmCPackComponent& component, dependIt != component.Dependencies.end(); ++dependIt) { - out << " && choices['" << (*dependIt)->Name << "Choice'].selected"; + out << " && choices['" << + (*dependIt)->Name << "Choice'].selected"; AddDependencyAttributes(**dependIt, visited, out); } } |