diff options
author | Brad King <brad.king@kitware.com> | 2016-05-06 18:30:06 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-09 13:41:43 (GMT) |
commit | 0ac18d40c8c29a17f1acfcaca506f41a26185901 (patch) | |
tree | 88b5d3c4b8c587d7979231d0e6ce9b03b0685a74 /Source/CPack | |
parent | d95fbdb70944a8f9a7e6ac11bc51f410a99aafcd (diff) | |
download | CMake-0ac18d40c8c29a17f1acfcaca506f41a26185901.zip CMake-0ac18d40c8c29a17f1acfcaca506f41a26185901.tar.gz CMake-0ac18d40c8c29a17f1acfcaca506f41a26185901.tar.bz2 |
Remove `//------...` horizontal separator comments
Modern editors provide plenty of ways to visually separate functions.
Drop the explicit comments that previously served this purpose.
Use the following command to automate the change:
$ git ls-files -z -- \
"*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" |
egrep -z -v "^Source/cmCommandArgumentLexer\." |
egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmDependsJavaLexer\." |
egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmExprLexer\." |
egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmFortranLexer\." |
egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmListFileLexer\." |
egrep -z -v "^Source/cm_sha2" |
egrep -z -v "^Source/(kwsys|CursesDialog/form)/" |
egrep -z -v "^Utilities/(KW|cm).*/" |
xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}'
This avoids modifying third-party sources and generated sources.
Diffstat (limited to 'Source/CPack')
25 files changed, 0 insertions, 201 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index c10803c..cf8587c 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -31,38 +31,32 @@ #include <cmVersionConfig.h> #include <cmXMLWriter.h> -//---------------------------------------------------------------------------- cmCPackIFWGenerator::cmCPackIFWGenerator() { } -//---------------------------------------------------------------------------- cmCPackIFWGenerator::~cmCPackIFWGenerator() { } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsVersionLess(const char *version) { return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS, FrameworkVersion.data(), version); } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsVersionGreater(const char *version) { return cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER, FrameworkVersion.data(), version); } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsVersionEqual(const char *version) { return cmSystemTools::VersionCompare(cmSystemTools::OP_EQUAL, FrameworkVersion.data(), version); } -//---------------------------------------------------------------------------- int cmCPackIFWGenerator::PackageFiles() { cmCPackLogger(cmCPackLog::LOG_OUTPUT, "- Configuration" << std::endl); @@ -223,7 +217,6 @@ int cmCPackIFWGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------------- const char *cmCPackIFWGenerator::GetPackagingInstallPrefix() { const char *defPrefix = cmCPackGenerator::GetPackagingInstallPrefix(); @@ -240,13 +233,11 @@ const char *cmCPackIFWGenerator::GetPackagingInstallPrefix() return this->GetOption("CPACK_IFW_PACKAGING_INSTALL_PREFIX"); } -//---------------------------------------------------------------------------- const char *cmCPackIFWGenerator::GetOutputExtension() { return ExecutableSuffix.c_str(); } -//---------------------------------------------------------------------------- int cmCPackIFWGenerator::InitializeInternal() { // Search Qt Installer Framework tools @@ -367,7 +358,6 @@ int cmCPackIFWGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetComponentInstallDirNameSuffix( const std::string& componentName) @@ -384,7 +374,6 @@ cmCPackIFWGenerator::GetComponentInstallDirNameSuffix( + suffix; } -//---------------------------------------------------------------------------- cmCPackComponent* cmCPackIFWGenerator::GetComponent(const std::string &projectName, const std::string &componentName) @@ -433,7 +422,6 @@ cmCPackIFWGenerator::GetComponent(const std::string &projectName, return component; } -//---------------------------------------------------------------------------- cmCPackComponentGroup* cmCPackIFWGenerator::GetComponentGroup(const std::string &projectName, const std::string &groupName) @@ -471,32 +459,27 @@ cmCPackIFWGenerator::GetComponentGroup(const std::string &projectName, return group; } -//---------------------------------------------------------------------------- enum cmCPackGenerator::CPackSetDestdirSupport cmCPackIFWGenerator::SupportsSetDestdir() const { return cmCPackGenerator::SETDESTDIR_SHOULD_NOT_BE_USED; } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::SupportsAbsoluteDestination() const { return false; } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::SupportsComponentInstallation() const { return true; } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsOnePackage() const { return componentPackageMethod == ONE_PACKAGE; } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetRootPackageName() { // Default value @@ -525,7 +508,6 @@ std::string cmCPackIFWGenerator::GetRootPackageName() return name; } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetGroupPackageName(cmCPackComponentGroup *group) const { @@ -556,7 +538,6 @@ cmCPackIFWGenerator::GetGroupPackageName(cmCPackComponentGroup *group) const return name; } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetComponentPackageName( cmCPackComponent *component) const { @@ -592,7 +573,6 @@ std::string cmCPackIFWGenerator::GetComponentPackageName( return name; } -//---------------------------------------------------------------------------- cmCPackIFWPackage* cmCPackIFWGenerator::GetGroupPackage( cmCPackComponentGroup *group) const { @@ -601,7 +581,6 @@ cmCPackIFWPackage* cmCPackIFWGenerator::GetGroupPackage( return pit != GroupPackages.end() ? pit->second : 0; } -//---------------------------------------------------------------------------- cmCPackIFWPackage* cmCPackIFWGenerator::GetComponentPackage( cmCPackComponent *component) const { @@ -610,7 +589,6 @@ cmCPackIFWPackage* cmCPackIFWGenerator::GetComponentPackage( return pit != ComponentPackages.end() ? pit->second : 0; } -//---------------------------------------------------------------------------- void cmCPackIFWGenerator::WriteGeneratedByToStrim(cmXMLWriter &xout) { std::stringstream comment; diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 224d606..dfb336c 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -32,44 +32,37 @@ } \ } while ( 0 ) -//---------------------------------------------------------------------------- cmCPackIFWInstaller::cmCPackIFWInstaller() : Generator(0) { } -//---------------------------------------------------------------------------- const char *cmCPackIFWInstaller::GetOption(const std::string &op) const { return Generator ? Generator->GetOption(op) : 0; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsOn(const std::string &op) const { return Generator ? Generator->IsOn(op) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsVersionLess(const char *version) { return Generator ? Generator->IsVersionLess(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsVersionGreater(const char *version) { return Generator ? Generator->IsVersionGreater(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsVersionEqual(const char *version) { return Generator ? Generator->IsVersionEqual(version) : false; } -//---------------------------------------------------------------------------- void cmCPackIFWInstaller::ConfigureFromOptions() { // Name; @@ -324,7 +317,6 @@ void cmCPackIFWInstaller::ConfigureFromOptions() } } -//---------------------------------------------------------------------------- void cmCPackIFWInstaller::GenerateInstallerFile() { // Lazy directory initialization @@ -486,7 +478,6 @@ void cmCPackIFWInstaller::GenerateInstallerFile() xout.EndDocument(); } -//---------------------------------------------------------------------------- void cmCPackIFWInstaller::GeneratePackageFiles() { if (Packages.empty() || Generator->IsOnePackage()) diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx index b71c7e3..a22c0b9 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.cxx +++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx @@ -45,7 +45,6 @@ cmCPackIFWPackage::DependenceStruct::DependenceStruct() { } -//---------------------------------------------------------------------------- cmCPackIFWPackage::DependenceStruct::DependenceStruct( const std::string &dependence) { @@ -79,7 +78,6 @@ cmCPackIFWPackage::DependenceStruct::DependenceStruct( Name = pos == std::string::npos ? dependence : dependence.substr(0, pos); } -//---------------------------------------------------------------------------- std::string cmCPackIFWPackage::DependenceStruct::NameWithCompare() const { if (Compare.Type == CompareNone) return Name; @@ -119,38 +117,32 @@ cmCPackIFWPackage::cmCPackIFWPackage() : { } -//---------------------------------------------------------------------------- const char *cmCPackIFWPackage::GetOption(const std::string &op) const { const char *option = Generator ? Generator->GetOption(op) : 0; return option && *option ? option : 0; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsOn(const std::string &op) const { return Generator ? Generator->IsOn(op) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsVersionLess(const char *version) { return Generator ? Generator->IsVersionLess(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsVersionGreater(const char *version) { return Generator ? Generator->IsVersionGreater(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsVersionEqual(const char *version) { return Generator ? Generator->IsVersionEqual(version) : false; } -//---------------------------------------------------------------------------- std::string cmCPackIFWPackage::GetComponentName(cmCPackComponent *component) { if (!component) return ""; @@ -161,7 +153,6 @@ std::string cmCPackIFWPackage::GetComponentName(cmCPackComponent *component) return option ? option : component->Name; } -//---------------------------------------------------------------------------- void cmCPackIFWPackage::DefaultConfiguration() { DisplayName = ""; @@ -176,7 +167,6 @@ void cmCPackIFWPackage::DefaultConfiguration() ForcedInstallation = ""; } -//---------------------------------------------------------------------------- // Defaul configuration (all in one package) int cmCPackIFWPackage::ConfigureFromOptions() { @@ -222,7 +212,6 @@ int cmCPackIFWPackage::ConfigureFromOptions() return 1; } -//---------------------------------------------------------------------------- int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent *component) { if(!component) return 0; @@ -329,7 +318,6 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent *component) return 1; } -//---------------------------------------------------------------------------- int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup *group) { @@ -389,7 +377,6 @@ cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup *group) return 1; } -//---------------------------------------------------------------------------- int cmCPackIFWPackage::ConfigureFromGroup(const std::string &groupName) { // Group configuration @@ -431,7 +418,6 @@ int cmCPackIFWPackage::ConfigureFromGroup(const std::string &groupName) return ConfigureFromGroup(&group); } -//---------------------------------------------------------------------------- void cmCPackIFWPackage::GeneratePackageFile() { // Lazy directory initialization diff --git a/Source/CPack/cmCPack7zGenerator.cxx b/Source/CPack/cmCPack7zGenerator.cxx index 2809e56..06bf7e7 100644 --- a/Source/CPack/cmCPack7zGenerator.cxx +++ b/Source/CPack/cmCPack7zGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPack7zGenerator.h" -//---------------------------------------------------------------------- cmCPack7zGenerator::cmCPack7zGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressNone, "7zip") { } -//---------------------------------------------------------------------- cmCPack7zGenerator::~cmCPack7zGenerator() { } diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index 37e8bf0..05ea1d8 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -24,7 +24,6 @@ #include <cmsys/Directory.hxx> #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------- cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t, std::string const& format) { @@ -32,18 +31,15 @@ cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t, this->ArchiveFormat = format; } -//---------------------------------------------------------------------- cmCPackArchiveGenerator::~cmCPackArchiveGenerator() { } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1"); return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive, cmCPackComponent* component) { @@ -118,7 +114,6 @@ if (!archive) \ return 0; \ } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup) { packageFileNames.clear(); @@ -220,7 +215,6 @@ int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup) return 1; } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::PackageComponentsAllInOne() { // reset the package file names @@ -248,7 +242,6 @@ int cmCPackArchiveGenerator::PackageComponentsAllInOne() return 1; } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::PackageFiles() { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: " @@ -300,7 +293,6 @@ int cmCPackArchiveGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::GenerateHeader(std::ostream*) { return 1; diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx index e86667d..6cc48aa 100644 --- a/Source/CPack/cmCPackBundleGenerator.cxx +++ b/Source/CPack/cmCPackBundleGenerator.cxx @@ -17,17 +17,14 @@ #include <cmsys/RegularExpression.hxx> -//---------------------------------------------------------------------- cmCPackBundleGenerator::cmCPackBundleGenerator() { } -//---------------------------------------------------------------------- cmCPackBundleGenerator::~cmCPackBundleGenerator() { } -//---------------------------------------------------------------------- int cmCPackBundleGenerator::InitializeInternal() { const char* name = this->GetOption("CPACK_BUNDLE_NAME"); @@ -58,7 +55,6 @@ int cmCPackBundleGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- const char* cmCPackBundleGenerator::GetPackagingInstallPrefix() { this->InstallPrefix = "/"; @@ -68,7 +64,6 @@ const char* cmCPackBundleGenerator::GetPackagingInstallPrefix() return this->InstallPrefix.c_str(); } -//---------------------------------------------------------------------- int cmCPackBundleGenerator::ConstructBundle() { @@ -184,7 +179,6 @@ int cmCPackBundleGenerator::ConstructBundle() return 1; } -//---------------------------------------------------------------------- int cmCPackBundleGenerator::PackageFiles() { if(!this->ConstructBundle()) diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx index b847589..88c59f3 100644 --- a/Source/CPack/cmCPackComponentGroup.cxx +++ b/Source/CPack/cmCPackComponentGroup.cxx @@ -17,7 +17,6 @@ #include <string> #include <vector> -//---------------------------------------------------------------------- unsigned long cmCPackComponent::GetInstalledSize( const std::string& installDir) const { @@ -38,7 +37,6 @@ unsigned long cmCPackComponent::GetInstalledSize( return this->TotalSize; } -//---------------------------------------------------------------------- unsigned long cmCPackComponent::GetInstalledSizeInKbytes(const std::string& installDir) const { diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx index 687689c..a3176e9 100644 --- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx +++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx @@ -21,17 +21,14 @@ #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------- cmCPackCygwinBinaryGenerator::cmCPackCygwinBinaryGenerator() { } -//---------------------------------------------------------------------- cmCPackCygwinBinaryGenerator::~cmCPackCygwinBinaryGenerator() { } -//---------------------------------------------------------------------- int cmCPackCygwinBinaryGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr"); @@ -39,7 +36,6 @@ int cmCPackCygwinBinaryGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackCygwinBinaryGenerator::PackageFiles() { std::string packageName = this->GetOption("CPACK_PACKAGE_NAME"); diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx index d84b1ee..132ebcf 100644 --- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx +++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx @@ -29,24 +29,20 @@ # include <windows.h> #endif -//---------------------------------------------------------------------- cmCPackCygwinSourceGenerator::cmCPackCygwinSourceGenerator() { } -//---------------------------------------------------------------------- cmCPackCygwinSourceGenerator::~cmCPackCygwinSourceGenerator() { } -//---------------------------------------------------------------------- int cmCPackCygwinSourceGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "0"); return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackCygwinSourceGenerator::PackageFiles() { // Create a tar file of the sources diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 794955f..0911713 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -32,17 +32,14 @@ // Therefore we provide our own implementation of a BSD-ar: static int ar_append(const char*archive,const std::vector<std::string>& files); -//---------------------------------------------------------------------- cmCPackDebGenerator::cmCPackDebGenerator() { } -//---------------------------------------------------------------------- cmCPackDebGenerator::~cmCPackDebGenerator() { } -//---------------------------------------------------------------------- int cmCPackDebGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr"); @@ -53,7 +50,6 @@ int cmCPackDebGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel, std::string packageName) { @@ -115,7 +111,6 @@ int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel, return retval; } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) { int retval = 1; @@ -170,7 +165,6 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) return retval; } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageComponentsAllInOne() { int retval = 1; @@ -243,7 +237,6 @@ int cmCPackDebGenerator::PackageComponentsAllInOne() return retval; } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageFiles() { int retval = -1; diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index b9c9c85..ea90c67 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -61,7 +61,6 @@ static const char* SLASTREnglish = "};\n" "\n"; -//---------------------------------------------------------------------- cmCPackDragNDropGenerator::cmCPackDragNDropGenerator() : singleLicense(false) { @@ -69,12 +68,10 @@ cmCPackDragNDropGenerator::cmCPackDragNDropGenerator() this->componentPackageMethod = ONE_PACKAGE; } -//---------------------------------------------------------------------- cmCPackDragNDropGenerator::~cmCPackDragNDropGenerator() { } -//---------------------------------------------------------------------- int cmCPackDragNDropGenerator::InitializeInternal() { // Starting with Xcode 4.3, look in "/Applications/Xcode.app" first: @@ -183,13 +180,11 @@ int cmCPackDragNDropGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- const char* cmCPackDragNDropGenerator::GetOutputExtension() { return ".dmg"; } -//---------------------------------------------------------------------- int cmCPackDragNDropGenerator::PackageFiles() { // gather which directories to make dmg files for @@ -245,7 +240,6 @@ int cmCPackDragNDropGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- bool cmCPackDragNDropGenerator::CopyFile(std::ostringstream& source, std::ostringstream& target) { @@ -266,7 +260,6 @@ bool cmCPackDragNDropGenerator::CopyFile(std::ostringstream& source, return true; } -//---------------------------------------------------------------------- bool cmCPackDragNDropGenerator::CreateEmptyFile(std::ostringstream& target, size_t size) { @@ -288,7 +281,6 @@ bool cmCPackDragNDropGenerator::CreateEmptyFile(std::ostringstream& target, return true; } -//---------------------------------------------------------------------- bool cmCPackDragNDropGenerator::RunCommand(std::ostringstream& command, std::string* output) { @@ -315,7 +307,6 @@ bool cmCPackDragNDropGenerator::RunCommand(std::ostringstream& command, return true; } -//---------------------------------------------------------------------- int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, const std::string& output_file) { diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 6cc67e7..04ee21a 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -31,7 +31,6 @@ #include <StorageDefs.h> #endif -//---------------------------------------------------------------------- cmCPackGenerator::cmCPackGenerator() { this->GeneratorVerbose = cmSystemTools::OUTPUT_NONE; @@ -40,20 +39,17 @@ cmCPackGenerator::cmCPackGenerator() this->componentPackageMethod = ONE_PACKAGE_PER_GROUP; } -//---------------------------------------------------------------------- cmCPackGenerator::~cmCPackGenerator() { this->MakefileMap = 0; } -//---------------------------------------------------------------------- void cmCPackGeneratorProgress(const char *msg, float prog, void* ptr) { cmCPackGenerator* self = static_cast<cmCPackGenerator*>(ptr); self->DisplayVerboseOutput(msg, prog); } -//---------------------------------------------------------------------- void cmCPackGenerator::DisplayVerboseOutput(const char* msg, float progress) { @@ -61,7 +57,6 @@ void cmCPackGenerator::DisplayVerboseOutput(const char* msg, cmCPackLogger(cmCPackLog::LOG_VERBOSE, "" << msg << std::endl); } -//---------------------------------------------------------------------- int cmCPackGenerator::PrepareNames() { cmCPackLogger(cmCPackLog::LOG_DEBUG, @@ -185,7 +180,6 @@ int cmCPackGenerator::PrepareNames() return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProject() { cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Install projects" << std::endl); @@ -267,7 +261,6 @@ int cmCPackGenerator::InstallProject() return res; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstallCommands( bool setDestDir, const std::string& tempInstallDirectory) { @@ -311,7 +304,6 @@ int cmCPackGenerator::InstallProjectViaInstallCommands( return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstalledDirectories( bool setDestDir, const std::string& tempInstallDirectory) { @@ -473,7 +465,6 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstallScript( bool setDestDir, const std::string& tempInstallDirectory) { @@ -540,7 +531,6 @@ int cmCPackGenerator::InstallProjectViaInstallScript( return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( bool setDestDir, const std::string& baseTempInstallDirectory) { @@ -983,7 +973,6 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( return 1; } -//---------------------------------------------------------------------- bool cmCPackGenerator::ReadListFile(const char* moduleName) { bool retval; @@ -994,7 +983,6 @@ bool cmCPackGenerator::ReadListFile(const char* moduleName) return retval; } -//---------------------------------------------------------------------- void cmCPackGenerator::SetOptionIfNotSet(const std::string& op, const char* value) { @@ -1006,7 +994,6 @@ void cmCPackGenerator::SetOptionIfNotSet(const std::string& op, this->SetOption(op, value); } -//---------------------------------------------------------------------- void cmCPackGenerator::SetOption(const std::string& op, const char* value) { if ( !value ) @@ -1019,7 +1006,6 @@ void cmCPackGenerator::SetOption(const std::string& op, const char* value) this->MakefileMap->AddDefinition(op, value); } -//---------------------------------------------------------------------- int cmCPackGenerator::DoPackage() { cmCPackLogger(cmCPackLog::LOG_OUTPUT, @@ -1160,7 +1146,6 @@ int cmCPackGenerator::DoPackage() return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf) { this->MakefileMap = mf; @@ -1188,25 +1173,21 @@ int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf) return result; } -//---------------------------------------------------------------------- int cmCPackGenerator::InitializeInternal() { return 1; } -//---------------------------------------------------------------------- bool cmCPackGenerator::IsSet(const std::string& name) const { return this->MakefileMap->IsSet(name); } -//---------------------------------------------------------------------- bool cmCPackGenerator::IsOn(const std::string& name) const { return cmSystemTools::IsOn(GetOption(name)); } -//---------------------------------------------------------------------- const char* cmCPackGenerator::GetOption(const std::string& op) const { const char* ret = this->MakefileMap->GetDefinition(op); @@ -1220,19 +1201,16 @@ const char* cmCPackGenerator::GetOption(const std::string& op) const return ret; } -//---------------------------------------------------------------------- std::vector<std::string> cmCPackGenerator::GetOptions() const { return this->MakefileMap->GetDefinitions(); } -//---------------------------------------------------------------------- int cmCPackGenerator::PackageFiles() { return 0; } -//---------------------------------------------------------------------- const char* cmCPackGenerator::GetInstallPath() { if ( !this->InstallPath.empty() ) @@ -1275,7 +1253,6 @@ const char* cmCPackGenerator::GetInstallPath() return this->InstallPath.c_str(); } -//---------------------------------------------------------------------- const char* cmCPackGenerator::GetPackagingInstallPrefix() { cmCPackLogger(cmCPackLog::LOG_DEBUG, "GetPackagingInstallPrefix: '" @@ -1284,7 +1261,6 @@ const char* cmCPackGenerator::GetPackagingInstallPrefix() return this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX"); } -//---------------------------------------------------------------------- std::string cmCPackGenerator::FindTemplate(const char* name) { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: " @@ -1295,7 +1271,6 @@ std::string cmCPackGenerator::FindTemplate(const char* name) return ffile; } -//---------------------------------------------------------------------- bool cmCPackGenerator::ConfigureString(const std::string& inString, std::string& outString) { @@ -1304,7 +1279,6 @@ bool cmCPackGenerator::ConfigureString(const std::string& inString, return true; } -//---------------------------------------------------------------------- bool cmCPackGenerator::ConfigureFile(const char* inName, const char* outName, bool copyOnly /* = false */) { @@ -1312,7 +1286,6 @@ bool cmCPackGenerator::ConfigureFile(const char* inName, copyOnly, true, false) == 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::CleanTemporaryDirectory() { std::string tempInstallDirectoryWithPostfix @@ -1335,7 +1308,6 @@ int cmCPackGenerator::CleanTemporaryDirectory() return 1; } -//---------------------------------------------------------------------- cmInstalledFile const* cmCPackGenerator::GetInstalledFile( std::string const& name) const { @@ -1343,7 +1315,6 @@ cmInstalledFile const* cmCPackGenerator::GetInstalledFile( return cm->GetInstalledFile(name); } -//---------------------------------------------------------------------- int cmCPackGenerator::PrepareGroupingKind() { // find a component package method specified by the user @@ -1440,12 +1411,10 @@ int cmCPackGenerator::PrepareGroupingKind() return 1; } -//---------------------------------------------------------------------- std::string cmCPackGenerator::GetComponentInstallDirNameSuffix( const std::string& componentName) { return componentName; } -//---------------------------------------------------------------------- std::string cmCPackGenerator::GetComponentPackageFileName( const std::string& initialPackageFileName, const std::string& groupOrComponentName, @@ -1486,26 +1455,22 @@ std::string cmCPackGenerator::GetComponentPackageFileName( return initialPackageFileName + suffix; } -//---------------------------------------------------------------------- enum cmCPackGenerator::CPackSetDestdirSupport cmCPackGenerator::SupportsSetDestdir() const { return cmCPackGenerator::SETDESTDIR_SUPPORTED; } -//---------------------------------------------------------------------- bool cmCPackGenerator::SupportsAbsoluteDestination() const { return true; } -//---------------------------------------------------------------------- bool cmCPackGenerator::SupportsComponentInstallation() const { return false; } -//---------------------------------------------------------------------- bool cmCPackGenerator::WantsComponentInstallation() const { return (!IsOn("CPACK_MONOLITHIC_INSTALL") @@ -1514,7 +1479,6 @@ bool cmCPackGenerator::WantsComponentInstallation() const && (!this->ComponentGroups.empty() || !this->Components.empty())); } -//---------------------------------------------------------------------- cmCPackInstallationType* cmCPackGenerator::GetInstallationType(const std::string& projectName, const std::string& name) @@ -1546,7 +1510,6 @@ cmCPackGenerator::GetInstallationType(const std::string& projectName, return installType; } -//---------------------------------------------------------------------- cmCPackComponent* cmCPackGenerator::GetComponent(const std::string& projectName, const std::string& name) @@ -1642,7 +1605,6 @@ cmCPackGenerator::GetComponent(const std::string& projectName, return component; } -//---------------------------------------------------------------------- cmCPackComponentGroup* cmCPackGenerator::GetComponentGroup(const std::string& projectName, const std::string& name) diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 669964d..5a63dbc 100644 --- a/Source/CPack/cmCPackGeneratorFactory.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -49,7 +49,6 @@ #include "cmCPackLog.h" -//---------------------------------------------------------------------- cmCPackGeneratorFactory::cmCPackGeneratorFactory() { if (cmCPackTGZGenerator::CanGenerate()) @@ -156,13 +155,11 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() #endif } -//---------------------------------------------------------------------- cmCPackGeneratorFactory::~cmCPackGeneratorFactory() { cmDeleteAll(this->Generators); } -//---------------------------------------------------------------------- cmCPackGenerator* cmCPackGeneratorFactory::NewGenerator( const std::string& name) { @@ -176,7 +173,6 @@ cmCPackGenerator* cmCPackGeneratorFactory::NewGenerator( return gen; } -//---------------------------------------------------------------------- cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal( const std::string& name) { @@ -189,7 +185,6 @@ cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal( return (it->second)(); } -//---------------------------------------------------------------------- void cmCPackGeneratorFactory::RegisterGenerator(const std::string& name, const char* generatorDescription, CreateGeneratorCall* createGenerator) diff --git a/Source/CPack/cmCPackLog.cxx b/Source/CPack/cmCPackLog.cxx index 7633ac2..61d97c8 100644 --- a/Source/CPack/cmCPackLog.cxx +++ b/Source/CPack/cmCPackLog.cxx @@ -15,7 +15,6 @@ #include "cmGeneratedFileStream.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------- cmCPackLog::cmCPackLog() { this->Verbose = false; @@ -33,13 +32,11 @@ cmCPackLog::cmCPackLog() this->LogOutputCleanup = false; } -//---------------------------------------------------------------------- cmCPackLog::~cmCPackLog() { this->SetLogOutputStream(0); } -//---------------------------------------------------------------------- void cmCPackLog::SetLogOutputStream(std::ostream* os) { if ( this->LogOutputCleanup && this->LogOutput ) @@ -50,7 +47,6 @@ void cmCPackLog::SetLogOutputStream(std::ostream* os) this->LogOutput = os; } -//---------------------------------------------------------------------- bool cmCPackLog::SetLogOutputFile(const char* fname) { cmGeneratedFileStream *cg = 0; @@ -72,7 +68,6 @@ bool cmCPackLog::SetLogOutputFile(const char* fname) return true; } -//---------------------------------------------------------------------- void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_t length) { diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index a5a9a19..9d6a457 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -31,18 +31,15 @@ # define NSIS_OPT "-" #endif -//---------------------------------------------------------------------- cmCPackNSISGenerator::cmCPackNSISGenerator(bool nsis64) { Nsis64 = nsis64; } -//---------------------------------------------------------------------- cmCPackNSISGenerator::~cmCPackNSISGenerator() { } -//---------------------------------------------------------------------- int cmCPackNSISGenerator::PackageFiles() { // TODO: Fix nsis to force out file name @@ -361,7 +358,6 @@ int cmCPackNSISGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackNSISGenerator::InitializeInternal() { if ( cmSystemTools::IsOn(this->GetOption( @@ -585,7 +581,6 @@ int cmCPackNSISGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- void cmCPackNSISGenerator::CreateMenuLinks( std::ostringstream& str, std::ostringstream& deleteStr) { @@ -663,7 +658,6 @@ void cmCPackNSISGenerator::CreateMenuLinks( std::ostringstream& str, } } -//---------------------------------------------------------------------- bool cmCPackNSISGenerator::GetListOfSubdirectories(const char* topdir, std::vector<std::string>& dirs) { @@ -692,26 +686,22 @@ bool cmCPackNSISGenerator::GetListOfSubdirectories(const char* topdir, return true; } -//---------------------------------------------------------------------- enum cmCPackGenerator::CPackSetDestdirSupport cmCPackNSISGenerator::SupportsSetDestdir() const { return cmCPackGenerator::SETDESTDIR_SHOULD_NOT_BE_USED; } -//---------------------------------------------------------------------- bool cmCPackNSISGenerator::SupportsAbsoluteDestination() const { return false; } -//---------------------------------------------------------------------- bool cmCPackNSISGenerator::SupportsComponentInstallation() const { return true; } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator:: CreateComponentDescription(cmCPackComponent *component, @@ -946,7 +936,6 @@ CreateComponentDescription(cmCPackComponent *component, return componentCode; } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator::CreateSelectionDependenciesDescription (cmCPackComponent *component, std::set<cmCPackComponent *>& visited) @@ -978,7 +967,6 @@ std::string cmCPackNSISGenerator::CreateSelectionDependenciesDescription } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription (cmCPackComponent *component, std::set<cmCPackComponent *>& visited) @@ -1011,7 +999,6 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription return out.str(); } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator:: CreateComponentGroupDescription(cmCPackComponentGroup *group, diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 1d7ef69..42b8c62 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -23,17 +23,14 @@ #include <cmsys/SystemTools.hxx> #include <sys/stat.h> -//---------------------------------------------------------------------- cmCPackOSXX11Generator::cmCPackOSXX11Generator() { } -//---------------------------------------------------------------------- cmCPackOSXX11Generator::~cmCPackOSXX11Generator() { } -//---------------------------------------------------------------------- int cmCPackOSXX11Generator::PackageFiles() { // TODO: Use toplevel ? @@ -206,7 +203,6 @@ int cmCPackOSXX11Generator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackOSXX11Generator::InitializeInternal() { cmCPackLogger(cmCPackLog::LOG_DEBUG, @@ -225,7 +221,6 @@ int cmCPackOSXX11Generator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- /* bool cmCPackOSXX11Generator::CopyCreateResourceFile(const std::string& name) { @@ -270,7 +265,6 @@ bool cmCPackOSXX11Generator::CopyCreateResourceFile(const std::string& name) } */ -//---------------------------------------------------------------------- bool cmCPackOSXX11Generator::CopyResourcePlistFile(const std::string& name, const std::string& dir, const char* outputFileName /* = 0 */, bool copyOnly /* = false */) @@ -301,7 +295,6 @@ bool cmCPackOSXX11Generator::CopyResourcePlistFile(const std::string& name, return true; } -//---------------------------------------------------------------------- const char* cmCPackOSXX11Generator::GetPackagingInstallPrefix() { this->InstallPrefix = "/"; diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 4f6238e..71a5b12 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -32,25 +32,21 @@ unsigned int getVersion(unsigned int major, unsigned int minor) return ((major & 0xFF) << 16 | minor); } -//---------------------------------------------------------------------- cmCPackPackageMakerGenerator::cmCPackPackageMakerGenerator() { this->PackageMakerVersion = 0.0; this->PackageCompatibilityVersion = getVersion(10, 4); } -//---------------------------------------------------------------------- cmCPackPackageMakerGenerator::~cmCPackPackageMakerGenerator() { } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator::SupportsComponentInstallation() const { return this->PackageCompatibilityVersion >= getVersion(10, 4); } -//---------------------------------------------------------------------- int cmCPackPackageMakerGenerator::CopyInstallScript(const std::string& resdir, const std::string& script, const std::string& name) @@ -67,7 +63,6 @@ int cmCPackPackageMakerGenerator::CopyInstallScript(const std::string& resdir, return 1; } -//---------------------------------------------------------------------- int cmCPackPackageMakerGenerator::PackageFiles() { // TODO: Use toplevel @@ -403,7 +398,6 @@ int cmCPackPackageMakerGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackPackageMakerGenerator::InitializeInternal() { cmCPackLogger(cmCPackLog::LOG_DEBUG, @@ -567,7 +561,6 @@ int cmCPackPackageMakerGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator::CopyCreateResourceFile( const std::string& name, const std::string& dirName) @@ -646,7 +639,6 @@ bool cmCPackPackageMakerGenerator::CopyResourcePlistFile( return true; } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator::RunPackageMaker(const char *command, const char *packageFile) { @@ -695,7 +687,6 @@ bool cmCPackPackageMakerGenerator::RunPackageMaker(const char *command, return true; } -//---------------------------------------------------------------------- std::string cmCPackPackageMakerGenerator::GetPackageName(const cmCPackComponent& component) { @@ -714,7 +705,6 @@ cmCPackPackageMakerGenerator::GetPackageName(const cmCPackComponent& component) } } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator:: GenerateComponentPackage(const char *packageFile, @@ -797,7 +787,6 @@ GenerateComponentPackage(const char *packageFile, return RunPackageMaker(pkgCmd.str().c_str(), packageFile); } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: WriteDistributionFile(const char* metapackageFile) @@ -875,7 +864,6 @@ WriteDistributionFile(const char* metapackageFile) distributionFile.c_str()); } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: CreateChoiceOutline(const cmCPackComponentGroup& group, @@ -899,7 +887,6 @@ CreateChoiceOutline(const cmCPackComponentGroup& group, out << "</line>" << std::endl; } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponentGroup& group, std::ostringstream& out) @@ -917,7 +904,6 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponentGroup& group, out << "></choice>" << std::endl; } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, std::ostringstream& out) @@ -1001,7 +987,6 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, out << "</pkg-ref>" << std::endl; } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: AddDependencyAttributes(const cmCPackComponent& component, @@ -1025,7 +1010,6 @@ AddDependencyAttributes(const cmCPackComponent& component, } } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: AddReverseDependencyAttributes(const cmCPackComponent& component, @@ -1048,7 +1032,6 @@ AddReverseDependencyAttributes(const cmCPackComponent& component, } } -//---------------------------------------------------------------------- std::string cmCPackPackageMakerGenerator::EscapeForXML(std::string str) { cmSystemTools::ReplaceString(str, "&", "&"); diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index 706f43a..6349e05 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -14,17 +14,14 @@ #include "cmCPackLog.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------- cmCPackRPMGenerator::cmCPackRPMGenerator() { } -//---------------------------------------------------------------------- cmCPackRPMGenerator::~cmCPackRPMGenerator() { } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr"); @@ -50,7 +47,6 @@ int cmCPackRPMGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageOnePack(std::string initialToplevel, std::string packageName) { @@ -94,7 +90,6 @@ int cmCPackRPMGenerator::PackageOnePack(std::string initialToplevel, return retval; } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup) { int retval = 1; @@ -147,7 +142,6 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup) return retval; } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageComponentsAllInOne() { int retval = 1; @@ -201,7 +195,6 @@ int cmCPackRPMGenerator::PackageComponentsAllInOne() return retval; } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageFiles() { int retval = 1; diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index 4a8754e..41e67c7 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -24,17 +24,14 @@ // include sys/stat.h after sys/types.h #include <sys/stat.h> -//---------------------------------------------------------------------- cmCPackSTGZGenerator::cmCPackSTGZGenerator() { } -//---------------------------------------------------------------------- cmCPackSTGZGenerator::~cmCPackSTGZGenerator() { } -//---------------------------------------------------------------------- int cmCPackSTGZGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "0"); @@ -52,7 +49,6 @@ int cmCPackSTGZGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackSTGZGenerator::PackageFiles() { bool retval = true; @@ -81,7 +77,6 @@ int cmCPackSTGZGenerator::PackageFiles() return retval; } -//---------------------------------------------------------------------- int cmCPackSTGZGenerator::GenerateHeader(std::ostream* os) { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Writing header" << std::endl); diff --git a/Source/CPack/cmCPackTGZGenerator.cxx b/Source/CPack/cmCPackTGZGenerator.cxx index 3fa2b64..90eb1a3 100644 --- a/Source/CPack/cmCPackTGZGenerator.cxx +++ b/Source/CPack/cmCPackTGZGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTGZGenerator.h" -//---------------------------------------------------------------------- cmCPackTGZGenerator::cmCPackTGZGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressGZip, "paxr") { } -//---------------------------------------------------------------------- cmCPackTGZGenerator::~cmCPackTGZGenerator() { } diff --git a/Source/CPack/cmCPackTXZGenerator.cxx b/Source/CPack/cmCPackTXZGenerator.cxx index 6d4ede1..454e062 100644 --- a/Source/CPack/cmCPackTXZGenerator.cxx +++ b/Source/CPack/cmCPackTXZGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTXZGenerator.h" -//---------------------------------------------------------------------- cmCPackTXZGenerator::cmCPackTXZGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressXZ, "paxr") { } -//---------------------------------------------------------------------- cmCPackTXZGenerator::~cmCPackTXZGenerator() { } diff --git a/Source/CPack/cmCPackTarBZip2Generator.cxx b/Source/CPack/cmCPackTarBZip2Generator.cxx index da16737..b05b399 100644 --- a/Source/CPack/cmCPackTarBZip2Generator.cxx +++ b/Source/CPack/cmCPackTarBZip2Generator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTarBZip2Generator.h" -//---------------------------------------------------------------------- cmCPackTarBZip2Generator::cmCPackTarBZip2Generator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2, "paxr") { } -//---------------------------------------------------------------------- cmCPackTarBZip2Generator::~cmCPackTarBZip2Generator() { } diff --git a/Source/CPack/cmCPackTarCompressGenerator.cxx b/Source/CPack/cmCPackTarCompressGenerator.cxx index 1c8311b..ddfe248 100644 --- a/Source/CPack/cmCPackTarCompressGenerator.cxx +++ b/Source/CPack/cmCPackTarCompressGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTarCompressGenerator.h" -//---------------------------------------------------------------------- cmCPackTarCompressGenerator::cmCPackTarCompressGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressCompress, "paxr") { } -//---------------------------------------------------------------------- cmCPackTarCompressGenerator::~cmCPackTarCompressGenerator() { } diff --git a/Source/CPack/cmCPackZIPGenerator.cxx b/Source/CPack/cmCPackZIPGenerator.cxx index 7ef7729..d316ab6 100644 --- a/Source/CPack/cmCPackZIPGenerator.cxx +++ b/Source/CPack/cmCPackZIPGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackZIPGenerator.h" -//---------------------------------------------------------------------- cmCPackZIPGenerator::cmCPackZIPGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressNone, "zip") { } -//---------------------------------------------------------------------- cmCPackZIPGenerator::~cmCPackZIPGenerator() { } diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 813fb01..6b2323c 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -26,7 +26,6 @@ #include <cmsys/Encoding.hxx> #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = { {0, @@ -34,7 +33,6 @@ static const char * cmDocumentationName[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsage[][2] = { {0, @@ -42,7 +40,6 @@ static const char * cmDocumentationUsage[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationOptions[][2] = { {"-G <generator>", "Use the specified generator to generate package."}, @@ -58,13 +55,11 @@ static const char * cmDocumentationOptions[][2] = {0,0} }; -//---------------------------------------------------------------------------- int cpackUnknownArgument(const char*, void*) { return 1; } -//---------------------------------------------------------------------------- struct cpackDefinitions { typedef std::map<std::string, std::string> MapType; @@ -72,7 +67,6 @@ struct cpackDefinitions cmCPackLog *Log; }; -//---------------------------------------------------------------------------- int cpackDefinitionArgument(const char* argument, const char* cValue, void* call_data) { @@ -95,7 +89,6 @@ int cpackDefinitionArgument(const char* argument, const char* cValue, } -//---------------------------------------------------------------------------- // this is CPack. int main (int argc, char const* const* argv) { |