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

Do Windows command line escapes for VS 10 too 

Until now the VS 10 generator did no Windows command-line escaping and
just did XML escapes.  This commit teaches the generator to use the same
command-line escape addition code used by other generators.  The script
construction method cmLocalVisualStudioGenerator::ConstructScript need
not do XML escapes.  Each VS generator version adds the XML escapes
necessary for that version.
This commit is contained in:
Brad King 2009-09-07 10:11:20 -04:00
parent f143dc2af2
commit 355511ade9
4 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmLocalVisualStudio10Generator.cxx
View File

@ -68,7 +68,6 @@ class cmVS10XMLParser : public cmXMLParser
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmLocalVisualStudio10Generator::cmLocalVisualStudio10Generator() cmLocalVisualStudio10Generator::cmLocalVisualStudio10Generator()
{ {
this->NeedXMLEscape = true;
} }
cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator() cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator()

21
Source/cmLocalVisualStudioGenerator.cxx
View File

@ -26,7 +26,6 @@ cmLocalVisualStudioGenerator::cmLocalVisualStudioGenerator()
{ {
this->WindowsShell = true; this->WindowsShell = true;
this->WindowsVSIDE = true; this->WindowsVSIDE = true;
this->NeedXMLEscape = false;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -232,26 +231,8 @@ cmLocalVisualStudioGenerator
} }
else else
{ {
if(this->NeedXMLEscape) script += this->EscapeForShell(commandLine[j].c_str(),
{
std::string arg = commandLine[j];
cmSystemTools::ReplaceString(arg, "&", "&");
cmSystemTools::ReplaceString(arg, "<", "&lt;");
cmSystemTools::ReplaceString(arg, ">", "&gt;");
if(arg.find(" ") != arg.npos)
{
std::string q("\"");
arg = q + arg +q;
}
script += arg;
//script += this->EscapeForShell(arg.c_str(),
//escapeAllowMakeVars);
}
else
{
script += this->EscapeForShell(commandLine[j].c_str(),
escapeAllowMakeVars); escapeAllowMakeVars);
}
} }
} }
} }

1
Source/cmLocalVisualStudioGenerator.h
View File

@ -56,7 +56,6 @@ protected:
std::map<cmStdString, int>& count); std::map<cmStdString, int>& count);
void InsertNeedObjectNames(const std::vector<cmSourceGroup>& groups, void InsertNeedObjectNames(const std::vector<cmSourceGroup>& groups,
std::map<cmStdString, int>& count); std::map<cmStdString, int>& count);
bool NeedXMLEscape;
std::set<const cmSourceFile*> NeedObjectName; std::set<const cmSourceFile*> NeedObjectName;
friend class cmVisualStudio10TargetGenerator; friend class cmVisualStudio10TargetGenerator;
}; };

35
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -27,6 +27,13 @@
#include "cmVS10LinkFlagTable.h" #include "cmVS10LinkFlagTable.h"
#include "cmVS10LibFlagTable.h" #include "cmVS10LibFlagTable.h"
static std::string cmVS10EscapeXML(std::string arg)
{
cmSystemTools::ReplaceString(arg, "&", "&amp;");
cmSystemTools::ReplaceString(arg, "<", "&lt;");
cmSystemTools::ReplaceString(arg, ">", "&gt;");
return arg;
}
cmVisualStudio10TargetGenerator:: cmVisualStudio10TargetGenerator::
cmVisualStudio10TargetGenerator(cmTarget* target, cmVisualStudio10TargetGenerator(cmTarget* target,
@ -289,12 +296,14 @@ cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile* source,
for(std::vector<std::string>::iterator i = configs->begin(); for(std::vector<std::string>::iterator i = configs->begin();
i != configs->end(); ++i) i != configs->end(); ++i)
{ {
std::string script = std::string script =
lg->ConstructScript(command.GetCommandLines(), cmVS10EscapeXML(
command.GetWorkingDirectory(), lg->ConstructScript(command.GetCommandLines(),
i->c_str(), command.GetWorkingDirectory(),
command.GetEscapeOldStyle(), i->c_str(),
command.GetEscapeAllowMakeVars()); command.GetEscapeOldStyle(),
command.GetEscapeAllowMakeVars())
);
this->WritePlatformConfigTag("Message",i->c_str(), 3); this->WritePlatformConfigTag("Message",i->c_str(), 3);
(*this->BuildFileStream ) << comment << "</Message>\n"; (*this->BuildFileStream ) << comment << "</Message>\n";
this->WritePlatformConfigTag("Command", i->c_str(), 3); this->WritePlatformConfigTag("Command", i->c_str(), 3);
@ -1202,12 +1211,14 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
comment += lg->ConstructComment(command); comment += lg->ConstructComment(command);
script += pre; script += pre;
pre = "\n"; pre = "\n";
script += script +=
lg->ConstructScript(command.GetCommandLines(), cmVS10EscapeXML(
command.GetWorkingDirectory(), lg->ConstructScript(command.GetCommandLines(),
configName.c_str(), command.GetWorkingDirectory(),
command.GetEscapeOldStyle(), configName.c_str(),
command.GetEscapeAllowMakeVars()); command.GetEscapeOldStyle(),
command.GetEscapeAllowMakeVars())
);
} }
this->WriteString("<Message>",3); this->WriteString("<Message>",3);
(*this->BuildFileStream ) << comment << "</Message>\n"; (*this->BuildFileStream ) << comment << "</Message>\n";