[cmake-commits] hoffman committed cmCPackDebGenerator.h 1.3 1.4
cmCPackGenerator.cxx NONE 1.1 cmCPackGenerator.h NONE 1.1
cmCPackGeneratorFactory.cxx 1.1 1.2 cmCPackGeneratorFactory.h
1.1 1.2 cmCPackGenericGenerator.cxx 1.49 NONE
cmCPackGenericGenerator.h 1.20 NONE cmCPackNSISGenerator.h 1.10
1.11 cmCPackOSXX11Generator.h 1.4 1.5
cmCPackPackageMakerGenerator.h 1.10 1.11 cmCPackRPMGenerator.h
1.4 1.5 cmCPackTGZGenerator.h 1.10 1.11 cmCPackZIPGenerator.h
1.5 1.6 cpack.cxx 1.39 1.40
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Nov 5 16:55:47 EST 2007
Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv27873/CPack
Modified Files:
cmCPackDebGenerator.h cmCPackGeneratorFactory.cxx
cmCPackGeneratorFactory.h cmCPackNSISGenerator.h
cmCPackOSXX11Generator.h cmCPackPackageMakerGenerator.h
cmCPackRPMGenerator.h cmCPackTGZGenerator.h
cmCPackZIPGenerator.h cpack.cxx
Added Files:
cmCPackGenerator.cxx cmCPackGenerator.h
Removed Files:
cmCPackGenericGenerator.cxx cmCPackGenericGenerator.h
Log Message:
ENH: change name
Index: cmCPackOSXX11Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackOSXX11Generator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmCPackOSXX11Generator.h 31 Oct 2007 12:50:17 -0000 1.4
+++ cmCPackOSXX11Generator.h 5 Nov 2007 21:55:45 -0000 1.5
@@ -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
--- cmCPackGenericGenerator.h DELETED ---
--- NEW FILE: cmCPackGenerator.cxx ---
/*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmCPackGenerator.cxx,v $
Language: C++
Date: $Date: 2007/11/05 21:55:45 $
Version: $Revision: 1.1 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "cmCPackGenerator.h"
[...1021 lines suppressed...]
{
std::string tempInstallDirectoryWithPostfix
= this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY");
const char* tempInstallDirectory = tempInstallDirectoryWithPostfix.c_str();
if(cmsys::SystemTools::FileExists(tempInstallDirectory))
{
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Clean temporary : "
<< tempInstallDirectory << std::endl);
if(!cmsys::SystemTools::RemoveADirectory(tempInstallDirectory))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Problem removing temporary directory: " <<
tempInstallDirectory
<< std::endl);
return 0;
}
}
return 1;
}
Index: cmCPackGeneratorFactory.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGeneratorFactory.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmCPackGeneratorFactory.cxx 5 Nov 2007 21:33:19 -0000 1.1
+++ cmCPackGeneratorFactory.cxx 5 Nov 2007 21:55:45 -0000 1.2
@@ -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()
{
- 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 @@
}
//----------------------------------------------------------------------
-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::NewGeneratorInternal(
+cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal(
const char* name)
{
if ( !name )
Index: cmCPackGeneratorFactory.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGeneratorFactory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmCPackGeneratorFactory.h 5 Nov 2007 21:33:19 -0000 1.1
+++ cmCPackGeneratorFactory.h 5 Nov 2007 21:55:45 -0000 1.2
@@ -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 @@
~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 @@
{ 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;
Index: cmCPackRPMGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackRPMGenerator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmCPackRPMGenerator.h 31 Oct 2007 12:50:17 -0000 1.4
+++ cmCPackRPMGenerator.h 5 Nov 2007 21:55:45 -0000 1.5
@@ -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
--- NEW FILE: cmCPackGenerator.h ---
/*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmCPackGenerator.h,v $
Language: C++
Date: $Date: 2007/11/05 21:55:45 $
Version: $Revision: 1.1 $
Copyright (c) 2002 Kitware, Inc. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef cmCPackGenerator_h
#define cmCPackGenerator_h
#include "cmObject.h"
#define cmCPackTypeMacro(class, superclass) \
cmTypeMacro(class, superclass); \
static cmCPackGenerator* CreateGenerator() { return new class; }
#define cmCPackLogger(logType, msg) \
do { \
cmOStringStream cmCPackLog_msg; \
cmCPackLog_msg << msg; \
this->Logger->Log(logType, __FILE__, __LINE__,\
cmCPackLog_msg.str().c_str());\
} while ( 0 )
#ifdef cerr
# undef cerr
#endif
#define cerr no_cerr_use_cmCPack_Log
#ifdef cout
# undef cout
#endif
#define cout no_cout_use_cmCPack_Log
class cmMakefile;
class cmCPackLog;
/** \class cmCPackGenerator
* \brief A superclass of all CPack Generators
*
*/
class cmCPackGenerator : public cmObject
{
public:
cmTypeMacro(cmCPackGenerator, cmObject);
/**
* If verbose then more informaiton is printed out
*/
void SetVerbose(bool val) { this->GeneratorVerbose = val; }
/**
* Do the actual processing. Subclass has to override it.
* Return 0 if error.
*/
virtual int ProcessGenerator();
/**
* Initialize generator
*/
int Initialize(const char* name, cmMakefile* mf, const char* argv0);
/**
* Construct generator
*/
cmCPackGenerator();
virtual ~cmCPackGenerator();
//! Set and get the options
void SetOption(const char* op, const char* value);
void SetOptionIfNotSet(const char* op, const char* value);
const char* GetOption(const char* op);
bool IsSet(const char* name) const;
//! Set all the variables
int FindRunningCMake(const char* arg0);
//! Set the logger
void SetLogger(cmCPackLog* log) { this->Logger = log; }
//! Display verbose information via logger
void DisplayVerboseOutput(const char* msg, float progress);
bool ReadListFile(const char* moduleName);
protected:
int PrepareNames();
int InstallProject();
int CleanTemporaryDirectory();
virtual const char* GetOutputExtension() { return ".cpack"; }
virtual const char* GetOutputPostfix() { return 0; }
virtual int CompressFiles(const char* outFileName, const char* toplevel,
const std::vector<std::string>& files);
virtual const char* GetInstallPath();
virtual const char* GetPackagingInstallPrefix();
virtual std::string FindTemplate(const char* name);
virtual bool ConfigureFile(const char* inName, const char* outName,
bool copyOnly = false);
virtual bool ConfigureString(const std::string& input, std::string& output);
virtual int InitializeInternal();
//! Run install commands if specified
virtual int InstallProjectViaInstallCommands(
bool setDestDir, const char* tempInstallDirectory);
virtual int InstallProjectViaInstallScript(
bool setDestDir, const char* tempInstallDirectory);
virtual int InstallProjectViaInstalledDirectories(
bool setDestDir, const char* tempInstallDirectory);
virtual int InstallProjectViaInstallCMakeProjects(
bool setDestDir, const char* tempInstallDirectory);
bool GeneratorVerbose;
std::string Name;
std::string InstallPath;
std::string CPackSelf;
std::string CMakeSelf;
std::string CMakeRoot;
cmCPackLog* Logger;
private:
cmMakefile* MakefileMap;
};
#endif
Index: cpack.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cpack.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- cpack.cxx 5 Nov 2007 21:33:19 -0000 1.39
+++ cpack.cxx 5 Nov 2007 21:55:45 -0000 1.40
@@ -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 @@
cmCPackGeneratorFactory generators;
generators.SetLogger(&log);
- cmCPackGenericGenerator* cpackGenerator = 0;
+ cmCPackGenerator* cpackGenerator = 0;
if ( !helpFull.empty() || !helpMAN.empty() ||
!helpHTML.empty() || helpVersion )
Index: cmCPackTGZGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmCPackTGZGenerator.h 2 Feb 2007 19:40:26 -0000 1.10
+++ cmCPackTGZGenerator.h 5 Nov 2007 21:55:45 -0000 1.11
@@ -18,7 +18,7 @@
#ifndef cmCPackTGZGenerator_h
#define cmCPackTGZGenerator_h
-#include "cmCPackGenericGenerator.h"
+#include "cmCPackGenerator.h"
class cmCPackTGZGeneratorForward;
@@ -27,11 +27,11 @@
*
* 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
Index: cmCPackPackageMakerGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackPackageMakerGenerator.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmCPackPackageMakerGenerator.h 5 Nov 2007 19:34:36 -0000 1.10
+++ cmCPackPackageMakerGenerator.h 5 Nov 2007 21:55:45 -0000 1.11
@@ -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
Index: cmCPackNSISGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmCPackNSISGenerator.h 18 Oct 2007 13:40:10 -0000 1.10
+++ cmCPackNSISGenerator.h 5 Nov 2007 21:55:45 -0000 1.11
@@ -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
Index: cmCPackZIPGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackZIPGenerator.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cmCPackZIPGenerator.h 24 Jul 2007 16:52:37 -0000 1.5
+++ cmCPackZIPGenerator.h 5 Nov 2007 21:55:45 -0000 1.6
@@ -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
--- cmCPackGenericGenerator.cxx DELETED ---
Index: cmCPackDebGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackDebGenerator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCPackDebGenerator.h 31 Oct 2007 12:50:17 -0000 1.3
+++ cmCPackDebGenerator.h 5 Nov 2007 21:55:45 -0000 1.4
@@ -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
More information about the Cmake-commits
mailing list