diff options
Diffstat (limited to 'Source/CPack/IFW/cmCPackIFWPackage.cxx')
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWPackage.cxx | 389 |
1 files changed, 156 insertions, 233 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx index a22c0b9..5bc1a0b 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.cxx +++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx @@ -22,21 +22,21 @@ //----------------------------------------------------------------- Logger --- #ifdef cmCPackLogger -# undef cmCPackLogger +#undef cmCPackLogger #endif -#define cmCPackLogger(logType, msg) \ - do { \ - std::ostringstream cmCPackLog_msg; \ - cmCPackLog_msg << msg; \ - if(Generator) { \ - Generator->Logger->Log(logType, __FILE__, __LINE__, \ - cmCPackLog_msg.str().c_str()); \ - } \ - } while ( 0 ) +#define cmCPackLogger(logType, msg) \ + do { \ + std::ostringstream cmCPackLog_msg; \ + cmCPackLog_msg << msg; \ + if (Generator) { \ + Generator->Logger->Log(logType, __FILE__, __LINE__, \ + cmCPackLog_msg.str().c_str()); \ + } \ + } while (0) //---------------------------------------------------------- CompareStruct --- -cmCPackIFWPackage::CompareStruct::CompareStruct() : - Type(CompareNone) +cmCPackIFWPackage::CompareStruct::CompareStruct() + : Type(CompareNone) { } @@ -46,64 +46,47 @@ cmCPackIFWPackage::DependenceStruct::DependenceStruct() } cmCPackIFWPackage::DependenceStruct::DependenceStruct( - const std::string &dependence) + const std::string& dependence) { // Search compare section size_t pos = std::string::npos; - if((pos = dependence.find("<=")) != std::string::npos) - { + if ((pos = dependence.find("<=")) != std::string::npos) { Compare.Type = CompareLessOrEqual; Compare.Value = dependence.substr(pos + 2); - } - else if((pos = dependence.find(">=")) != std::string::npos) - { + } else if ((pos = dependence.find(">=")) != std::string::npos) { Compare.Type = CompareGreaterOrEqual; Compare.Value = dependence.substr(pos + 2); - } - else if((pos = dependence.find("<")) != std::string::npos) - { + } else if ((pos = dependence.find("<")) != std::string::npos) { Compare.Type = CompareLess; Compare.Value = dependence.substr(pos + 1); - } - else if((pos = dependence.find("=")) != std::string::npos) - { + } else if ((pos = dependence.find("=")) != std::string::npos) { Compare.Type = CompareEqual; Compare.Value = dependence.substr(pos + 1); - } - else if((pos = dependence.find(">")) != std::string::npos) - { + } else if ((pos = dependence.find(">")) != std::string::npos) { Compare.Type = CompareGreater; Compare.Value = dependence.substr(pos + 1); - } + } Name = pos == std::string::npos ? dependence : dependence.substr(0, pos); } std::string cmCPackIFWPackage::DependenceStruct::NameWithCompare() const { - if (Compare.Type == CompareNone) return Name; + if (Compare.Type == CompareNone) + return Name; std::string result = Name; - if (Compare.Type == CompareLessOrEqual) - { + if (Compare.Type == CompareLessOrEqual) { result += "<="; - } - else if (Compare.Type == CompareGreaterOrEqual) - { + } else if (Compare.Type == CompareGreaterOrEqual) { result += ">="; - } - else if (Compare.Type == CompareLess) - { + } else if (Compare.Type == CompareLess) { result += "<"; - } - else if (Compare.Type == CompareEqual) - { + } else if (Compare.Type == CompareEqual) { result += "="; - } - else if (Compare.Type == CompareGreater) - { + } else if (Compare.Type == CompareGreater) { result += ">"; - } + } result += Compare.Value; @@ -111,45 +94,45 @@ std::string cmCPackIFWPackage::DependenceStruct::NameWithCompare() const } //------------------------------------------------------ cmCPackIFWPackage --- -cmCPackIFWPackage::cmCPackIFWPackage() : - Generator(0), - Installer(0) +cmCPackIFWPackage::cmCPackIFWPackage() + : Generator(0) + , Installer(0) { } -const char *cmCPackIFWPackage::GetOption(const std::string &op) const +const char* cmCPackIFWPackage::GetOption(const std::string& op) const { - const char *option = Generator ? Generator->GetOption(op) : 0; + const char* option = Generator ? Generator->GetOption(op) : 0; return option && *option ? option : 0; } -bool cmCPackIFWPackage::IsOn(const std::string &op) const +bool cmCPackIFWPackage::IsOn(const std::string& op) const { return Generator ? Generator->IsOn(op) : false; } -bool cmCPackIFWPackage::IsVersionLess(const char *version) +bool cmCPackIFWPackage::IsVersionLess(const char* version) { return Generator ? Generator->IsVersionLess(version) : false; } -bool cmCPackIFWPackage::IsVersionGreater(const char *version) +bool cmCPackIFWPackage::IsVersionGreater(const char* version) { return Generator ? Generator->IsVersionGreater(version) : false; } -bool cmCPackIFWPackage::IsVersionEqual(const char *version) +bool cmCPackIFWPackage::IsVersionEqual(const char* version) { return Generator ? Generator->IsVersionEqual(version) : false; } -std::string cmCPackIFWPackage::GetComponentName(cmCPackComponent *component) +std::string cmCPackIFWPackage::GetComponentName(cmCPackComponent* component) { - if (!component) return ""; - const char* option = GetOption( - "CPACK_IFW_COMPONENT_" - + cmsys::SystemTools::UpperCase(component->Name) - + "_NAME"); + if (!component) + return ""; + const char* option = + GetOption("CPACK_IFW_COMPONENT_" + + cmsys::SystemTools::UpperCase(component->Name) + "_NAME"); return option ? option : component->Name; } @@ -177,51 +160,42 @@ int cmCPackIFWPackage::ConfigureFromOptions() Name = Generator->GetRootPackageName(); // Display name - if (const char *option = this->GetOption("CPACK_PACKAGE_NAME")) - { + if (const char* option = this->GetOption("CPACK_PACKAGE_NAME")) { DisplayName = option; - } - else - { + } else { DisplayName = "Your package"; - } + } // Description if (const char* option = - this->GetOption("CPACK_PACKAGE_DESCRIPTION_SUMMARY")) - { + this->GetOption("CPACK_PACKAGE_DESCRIPTION_SUMMARY")) { Description = option; - } - else - { + } else { Description = "Your package description"; - } + } // Version - if(const char* option = GetOption("CPACK_PACKAGE_VERSION")) - { + if (const char* option = GetOption("CPACK_PACKAGE_VERSION")) { Version = option; - } - else - { + } else { Version = "1.0.0"; - } + } ForcedInstallation = "true"; return 1; } -int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent *component) +int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component) { - if(!component) return 0; + if (!component) + return 0; // Restore defaul configuration DefaultConfiguration(); - std::string prefix = "CPACK_IFW_COMPONENT_" - + cmsys::SystemTools::UpperCase(component->Name) - + "_"; + std::string prefix = "CPACK_IFW_COMPONENT_" + + cmsys::SystemTools::UpperCase(component->Name) + "_"; // Display name DisplayName = component->DisplayName; @@ -230,81 +204,65 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent *component) Description = component->Description; // Version - if(const char* optVERSION = GetOption(prefix + "VERSION")) - { + if (const char* optVERSION = GetOption(prefix + "VERSION")) { Version = optVERSION; - } - else if(const char* optPACKAGE_VERSION = - GetOption("CPACK_PACKAGE_VERSION")) - { + } else if (const char* optPACKAGE_VERSION = + GetOption("CPACK_PACKAGE_VERSION")) { Version = optPACKAGE_VERSION; - } - else - { + } else { Version = "1.0.0"; - } + } // Script - if (const char* option = GetOption(prefix + "SCRIPT")) - { + if (const char* option = GetOption(prefix + "SCRIPT")) { Script = option; - } + } // CMake dependencies - if (!component->Dependencies.empty()) - { + if (!component->Dependencies.empty()) { std::vector<cmCPackComponent*>::iterator dit; - for(dit = component->Dependencies.begin(); - dit != component->Dependencies.end(); - ++dit) - { + for (dit = component->Dependencies.begin(); + dit != component->Dependencies.end(); ++dit) { Dependencies.insert(Generator->ComponentPackages[*dit]); - } } + } // QtIFW dependencies - if(const char* option = this->GetOption(prefix + "DEPENDS")) - { + if (const char* option = this->GetOption(prefix + "DEPENDS")) { std::vector<std::string> deps; - cmSystemTools::ExpandListArgument(option, - deps); - for(std::vector<std::string>::iterator - dit = deps.begin(); dit != deps.end(); ++dit) - { + cmSystemTools::ExpandListArgument(option, deps); + for (std::vector<std::string>::iterator dit = deps.begin(); + dit != deps.end(); ++dit) { DependenceStruct dep(*dit); - if (!Generator->Packages.count(dep.Name)) - { + if (!Generator->Packages.count(dep.Name)) { bool hasDep = Generator->DependentPackages.count(dep.Name) > 0; - DependenceStruct &depRef = - Generator->DependentPackages[dep.Name]; - if(!hasDep) - { + DependenceStruct& depRef = Generator->DependentPackages[dep.Name]; + if (!hasDep) { depRef = dep; - } - AlienDependencies.insert(&depRef); } + AlienDependencies.insert(&depRef); } } + } // Licenses - if (const char* option = this->GetOption(prefix + "LICENSES")) - { + if (const char* option = this->GetOption(prefix + "LICENSES")) { Licenses.clear(); - cmSystemTools::ExpandListArgument( option, Licenses ); - if ( Licenses.size() % 2 != 0 ) - { - cmCPackLogger(cmCPackLog::LOG_WARNING, prefix << "LICENSES" - << " should contain pairs of <display_name> and <file_path>." - << std::endl); + cmSystemTools::ExpandListArgument(option, Licenses); + if (Licenses.size() % 2 != 0) { + cmCPackLogger( + cmCPackLog::LOG_WARNING, prefix + << "LICENSES" + << " should contain pairs of <display_name> and <file_path>." + << std::endl); Licenses.clear(); - } } + } // Priority - if(const char* option = this->GetOption(prefix + "PRIORITY")) - { + if (const char* option = this->GetOption(prefix + "PRIORITY")) { SortingPriority = option; - } + } // Default Default = component->IsDisabledByDefault ? "false" : "true"; @@ -318,87 +276,74 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent *component) return 1; } -int -cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup *group) +int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup* group) { - if(!group) return 0; + if (!group) + return 0; // Restore defaul configuration DefaultConfiguration(); - std::string prefix = "CPACK_IFW_COMPONENT_GROUP_" - + cmsys::SystemTools::UpperCase(group->Name) - + "_"; + std::string prefix = "CPACK_IFW_COMPONENT_GROUP_" + + cmsys::SystemTools::UpperCase(group->Name) + "_"; DisplayName = group->DisplayName; Description = group->Description; // Version - if(const char* optVERSION = GetOption(prefix + "VERSION")) - { + if (const char* optVERSION = GetOption(prefix + "VERSION")) { Version = optVERSION; - } - else if(const char* optPACKAGE_VERSION = - GetOption("CPACK_PACKAGE_VERSION")) - { + } else if (const char* optPACKAGE_VERSION = + GetOption("CPACK_PACKAGE_VERSION")) { Version = optPACKAGE_VERSION; - } - else - { + } else { Version = "1.0.0"; - } + } // Script - if (const char* option = GetOption(prefix + "SCRIPT")) - { + if (const char* option = GetOption(prefix + "SCRIPT")) { Script = option; - } + } // Licenses - if (const char* option = this->GetOption(prefix + "LICENSES")) - { + if (const char* option = this->GetOption(prefix + "LICENSES")) { Licenses.clear(); - cmSystemTools::ExpandListArgument( option, Licenses ); - if ( Licenses.size() % 2 != 0 ) - { - cmCPackLogger(cmCPackLog::LOG_WARNING, prefix << "LICENSES" - << " should contain pairs of <display_name> and <file_path>." - << std::endl); + cmSystemTools::ExpandListArgument(option, Licenses); + if (Licenses.size() % 2 != 0) { + cmCPackLogger( + cmCPackLog::LOG_WARNING, prefix + << "LICENSES" + << " should contain pairs of <display_name> and <file_path>." + << std::endl); Licenses.clear(); - } } + } // Priority - if(const char* option = this->GetOption(prefix + "PRIORITY")) - { + if (const char* option = this->GetOption(prefix + "PRIORITY")) { SortingPriority = option; - } + } return 1; } -int cmCPackIFWPackage::ConfigureFromGroup(const std::string &groupName) +int cmCPackIFWPackage::ConfigureFromGroup(const std::string& groupName) { // Group configuration cmCPackComponentGroup group; - std::string prefix = "CPACK_COMPONENT_GROUP_" - + cmsys::SystemTools::UpperCase(groupName) - + "_"; + std::string prefix = + "CPACK_COMPONENT_GROUP_" + cmsys::SystemTools::UpperCase(groupName) + "_"; - if (const char *option = GetOption(prefix + "DISPLAY_NAME")) - { + if (const char* option = GetOption(prefix + "DISPLAY_NAME")) { group.DisplayName = option; - } - else - { + } else { group.DisplayName = group.Name; - } + } - if (const char* option = GetOption(prefix + "DESCRIPTION")) - { + if (const char* option = GetOption(prefix + "DESCRIPTION")) { group.Description = option; - } + } group.IsBold = IsOn(prefix + "BOLD_TITLE"); group.IsExpandedByDefault = IsOn(prefix + "EXPANDED"); @@ -406,14 +351,11 @@ int cmCPackIFWPackage::ConfigureFromGroup(const std::string &groupName) group.Name = groupName; - if(Generator) - { + if (Generator) { Name = Generator->GetGroupPackageName(&group); - } - else - { + } else { Name = group.Name; - } + } return ConfigureFromGroup(&group); } @@ -421,17 +363,13 @@ int cmCPackIFWPackage::ConfigureFromGroup(const std::string &groupName) void cmCPackIFWPackage::GeneratePackageFile() { // Lazy directory initialization - if (Directory.empty()) - { - if(Installer) - { + if (Directory.empty()) { + if (Installer) { Directory = Installer->Directory + "/packages/" + Name; - } - else if (Generator) - { + } else if (Generator) { Directory = Generator->toplevel + "/packages/" + Name; - } } + } // Output stream cmGeneratedFileStream fout((Directory + "/meta/package.xml").data()); @@ -448,98 +386,83 @@ void cmCPackIFWPackage::GeneratePackageFile() xout.Element("Name", Name); xout.Element("Version", Version); - if (!ReleaseDate.empty()) - { + if (!ReleaseDate.empty()) { xout.Element("ReleaseDate", ReleaseDate); - } - else - { + } else { xout.Element("ReleaseDate", cmTimestamp().CurrentTime("%Y-%m-%d", true)); - } + } // Script (copy to meta dir) - if(!Script.empty()) - { + if (!Script.empty()) { std::string name = cmSystemTools::GetFilenameName(Script); std::string path = Directory + "/meta/" + name; cmsys::SystemTools::CopyFileIfDifferent(Script.data(), path.data()); xout.Element("Script", name); - } + } // Dependencies std::set<DependenceStruct> compDepSet; - for(std::set<DependenceStruct*>::iterator ait = AlienDependencies.begin(); - ait != AlienDependencies.end(); ++ait) - { + for (std::set<DependenceStruct*>::iterator ait = AlienDependencies.begin(); + ait != AlienDependencies.end(); ++ait) { compDepSet.insert(*(*ait)); - } - for(std::set<cmCPackIFWPackage*>::iterator it = Dependencies.begin(); - it != Dependencies.end(); ++it) - { + } + for (std::set<cmCPackIFWPackage*>::iterator it = Dependencies.begin(); + it != Dependencies.end(); ++it) { compDepSet.insert(DependenceStruct((*it)->Name)); - } + } // Write dependencies - if (!compDepSet.empty()) - { + if (!compDepSet.empty()) { std::stringstream dependencies; std::set<DependenceStruct>::iterator it = compDepSet.begin(); dependencies << it->NameWithCompare(); ++it; - while(it != compDepSet.end()) - { + while (it != compDepSet.end()) { dependencies << "," << it->NameWithCompare(); ++it; - } - xout.Element("Dependencies", dependencies.str()); } + xout.Element("Dependencies", dependencies.str()); + } // Licenses (copy to meta dir) std::vector<std::string> licenses = Licenses; - for(size_t i = 1; i < licenses.size(); i += 2) - { + for (size_t i = 1; i < licenses.size(); i += 2) { std::string name = cmSystemTools::GetFilenameName(licenses[i]); std::string path = Directory + "/meta/" + name; cmsys::SystemTools::CopyFileIfDifferent(licenses[i].data(), path.data()); licenses[i] = name; - } - if(!licenses.empty()) - { + } + if (!licenses.empty()) { xout.StartElement("Licenses"); - for(size_t i = 0; i < licenses.size(); i += 2) - { + for (size_t i = 0; i < licenses.size(); i += 2) { xout.StartElement("License"); xout.Attribute("name", licenses[i]); xout.Attribute("file", licenses[i + 1]); xout.EndElement(); - } - xout.EndElement(); } + xout.EndElement(); + } - if (!ForcedInstallation.empty()) - { + if (!ForcedInstallation.empty()) { xout.Element("ForcedInstallation", ForcedInstallation); - } + } - if (!Virtual.empty()) - { + if (!Virtual.empty()) { xout.Element("Virtual", Virtual); - } - else if (!Default.empty()) - { + } else if (!Default.empty()) { xout.Element("Default", Default); - } + } // Priority - if(!SortingPriority.empty()) - { + if (!SortingPriority.empty()) { xout.Element("SortingPriority", SortingPriority); - } + } xout.EndElement(); xout.EndDocument(); } -void cmCPackIFWPackage::WriteGeneratedByToStrim(cmXMLWriter &xout) +void cmCPackIFWPackage::WriteGeneratedByToStrim(cmXMLWriter& xout) { - if(Generator) Generator->WriteGeneratedByToStrim(xout); + if (Generator) + Generator->WriteGeneratedByToStrim(xout); } |