[Cmake-commits] [cmake-commits] hoffman committed cmCPackBundleGenerator.cxx 1.3 1.4 cmCPackGenerator.cxx 1.13 1.14 cmCPackGenerator.h 1.6 1.7 cmCPackNSISGenerator.cxx 1.36 1.37 cmCPackNSISGenerator.h 1.13 1.14 cmCPackPackageMakerGenerator.cxx 1.28 1.29
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Oct 1 09:04:30 EDT 2008
Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv23135/Source/CPack
Modified Files:
cmCPackBundleGenerator.cxx cmCPackGenerator.cxx
cmCPackGenerator.h cmCPackNSISGenerator.cxx
cmCPackNSISGenerator.h cmCPackPackageMakerGenerator.cxx
Log Message:
STYLE: fix line length stuff for KWStyle
Index: cmCPackBundleGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackBundleGenerator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmCPackBundleGenerator.cxx 18 Jul 2008 20:12:36 -0000 1.3
--- cmCPackBundleGenerator.cxx 1 Oct 2008 13:04:27 -0000 1.4
***************
*** 81,85 ****
// Get required arguments ...
! const std::string cpack_bundle_name = this->GetOption("CPACK_BUNDLE_NAME") ? this->GetOption("CPACK_BUNDLE_NAME") : "";
if(cpack_bundle_name.empty())
{
--- 81,86 ----
// Get required arguments ...
! const std::string cpack_bundle_name = this->GetOption("CPACK_BUNDLE_NAME")
! ? this->GetOption("CPACK_BUNDLE_NAME") : "";
if(cpack_bundle_name.empty())
{
***************
*** 91,95 ****
}
! const std::string cpack_bundle_plist = this->GetOption("CPACK_BUNDLE_PLIST") ? this->GetOption("CPACK_BUNDLE_PLIST") : "";
if(cpack_bundle_plist.empty())
{
--- 92,97 ----
}
! const std::string cpack_bundle_plist = this->GetOption("CPACK_BUNDLE_PLIST")
! ? this->GetOption("CPACK_BUNDLE_PLIST") : "";
if(cpack_bundle_plist.empty())
{
***************
*** 101,105 ****
}
! const std::string cpack_bundle_icon = this->GetOption("CPACK_BUNDLE_ICON") ? this->GetOption("CPACK_BUNDLE_ICON") : "";
if(cpack_bundle_icon.empty())
{
--- 103,108 ----
}
! const std::string cpack_bundle_icon = this->GetOption("CPACK_BUNDLE_ICON")
! ? this->GetOption("CPACK_BUNDLE_ICON") : "";
if(cpack_bundle_icon.empty())
{
***************
*** 111,115 ****
}
! 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())
{
--- 114,120 ----
}
! 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())
{
***************
*** 122,126 ****
// Get optional arguments ...
! 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
--- 127,132 ----
// Get optional arguments ...
! 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
Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** cmCPackGenerator.cxx 24 Sep 2008 13:57:52 -0000 1.13
--- cmCPackGenerator.cxx 1 Oct 2008 13:04:27 -0000 1.14
***************
*** 662,668 ****
}
! cmCPackLogger(cmCPackLog::LOG_DEBUG,
! "- Using DESTDIR + CPACK_INSTALL_PREFIX... (mf->AddDefinition)"
! << std::endl);
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"- Setting CMAKE_INSTALL_PREFIX to '" << dir << "'"
--- 662,669 ----
}
! cmCPackLogger(
! cmCPackLog::LOG_DEBUG,
! "- Using DESTDIR + CPACK_INSTALL_PREFIX... (mf->AddDefinition)"
! << std::endl);
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"- Setting CMAKE_INSTALL_PREFIX to '" << dir << "'"
***************
*** 682,688 ****
cmCPackLogger(cmCPackLog::LOG_DEBUG,
! "- Using non-DESTDIR install... (mf->AddDefinition)" << std::endl);
cmCPackLogger(cmCPackLog::LOG_DEBUG,
! "- Setting CMAKE_INSTALL_PREFIX to '" << tempInstallDirectory
<< "'" << std::endl);
}
--- 683,691 ----
cmCPackLogger(cmCPackLog::LOG_DEBUG,
! "- Using non-DESTDIR install... (mf->AddDefinition)"
! << std::endl);
cmCPackLogger(cmCPackLog::LOG_DEBUG,
! "- Setting CMAKE_INSTALL_PREFIX to '"
! << tempInstallDirectory
<< "'" << std::endl);
}
***************
*** 771,775 ****
if ( cmSystemTools::FileExists(toplevelDirectory) )
{
! cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Remove toplevel directory: "
<< toplevelDirectory << std::endl);
if ( !cmSystemTools::RemoveADirectory(toplevelDirectory) )
--- 774,779 ----
if ( cmSystemTools::FileExists(toplevelDirectory) )
{
! cmCPackLogger(cmCPackLog::LOG_VERBOSE,
! "Remove toplevel directory: "
<< toplevelDirectory << std::endl);
if ( !cmSystemTools::RemoveADirectory(toplevelDirectory) )
***************
*** 1078,1082 ****
//----------------------------------------------------------------------
cmCPackInstallationType*
! cmCPackGenerator::GetInstallationType(const char *projectName, const char *name)
{
(void) projectName;
--- 1082,1087 ----
//----------------------------------------------------------------------
cmCPackInstallationType*
! cmCPackGenerator::GetInstallationType(const char *projectName,
! const char *name)
{
(void) projectName;
***************
*** 1139,1143 ****
|| cmSystemTools::IsOn(this->GetOption("CPACK_DOWNLOAD_ALL"));
! const char* archiveFile = this->GetOption((macroPrefix + "_ARCHIVE_FILE").c_str());
if (archiveFile && *archiveFile)
{
--- 1144,1149 ----
|| cmSystemTools::IsOn(this->GetOption("CPACK_DOWNLOAD_ALL"));
! const char* archiveFile = this->GetOption((macroPrefix +
! "_ARCHIVE_FILE").c_str());
if (archiveFile && *archiveFile)
{
***************
*** 1191,1195 ****
++dependIt)
{
! cmCPackComponent *child = GetComponent(projectName, dependIt->c_str());
component->Dependencies.push_back(child);
child->ReverseDependencies.push_back(component);
--- 1197,1202 ----
++dependIt)
{
! cmCPackComponent *child = GetComponent(projectName,
! dependIt->c_str());
component->Dependencies.push_back(child);
child->ReverseDependencies.push_back(component);
Index: cmCPackGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** cmCPackGenerator.h 24 Sep 2008 13:57:52 -0000 1.6
--- cmCPackGenerator.h 1 Oct 2008 13:04:27 -0000 1.7
***************
*** 128,134 ****
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);
bool GeneratorVerbose;
--- 128,137 ----
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);
bool GeneratorVerbose;
Index: cmCPackNSISGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** cmCPackNSISGenerator.h 8 Jul 2008 15:52:24 -0000 1.13
--- cmCPackNSISGenerator.h 1 Oct 2008 13:04:27 -0000 1.14
***************
*** 66,71 ****
std::set<cmCPackComponent *>& visited);
! /// Produce NSIS code that de-selects all of the components that are dependent
! /// on this component, recursively.
std::string CreateDeselectionDependenciesDescription
(cmCPackComponent *component,
--- 66,71 ----
std::set<cmCPackComponent *>& visited);
! /// Produce NSIS code that de-selects all of the components that are
! /// dependent on this component, recursively.
std::string CreateDeselectionDependenciesDescription
(cmCPackComponent *component,
Index: cmCPackPackageMakerGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackPackageMakerGenerator.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -C 2 -d -r1.28 -r1.29
*** cmCPackPackageMakerGenerator.cxx 30 Jul 2008 17:28:17 -0000 1.28
--- cmCPackPackageMakerGenerator.cxx 1 Oct 2008 13:04:27 -0000 1.29
***************
*** 180,184 ****
// Create the directory where downloaded component packages will
// be placed.
! const char* userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY");
std::string uploadDirectory;
if (userUploadDirectory && *userUploadDirectory)
--- 180,185 ----
// Create the directory where downloaded component packages will
// be placed.
! const char* userUploadDirectory =
! this->GetOption("CPACK_UPLOAD_DIRECTORY");
std::string uploadDirectory;
if (userUploadDirectory && *userUploadDirectory)
***************
*** 223,229 ****
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);
}
--- 224,233 ----
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);
}
***************
*** 231,235 ****
{
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."
<< std::endl);
}
--- 235,241 ----
{
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."
<< std::endl);
}
***************
*** 606,610 ****
{
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
! "- Building component package: " << packageFile << std::endl);
// The command that will be used to run PackageMaker
--- 612,617 ----
{
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
! "- Building component package: " <<
! packageFile << std::endl);
// The command that will be used to run PackageMaker
***************
*** 639,643 ****
std::string moduleVersionSuffix = ".";
moduleVersionSuffix += component.Name;
! this->SetOption("CPACK_MODULE_VERSION_SUFFIX", moduleVersionSuffix.c_str());
std::string infoFileName = component.Name;
infoFileName += "-Info.plist";
--- 646,651 ----
std::string moduleVersionSuffix = ".";
moduleVersionSuffix += component.Name;
! this->SetOption("CPACK_MODULE_VERSION_SUFFIX",
! moduleVersionSuffix.c_str());
std::string infoFileName = component.Name;
infoFileName += "-Info.plist";
***************
*** 802,806 ****
<< "title=\"" << component.DisplayName << "\" "
<< "start_selected=\""
! << (component.IsDisabledByDefault && !component.IsRequired? "false" : "true")
<< "\" "
<< "start_enabled=\""
--- 810,815 ----
<< "title=\"" << component.DisplayName << "\" "
<< "start_selected=\""
! << (component.IsDisabledByDefault &&
! !component.IsRequired? "false" : "true")
<< "\" "
<< "start_enabled=\""
***************
*** 813,817 ****
<< "\" ";
}
! if (!component.Dependencies.empty() || !component.ReverseDependencies.empty())
{
// The "selected" expression is evaluated each time any choice is
--- 822,827 ----
<< "\" ";
}
! if (!component.Dependencies.empty() ||
! !component.ReverseDependencies.empty())
{
// The "selected" expression is evaluated each time any choice is
***************
*** 886,890 ****
++dependIt)
{
! out << " && choices['" << (*dependIt)->Name << "Choice'].selected";
AddDependencyAttributes(**dependIt, visited, out);
}
--- 896,901 ----
++dependIt)
{
! out << " && choices['" <<
! (*dependIt)->Name << "Choice'].selected";
AddDependencyAttributes(**dependIt, visited, out);
}
Index: cmCPackNSISGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** cmCPackNSISGenerator.cxx 8 Jul 2008 15:52:24 -0000 1.36
--- cmCPackNSISGenerator.cxx 1 Oct 2008 13:04:27 -0000 1.37
***************
*** 112,116 ****
if (slash != std::string::npos)
{
! // If this is a component installation, determine which component it is.
componentName = fileN.substr(0, slash);
--- 112,117 ----
if (slash != std::string::npos)
{
! // If this is a component installation, determine which component it
! // is.
componentName = fileN.substr(0, slash);
***************
*** 285,294 ****
}
! 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->SetOption("CPACK_NSIS_DEFINES", defines.c_str());
}
--- 286,300 ----
}
! 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->SetOption("CPACK_NSIS_DEFINES", defines.c_str());
}
***************
*** 591,595 ****
std::string
cmCPackNSISGenerator::
! CreateComponentDescription(cmCPackComponent *component, cmOStringStream& macrosOut)
{
// Basic description of the component
--- 597,602 ----
std::string
cmCPackNSISGenerator::
! CreateComponentDescription(cmCPackComponent *component,
! cmOStringStream& macrosOut)
{
// Basic description of the component
***************
*** 641,645 ****
// Create the directory for the upload area
! const char* userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY");
std::string uploadDirectory;
if (userUploadDirectory && *userUploadDirectory)
--- 648,653 ----
// Create the directory for the upload area
! const char* userUploadDirectory =
! this->GetOption("CPACK_UPLOAD_DIRECTORY");
std::string uploadDirectory;
if (userUploadDirectory && *userUploadDirectory)
***************
*** 771,775 ****
else
{
! componentCode += " File /r \"${INST_DIR}\\" + component->Name + "\\*.*\"\n";
}
componentCode += " noinstall_" + component->Name + ":\n";
--- 779,784 ----
else
{
! componentCode += " File /r \"${INST_DIR}\\" +
! component->Name + "\\*.*\"\n";
}
componentCode += " noinstall_" + component->Name + ":\n";
***************
*** 838,842 ****
out << " IntOp $0 $0 | ${SF_SELECTED}\n";
out << " SectionSetFlags ${" << (*dependIt)->Name << "} $0\n";
! out << " IntOp $" << (*dependIt)->Name << "_selected 0 + ${SF_SELECTED}\n";
// Recurse
out << CreateSelectionDependenciesDescription(*dependIt, visited).c_str();
--- 847,852 ----
out << " IntOp $0 $0 | ${SF_SELECTED}\n";
out << " SectionSetFlags ${" << (*dependIt)->Name << "} $0\n";
! out << " IntOp $" << (*dependIt)->Name
! << "_selected 0 + ${SF_SELECTED}\n";
// Recurse
out << CreateSelectionDependenciesDescription(*dependIt, visited).c_str();
***************
*** 873,877 ****
// Recurse
! out << CreateDeselectionDependenciesDescription(*dependIt, visited).c_str();
}
--- 883,888 ----
// Recurse
! out <<
! CreateDeselectionDependenciesDescription(*dependIt, visited).c_str();
}
More information about the Cmake-commits
mailing list