diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalVisualStudio10Generator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudioGenerator.cxx | 21 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudioGenerator.h | 1 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 35 |
4 files changed, 24 insertions, 34 deletions
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index 44318f4..80f98f2 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -68,7 +68,6 @@ class cmVS10XMLParser : public cmXMLParser //---------------------------------------------------------------------------- cmLocalVisualStudio10Generator::cmLocalVisualStudio10Generator() { - this->NeedXMLEscape = true; } cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator() diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index da214cf..4706a96 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -26,7 +26,6 @@ cmLocalVisualStudioGenerator::cmLocalVisualStudioGenerator() { this->WindowsShell = true; this->WindowsVSIDE = true; - this->NeedXMLEscape = false; } //---------------------------------------------------------------------------- @@ -232,26 +231,8 @@ cmLocalVisualStudioGenerator } else { - if(this->NeedXMLEscape) - { - std::string arg = commandLine[j]; - cmSystemTools::ReplaceString(arg, "&", "&"); - cmSystemTools::ReplaceString(arg, "<", "<"); - cmSystemTools::ReplaceString(arg, ">", ">"); - 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(), + script += this->EscapeForShell(commandLine[j].c_str(), escapeAllowMakeVars); - } } } } diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h index 4b31599..a6bdfbf 100644 --- a/Source/cmLocalVisualStudioGenerator.h +++ b/Source/cmLocalVisualStudioGenerator.h @@ -56,7 +56,6 @@ protected: std::map<cmStdString, int>& count); void InsertNeedObjectNames(const std::vector<cmSourceGroup>& groups, std::map<cmStdString, int>& count); - bool NeedXMLEscape; std::set<const cmSourceFile*> NeedObjectName; friend class cmVisualStudio10TargetGenerator; }; diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 2a96932..e8aaf61 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -27,6 +27,13 @@ #include "cmVS10LinkFlagTable.h" #include "cmVS10LibFlagTable.h" +static std::string cmVS10EscapeXML(std::string arg) +{ + cmSystemTools::ReplaceString(arg, "&", "&"); + cmSystemTools::ReplaceString(arg, "<", "<"); + cmSystemTools::ReplaceString(arg, ">", ">"); + return arg; +} cmVisualStudio10TargetGenerator:: cmVisualStudio10TargetGenerator(cmTarget* target, @@ -289,12 +296,14 @@ cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile* source, for(std::vector<std::string>::iterator i = configs->begin(); i != configs->end(); ++i) { - std::string script = - lg->ConstructScript(command.GetCommandLines(), - command.GetWorkingDirectory(), - i->c_str(), - command.GetEscapeOldStyle(), - command.GetEscapeAllowMakeVars()); + std::string script = + cmVS10EscapeXML( + lg->ConstructScript(command.GetCommandLines(), + command.GetWorkingDirectory(), + i->c_str(), + command.GetEscapeOldStyle(), + command.GetEscapeAllowMakeVars()) + ); this->WritePlatformConfigTag("Message",i->c_str(), 3); (*this->BuildFileStream ) << comment << "</Message>\n"; this->WritePlatformConfigTag("Command", i->c_str(), 3); @@ -1202,12 +1211,14 @@ void cmVisualStudio10TargetGenerator::WriteEvent( comment += lg->ConstructComment(command); script += pre; pre = "\n"; - script += - lg->ConstructScript(command.GetCommandLines(), - command.GetWorkingDirectory(), - configName.c_str(), - command.GetEscapeOldStyle(), - command.GetEscapeAllowMakeVars()); + script += + cmVS10EscapeXML( + lg->ConstructScript(command.GetCommandLines(), + command.GetWorkingDirectory(), + configName.c_str(), + command.GetEscapeOldStyle(), + command.GetEscapeAllowMakeVars()) + ); } this->WriteString("<Message>",3); (*this->BuildFileStream ) << comment << "</Message>\n"; |