godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build: make ninja output file consistent 

After upgrading, I noticed that the SCons ninja output had a different
filename which messed up the "flaky file" logic.

This patch explicitly passes it to the tool and switches to
`build.ninja` (ninja's default).
This commit is contained in:
Riteo 2024-09-08 16:30:29 +02:00
parent 5675c76461
commit 0d40efbe66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -1053,7 +1053,7 @@ if env["ninja"]:
SetOption("experimental", "ninja") SetOption("experimental", "ninja")
env["NINJA_FILE_NAME"] = env["ninja_file"] env["NINJA_FILE_NAME"] = env["ninja_file"]
env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"] env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"]
env.Tool("ninja") env.Tool("ninja", "build.ninja")
# Threads # Threads
if env["threads"]: if env["threads"]:
@ -1116,7 +1116,7 @@ atexit.register(print_elapsed_time)
def purge_flaky_files(): def purge_flaky_files():
paths_to_keep = ["ninja.build"] paths_to_keep = ["build.ninja"]
for build_failure in GetBuildFailures(): for build_failure in GetBuildFailures():
path = build_failure.node.path path = build_failure.node.path
if os.path.isfile(path) and path not in paths_to_keep: if os.path.isfile(path) and path not in paths_to_keep: