ENH: change name

Source/CMakeLists.txt

@@ -308,7 +308,7 @@ TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_L
 #
 SET(CPACK_SRCS
   CPack/cmCPackGeneratorFactory.cxx
-  CPack/cmCPackGenericGenerator.cxx
+  CPack/cmCPackGenerator.cxx
   CPack/cmCPackLog.cxx
   CPack/cmCPackNSISGenerator.cxx
   CPack/cmCPackSTGZGenerator.cxx

Source/CPack/cmCPackDebGenerator.h

@@ -19,16 +19,16 @@
 #define cmCPackDebGenerator_h
 
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 /** \class cmCPackDebGenerator
  * \brief A generator for Debian packages
  *
  */
-class cmCPackDebGenerator : public cmCPackGenericGenerator
+class cmCPackDebGenerator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackDebGenerator, cmCPackGenericGenerator);
+  cmCPackTypeMacro(cmCPackDebGenerator, cmCPackGenerator);
 
   /**
    * Construct generator

Source/CPack/cmCPackGenericGenerator.cxx → Source/CPack/cmCPackGenerator.cxx

@@ -15,7 +15,7 @@
 
 =========================================================================*/
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 #include "cmMakefile.h"
 #include "cmCPackLog.h"
@@ -29,7 +29,7 @@
 #include <memory> // auto_ptr
 
 //----------------------------------------------------------------------
-cmCPackGenericGenerator::cmCPackGenericGenerator()
+cmCPackGenerator::cmCPackGenerator()
 {
   this->GeneratorVerbose = false;
   this->MakefileMap = 0;
@@ -37,20 +37,20 @@ cmCPackGenericGenerator::cmCPackGenericGenerator()
 }
 
 //----------------------------------------------------------------------
-cmCPackGenericGenerator::~cmCPackGenericGenerator()
+cmCPackGenerator::~cmCPackGenerator()
 {
   this->MakefileMap = 0;
 }
 
 //----------------------------------------------------------------------
-void cmCPackGenericGeneratorProgress(const char *msg, float prog, void* ptr)
+void cmCPackGeneratorProgress(const char *msg, float prog, void* ptr)
 {
-  cmCPackGenericGenerator* self = static_cast<cmCPackGenericGenerator*>(ptr);
+  cmCPackGenerator* self = static_cast<cmCPackGenerator*>(ptr);
   self->DisplayVerboseOutput(msg, prog);
 }
 
 //----------------------------------------------------------------------
