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

BUG: Fixed XML escapes for custom commands. Also added escaping of newlines for VS 2005.

Browse Source
This commit is contained in:
Brad King 2005-11-17 15:57:51 -05:00
parent 0df3c162fb
commit 8dc8232027
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1162,8 +1162,6 @@ WriteCustomRule(std::ostream& fout,
const char *output, const char *output,
const char* compileFlags) const char* compileFlags)
{ {
std::string cmd = command;
cmSystemTools::ReplaceString(cmd, "\"", """);
std::vector<std::string>::iterator i; std::vector<std::string>::iterator i;
std::vector<std::string> *configs = std::vector<std::string> *configs =
static_cast<cmGlobalVisualStudio7Generator *>(m_GlobalGenerator)->GetConfigurations(); static_cast<cmGlobalVisualStudio7Generator *>(m_GlobalGenerator)->GetConfigurations();
@ -1183,7 +1181,8 @@ WriteCustomRule(std::ostream& fout,
<< "\t\t\t\t\tDescription=\"Building " << comment; << "\t\t\t\t\tDescription=\"Building " << comment;
fout << " " << output; fout << " " << output;
fout << "\"\n" fout << "\"\n"
<< "\t\t\t\t\tCommandLine=\"" << cmd << "\n\"\n" << "\t\t\t\t\tCommandLine=\""
<< this->EscapeForXML(command) << "\"\n"
<< "\t\t\t\t\tAdditionalDependencies=\""; << "\t\t\t\t\tAdditionalDependencies=\"";
// Write out the dependencies for the rule. // Write out the dependencies for the rule.
std::string temp; std::string temp;
@ -1381,6 +1380,7 @@ std::string cmLocalVisualStudio7Generator::EscapeForXML(const char* s)
cmSystemTools::ReplaceString(ret, "\"", "&quot;"); cmSystemTools::ReplaceString(ret, "\"", "&quot;");
cmSystemTools::ReplaceString(ret, "<", "&lt;"); cmSystemTools::ReplaceString(ret, "<", "&lt;");
cmSystemTools::ReplaceString(ret, ">", "&gt;"); cmSystemTools::ReplaceString(ret, ">", "&gt;");
cmSystemTools::ReplaceString(ret, "\n", "&#x0D;&#x0A;");
return ret; return ret;
} }