Ninja: Partially revert "win fixes: escape back slash/colon, use cd. as cmd.exe nop"
It introduced encoding rules in the wrong place, and broke the
CustomCommand test case.
This reverts commit 7fb2bb3e8b
.
This commit is contained in:
parent
f999a59afe
commit
99856d537c
|
@ -353,7 +353,8 @@ IF (WIN32)
|
||||||
ENDIF(NOT UNIX)
|
ENDIF(NOT UNIX)
|
||||||
ENDIF (WIN32)
|
ENDIF (WIN32)
|
||||||
|
|
||||||
|
# Ninja only works on UNIX.
|
||||||
|
IF(UNIX)
|
||||||
SET(SRCS ${SRCS}
|
SET(SRCS ${SRCS}
|
||||||
cmGlobalNinjaGenerator.cxx
|
cmGlobalNinjaGenerator.cxx
|
||||||
cmGlobalNinjaGenerator.h
|
cmGlobalNinjaGenerator.h
|
||||||
|
@ -368,7 +369,7 @@ SET(SRCS ${SRCS}
|
||||||
cmNinjaUtilityTargetGenerator.h
|
cmNinjaUtilityTargetGenerator.h
|
||||||
)
|
)
|
||||||
ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
|
ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
|
||||||
|
ENDIF(UNIX)
|
||||||
|
|
||||||
# create a library used by the command line and the GUI
|
# create a library used by the command line and the GUI
|
||||||
ADD_LIBRARY(CMakeLib ${SRCS})
|
ADD_LIBRARY(CMakeLib ${SRCS})
|
||||||
|
|
|
@ -59,7 +59,6 @@ static bool IsIdentChar(char c)
|
||||||
(c == '_') || (c == '$') || (c == '\\');
|
(c == '_') || (c == '$') || (c == '\\');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::string cmGlobalNinjaGenerator::EncodeIdent(const std::string &ident,
|
std::string cmGlobalNinjaGenerator::EncodeIdent(const std::string &ident,
|
||||||
std::ostream &vars) {
|
std::ostream &vars) {
|
||||||
if (std::find_if(ident.begin(), ident.end(),
|
if (std::find_if(ident.begin(), ident.end(),
|
||||||
|
@ -70,19 +69,14 @@ std::string cmGlobalNinjaGenerator::EncodeIdent(const std::string &ident,
|
||||||
vars << names.str() << " = " << ident << "\n";
|
vars << names.str() << " = " << ident << "\n";
|
||||||
return "$" + names.str();
|
return "$" + names.str();
|
||||||
} else {
|
} else {
|
||||||
return EncodeLiteral(ident);
|
return ident;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string &lit)
|
std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string &lit)
|
||||||
{
|
{
|
||||||
std::string result = lit;
|
std::string result = lit;
|
||||||
cmSystemTools::ReplaceString(result, "$", "$$");
|
cmSystemTools::ReplaceString(result, "$", "$$");
|
||||||
cmSystemTools::ReplaceString(result, ":", "$:");
|
|
||||||
#ifdef _WIN32
|
|
||||||
cmSystemTools::ReplaceString(result, "/", "\\");
|
|
||||||
#endif
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -206,8 +200,7 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const std::string& command,
|
||||||
this->AddCustomCommandRule();
|
this->AddCustomCommandRule();
|
||||||
|
|
||||||
cmNinjaVars vars;
|
cmNinjaVars vars;
|
||||||
|
vars["COMMAND"] = command;
|
||||||
vars["COMMAND"] = EncodeLiteral(command);
|
|
||||||
vars["DESC"] = EncodeLiteral(description);
|
vars["DESC"] = EncodeLiteral(description);
|
||||||
|
|
||||||
cmGlobalNinjaGenerator::WriteBuild(*this->BuildFileStream,
|
cmGlobalNinjaGenerator::WriteBuild(*this->BuildFileStream,
|
||||||
|
|
Loading…
Reference in New Issue