ENH: change name of class
This commit is contained in:
parent
a651938572
commit
62decc533b
|
@ -307,7 +307,7 @@ TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_L
|
|||
# Sources for CPack
|
||||
#
|
||||
SET(CPACK_SRCS
|
||||
CPack/cmCPackGenerators.cxx
|
||||
CPack/cmCPackGeneratorFactory.cxx
|
||||
CPack/cmCPackGenericGenerator.cxx
|
||||
CPack/cmCPackLog.cxx
|
||||
CPack/cmCPackNSISGenerator.cxx
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
=========================================================================*/
|
||||
|
||||
#include "cmCPackGenerators.h"
|
||||
#include "cmCPackGeneratorFactory.h"
|
||||
|
||||
#include "cmCPackGenericGenerator.h"
|
||||
#include "cmCPackTGZGenerator.h"
|
||||
|
@ -44,7 +44,7 @@
|
|||
#include "cmCPackLog.h"
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
cmCPackGenerators::cmCPackGenerators()
|
||||
cmCPackGeneratorFactory::cmCPackGeneratorFactory()
|
||||
{
|
||||
this->RegisterGenerator("TGZ", "Tar GZip compression",
|
||||
cmCPackTGZGenerator::CreateGenerator);
|
||||
|
@ -81,7 +81,7 @@ cmCPackGenerators::cmCPackGenerators()
|
|||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
cmCPackGenerators::~cmCPackGenerators()
|
||||
cmCPackGeneratorFactory::~cmCPackGeneratorFactory()
|
||||
{
|
||||
std::vector<cmCPackGenericGenerator*>::iterator 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);
|
||||
if ( !gen )
|
||||
|
@ -104,14 +104,14 @@ cmCPackGenericGenerator* cmCPackGenerators::NewGenerator(const char* name)
|
|||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
cmCPackGenericGenerator* cmCPackGenerators::NewGeneratorInternal(
|
||||
cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGeneratorInternal(
|
||||
const char* name)
|
||||
{
|
||||
if ( !name )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
cmCPackGenerators::t_GeneratorCreatorsMap::iterator it
|
||||
cmCPackGeneratorFactory::t_GeneratorCreatorsMap::iterator it
|
||||
= this->GeneratorCreators.find(name);
|
||||
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,
|
||||
CreateGeneratorCall* createGenerator)
|
||||
{
|
|
@ -15,25 +15,25 @@
|
|||
|
||||
=========================================================================*/
|
||||
|
||||
#ifndef cmCPackGenerators_h
|
||||
#define cmCPackGenerators_h
|
||||
#ifndef cmCPackGeneratorFactory_h
|
||||
#define cmCPackGeneratorFactory_h
|
||||
|
||||
#include "cmObject.h"
|
||||
|
||||
class cmCPackLog;
|
||||
class cmCPackGenericGenerator;
|
||||
|
||||
/** \class cmCPackGenerators
|
||||
/** \class cmCPackGeneratorFactory
|
||||
* \brief A container for CPack generators
|
||||
*
|
||||
*/
|
||||
class cmCPackGenerators : public cmObject
|
||||
class cmCPackGeneratorFactory : public cmObject
|
||||
{
|
||||
public:
|
||||
cmTypeMacro(cmCPackGenerators, cmObject);
|
||||
cmTypeMacro(cmCPackGeneratorFactory, cmObject);
|
||||
|
||||
cmCPackGenerators();
|
||||
~cmCPackGenerators();
|
||||
cmCPackGeneratorFactory();
|
||||
~cmCPackGeneratorFactory();
|
||||
|
||||
//! Get the generator
|
||||
cmCPackGenericGenerator* NewGenerator(const char* name);
|
|
@ -19,7 +19,7 @@
|
|||
// Need these for documentation support.
|
||||
#include "cmake.h"
|
||||
#include "cmDocumentation.h"
|
||||
#include "cmCPackGenerators.h"
|
||||
#include "cmCPackGeneratorFactory.h"
|
||||
#include "cmCPackGenericGenerator.h"
|
||||
#include "cmake.h"
|
||||
#include "cmGlobalGenerator.h"
|
||||
|
@ -232,7 +232,7 @@ int main (int argc, char *argv[])
|
|||
cpackConfigFileSpecified = false;
|
||||
}
|
||||
|
||||
cmCPackGenerators generators;
|
||||
cmCPackGeneratorFactory generators;
|
||||
generators.SetLogger(&log);
|
||||
cmCPackGenericGenerator* cpackGenerator = 0;
|
||||
|
||||
|
@ -453,7 +453,7 @@ int main (int argc, char *argv[])
|
|||
doc.SetSection("Options",cmDocumentationOptions);
|
||||
|
||||
std::vector<cmDocumentationEntry> v;
|
||||
cmCPackGenerators::DescriptionsMap::const_iterator generatorIt;
|
||||
cmCPackGeneratorFactory::DescriptionsMap::const_iterator generatorIt;
|
||||
for( generatorIt = generators.GetGeneratorsList().begin();
|
||||
generatorIt != generators.GetGeneratorsList().end();
|
||||
++ generatorIt )
|
||||
|
|
Loading…
Reference in New Issue