michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(bin/linja): escape ' ' in depfiles differently

Browse source 
' ' ==> '\\ ' in .d files

fix #515
This commit is contained in:
Soonho Kong 2015-03-28 22:37:45 -04:00
parent f72f4cf441
commit 93a3ef1447
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/linja.in
View file

@ -627,7 +627,7 @@ def build_olean(lean, olean, clean, dlean, ilean, base):
else: else:
str = """build %s %s: LEAN %s | %s""" % (olean, ilean, lean, dlean) str = """build %s %s: LEAN %s | %s""" % (olean, ilean, lean, dlean)
if g_lean_bin_dep_flag: if g_lean_bin_dep_flag:
str += " %s" % normalize_drive_name(g_lean_path) str += " %s" % escape_ninja_char(normalize_drive_name(g_lean_path))
str += "\n" str += "\n"
str += " DLEAN_FILE=%s\n" % dlean str += " DLEAN_FILE=%s\n" % dlean
str += " OLEAN_FILE=%s\n" % olean str += " OLEAN_FILE=%s\n" % olean
@ -646,7 +646,7 @@ def make_build_ninja(args):
print("""rule LEAN""", file=f) print("""rule LEAN""", file=f)
print(""" depfile = ${DLEAN_FILE}""", file=f) print(""" depfile = ${DLEAN_FILE}""", file=f)
print(""" command = "%s" %s "$in" -o "${OLEAN_FILE}" -c "${CLEAN_FILE}" -i "${ILEAN_FILE}" """ \ print(""" command = "%s" %s $in -o "${OLEAN_FILE}" -c "${CLEAN_FILE}" -i "${ILEAN_FILE}" """ \
% (g_lean_path, " ".join(args.lean_options)), file=f) % (g_lean_path, " ".join(args.lean_options)), file=f)
print("""rule LEANTAGS""", file=f) print("""rule LEANTAGS""", file=f)
@ -674,16 +674,19 @@ def make_build_ninja(args):
print("""default all""", file=f) print("""default all""", file=f)
def escape_dep(s):
return s.replace(" ", "\\ ")
def make_deps(lean_file, dlean_file, olean_file): def make_deps(lean_file, dlean_file, olean_file):
with open(dlean_file, "w") as f: with open(dlean_file, "w") as f:
deps = [] deps = []
proc = subprocess.Popen([g_lean_path, "--deps", lean_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) proc = subprocess.Popen([g_lean_path, "--deps", lean_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
output = proc.communicate()[0] output = proc.communicate()[0]
print(escape_ninja_char(olean_file) + ": \\", file=f) print(escape_dep(olean_file) + ": \\", file=f)
for olean_file in output.strip().splitlines(): for olean_file in output.strip().splitlines():
if olean_file: if olean_file:
deps.append(normalize_drive_name(os.path.abspath(olean_file))) deps.append(normalize_drive_name(os.path.abspath(olean_file)))
deps = map(escape_ninja_char, deps) deps = list(map(escape_dep, deps))
deps_str = b" " + (b" \\\n ".join(deps)) deps_str = b" " + (b" \\\n ".join(deps))
print(deps_str, file=f) print(deps_str, file=f)