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

stringapi: Use string for OS X resource names

This commit is contained in:
Ben Boeckel 2014-02-07 15:02:41 -05:00 committed by Brad King
parent a599611116
commit 473ca1ac4a
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CPack/cmCPackOSXX11Generator.cxx
View File

@ -227,7 +227,7 @@ int cmCPackOSXX11Generator::InitializeInternal()
//---------------------------------------------------------------------- //----------------------------------------------------------------------
/* /*
bool cmCPackOSXX11Generator::CopyCreateResourceFile(const char* name) bool cmCPackOSXX11Generator::CopyCreateResourceFile(const std::string& name)
{ {
std::string uname = cmSystemTools::UpperCase(name); std::string uname = cmSystemTools::UpperCase(name);
std::string cpackVar = "CPACK_RESOURCE_FILE_" + uname; std::string cpackVar = "CPACK_RESOURCE_FILE_" + uname;
@ -271,7 +271,7 @@ bool cmCPackOSXX11Generator::CopyCreateResourceFile(const char* name)
*/ */
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCPackOSXX11Generator::CopyResourcePlistFile(const char* name, bool cmCPackOSXX11Generator::CopyResourcePlistFile(const std::string& name,
const char* dir, const char* outputFileName /* = 0 */, const char* dir, const char* outputFileName /* = 0 */,
bool copyOnly /* = false */) bool copyOnly /* = false */)
{ {
@ -288,7 +288,7 @@ bool cmCPackOSXX11Generator::CopyResourcePlistFile(const char* name,
if ( !outputFileName ) if ( !outputFileName )
{ {
outputFileName = name; outputFileName = name.c_str();
} }
std::string destFileName = dir; std::string destFileName = dir;

5
Source/CPack/cmCPackOSXX11Generator.h
View File

@ -37,8 +37,9 @@ protected:
virtual const char* GetPackagingInstallPrefix(); virtual const char* GetPackagingInstallPrefix();
virtual const char* GetOutputExtension() { return ".dmg"; } virtual const char* GetOutputExtension() { return ".dmg"; }
//bool CopyCreateResourceFile(const char* name, const char* dir); //bool CopyCreateResourceFile(const std::string& name,
bool CopyResourcePlistFile(const char* name, const char* dir, // const std::string& dir);
bool CopyResourcePlistFile(const std::string& name, const char* dir,
const char* outputFileName = 0, bool copyOnly = false); const char* outputFileName = 0, bool copyOnly = false);
std::string InstallPrefix; std::string InstallPrefix;
}; };

9
Source/CPack/cmCPackPackageMakerGenerator.cxx
View File

@ -553,8 +553,9 @@ int cmCPackPackageMakerGenerator::InitializeInternal()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCPackPackageMakerGenerator::CopyCreateResourceFile(const char* name, bool cmCPackPackageMakerGenerator::CopyCreateResourceFile(
const char* dirName) const std::string& name,
const std::string& dirName)
{ {
std::string uname = cmSystemTools::UpperCase(name); std::string uname = cmSystemTools::UpperCase(name);
std::string cpackVar = "CPACK_RESOURCE_FILE_" + uname; std::string cpackVar = "CPACK_RESOURCE_FILE_" + uname;
@ -563,7 +564,7 @@ bool cmCPackPackageMakerGenerator::CopyCreateResourceFile(const char* name,
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack option: " << cpackVar.c_str() cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack option: " << cpackVar.c_str()
<< " not specified. It should point to " << " not specified. It should point to "
<< (name ? name : "(NULL)") << (!name.empty() ? name : "<empty>")
<< ".rtf, " << name << ".rtf, " << name
<< ".html, or " << name << ".txt file" << std::endl); << ".html, or " << name << ".txt file" << std::endl);
return false; return false;
@ -571,7 +572,7 @@ bool cmCPackPackageMakerGenerator::CopyCreateResourceFile(const char* name,
if ( !cmSystemTools::FileExists(inFileName) ) if ( !cmSystemTools::FileExists(inFileName) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find " cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find "
<< (name ? name : "(NULL)") << (!name.empty() ? name : "<empty>")
<< " resource file: " << inFileName << std::endl); << " resource file: " << inFileName << std::endl);
return false; return false;
} }

3
Source/CPack/cmCPackPackageMakerGenerator.h
View File

@ -51,7 +51,8 @@ protected:
// CPACK_RESOURCE_FILE_${NAME} (where ${NAME} is the uppercased // CPACK_RESOURCE_FILE_${NAME} (where ${NAME} is the uppercased
// version of name) specifies the input file to use for this file, // version of name) specifies the input file to use for this file,
// which will be configured via ConfigureFile. // which will be configured via ConfigureFile.
bool CopyCreateResourceFile(const char* name, const char *dirName); bool CopyCreateResourceFile(const std::string& name,
const std::string& dirName);
bool CopyResourcePlistFile(const char* name, const char* outName = 0); bool CopyResourcePlistFile(const char* name, const char* outName = 0);
// Run PackageMaker with the given command line, which will (if // Run PackageMaker with the given command line, which will (if