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

cmLocalGenerator: Rename 'MAKEFILE' to 'MAKERULE'

Browse Source 
Rename the internal enumeration value for converting paths destined
for use in Makefile rule syntax.
This commit is contained in:
Brad King 2014-07-22 12:27:57 -04:00
parent 8e018ae44e
commit 9f92a78be2
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmDepends.cxx
View File

@ -63,7 +63,7 @@ bool cmDepends::Write(std::ostream &makeDepends,
// Make sure the object file is relative to the top of the build tree. // Make sure the object file is relative to the top of the build tree.
obj = this->LocalGenerator->Convert(obj, obj = this->LocalGenerator->Convert(obj,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKERULE);
dependencies[obj].insert(src); dependencies[obj].insert(src);
} }
for(std::map<std::string, std::set<std::string> >::const_iterator for(std::map<std::string, std::set<std::string> >::const_iterator

2
Source/cmDependsC.cxx
View File

@ -276,7 +276,7 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources,
makeDepends << obj << ": " << makeDepends << obj << ": " <<
this->LocalGenerator->Convert(*i, this->LocalGenerator->Convert(*i,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKERULE)
<< std::endl; << std::endl;
internalDepends << " " << *i << std::endl; internalDepends << " " << *i << std::endl;
} }

12
Source/cmDependsFortran.cxx
View File

@ -451,7 +451,7 @@ cmDependsFortran
makeDepends << obj << ": " << makeDepends << obj << ": " <<
this->LocalGenerator->Convert(*i, this->LocalGenerator->Convert(*i,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKERULE)
<< std::endl; << std::endl;
internalDepends << " " << *i << std::endl; internalDepends << " " << *i << std::endl;
} }
@ -482,7 +482,7 @@ cmDependsFortran
proxy += ".mod.proxy"; proxy += ".mod.proxy";
proxy = this->LocalGenerator->Convert(proxy, proxy = this->LocalGenerator->Convert(proxy,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKERULE);
// since we require some things add them to our list of requirements // since we require some things add them to our list of requirements
makeDepends << obj << ".requires: " << proxy << std::endl; makeDepends << obj << ".requires: " << proxy << std::endl;
@ -499,7 +499,7 @@ cmDependsFortran
std::string stampFile = std::string stampFile =
this->LocalGenerator->Convert(required->second, this->LocalGenerator->Convert(required->second,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKERULE);
makeDepends << obj << ": " << stampFile << "\n"; makeDepends << obj << ": " << stampFile << "\n";
} }
else else
@ -512,7 +512,7 @@ cmDependsFortran
module = module =
this->LocalGenerator->Convert(module, this->LocalGenerator->Convert(module,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKERULE);
makeDepends << obj << ": " << module << "\n"; makeDepends << obj << ": " << module << "\n";
} }
} }
@ -528,7 +528,7 @@ cmDependsFortran
proxy += ".mod.proxy"; proxy += ".mod.proxy";
proxy = this->LocalGenerator->Convert(proxy, proxy = this->LocalGenerator->Convert(proxy,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKERULE);
makeDepends << proxy << ": " << obj << ".provides" << std::endl; makeDepends << proxy << ": " << obj << ".provides" << std::endl;
} }
@ -584,7 +584,7 @@ cmDependsFortran
driver += "/build"; driver += "/build";
driver = this->LocalGenerator->Convert(driver, driver = this->LocalGenerator->Convert(driver,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKERULE);
makeDepends << driver << ": " << obj << ".provides.build\n"; makeDepends << driver << ": " << obj << ".provides.build\n";
} }

2
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -530,7 +530,7 @@ cmGlobalUnixMakefileGenerator3
// Begin the directory-level rules section. // Begin the directory-level rules section.
std::string dir = lg->GetMakefile()->GetStartOutputDirectory(); std::string dir = lg->GetMakefile()->GetStartOutputDirectory();
dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT, dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKERULE);
lg->WriteDivider(ruleFileStream); lg->WriteDivider(ruleFileStream);
ruleFileStream ruleFileStream
<< "# Directory level rules for directory " << "# Directory level rules for directory "

4
Source/cmLocalGenerator.cxx
View File

