kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: change name of class

This commit is contained in:
Bill Hoffman 2007-11-05 16:33:19 -05:00
parent a651938572
commit 62decc533b
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -307,7 +307,7 @@ TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_L
# Sources for CPack # Sources for CPack
# #
SET(CPACK_SRCS SET(CPACK_SRCS
CPack/cmCPackGenerators.cxx CPack/cmCPackGeneratorFactory.cxx
CPack/cmCPackGenericGenerator.cxx CPack/cmCPackGenericGenerator.cxx
CPack/cmCPackLog.cxx CPack/cmCPackLog.cxx
CPack/cmCPackNSISGenerator.cxx CPack/cmCPackNSISGenerator.cxx

14
Source/CPack/cmCPackGenerators.cxx → Source/CPack/cmCPackGeneratorFactory.cxx
View File

@ -15,7 +15,7 @@
=========================================================================*/ =========================================================================*/
#include "cmCPackGenerators.h" #include "cmCPackGeneratorFactory.h"
#include "cmCPackGenericGenerator.h" #include "cmCPackGenericGenerator.h"
#include "cmCPackTGZGenerator.h" #include "cmCPackTGZGenerator.h"
@ -44,7 +44,7 @@
#include "cmCPackLog.h" #include "cmCPackLog.h"
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenerators::cmCPackGenerators() cmCPackGeneratorFactory::cmCPackGeneratorFactory()
{ {
this->RegisterGenerator("TGZ", "Tar GZip compression", this->RegisterGenerator("TGZ", "Tar GZip compression",
cmCPackTGZGenerator::CreateGenerator); cmCPackTGZGenerator::CreateGenerator);
@ -81,7 +81,7 @@ cmCPackGenerators::cmCPackGenerators()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenerators::~cmCPackGenerators() cmCPackGeneratorFactory::~cmCPackGeneratorFactory()
{ {
std::vector<cmCPackGenericGenerator*>::iterator it; std::vector<cmCPackGenericGenerator*>::iterator it;
for ( it = this->Generators.begin(); it != this->Generators.end(); ++ it ) for ( it = this->Generators.begin(); it != this->Generators.end(); ++ it )
@ -91,7 +91,7 @@ cmCPackGenerators::~cmCPackGenerators()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenericGenerator* cmCPackGenerators::NewGenerator(const char* name) cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name)
{ {
cmCPackGenericGenerator* gen = this->NewGeneratorInternal(name); cmCPackGenericGenerator* gen = this->NewGeneratorInternal(name);
if ( !gen ) if ( !gen )
@ -104,14 +104,14 @@ cmCPackGenericGenerator* cmCPackGenerators::NewGenerator(const char* name)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenericGenerator* cmCPackGenerators::NewGeneratorInternal( cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGeneratorInternal(
const char* name) const char* name)
{ {
if ( !name ) if ( !name )
{ {
return 0; return 0;
} }
cmCPackGenerators::t_GeneratorCreatorsMap::iterator it cmCPackGeneratorFactory::t_GeneratorCreatorsMap::iterator it
= this->GeneratorCreators.find(name); = this->GeneratorCreators.find(name);
if ( it == this->GeneratorCreators.end() ) if ( it == this->GeneratorCreators.end() )
{ {
@ -121,7 +121,7 @@ cmCPackGenericGenerator* cmCPackGenerators::NewGeneratorInternal(
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void cmCPackGenerators::RegisterGenerator(const char* name, void cmCPackGeneratorFactory::RegisterGenerator(const char* name,
const char* generatorDescription, const char* generatorDescription,
CreateGeneratorCall* createGenerator) CreateGeneratorCall* createGenerator)
{ {

14
Source/CPack/cmCPackGenerators.h → Source/CPack/cmCPackGeneratorFactory.h
View File

@ -15,25 +15,25 @@
=========================================================================*/ =========================================================================*/
#ifndef cmCPackGenerators_h #ifndef cmCPackGeneratorFactory_h
#define cmCPackGenerators_h #define cmCPackGeneratorFactory_h
#include "cmObject.h" #include "cmObject.h"
class cmCPackLog; class cmCPackLog;
class cmCPackGenericGenerator; class cmCPackGenericGenerator;
/** \class cmCPackGenerators /** \class cmCPackGeneratorFactory
* \brief A container for CPack generators * \brief A container for CPack generators
* *
*/ */
class cmCPackGenerators : public cmObject class cmCPackGeneratorFactory : public cmObject
{ {
public: public:
cmTypeMacro(cmCPackGenerators, cmObject); cmTypeMacro(cmCPackGeneratorFactory, cmObject);
cmCPackGenerators(); cmCPackGeneratorFactory();
~cmCPackGenerators(); ~cmCPackGeneratorFactory();
//! Get the generator //! Get the generator
cmCPackGenericGenerator* NewGenerator(const char* name); cmCPackGenericGenerator* NewGenerator(const char* name);

6
Source/CPack/cpack.cxx
View File

@ -19,7 +19,7 @@
// Need these for documentation support. // Need these for documentation support.
#include "cmake.h" #include "cmake.h"
#include "cmDocumentation.h" #include "cmDocumentation.h"
#include "cmCPackGenerators.h" #include "cmCPackGeneratorFactory.h"
#include "cmCPackGenericGenerator.h" #include "cmCPackGenericGenerator.h"
#include "cmake.h" #include "cmake.h"
#include "cmGlobalGenerator.h" #include "cmGlobalGenerator.h"
@ -232,7 +232,7 @@ int main (int argc, char *argv[])
cpackConfigFileSpecified = false; cpackConfigFileSpecified = false;
} }
cmCPackGenerators generators; cmCPackGeneratorFactory generators;
generators.SetLogger(&log); generators.SetLogger(&log);
cmCPackGenericGenerator* cpackGenerator = 0; cmCPackGenericGenerator* cpackGenerator = 0;
@ -453,7 +453,7 @@ int main (int argc, char *argv[])
doc.SetSection("Options",cmDocumentationOptions); doc.SetSection("Options",cmDocumentationOptions);
std::vector<cmDocumentationEntry> v; std::vector<cmDocumentationEntry> v;
cmCPackGenerators::DescriptionsMap::const_iterator generatorIt; cmCPackGeneratorFactory::DescriptionsMap::const_iterator generatorIt;
for( generatorIt = generators.GetGeneratorsList().begin(); for( generatorIt = generators.GetGeneratorsList().begin();
generatorIt != generators.GetGeneratorsList().end(); generatorIt != generators.GetGeneratorsList().end();
++ generatorIt ) ++ generatorIt )