diff options
Diffstat (limited to 'Source/CPack/cmCPackNSISGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 33 |
1 files changed, 22 insertions, 11 deletions
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(); |