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

Ninja: ninja now also could read parentheses in .d files

This commit is contained in:
Peter Kuemmel 2012-06-14 14:37:08 +02:00
parent 6546086004
commit 6e6886d3bd
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmcldeps.cxx
View File

@ -580,8 +580,6 @@ static void outputDepFile(const string& dfile, const string& objfile,
tmp = *i; tmp = *i;
doEscape(tmp, "\\", "/"); doEscape(tmp, "\\", "/");
doEscape(tmp, " ", "\\ "); doEscape(tmp, " ", "\\ ");
//doEscape(tmp, "(", "\\("); // TODO ninja can't read ( and )
//doEscape(tmp, ")", "\\)");
fprintf(out, "%s \\\n", tmp.c_str()); fprintf(out, "%s \\\n", tmp.c_str());
//printf("include: %s \n", tmp.c_str()); //printf("include: %s \n", tmp.c_str());
} }
@ -640,12 +638,10 @@ static int process( const string& srcfilename,
bool isFirstLine = true; // cl prints always first the source filename bool isFirstLine = true; // cl prints always first the source filename
while (getline(ss, line)) { while (getline(ss, line)) {
if (startsWith(line, prefix)) { if (startsWith(line, prefix)) {
if (!contains(line, "(") && !contains(line, ")")) { string inc = trimLeadingSpace(line.substr(prefix.size()).c_str());
string inc = trimLeadingSpace(line.substr(prefix.size()).c_str()); if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n
if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n inc = inc.substr(0, inc.size() - 1);
inc = inc.substr(0, inc.size() - 1); includes.push_back(inc);
includes.push_back(inc);
}
} else { } else {
if (!isFirstLine || !startsWith(line, srcfilename)) { if (!isFirstLine || !startsWith(line, srcfilename)) {
if (!quiet) { if (!quiet) {