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

STYLE: preparations for the INSTALL(EXPORT ...) generator 

-move std::string Destination to cmInstallGenerator, since all (except
the script one) have it and add a const accessor so it can be queried
-use temporary variables in cmInstallCommand for the generators so they can be reused easier
-some more const

Alex
This commit is contained in:
Alexander Neundorf 2007-06-19 11:11:06 -04:00
parent f786f3ae32
commit 617602e9e9
9 changed files with 71 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Source/cmInstallCommand.cxx
View File

@ -410,6 +410,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
{
// Handle each target type.
cmTarget& target = *(*ti);
cmInstallTargetGenerator* archiveGenerator = 0;
cmInstallTargetGenerator* runtimeGenerator = 0;
cmInstallTargetGenerator* libraryGenerator = 0;
switch(target.GetType())
{
case cmTarget::SHARED_LIBRARY:
@ -424,23 +428,24 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
if(archive_destination)
{
// The import library uses the ARCHIVE properties.
this->Makefile->AddInstallGenerator(
new cmInstallTargetGenerator(target, archive_dest.c_str(), true,
archiveGenerator = new cmInstallTargetGenerator(target,
archive_dest.c_str(),
true,
archive_permissions.c_str(),
archive_configurations,
archive_component.c_str(),
archive_optional));
archive_optional);
}
if(runtime_destination)
{
// The DLL uses the RUNTIME properties.
this->Makefile->AddInstallGenerator(
new cmInstallTargetGenerator(target, runtime_dest.c_str(),
runtimeGenerator = new cmInstallTargetGenerator(target,
runtime_dest.c_str(),
false,
runtime_permissions.c_str(),
runtime_configurations,
runtime_component.c_str(),
runtime_optional));
runtime_optional);
}
}
else
@ -449,13 +454,13 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
if(library_destination)
{
// The shared library uses the LIBRARY properties.
this->Makefile->AddInstallGenerator(
new cmInstallTargetGenerator(target, library_dest.c_str(),
libraryGenerator = new cmInstallTargetGenerator(target,
library_dest.c_str(),
false,
library_permissions.c_str(),
library_configurations,
library_component.c_str(),
library_optional));
library_optional);
}
else
{
@ -473,12 +478,13 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// Static libraries use ARCHIVE properties.
if(archive_destination)
{
this->Makefile->AddInstallGenerator(
new cmInstallTargetGenerator(target, archive_dest.c_str(), false,
archiveGenerator = new cmInstallTargetGenerator(target,
archive_dest.c_str(),
false,
archive_permissions.c_str(),
archive_configurations,
archive_component.c_str(),
archive_optional));
archive_optional);
}
else
{
@ -495,12 +501,13 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// Modules use LIBRARY properties.
if(library_destination)
{
this->Makefile->AddInstallGenerator(
new cmInstallTargetGenerator(target, library_dest.c_str(), false,
libraryGenerator = new cmInstallTargetGenerator(target,
library_dest.c_str(),
false,
library_permissions.c_str(),
library_configurations,
library_component.c_str(),
library_optional));
library_optional);
}
else
{
@ -517,12 +524,13 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// Executables use the RUNTIME properties.
if(runtime_destination)
{
this->Makefile->AddInstallGenerator(
new cmInstallTargetGenerator(target, runtime_dest.c_str(), false,
runtimeGenerator = new cmInstallTargetGenerator(target,
runtime_dest.c_str(),
false,
runtime_permissions.c_str(),
runtime_configurations,
runtime_component.c_str(),
runtime_optional));
runtime_optional);
}
else
{
@ -539,12 +547,13 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
if(dll_platform && archive_destination)
{
// The import library uses the ARCHIVE properties.
this->Makefile->AddInstallGenerator(
new cmInstallTargetGenerator(target, archive_dest.c_str(), true,
archiveGenerator = new cmInstallTargetGenerator(target,
archive_dest.c_str(),
true,
archive_permissions.c_str(),
archive_configurations,
archive_component.c_str(),
true));
true);
}
}
break;
@ -553,6 +562,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// Ignore the case.
break;
}
this->Makefile->AddInstallGenerator(archiveGenerator);
this->Makefile->AddInstallGenerator(runtimeGenerator);
this->Makefile->AddInstallGenerator(libraryGenerator);
}
// Tell the global generator about any installation component names
@ -1114,7 +1127,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
//----------------------------------------------------------------------------
void cmInstallCommand::ComputeDestination(const char* destination,
std::string& dest)
std::string& dest) const
{
if(destination)
{
@ -1142,7 +1155,7 @@ void cmInstallCommand::ComputeDestination(const char* destination,
//----------------------------------------------------------------------------
bool cmInstallCommand::CheckPermissions(std::string const& arg,
std::string& permissions)
std::string& permissions) const
{
// Table of valid permissions.
const char* table[] =

4
Source/cmInstallCommand.h
View File

@ -248,8 +248,8 @@ private:
bool HandleTargetsMode(std::vector<std::string> const& args);
bool HandleFilesMode(std::vector<std::string> const& args);
bool HandleDirectoryMode(std::vector<std::string> const& args);
void ComputeDestination(const char* destination, std::string& dest);
bool CheckPermissions(std::string const& arg, std::string& permissions);
void ComputeDestination(const char* destination, std::string& dest) const;
bool CheckPermissions(std::string const& arg, std::string& permissions)const;
};

2
Source/cmInstallDirectoryGenerator.cxx
View File

@ -27,7 +27,7 @@ cmInstallDirectoryGenerator
std::vector<std::string> const& configurations,
const char* component,
const char* literal_args):
Directories(dirs), Destination(dest),
cmInstallGenerator(dest), Directories(dirs),
FilePermissions(file_permissions), DirPermissions(dir_permissions),
Configurations(configurations), Component(component),
LiteralArguments(literal_args)

1
Source/cmInstallDirectoryGenerator.h
View File

@ -37,7 +37,6 @@ public:
protected:
virtual void GenerateScript(std::ostream& os);
std::vector<std::string> Directories;
std::string Destination;
std::string FilePermissions;
std::string DirPermissions;
std::vector<std::string> Configurations;

2
Source/cmInstallFilesGenerator.cxx
View File

@ -27,7 +27,7 @@ cmInstallFilesGenerator
const char* component,
const char* rename,
bool optional):
Files(files), Destination(dest), Programs(programs),
cmInstallGenerator(dest), Files(files), Programs(programs),
FilePermissions(file_permissions), Configurations(configurations),
Component(component), Rename(rename), Optional(optional)
{

1
Source/cmInstallFilesGenerator.h
View File

@ -37,7 +37,6 @@ public:
protected:
virtual void GenerateScript(std::ostream& os);
std::vector<std::string> Files;
std::string Destination;
bool Programs;
std::string FilePermissions;
std::vector<std::string> Configurations;

3
Source/cmInstallGenerator.h
View File

@ -29,6 +29,7 @@ class cmInstallGenerator
{
public:
cmInstallGenerator();
cmInstallGenerator(const char* dest):Destination(dest?dest:"") {}
virtual ~cmInstallGenerator();
void Generate(std::ostream& os, const char* config,
@ -47,11 +48,13 @@ public:
const char* literal_args = 0
);
const char* GetDestination() const {return this->Destination.c_str();}
protected:
virtual void GenerateScript(std::ostream& os)=0;
const char* ConfigurationName;
std::vector<std::string> const* ConfigurationTypes;
std::string Destination;
};
#endif

40
Source/cmInstallTargetGenerator.cxx
View File

@ -27,7 +27,7 @@ cmInstallTargetGenerator
const char* file_permissions,
std::vector<std::string> const& configurations,
const char* component, bool optional):
Target(&t), Destination(dest), ImportLibrary(implib),
cmInstallGenerator(dest), Target(&t), ImportLibrary(implib),
FilePermissions(file_permissions), Configurations(configurations),
Component(component), Optional(optional)
{
@ -58,11 +58,11 @@ void cmInstallTargetGenerator::GenerateScript(std::ostream& os)
}
// Write variable settings to do per-configuration references.
this->PrepareScriptReference(os, this->Target, "BUILD", true, false);
this->PrepareScriptReference(os, this->Target, "BUILD", true, this->ImportLibrary, false);
// Create the per-configuration reference.
std::string fromName = this->GetScriptReference(this->Target, "BUILD",
false);
this->ImportLibrary, false);
std::string fromFile = fromDir;
fromFile += fromName;
@ -137,7 +137,7 @@ void cmInstallTargetGenerator::GenerateScript(std::ostream& os)
// Compute the source locations of the bundle executable and
// Info.plist file.
this->PrepareScriptReference(os, this->Target, "INSTALL",
false, false);
false, this->ImportLibrary, false);
fromFile += ".app";
type = cmTarget::INSTALL_DIRECTORY;
literal_args += " USE_SOURCE_PERMISSIONS";
@ -188,6 +188,12 @@ void cmInstallTargetGenerator::GenerateScript(std::ostream& os)
this->AddStripRule(os, type, quotedFullDestinationFilename, optional);
}
std::string cmInstallTargetGenerator::GetInstallFilename(const char* config) const
{
return cmInstallTargetGenerator::GetInstallFilename(this->Target, config, this->ImportLibrary, false);
}
//----------------------------------------------------------------------------
std::string cmInstallTargetGenerator::GetInstallFilename(cmTarget* target,
const char* config,
@ -250,7 +256,7 @@ void
cmInstallTargetGenerator
::PrepareScriptReference(std::ostream& os, cmTarget* target,
const char* place, bool useConfigDir,
bool useSOName)
bool implib, bool useSOName)
{
// If the target name may vary with the configuration type then
// store all possible names ahead of time in variables.
@ -270,11 +276,11 @@ cmInstallTargetGenerator
}
fname += this->GetInstallFilename(target, i->c_str(),
this->ImportLibrary, useSOName);
implib, useSOName);
// Set a variable with the target name for this configuration.
os << "SET(" << target->GetName() << "_" << place
<< (this->ImportLibrary? "_IMPNAME_" : "_NAME_") << *i
<< (implib? "_IMPNAME_" : "_NAME_") << *i
<< " \"" << fname << "\")\n";
}
}
@ -282,20 +288,20 @@ cmInstallTargetGenerator
//----------------------------------------------------------------------------
std::string cmInstallTargetGenerator::GetScriptReference(cmTarget* target,
const char* place,
bool useSOName)
bool implib, bool useSOName)
{
if(this->ConfigurationTypes->empty())
{
// Reference the target by its one configuration name.
return this->GetInstallFilename(target, this->ConfigurationName,
this->ImportLibrary, useSOName);
implib, useSOName);
}
else
{
// Reference the target using the per-configuration variable.
std::string ref = "${";
ref += target->GetName();
if(this->ImportLibrary)
if(implib)
{
ref += "_";
ref += place;
@ -361,13 +367,13 @@ void cmInstallTargetGenerator
{
// Map from the build-tree install_name.
this->PrepareScriptReference(os, tgt, "REMAP_FROM",
!for_build.empty(), true);
for_build += this->GetScriptReference(tgt, "REMAP_FROM", true);
!for_build.empty(), false, true);
for_build += this->GetScriptReference(tgt, "REMAP_FROM", false, true);
// Map to the install-tree install_name.
this->PrepareScriptReference(os, tgt, "REMAP_TO",
false, true);
for_install += this->GetScriptReference(tgt, "REMAP_TO", true);
false, false, true);
for_install += this->GetScriptReference(tgt, "REMAP_TO", false, true);
// Store the mapping entry.
install_name_remap[for_build] = for_install;
@ -378,7 +384,7 @@ void cmInstallTargetGenerator
}
// Edit the install_name of the target itself if necessary.
this->PrepareScriptReference(os, this->Target, "REMAPPED", false, true);
this->PrepareScriptReference(os, this->Target, "REMAPPED", false, this->ImportLibrary, true);
std::string new_id;
if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
{
@ -390,7 +396,7 @@ void cmInstallTargetGenerator
{
// Prepare to refer to the install-tree install_name.
new_id = for_install;
new_id += this->GetScriptReference(this->Target, "REMAPPED", true);
new_id += this->GetScriptReference(this->Target, "REMAPPED", this->ImportLibrary, true);
}
}
@ -416,7 +422,7 @@ void cmInstallTargetGenerator
os << "\n -change \"" << i->first << "\" \"" << i->second << "\"";
}
os << "\n \"$ENV{DESTDIR}" << destination << "/"
<< this->GetScriptReference(this->Target, "REMAPPED", true) << "\")\n";
<< this->GetScriptReference(this->Target, "REMAPPED", this->ImportLibrary, true) << "\")\n";
os << "ENDIF(" << component_test << ")\n";
}
}

8
Source/cmInstallTargetGenerator.h
View File

@ -36,16 +36,19 @@ public:
);
virtual ~cmInstallTargetGenerator();
std::string GetInstallFilename(const char* config) const;
static std::string GetInstallFilename(cmTarget*target, const char* config,
bool implib, bool useSOName);
const std::vector<std::string>& GetConfigurations() const {return this->Configurations;}
protected:
virtual void GenerateScript(std::ostream& os);
void PrepareScriptReference(std::ostream& os, cmTarget* target,
const char* place, bool useConfigDir,
bool useSOName);
bool implib, bool useSOName);
std::string GetScriptReference(cmTarget* target, const char* place,
bool useSOName);
bool implib, bool useSOName);
void AddInstallNamePatchRule(std::ostream& os, const char* destination);
void AddStripRule(std::ostream& os,
cmTarget::TargetType type,
@ -56,7 +59,6 @@ protected:
const std::string& quotedFullDestinationFilename);
cmTarget* Target;
std::string Destination;
bool ImportLibrary;
std::string FilePermissions;
std::vector<std::string> Configurations;