@ -681,7 +681,7 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang,
objVector.push_back(ofname); objVector.push_back(ofname);
this->AddCustomCommandToCreateObject(ofname.c_str(), this->AddCustomCommandToCreateObject(ofname.c_str(),
llang, *(*i), target); llang, *(*i), target);
objs += this->Convert(ofname,START_OUTPUT,MAKEFILE); objs += this->Convert(ofname,START_OUTPUT,MAKERULE);
objs += " "; objs += " ";
} }
} }
@ -2755,7 +2755,7 @@ std::string cmLocalGenerator::ConvertToOutputFormat(const std::string& source,
{ {
std::string result = source; std::string result = source;
// Convert it to an output path. // Convert it to an output path.
if (output == MAKEFILE) if (output == MAKERULE)
{ {
result = cmSystemTools::ConvertToOutputPath(result.c_str()); result = cmSystemTools::ConvertToOutputPath(result.c_str());
} }

2
Source/cmLocalGenerator.h
View File

@ -106,7 +106,7 @@ public:
* path setting * path setting
*/ */
enum RelativeRoot { NONE, FULL, HOME, START, HOME_OUTPUT, START_OUTPUT }; enum RelativeRoot { NONE, FULL, HOME, START, HOME_OUTPUT, START_OUTPUT };
enum OutputFormat { UNCHANGED, MAKEFILE, SHELL, WATCOMQUOTE, RESPONSE }; enum OutputFormat { UNCHANGED, MAKERULE, SHELL, WATCOMQUOTE, RESPONSE };
std::string ConvertToOutputFormat(const std::string& source, std::string ConvertToOutputFormat(const std::string& source,
OutputFormat output); OutputFormat output);
std::string Convert(const std::string& remote, RelativeRoot local, std::string Convert(const std::string& remote, RelativeRoot local,

4
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -630,7 +630,7 @@ cmLocalUnixMakefileGenerator3
// Construct the left hand side of the rule. // Construct the left hand side of the rule.
replace = target; replace = target;
std::string tgt = this->Convert(replace,HOME_OUTPUT,MAKEFILE); std::string tgt = this->Convert(replace,HOME_OUTPUT,MAKERULE);
const char* space = ""; const char* space = "";
if(tgt.size() == 1) if(tgt.size() == 1)
{ {
@ -663,7 +663,7 @@ cmLocalUnixMakefileGenerator3
dep != depends.end(); ++dep) dep != depends.end(); ++dep)
{ {
replace = *dep; replace = *dep;
replace = this->Convert(replace,HOME_OUTPUT,MAKEFILE); replace = this->Convert(replace,HOME_OUTPUT,MAKERULE);
os << cmMakeSafe(tgt) << space << ": " << cmMakeSafe(replace) << "\n"; os << cmMakeSafe(tgt) << space << ": " << cmMakeSafe(replace) << "\n";
} }
} }

6
Source/cmMakefileTargetGenerator.cxx
View File

@ -218,7 +218,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
<< this->LocalGenerator->IncludeDirective << " " << root << this->LocalGenerator->IncludeDirective << " " << root
<< this->Convert(dependFileNameFull, << this->Convert(dependFileNameFull,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKERULE)
<< "\n\n"; << "\n\n";
if(!this->NoRuleMessages) if(!this->NoRuleMessages)
@ -229,7 +229,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
<< this->LocalGenerator->IncludeDirective << " " << root << this->LocalGenerator->IncludeDirective << " " << root
<< this->Convert(this->ProgressFileNameFull, << this->Convert(this->ProgressFileNameFull,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKERULE)
<< "\n\n"; << "\n\n";
} }
@ -262,7 +262,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
<< this->LocalGenerator->IncludeDirective << " " << root << this->LocalGenerator->IncludeDirective << " " << root
<< this->Convert(this->FlagFileNameFull, << this->Convert(this->FlagFileNameFull,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKERULE)
<< "\n\n"; << "\n\n";
} }

2
Source/cmMakefileUtilityTargetGenerator.cxx
View File

@ -54,7 +54,7 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
<< this->LocalGenerator->IncludeDirective << " " << root << this->LocalGenerator->IncludeDirective << " " << root
<< this->Convert(this->ProgressFileNameFull, << this->Convert(this->ProgressFileNameFull,
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKERULE)
<< "\n\n"; << "\n\n";
} }