-void cmCPackGenericGenerator::DisplayVerboseOutput(const char* msg,
+void cmCPackGenerator::DisplayVerboseOutput(const char* msg,
   float progress)
 {
   (void)progress;
@@ -58,7 +58,7 @@ void cmCPackGenericGenerator::DisplayVerboseOutput(const char* msg,
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::PrepareNames()
+int cmCPackGenerator::PrepareNames()
 {
 
   std::string tempDirectory = this->GetOption("CPACK_PACKAGE_DIRECTORY");
@@ -148,7 +148,7 @@ int cmCPackGenericGenerator::PrepareNames()
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::InstallProject()
+int cmCPackGenerator::InstallProject()
 {
   cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Install projects" << std::endl);
   this->CleanTemporaryDirectory();
@@ -221,7 +221,7 @@ int cmCPackGenericGenerator::InstallProject()
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::InstallProjectViaInstallCommands(
+int cmCPackGenerator::InstallProjectViaInstallCommands(
   bool setDestDir, const char* tempInstallDirectory)
 {
   (void)setDestDir;
@@ -265,7 +265,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCommands(
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories(
+int cmCPackGenerator::InstallProjectViaInstalledDirectories(
   bool setDestDir, const char* tempInstallDirectory)
 {
   (void)setDestDir;
@@ -365,7 +365,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories(
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::InstallProjectViaInstallScript(
+int cmCPackGenerator::InstallProjectViaInstallScript(
   bool setDestDir, const char* tempInstallDirectory)
 {
   const char* cmakeScripts
@@ -434,7 +434,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallScript(
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects(
+int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
   bool setDestDir, const char* tempInstallDirectory)
 {
   const char* cmakeProjects
@@ -537,7 +537,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects(
       cmCPackLogger(cmCPackLog::LOG_OUTPUT,
         "- Install project: " << installProjectName << std::endl);
       cmake cm;
-      cm.SetProgressCallback(cmCPackGenericGeneratorProgress, this);
+      cm.SetProgressCallback(cmCPackGeneratorProgress, this);
       cmGlobalGenerator gg;
       gg.SetCMakeInstance(&cm);
       std::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
@@ -609,14 +609,14 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects(
 }
 
 //----------------------------------------------------------------------
-bool cmCPackGenericGenerator::ReadListFile(const char* moduleName)
+bool cmCPackGenerator::ReadListFile(const char* moduleName)
 {
   std::string fullPath = this->MakefileMap->GetModulesFile(moduleName);
   return this->MakefileMap->ReadListFile(0, fullPath.c_str());
 }
 
 //----------------------------------------------------------------------
-void cmCPackGenericGenerator::SetOptionIfNotSet(const char* op,
+void cmCPackGenerator::SetOptionIfNotSet(const char* op,
   const char* value)
 {
   const char* def = this->MakefileMap->GetDefinition(op);
@@ -628,7 +628,7 @@ void cmCPackGenericGenerator::SetOptionIfNotSet(const char* op,
 }
 
 //----------------------------------------------------------------------
-void cmCPackGenericGenerator::SetOption(const char* op, const char* value)
+void cmCPackGenerator::SetOption(const char* op, const char* value)
 {
   if ( !op )
     {
@@ -645,7 +645,7 @@ void cmCPackGenericGenerator::SetOption(const char* op, const char* value)
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::ProcessGenerator()
+int cmCPackGenerator::ProcessGenerator()
 {
   cmCPackLogger(cmCPackLog::LOG_OUTPUT,
     "Create package using " << this->Name.c_str() << std::endl);
@@ -742,7 +742,7 @@ int cmCPackGenericGenerator::ProcessGenerator()
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::Initialize(const char* name, cmMakefile* mf,
+int cmCPackGenerator::Initialize(const char* name, cmMakefile* mf,
  const char* argv0)
 {
   this->MakefileMap = mf;
@@ -777,25 +777,25 @@ int cmCPackGenericGenerator::Initialize(const char* name, cmMakefile* mf,
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::InitializeInternal()
+int cmCPackGenerator::InitializeInternal()
 {
   return 1;
 }
 
 //----------------------------------------------------------------------
-bool cmCPackGenericGenerator::IsSet(const char* name) const
+bool cmCPackGenerator::IsSet(const char* name) const
 {
   return this->MakefileMap->IsSet(name);
 }
 
 //----------------------------------------------------------------------
-const char* cmCPackGenericGenerator::GetOption(const char* op)
+const char* cmCPackGenerator::GetOption(const char* op)
 {
   return this->MakefileMap->GetDefinition(op);
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::FindRunningCMake(const char* arg0)
+int cmCPackGenerator::FindRunningCMake(const char* arg0)
 {
   int found = 0;
   // Find our own executable.
@@ -957,7 +957,7 @@ int cmCPackGenericGenerator::FindRunningCMake(const char* arg0)
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::CompressFiles(const char* outFileName,
+int cmCPackGenerator::CompressFiles(const char* outFileName,
   const char* toplevel, const std::vector<std::string>& files)
 {
   (void)outFileName;
@@ -967,7 +967,7 @@ int cmCPackGenericGenerator::CompressFiles(const char* outFileName,
 }
 
 //----------------------------------------------------------------------
-const char* cmCPackGenericGenerator::GetInstallPath()
+const char* cmCPackGenerator::GetInstallPath()
 {
   if ( !this->InstallPath.empty() )
     {
@@ -1000,7 +1000,7 @@ const char* cmCPackGenericGenerator::GetInstallPath()
 }
 
 //----------------------------------------------------------------------
-const char* cmCPackGenericGenerator::GetPackagingInstallPrefix()
+const char* cmCPackGenerator::GetPackagingInstallPrefix()
 {
   cmCPackLogger(cmCPackLog::LOG_DEBUG, "GetPackagingInstallPrefix: '"
     << this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX") << "'" << std::endl);
@@ -1009,7 +1009,7 @@ const char* cmCPackGenericGenerator::GetPackagingInstallPrefix()
 }
 
 //----------------------------------------------------------------------
-std::string cmCPackGenericGenerator::FindTemplate(const char* name)
+std::string cmCPackGenerator::FindTemplate(const char* name)
 {
   cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: "
     << (name ? name : "(NULL)") << std::endl);
@@ -1020,7 +1020,7 @@ std::string cmCPackGenericGenerator::FindTemplate(const char* name)
 }
 
 //----------------------------------------------------------------------
-bool cmCPackGenericGenerator::ConfigureString(const std::string& inString,
+bool cmCPackGenerator::ConfigureString(const std::string& inString,
   std::string& outString)
 {
   this->MakefileMap->ConfigureString(inString,
@@ -1029,7 +1029,7 @@ bool cmCPackGenericGenerator::ConfigureString(const std::string& inString,
 }
 
 //----------------------------------------------------------------------
-bool cmCPackGenericGenerator::ConfigureFile(const char* inName,
+bool cmCPackGenerator::ConfigureFile(const char* inName,
   const char* outName, bool copyOnly /* = false */)
 {
   return this->MakefileMap->ConfigureFile(inName, outName,
@@ -1037,7 +1037,7 @@ bool cmCPackGenericGenerator::ConfigureFile(const char* inName,
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::CleanTemporaryDirectory()
+int cmCPackGenerator::CleanTemporaryDirectory()
 {
   std::string tempInstallDirectoryWithPostfix
     = this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY");

Source/CPack/cmCPackGenericGenerator.h → Source/CPack/cmCPackGenerator.h

@@ -15,14 +15,14 @@
 
 =========================================================================*/
 
-#ifndef cmCPackGenericGenerator_h
-#define cmCPackGenericGenerator_h
+#ifndef cmCPackGenerator_h
+#define cmCPackGenerator_h
 
 #include "cmObject.h"
 
 #define cmCPackTypeMacro(class, superclass) \
   cmTypeMacro(class, superclass); \
-  static cmCPackGenericGenerator* CreateGenerator() { return new class; }
+  static cmCPackGenerator* CreateGenerator() { return new class; }
 
 #define cmCPackLogger(logType, msg) \
   do { \
@@ -45,14 +45,14 @@
 class cmMakefile;
 class cmCPackLog;
 
-/** \class cmCPackGenericGenerator
+/** \class cmCPackGenerator
  * \brief A superclass of all CPack Generators
  *
  */
-class cmCPackGenericGenerator : public cmObject
+class cmCPackGenerator : public cmObject
 {
 public:
-  cmTypeMacro(cmCPackGenericGenerator, cmObject);
+  cmTypeMacro(cmCPackGenerator, cmObject);
   /**
    * If verbose then more informaiton is printed out
    */
@@ -72,8 +72,8 @@ public:
   /**
    * Construct generator
    */
-  cmCPackGenericGenerator();
-  virtual ~cmCPackGenericGenerator();
+  cmCPackGenerator();
+  virtual ~cmCPackGenerator();
 
   //! Set and get the options
   void SetOption(const char* op, const char* value);

Source/CPack/cmCPackGeneratorFactory.cxx

@@ -17,7 +17,7 @@
 
 #include "cmCPackGeneratorFactory.h"
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 #include "cmCPackTGZGenerator.h"
 #include "cmCPackTarBZip2Generator.h"
 #include "cmCPackTarCompressGenerator.h"
@@ -83,7 +83,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
 //----------------------------------------------------------------------
 cmCPackGeneratorFactory::~cmCPackGeneratorFactory()
 {
-  std::vector<cmCPackGenericGenerator*>::iterator it;
+  std::vector<cmCPackGenerator*>::iterator it;
   for ( it = this->Generators.begin(); it != this->Generators.end(); ++ it )
     {
     delete *it;
@@ -91,9 +91,9 @@ cmCPackGeneratorFactory::~cmCPackGeneratorFactory()
 }
 
 //----------------------------------------------------------------------
-cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name)
+cmCPackGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name)
 {
-  cmCPackGenericGenerator* gen = this->NewGeneratorInternal(name);
+  cmCPackGenerator* gen = this->NewGeneratorInternal(name);
   if ( !gen )
     {
     return 0;
@@ -104,7 +104,7 @@ cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name)
 }
 
 //----------------------------------------------------------------------
-cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGeneratorInternal(
+cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal(
   const char* name)
 {
   if ( !name )

Source/CPack/cmCPackGeneratorFactory.h

@@ -21,7 +21,7 @@
 #include "cmObject.h"
 
 class cmCPackLog;
-class cmCPackGenericGenerator;
+class cmCPackGenerator;
 
 /** \class cmCPackGeneratorFactory
  * \brief A container for CPack generators
@@ -36,10 +36,10 @@ public:
   ~cmCPackGeneratorFactory();
 
   //! Get the generator
-  cmCPackGenericGenerator* NewGenerator(const char* name);
-  void DeleteGenerator(cmCPackGenericGenerator* gen);
+  cmCPackGenerator* NewGenerator(const char* name);
+  void DeleteGenerator(cmCPackGenerator* gen);
 
-  typedef cmCPackGenericGenerator* CreateGeneratorCall();
+  typedef cmCPackGenerator* CreateGeneratorCall();
 
   void RegisterGenerator(const char* name,
     const char* generatorDescription,
@@ -52,8 +52,8 @@ public:
     { return this->GeneratorDescriptions; }
 
 private:
-  cmCPackGenericGenerator* NewGeneratorInternal(const char* name);
-  std::vector<cmCPackGenericGenerator*> Generators;
+  cmCPackGenerator* NewGeneratorInternal(const char* name);
+  std::vector<cmCPackGenerator*> Generators;
 
   typedef std::map<cmStdString, CreateGeneratorCall*> t_GeneratorCreatorsMap;
   t_GeneratorCreatorsMap GeneratorCreators;

Source/CPack/cmCPackNSISGenerator.h

@@ -19,17 +19,17 @@
 #define cmCPackNSISGenerator_h
 
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 /** \class cmCPackNSISGenerator
  * \brief A generator for NSIS files
  *
  * http://people.freebsd.org/~kientzle/libarchive/
  */
-class cmCPackNSISGenerator : public cmCPackGenericGenerator
+class cmCPackNSISGenerator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackNSISGenerator, cmCPackGenericGenerator);
+  cmCPackTypeMacro(cmCPackNSISGenerator, cmCPackGenerator);
 
   /**
    * Construct generator

Source/CPack/cmCPackOSXX11Generator.h

@@ -18,17 +18,17 @@
 #ifndef cmCPackOSXX11Generator_h
 #define cmCPackOSXX11Generator_h
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 /** \class cmCPackOSXX11Generator
  * \brief A generator for OSX X11 modules
  *
  * Based on Gimp.app
  */
-class cmCPackOSXX11Generator : public cmCPackGenericGenerator
+class cmCPackOSXX11Generator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackOSXX11Generator, cmCPackGenericGenerator);
+  cmCPackTypeMacro(cmCPackOSXX11Generator, cmCPackGenerator);
 
   /**
    * Construct generator

Source/CPack/cmCPackPackageMakerGenerator.h

@@ -19,7 +19,7 @@
 #define cmCPackPackageMakerGenerator_h
 
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 /** \class cmCPackPackageMakerGenerator
  * \brief A generator for PackageMaker files
@@ -27,10 +27,10 @@
  * http://developer.apple.com/documentation/Darwin
  * /Reference/ManPages/man1/packagemaker.1.html
  */
-class cmCPackPackageMakerGenerator : public cmCPackGenericGenerator
+class cmCPackPackageMakerGenerator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackPackageMakerGenerator, cmCPackGenericGenerator);
+  cmCPackTypeMacro(cmCPackPackageMakerGenerator, cmCPackGenerator);
 
   /**
    * Construct generator

Source/CPack/cmCPackRPMGenerator.h

@@ -19,7 +19,7 @@
 #define cmCPackRPMGenerator_h
 
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 /** \class cmCPackRPMGenerator
  * \brief A generator for RPM packages
@@ -29,10 +29,10 @@
  * will only 'execute' (aka ->ReadListFile) several
  * CMake macros files.
  */
-class cmCPackRPMGenerator : public cmCPackGenericGenerator
+class cmCPackRPMGenerator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackRPMGenerator, cmCPackGenericGenerator);
+  cmCPackTypeMacro(cmCPackRPMGenerator, cmCPackGenerator);
 
   /**
    * Construct generator

Source/CPack/cmCPackTGZGenerator.h

@@ -18,7 +18,7 @@
 #ifndef cmCPackTGZGenerator_h
 #define cmCPackTGZGenerator_h
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 class cmCPackTGZGeneratorForward;
 
@@ -27,11 +27,11 @@ class cmCPackTGZGeneratorForward;
  *
  * http://people.freebsd.org/~kientzle/libarchive/
  */
-class cmCPackTGZGenerator : public cmCPackGenericGenerator
+class cmCPackTGZGenerator : public cmCPackGenerator
 {
 public:
   friend class cmCPackTGZGeneratorForward;
-  cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackGenericGenerator);
+  cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackGenerator);
 
   /**
    * Construct generator

Source/CPack/cmCPackZIPGenerator.h

@@ -18,18 +18,18 @@
 #ifndef cmCPackZIPGenerator_h
 #define cmCPackZIPGenerator_h
 
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 
 class cmCPackZIPGeneratorForward;
 
 /** \class cmCPackZIPGenerator
  * \brief A generator for ZIP files
  */
-class cmCPackZIPGenerator : public cmCPackGenericGenerator
+class cmCPackZIPGenerator : public cmCPackGenerator
 {
 public:
   friend class cmCPackZIPGeneratorForward;
-  cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackGenericGenerator);
+  cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackGenerator);
 
   /**
    * Construct generator

Source/CPack/cpack.cxx

@@ -20,7 +20,7 @@
 #include "cmake.h"
 #include "cmDocumentation.h"
 #include "cmCPackGeneratorFactory.h"
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
 #include "cmLocalGenerator.h"
@@ -234,7 +234,7 @@ int main (int argc, char *argv[])
 
   cmCPackGeneratorFactory generators;
   generators.SetLogger(&log);
-  cmCPackGenericGenerator* cpackGenerator = 0;
+  cmCPackGenerator* cpackGenerator = 0;
 
   if ( !helpFull.empty() || !helpMAN.empty() ||
     !helpHTML.empty() || helpVersion )