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

Ninja: undo all the NOSHELL patches

This commit is contained in:
Peter Kuemmel 2012-06-15 01:43:08 +02:00
parent 555bda4e43
commit f13a6a087e
6 changed files with 37 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalNinjaGenerator.cxx
View File

@ -106,7 +106,6 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
const cmNinjaDeps& implicitDeps, const cmNinjaDeps& implicitDeps,
const cmNinjaDeps& orderOnlyDeps, const cmNinjaDeps& orderOnlyDeps,
const cmNinjaVars& variables, const cmNinjaVars& variables,
bool suppressShell,
int cmdLineLimit) int cmdLineLimit)
{ {
// Make sure there is a rule. // Make sure there is a rule.
@ -178,15 +177,8 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
// check if a response file rule should be used // check if a response file rule should be used
const std::string args = arguments.str(); const std::string args = arguments.str();
if (suppressShell) if (cmdLineLimit > 0 && args.size() > (size_t)cmdLineLimit)
{
builds << "_NOSHELL";
}
else if (cmdLineLimit > 0 &&
args.size() + builds.str().size() > (size_t)cmdLineLimit)
{
builds << "_RSPFILE"; builds << "_RSPFILE";
}
os << builds.str() << args; os << builds.str() << args;

1
Source/cmGlobalNinjaGenerator.h
View File

@ -84,7 +84,6 @@ public:
const cmNinjaDeps& implicitDeps, const cmNinjaDeps& implicitDeps,
const cmNinjaDeps& orderOnlyDeps, const cmNinjaDeps& orderOnlyDeps,
const cmNinjaVars& variables, const cmNinjaVars& variables,
bool suppressShell = false,
int cmdLineLimit = -1); int cmdLineLimit = -1);
/** /**

13
Source/cmLocalNinjaGenerator.cxx
View File

@ -264,14 +264,6 @@ void cmLocalNinjaGenerator::AppendCustomCommandDeps(const cmCustomCommand *cc,
} }
} }
std::string cmLocalNinjaGenerator::nopCommand() const {
#ifdef _WIN32
return "cd .";
#else
return ":";
#endif
}
std::string cmLocalNinjaGenerator::BuildCommandLine( std::string cmLocalNinjaGenerator::BuildCommandLine(
const std::vector<std::string> &cmdLines) const std::vector<std::string> &cmdLines)
{ {
@ -280,10 +272,9 @@ std::string cmLocalNinjaGenerator::BuildCommandLine(
// don't use POST_BUILD. // don't use POST_BUILD.
if (cmdLines.empty()) if (cmdLines.empty())
#ifdef _WIN32 #ifdef _WIN32
return ""; return "cd.";
#else #else
// TODO use _NOSHELL rule also on Linux return ":";
return nopCommand();
#endif #endif
std::ostringstream cmd; std::ostringstream cmd;

1
Source/cmLocalNinjaGenerator.h
View File

@ -111,7 +111,6 @@ private:
void AppendCustomCommandDeps(const cmCustomCommand *cc, void AppendCustomCommandDeps(const cmCustomCommand *cc,
cmNinjaDeps &ninjaDeps); cmNinjaDeps &ninjaDeps);
std::string nopCommand() const;
std::string BuildCommandLine(const std::vector<std::string> &cmdLines); std::string BuildCommandLine(const std::vector<std::string> &cmdLines);
void AppendCustomCommandLines(const cmCustomCommand *cc, void AppendCustomCommandLines(const cmCustomCommand *cc,
std::vector<std::string> &cmdLines); std::vector<std::string> &cmdLines);

95
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -75,13 +75,9 @@ void cmNinjaNormalTargetGenerator::Generate()
} }
else else
{ {
this->WriteLinkRule(); this->WriteLinkRule(false);
#ifdef _WIN32 #ifdef _WIN32 // TODO response file support only Linux
// TODO remove hardcoded strings this->WriteLinkRule(true);
this->WriteLinkRule("_RSPFILE");
this->WriteLinkRule("_NOSHELL");
#else
// TODO response file support only Linux
#endif #endif
this->WriteLinkStatement(); this->WriteLinkStatement();
} }
@ -135,18 +131,12 @@ cmNinjaNormalTargetGenerator
void void
cmNinjaNormalTargetGenerator cmNinjaNormalTargetGenerator
::WriteLinkRule(const std::string& postfix) ::WriteLinkRule(bool useResponseFile)
{ {
cmTarget::TargetType targetType = this->GetTarget()->GetType(); cmTarget::TargetType targetType = this->GetTarget()->GetType();
std::string ruleName = this->LanguageLinkerRule(); std::string ruleName = this->LanguageLinkerRule();
if (useResponseFile)
bool useResponseFile = false; ruleName += "_RSPFILE";
bool suppressShell = false;
if (!postfix.empty()) {
ruleName += postfix;
useResponseFile = (postfix == "_RSPFILE");
suppressShell = (postfix == "_NOSHELL");
}
// Select whether to use a response file for objects. // Select whether to use a response file for objects.
std::string rspfile; std::string rspfile;
@ -220,10 +210,8 @@ cmNinjaNormalTargetGenerator
{ {
this->GetLocalGenerator()->ExpandRuleVariables(*i, vars); this->GetLocalGenerator()->ExpandRuleVariables(*i, vars);
} }
if (!suppressShell) { linkCmds.insert(linkCmds.begin(), "$PRE_LINK");
linkCmds.insert(linkCmds.begin(), "$PRE_LINK"); linkCmds.push_back("$POST_BUILD");
linkCmds.push_back("$POST_BUILD");
}
std::string linkCmd = std::string linkCmd =
this->GetLocalGenerator()->BuildCommandLine(linkCmds); this->GetLocalGenerator()->BuildCommandLine(linkCmds);
@ -343,7 +331,6 @@ cmNinjaNormalTargetGenerator
void cmNinjaNormalTargetGenerator::WriteLinkStatement() void cmNinjaNormalTargetGenerator::WriteLinkStatement()
{ {
cmLocalNinjaGenerator* locGtor = this->GetLocalGenerator();
cmTarget::TargetType targetType = this->GetTarget()->GetType(); cmTarget::TargetType targetType = this->GetTarget()->GetType();
// Write comments. // Write comments.
@ -381,10 +368,10 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
cmNinjaDeps explicitDeps = this->GetObjects(), cmNinjaDeps explicitDeps = this->GetObjects(),
implicitDeps = this->ComputeLinkDeps(); implicitDeps = this->ComputeLinkDeps();
locGtor->GetTargetFlags(vars["LINK_LIBRARIES"], this->GetLocalGenerator()->GetTargetFlags(vars["LINK_LIBRARIES"],
vars["FLAGS"], vars["FLAGS"],
vars["LINK_FLAGS"], vars["LINK_FLAGS"],
*this->GetTarget()); *this->GetTarget());
this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]); this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
@ -394,7 +381,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
std::string flags = (targetType == cmTarget::EXECUTABLE std::string flags = (targetType == cmTarget::EXECUTABLE
? vars["FLAGS"] ? vars["FLAGS"]
: vars["ARCH_FLAGS"]); : vars["ARCH_FLAGS"]);
locGtor->AddArchitectureFlags(flags, this->GetLocalGenerator()->AddArchitectureFlags(flags,
this->GetTarget(), this->GetTarget(),
this->TargetLinkLanguage, this->TargetLinkLanguage,
this->GetConfigName()); this->GetConfigName());
@ -413,16 +400,16 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
if (!install_name_dir.empty()) { if (!install_name_dir.empty()) {
vars["INSTALLNAME_DIR"] = vars["INSTALLNAME_DIR"] =
locGtor->Convert(install_name_dir.c_str(), this->GetLocalGenerator()->Convert(install_name_dir.c_str(),
cmLocalGenerator::NONE, cmLocalGenerator::NONE,
cmLocalGenerator::SHELL, false); cmLocalGenerator::SHELL, false);
} }
} }
} }
std::string path; std::string path;
if (!this->TargetNameImport.empty()) { if (!this->TargetNameImport.empty()) {
path = locGtor->ConvertToOutputFormat( path = this->GetLocalGenerator()->ConvertToOutputFormat(
targetOutputImplib.c_str(), cmLocalGenerator::SHELL); targetOutputImplib.c_str(), cmLocalGenerator::SHELL);
vars["TARGET_IMPLIB"] = path; vars["TARGET_IMPLIB"] = path;
EnsureParentDirectoryExists(path); EnsureParentDirectoryExists(path);
@ -434,7 +421,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
mf->GetDefinition("MSVC_CXX_ARCHITECTURE_ID")) mf->GetDefinition("MSVC_CXX_ARCHITECTURE_ID"))
{ {
path = this->GetTargetPDB(); path = this->GetTargetPDB();
vars["TARGET_PDB"] = locGtor->ConvertToOutputFormat( vars["TARGET_PDB"] = this->GetLocalGenerator()->ConvertToOutputFormat(
ConvertToNinjaPath(path.c_str()).c_str(), ConvertToNinjaPath(path.c_str()).c_str(),
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
EnsureParentDirectoryExists(path); EnsureParentDirectoryExists(path);
@ -464,53 +451,38 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
for (std::vector<cmCustomCommand>::const_iterator for (std::vector<cmCustomCommand>::const_iterator
ci = cmdLists[i]->begin(); ci = cmdLists[i]->begin();
ci != cmdLists[i]->end(); ++ci) { ci != cmdLists[i]->end(); ++ci) {
locGtor->AppendCustomCommandLines(&*ci, *cmdLineLists[i]); this->GetLocalGenerator()->AppendCustomCommandLines(&*ci,
*cmdLineLists[i]);
} }
} }
// If we have any PRE_LINK commands, we need to go back to HOME_OUTPUT for // If we have any PRE_LINK commands, we need to go back to HOME_OUTPUT for
// the link commands. // the link commands.
if (!preLinkCmdLines.empty()) { if (!preLinkCmdLines.empty()) {
path = locGtor->ConvertToOutputFormat( path = this->GetLocalGenerator()->ConvertToOutputFormat(
this->GetMakefile()->GetHomeOutputDirectory(), this->GetMakefile()->GetHomeOutputDirectory(),
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
preLinkCmdLines.push_back("cd " + path); preLinkCmdLines.push_back("cd " + path);
vars["PRE_LINK"] = locGtor->BuildCommandLine(preLinkCmdLines);
} }
vars["PRE_LINK"] =
this->GetLocalGenerator()->BuildCommandLine(preLinkCmdLines);
std::string postBuildCmdLine =
this->GetLocalGenerator()->BuildCommandLine(postBuildCmdLines);
cmNinjaVars symlinkVars; cmNinjaVars symlinkVars;
if (!postBuildCmdLines.empty()) { if (targetOutput == targetOutputReal) {
std::string postBuildCmdLine = vars["POST_BUILD"] = postBuildCmdLine;
locGtor->BuildCommandLine(postBuildCmdLines); } else {
vars["POST_BUILD"] = ":";
if (targetOutput == targetOutputReal) { symlinkVars["POST_BUILD"] = postBuildCmdLine;
vars["POST_BUILD"] = postBuildCmdLine;
if (preLinkCmdLines.empty()) {
// rule with PRE_LINK will be selected, feed it
vars["PRE_LINK"] = locGtor->nopCommand();
}
} else {
symlinkVars["POST_BUILD"] = postBuildCmdLine;
}
} }
bool suppressShell = preLinkCmdLines.empty() && postBuildCmdLines.empty();
int cmdLineLimit = -1; int cmdLineLimit = -1;
#ifdef _WIN32 #ifdef _WIN32
cmdLineLimit = 8000; cmdLineLimit = 8100;
#else #else
// cmdLineLimit = ?? TODO // TODO
suppressShell = false;
// TODO also use _NOSHELL rule
if (vars.find("PRE_LINK") == vars.end())
vars["PRE_LINK"] = locGtor->nopCommand();
if (vars.find("POST_BUILD") == vars.end())
vars["POST_BUILD"] = locGtor->nopCommand();
if (targetOutput != targetOutputReal &&
symlinkVars.find("POST_BUILD") == symlinkVars.end())
symlinkVars["POST_BUILD"] = locGtor->nopCommand();
#endif #endif
// Write the build statement for this target. // Write the build statement for this target.
cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(), cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(),
@ -521,7 +493,6 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
implicitDeps, implicitDeps,
emptyDeps, emptyDeps,
vars, vars,
suppressShell,
cmdLineLimit); cmdLineLimit);
if (targetOutput != targetOutputReal) { if (targetOutput != targetOutputReal) {

2
Source/cmNinjaNormalTargetGenerator.h
View File

@ -30,7 +30,7 @@ private:
std::string LanguageLinkerRule() const; std::string LanguageLinkerRule() const;
const char* GetVisibleTypeName() const; const char* GetVisibleTypeName() const;
void WriteLanguagesRules(); void WriteLanguagesRules();
void WriteLinkRule(const std::string& postfix = ""); void WriteLinkRule(bool useResponseFile);
void WriteLinkStatement(); void WriteLinkStatement();
void WriteObjectLibStatement(); void WriteObjectLibStatement();
std::vector<std::string> ComputeLinkCmd(); std::vector<std::string> ComputeLinkCmd();