From 1250681a4f43282c6e2b466c527d748a940227fa Mon Sep 17 00:00:00 2001 From: "Yevhen Babiichuk (DustDFG)" Date: Mon, 18 Nov 2024 12:12:32 +0200 Subject: [PATCH] SCons: pass `ninja_file` variable in tool instead of default name Noticed that when I run with `ninja_file` it wasn't created even though in terminal I saw that the file will be generated Signed-off-by: Yevhen Babiichuk (DustDFG) --- .gitignore | 4 ++-- SConstruct | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0dcf79c4604..f72ea1ac514 100644 --- a/.gitignore +++ b/.gitignore @@ -36,8 +36,8 @@ compile_commands.json platform/windows/godot_res.res # Ninja build files -build.ninja -.ninja +*.ninja +.ninja/ run_ninja_env.bat # Generated by Godot binary diff --git a/SConstruct b/SConstruct index 234a6624f1c..7c7d3d25a0d 100644 --- a/SConstruct +++ b/SConstruct @@ -1050,7 +1050,7 @@ if env["ninja"]: SetOption("experimental", "ninja") env["NINJA_FILE_NAME"] = env["ninja_file"] env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"] - env.Tool("ninja", "build.ninja") + env.Tool("ninja", env["ninja_file"]) # Threads if env["threads"]: @@ -1112,7 +1112,7 @@ atexit.register(print_elapsed_time) def purge_flaky_files(): - paths_to_keep = ["build.ninja"] + paths_to_keep = [env["ninja_file"]] for build_failure in GetBuildFailures(): path = build_failure.node.path if os.path.isfile(path) and path not in paths_to_keep: