summaryrefslogtreecommitdiffstats
path: root/Source/CPack/IFW
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CPack/IFW')
-rw-r--r--Source/CPack/IFW/cmCPackIFWCommon.cxx2
-rw-r--r--Source/CPack/IFW/cmCPackIFWCommon.h4
-rw-r--r--Source/CPack/IFW/cmCPackIFWGenerator.cxx34
-rw-r--r--Source/CPack/IFW/cmCPackIFWInstaller.cxx61
-rw-r--r--Source/CPack/IFW/cmCPackIFWPackage.cxx60
-rw-r--r--Source/CPack/IFW/cmCPackIFWRepository.cxx14
6 files changed, 89 insertions, 86 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWCommon.cxx b/Source/CPack/IFW/cmCPackIFWCommon.cxx
index c7ab994..f6b8a8a 100644
--- a/Source/CPack/IFW/cmCPackIFWCommon.cxx
+++ b/Source/CPack/IFW/cmCPackIFWCommon.cxx
@@ -21,7 +21,7 @@ cmCPackIFWCommon::cmCPackIFWCommon()
{
}
-cmProp cmCPackIFWCommon::GetOption(const std::string& op) const
+cmValue cmCPackIFWCommon::GetOption(const std::string& op) const
{
return this->Generator ? this->Generator->cmCPackGenerator::GetOption(op)
: nullptr;
diff --git a/Source/CPack/IFW/cmCPackIFWCommon.h b/Source/CPack/IFW/cmCPackIFWCommon.h
index cf243dc..f2e6b88 100644
--- a/Source/CPack/IFW/cmCPackIFWCommon.h
+++ b/Source/CPack/IFW/cmCPackIFWCommon.h
@@ -7,7 +7,7 @@
#include <map>
#include <string>
-#include "cmProperty.h"
+#include "cmValue.h"
class cmCPackIFWGenerator;
class cmXMLWriter;
@@ -28,7 +28,7 @@ public:
public:
// Internal implementation
- cmProp GetOption(const std::string& op) const;
+ cmValue GetOption(const std::string& op) const;
bool IsOn(const std::string& op) const;
bool IsSetToOff(const std::string& op) const;
bool IsSetToEmpty(const std::string& op) const;
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
index 0e2aec0..b375ba6 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
@@ -14,9 +14,9 @@
#include "cmCPackLog.h" // IWYU pragma: keep
#include "cmDuration.h"
#include "cmGeneratedFileStream.h"
-#include "cmProperty.h"
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
+#include "cmValue.h"
cmCPackIFWGenerator::cmCPackIFWGenerator()
{
@@ -274,7 +274,7 @@ int cmCPackIFWGenerator::InitializeInternal()
// Look 'binarycreator' executable (needs)
- cmProp BinCreatorStr = this->GetOption(BinCreatorOpt);
+ cmValue BinCreatorStr = this->GetOption(BinCreatorOpt);
if (!BinCreatorStr || cmIsNOTFOUND(BinCreatorStr)) {
this->BinCreator.clear();
} else {
@@ -291,7 +291,7 @@ int cmCPackIFWGenerator::InitializeInternal()
// Look 'repogen' executable (optional)
- cmProp repoGen = this->GetOption(RepoGenOpt);
+ cmValue repoGen = this->GetOption(RepoGenOpt);
if (!repoGen || cmIsNOTFOUND(repoGen)) {
this->RepoGen.clear();
} else {
@@ -299,7 +299,7 @@ int cmCPackIFWGenerator::InitializeInternal()
}
// Framework version
- if (cmProp frameworkVersion = this->GetOption(FrameworkVersionOpt)) {
+ if (cmValue frameworkVersion = this->GetOption(FrameworkVersionOpt)) {
this->FrameworkVersion = *frameworkVersion;
} else {
this->FrameworkVersion = "1.9.9";
@@ -313,13 +313,13 @@ int cmCPackIFWGenerator::InitializeInternal()
// Additional packages dirs
this->PkgsDirsVector.clear();
- if (cmProp dirs = this->GetOption("CPACK_IFW_PACKAGES_DIRECTORIES")) {
+ if (cmValue dirs = this->GetOption("CPACK_IFW_PACKAGES_DIRECTORIES")) {
cmExpandList(dirs, this->PkgsDirsVector);
}
// Additional repositories dirs
this->RepoDirsVector.clear();
- if (cmProp dirs = this->GetOption("CPACK_IFW_REPOSITORIES_DIRECTORIES")) {
+ if (cmValue dirs = this->GetOption("CPACK_IFW_REPOSITORIES_DIRECTORIES")) {
cmExpandList(dirs, this->RepoDirsVector);
}
@@ -330,22 +330,23 @@ int cmCPackIFWGenerator::InitializeInternal()
// Repository
this->Repository.Generator = this;
this->Repository.Name = "Unspecified";
- if (cmProp site = this->GetOption("CPACK_DOWNLOAD_SITE")) {
+ if (cmValue site = this->GetOption("CPACK_DOWNLOAD_SITE")) {
this->Repository.Url = *site;
this->Installer.RemoteRepositories.push_back(&this->Repository);
}
// Repositories
- if (cmProp RepoAllStr = this->GetOption("CPACK_IFW_REPOSITORIES_ALL")) {
+ if (cmValue RepoAllStr = this->GetOption("CPACK_IFW_REPOSITORIES_ALL")) {
std::vector<std::string> RepoAllVector = cmExpandedList(RepoAllStr);
for (std::string const& r : RepoAllVector) {
this->GetRepository(r);
}
}
- if (cmProp ifwDownloadAll = this->GetOption("CPACK_IFW_DOWNLOAD_ALL")) {
+ if (cmValue ifwDownloadAll = this->GetOption("CPACK_IFW_DOWNLOAD_ALL")) {
this->OnlineOnly = cmIsOn(ifwDownloadAll);
- } else if (cmProp cpackDownloadAll = this->GetOption("CPACK_DOWNLOAD_ALL")) {
+ } else if (cmValue cpackDownloadAll =
+ this->GetOption("CPACK_DOWNLOAD_ALL")) {
this->OnlineOnly = cmIsOn(cpackDownloadAll);
} else {
this->OnlineOnly = false;
@@ -373,7 +374,8 @@ int cmCPackIFWGenerator::InitializeInternal()
}
// Output extension
- if (cmProp optOutExt = this->GetOption("CPACK_IFW_PACKAGE_FILE_EXTENSION")) {
+ if (cmValue optOutExt =
+ this->GetOption("CPACK_IFW_PACKAGE_FILE_EXTENSION")) {
this->OutputExtension = *optOutExt;
} else if (sysName == "Darwin") {
this->OutputExtension = ".dmg";
@@ -506,18 +508,18 @@ std::string cmCPackIFWGenerator::GetRootPackageName()
{
// Default value
std::string name = "root";
- if (cmProp optIFW_PACKAGE_GROUP =
+ if (cmValue optIFW_PACKAGE_GROUP =
this->GetOption("CPACK_IFW_PACKAGE_GROUP")) {
// Configure from root group
cmCPackIFWPackage package;
package.Generator = this;
package.ConfigureFromGroup(optIFW_PACKAGE_GROUP);
name = package.Name;
- } else if (cmProp optIFW_PACKAGE_NAME =
+ } else if (cmValue optIFW_PACKAGE_NAME =
this->GetOption("CPACK_IFW_PACKAGE_NAME")) {
// Configure from root package name
name = *optIFW_PACKAGE_NAME;
- } else if (cmProp optPACKAGE_NAME = this->GetOption("CPACK_PACKAGE_NAME")) {
+ } else if (cmValue optPACKAGE_NAME = this->GetOption("CPACK_PACKAGE_NAME")) {
// Configure from package name
name = *optPACKAGE_NAME;
}
@@ -534,7 +536,7 @@ std::string cmCPackIFWGenerator::GetGroupPackageName(
if (cmCPackIFWPackage* package = this->GetGroupPackage(group)) {
return package->Name;
}
- cmProp option =
+ cmValue option =
this->GetOption("CPACK_IFW_COMPONENT_GROUP_" +
cmsys::SystemTools::UpperCase(group->Name) + "_NAME");
name = option ? *option : group->Name;
@@ -560,7 +562,7 @@ std::string cmCPackIFWGenerator::GetComponentPackageName(
}
std::string prefix = "CPACK_IFW_COMPONENT_" +
cmsys::SystemTools::UpperCase(component->Name) + "_";
- cmProp option = this->GetOption(prefix + "NAME");
+ cmValue option = this->GetOption(prefix + "NAME");
name = option ? *option : component->Name;
if (component->Group) {
cmCPackIFWPackage* package = this->GetGroupPackage(component->Group);
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
index 23b73ff..7ee6300 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
@@ -12,9 +12,9 @@
#include "cmCPackIFWRepository.h"
#include "cmCPackLog.h" // IWYU pragma: keep
#include "cmGeneratedFileStream.h"
-#include "cmProperty.h"
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
+#include "cmValue.h"
#include "cmXMLParser.h"
#include "cmXMLWriter.h"
@@ -34,19 +34,20 @@ void cmCPackIFWInstaller::printSkippedOptionWarning(
void cmCPackIFWInstaller::ConfigureFromOptions()
{
// Name;
- if (cmProp optIFW_PACKAGE_NAME = this->GetOption("CPACK_IFW_PACKAGE_NAME")) {
+ if (cmValue optIFW_PACKAGE_NAME =
+ this->GetOption("CPACK_IFW_PACKAGE_NAME")) {
this->Name = *optIFW_PACKAGE_NAME;
- } else if (cmProp optPACKAGE_NAME = this->GetOption("CPACK_PACKAGE_NAME")) {
+ } else if (cmValue optPACKAGE_NAME = this->GetOption("CPACK_PACKAGE_NAME")) {
this->Name = *optPACKAGE_NAME;
} else {
this->Name = "Your package";
}
// Title;
- if (cmProp optIFW_PACKAGE_TITLE =
+ if (cmValue optIFW_PACKAGE_TITLE =
this->GetOption("CPACK_IFW_PACKAGE_TITLE")) {
this->Title = *optIFW_PACKAGE_TITLE;
- } else if (cmProp optPACKAGE_DESCRIPTION_SUMMARY =
+ } else if (cmValue optPACKAGE_DESCRIPTION_SUMMARY =
this->GetOption("CPACK_PACKAGE_DESCRIPTION_SUMMARY")) {
this->Title = *optPACKAGE_DESCRIPTION_SUMMARY;
} else {
@@ -54,28 +55,28 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Version;
- if (cmProp option = this->GetOption("CPACK_PACKAGE_VERSION")) {
+ if (cmValue option = this->GetOption("CPACK_PACKAGE_VERSION")) {
this->Version = *option;
} else {
this->Version = "1.0.0";
}
// Publisher
- if (cmProp optIFW_PACKAGE_PUBLISHER =
+ if (cmValue optIFW_PACKAGE_PUBLISHER =
this->GetOption("CPACK_IFW_PACKAGE_PUBLISHER")) {
this->Publisher = *optIFW_PACKAGE_PUBLISHER;
- } else if (cmProp optPACKAGE_VENDOR =
+ } else if (cmValue optPACKAGE_VENDOR =
this->GetOption("CPACK_PACKAGE_VENDOR")) {
this->Publisher = *optPACKAGE_VENDOR;
}
// ProductUrl
- if (cmProp option = this->GetOption("CPACK_IFW_PRODUCT_URL")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PRODUCT_URL")) {
this->ProductUrl = *option;
}
// ApplicationIcon
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_ICON")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_ICON")) {
if (cmSystemTools::FileExists(option)) {
this->InstallerApplicationIcon = *option;
} else {
@@ -84,7 +85,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// WindowIcon
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_WINDOW_ICON")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_WINDOW_ICON")) {
if (cmSystemTools::FileExists(option)) {
this->InstallerWindowIcon = *option;
} else {
@@ -102,7 +103,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Logo
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_LOGO")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_LOGO")) {
if (cmSystemTools::FileExists(option)) {
this->Logo = *option;
} else {
@@ -111,7 +112,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Watermark
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_WATERMARK")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_WATERMARK")) {
if (cmSystemTools::FileExists(option)) {
this->Watermark = *option;
} else {
@@ -120,7 +121,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Banner
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_BANNER")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_BANNER")) {
if (cmSystemTools::FileExists(option)) {
this->Banner = *option;
} else {
@@ -129,7 +130,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Background
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_BACKGROUND")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_BACKGROUND")) {
if (cmSystemTools::FileExists(option)) {
this->Background = *option;
} else {
@@ -138,7 +139,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// WizardStyle
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_WIZARD_STYLE")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_WIZARD_STYLE")) {
// Setting the user value in any case
this->WizardStyle = *option;
// Check known values
@@ -153,7 +154,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// StyleSheet
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_STYLE_SHEET")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_STYLE_SHEET")) {
if (cmSystemTools::FileExists(option)) {
this->StyleSheet = *option;
} else {
@@ -162,19 +163,19 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// WizardDefaultWidth
- if (cmProp option =
+ if (cmValue option =
this->GetOption("CPACK_IFW_PACKAGE_WIZARD_DEFAULT_WIDTH")) {
this->WizardDefaultWidth = *option;
}
// WizardDefaultHeight
- if (cmProp option =
+ if (cmValue option =
this->GetOption("CPACK_IFW_PACKAGE_WIZARD_DEFAULT_HEIGHT")) {
this->WizardDefaultHeight = *option;
}
// WizardShowPageList
- if (cmProp option =
+ if (cmValue option =
this->GetOption("CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST")) {
if (!this->IsVersionLess("4.0")) {
if (this->IsSetToOff("CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST")) {
@@ -203,12 +204,12 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// TitleColor
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_TITLE_COLOR")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_TITLE_COLOR")) {
this->TitleColor = *option;
}
// Start menu
- if (cmProp optIFW_START_MENU_DIR =
+ if (cmValue optIFW_START_MENU_DIR =
this->GetOption("CPACK_IFW_PACKAGE_START_MENU_DIRECTORY")) {
this->StartMenuDir = *optIFW_START_MENU_DIR;
} else {
@@ -216,10 +217,10 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Default target directory for installation
- if (cmProp optIFW_TARGET_DIRECTORY =
+ if (cmValue optIFW_TARGET_DIRECTORY =
this->GetOption("CPACK_IFW_TARGET_DIRECTORY")) {
this->TargetDir = *optIFW_TARGET_DIRECTORY;
- } else if (cmProp optPACKAGE_INSTALL_DIRECTORY =
+ } else if (cmValue optPACKAGE_INSTALL_DIRECTORY =
this->GetOption("CPACK_PACKAGE_INSTALL_DIRECTORY")) {
this->TargetDir =
cmStrCat("@ApplicationsDir@/", optPACKAGE_INSTALL_DIRECTORY);
@@ -228,18 +229,18 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Default target directory for installation with administrator rights
- if (cmProp option = this->GetOption("CPACK_IFW_ADMIN_TARGET_DIRECTORY")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_ADMIN_TARGET_DIRECTORY")) {
this->AdminTargetDir = *option;
}
// Maintenance tool
- if (cmProp optIFW_MAINTENANCE_TOOL =
+ if (cmValue optIFW_MAINTENANCE_TOOL =
this->GetOption("CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_NAME")) {
this->MaintenanceToolName = *optIFW_MAINTENANCE_TOOL;
}
// Maintenance tool ini file
- if (cmProp optIFW_MAINTENANCE_TOOL_INI =
+ if (cmValue optIFW_MAINTENANCE_TOOL_INI =
this->GetOption("CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_INI_FILE")) {
this->MaintenanceToolIniFile = *optIFW_MAINTENANCE_TOOL_INI;
}
@@ -263,13 +264,13 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
}
// Control script
- if (cmProp optIFW_CONTROL_SCRIPT =
+ if (cmValue optIFW_CONTROL_SCRIPT =
this->GetOption("CPACK_IFW_PACKAGE_CONTROL_SCRIPT")) {
this->ControlScript = *optIFW_CONTROL_SCRIPT;
}
// Resources
- if (cmProp optIFW_PACKAGE_RESOURCES =
+ if (cmValue optIFW_PACKAGE_RESOURCES =
this->GetOption("CPACK_IFW_PACKAGE_RESOURCES")) {
this->Resources.clear();
cmExpandList(optIFW_PACKAGE_RESOURCES, this->Resources);
@@ -539,7 +540,7 @@ void cmCPackIFWInstaller::GeneratePackageFiles()
package.Generator = this->Generator;
package.Installer = this;
// Check package group
- if (cmProp option = this->GetOption("CPACK_IFW_PACKAGE_GROUP")) {
+ if (cmValue option = this->GetOption("CPACK_IFW_PACKAGE_GROUP")) {
package.ConfigureFromGroup(option);
std::string forcedOption = "CPACK_IFW_COMPONENT_GROUP_" +
cmsys::SystemTools::UpperCase(option) + "_FORCED_INSTALLATION";
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx
index c1e11d2..c2109c9 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.cxx
+++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx
@@ -15,10 +15,10 @@
#include "cmCPackIFWInstaller.h"
#include "cmCPackLog.h" // IWYU pragma: keep
#include "cmGeneratedFileStream.h"
-#include "cmProperty.h"
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
#include "cmTimestamp.h"
+#include "cmValue.h"
#include "cmXMLWriter.h"
//---------------------------------------------------------- CompareStruct ---
@@ -125,7 +125,7 @@ std::string cmCPackIFWPackage::GetComponentName(cmCPackComponent* component)
if (!component) {
return "";
}
- cmProp option =
+ cmValue option =
this->GetOption("CPACK_IFW_COMPONENT_" +
cmsys::SystemTools::UpperCase(component->Name) + "_NAME");
return option ? *option : component->Name;
@@ -160,21 +160,21 @@ int cmCPackIFWPackage::ConfigureFromOptions()
this->Name = this->Generator->GetRootPackageName();
// Display name
- if (cmProp option = this->GetOption("CPACK_PACKAGE_NAME")) {
+ if (cmValue option = this->GetOption("CPACK_PACKAGE_NAME")) {
this->DisplayName[""] = *option;
} else {
this->DisplayName[""] = "Your package";
}
// Description
- if (cmProp option = this->GetOption("CPACK_PACKAGE_DESCRIPTION_SUMMARY")) {
+ if (cmValue option = this->GetOption("CPACK_PACKAGE_DESCRIPTION_SUMMARY")) {
this->Description[""] = *option;
} else {
this->Description[""] = "Your package description";
}
// Version
- if (cmProp option = this->GetOption("CPACK_PACKAGE_VERSION")) {
+ if (cmValue option = this->GetOption("CPACK_PACKAGE_VERSION")) {
this->Version = *option;
} else {
this->Version = "1.0.0";
@@ -204,9 +204,9 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component)
this->Description[""] = component->Description;
// Version
- if (cmProp optVERSION = this->GetOption(prefix + "VERSION")) {
+ if (cmValue optVERSION = this->GetOption(prefix + "VERSION")) {
this->Version = *optVERSION;
- } else if (cmProp optPACKAGE_VERSION =
+ } else if (cmValue optPACKAGE_VERSION =
this->GetOption("CPACK_PACKAGE_VERSION")) {
this->Version = *optPACKAGE_VERSION;
} else {
@@ -214,12 +214,12 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component)
}
// Script
- if (cmProp option = this->GetOption(prefix + "SCRIPT")) {
+ if (cmValue option = this->GetOption(prefix + "SCRIPT")) {
this->Script = *option;
}
// User interfaces
- if (cmProp option = this->GetOption(prefix + "USER_INTERFACES")) {
+ if (cmValue option = this->GetOption(prefix + "USER_INTERFACES")) {
this->UserInterfaces.clear();
cmExpandList(option, this->UserInterfaces);
}
@@ -232,7 +232,7 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component)
}
// Licenses
- if (cmProp option = this->GetOption(prefix + "LICENSES")) {
+ if (cmValue option = this->GetOption(prefix + "LICENSES")) {
this->Licenses.clear();
cmExpandList(option, this->Licenses);
if (this->Licenses.size() % 2 != 0) {
@@ -246,7 +246,7 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component)
}
// Priority
- if (cmProp option = this->GetOption(prefix + "PRIORITY")) {
+ if (cmValue option = this->GetOption(prefix + "PRIORITY")) {
this->SortingPriority = *option;
cmCPackIFWLogger(
WARNING,
@@ -289,9 +289,9 @@ int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup* group)
this->Description[""] = group->Description;
// Version
- if (cmProp optVERSION = this->GetOption(prefix + "VERSION")) {
+ if (cmValue optVERSION = this->GetOption(prefix + "VERSION")) {
this->Version = *optVERSION;
- } else if (cmProp optPACKAGE_VERSION =
+ } else if (cmValue optPACKAGE_VERSION =
this->GetOption("CPACK_PACKAGE_VERSION")) {
this->Version = *optPACKAGE_VERSION;
} else {
@@ -299,18 +299,18 @@ int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup* group)
}
// Script
- if (cmProp option = this->GetOption(prefix + "SCRIPT")) {
+ if (cmValue option = this->GetOption(prefix + "SCRIPT")) {
this->Script = *option;
}
// User interfaces
- if (cmProp option = this->GetOption(prefix + "USER_INTERFACES")) {
+ if (cmValue option = this->GetOption(prefix + "USER_INTERFACES")) {
this->UserInterfaces.clear();
cmExpandList(option, this->UserInterfaces);
}
// Licenses
- if (cmProp option = this->GetOption(prefix + "LICENSES")) {
+ if (cmValue option = this->GetOption(prefix + "LICENSES")) {
this->Licenses.clear();
cmExpandList(option, this->Licenses);
if (this->Licenses.size() % 2 != 0) {
@@ -324,7 +324,7 @@ int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup* group)
}
// Priority
- if (cmProp option = this->GetOption(prefix + "PRIORITY")) {
+ if (cmValue option = this->GetOption(prefix + "PRIORITY")) {
this->SortingPriority = *option;
cmCPackIFWLogger(
WARNING,
@@ -346,13 +346,13 @@ int cmCPackIFWPackage::ConfigureFromGroup(const std::string& groupName)
std::string prefix =
"CPACK_COMPONENT_GROUP_" + cmsys::SystemTools::UpperCase(groupName) + "_";
- if (cmProp option = this->GetOption(prefix + "DISPLAY_NAME")) {
+ if (cmValue option = this->GetOption(prefix + "DISPLAY_NAME")) {
group.DisplayName = *option;
} else {
group.DisplayName = group.Name;
}
- if (cmProp option = this->GetOption(prefix + "DESCRIPTION")) {
+ if (cmValue option = this->GetOption(prefix + "DESCRIPTION")) {
group.Description = *option;
}
group.IsBold = this->IsOn(prefix + "BOLD_TITLE");
@@ -381,7 +381,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "DISPLAY_NAME";
if (this->IsSetToEmpty(option)) {
this->DisplayName.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
cmCPackIFWPackage::ExpandListArgument(value, this->DisplayName);
}
@@ -389,7 +389,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "DESCRIPTION";
if (this->IsSetToEmpty(option)) {
this->Description.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
cmCPackIFWPackage::ExpandListArgument(value, this->Description);
}
@@ -397,7 +397,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "RELEASE_DATE";
if (this->IsSetToEmpty(option)) {
this->ReleaseDate.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
this->ReleaseDate = *value;
}
@@ -405,7 +405,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "SORTING_PRIORITY";
if (this->IsSetToEmpty(option)) {
this->SortingPriority.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
this->SortingPriority = *value;
}
@@ -413,7 +413,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "UPDATE_TEXT";
if (this->IsSetToEmpty(option)) {
this->UpdateText.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
this->UpdateText = *value;
}
@@ -421,7 +421,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "TRANSLATIONS";
if (this->IsSetToEmpty(option)) {
this->Translations.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
this->Translations.clear();
cmExpandList(value, this->Translations);
}
@@ -429,11 +429,11 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
// QtIFW dependencies
std::vector<std::string> deps;
option = prefix + "DEPENDS";
- if (cmProp value = this->GetOption(option)) {
+ if (cmValue value = this->GetOption(option)) {
cmExpandList(value, deps);
}
option = prefix + "DEPENDENCIES";
- if (cmProp value = this->GetOption(option)) {
+ if (cmValue value = this->GetOption(option)) {
cmExpandList(value, deps);
}
for (std::string const& d : deps) {
@@ -454,7 +454,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "AUTO_DEPEND_ON";
if (this->IsSetToEmpty(option)) {
this->AlienAutoDependOn.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
std::vector<std::string> depsOn = cmExpandedList(value);
for (std::string const& d : depsOn) {
DependenceStruct dep(d);
@@ -483,7 +483,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "DEFAULT";
if (this->IsSetToEmpty(option)) {
this->Default.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
std::string lowerValue = cmsys::SystemTools::LowerCase(value);
if (lowerValue == "true") {
this->Default = "true";
@@ -510,7 +510,7 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
option = prefix + "REPLACES";
if (this->IsSetToEmpty(option)) {
this->Replaces.clear();
- } else if (cmProp value = this->GetOption(option)) {
+ } else if (cmValue value = this->GetOption(option)) {
this->Replaces.clear();
cmExpandList(value, this->Replaces);
}
diff --git a/Source/CPack/IFW/cmCPackIFWRepository.cxx b/Source/CPack/IFW/cmCPackIFWRepository.cxx
index cc64e93..f25d2d2 100644
--- a/Source/CPack/IFW/cmCPackIFWRepository.cxx
+++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx
@@ -6,8 +6,8 @@
#include "cmCPackIFWGenerator.h"
#include "cmGeneratedFileStream.h"
-#include "cmProperty.h"
#include "cmSystemTools.h"
+#include "cmValue.h"
#include "cmXMLParser.h"
#include "cmXMLWriter.h"
@@ -56,21 +56,21 @@ bool cmCPackIFWRepository::ConfigureFromOptions()
}
// Url
- if (cmProp url = this->GetOption(prefix + "URL")) {
+ if (cmValue url = this->GetOption(prefix + "URL")) {
this->Url = *url;
} else {
this->Url.clear();
}
// Old url
- if (cmProp oldUrl = this->GetOption(prefix + "OLD_URL")) {
+ if (cmValue oldUrl = this->GetOption(prefix + "OLD_URL")) {
this->OldUrl = *oldUrl;
} else {
this->OldUrl.clear();
}
// New url
- if (cmProp newUrl = this->GetOption(prefix + "NEW_URL")) {
+ if (cmValue newUrl = this->GetOption(prefix + "NEW_URL")) {
this->NewUrl = *newUrl;
} else {
this->NewUrl.clear();
@@ -84,21 +84,21 @@ bool cmCPackIFWRepository::ConfigureFromOptions()
}
// Username
- if (cmProp username = this->GetOption(prefix + "USERNAME")) {
+ if (cmValue username = this->GetOption(prefix + "USERNAME")) {
this->Username = *username;
} else {
this->Username.clear();
}
// Password
- if (cmProp password = this->GetOption(prefix + "PASSWORD")) {
+ if (cmValue password = this->GetOption(prefix + "PASSWORD")) {
this->Password = *password;
} else {
this->Password.clear();
}
// DisplayName
- if (cmProp displayName = this->GetOption(prefix + "DISPLAY_NAME")) {
+ if (cmValue displayName = this->GetOption(prefix + "DISPLAY_NAME")) {
this->DisplayName = *displayName;
} else {
this->DisplayName.clear();
generated by cgit v0.12 at 2025-01-04 01:27:21 (GMT)