Skip to content

Commit 1250681

Browse files
committedNov 18, 2024·
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) <dfgdust@gmail.com>
1 parent 5efd124 commit 1250681

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ compile_commands.json
3636
platform/windows/godot_res.res
3737

3838
# Ninja build files
39-
build.ninja
40-
.ninja
39+
*.ninja
40+
.ninja/
4141
run_ninja_env.bat
4242

4343
# Generated by Godot binary

‎SConstruct

+2-2
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ if env["ninja"]:
10501050
SetOption("experimental", "ninja")
10511051
env["NINJA_FILE_NAME"] = env["ninja_file"]
10521052
env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"]
1053-
env.Tool("ninja", "build.ninja")
1053+
env.Tool("ninja", env["ninja_file"])
10541054

10551055
# Threads
10561056
if env["threads"]:
@@ -1112,7 +1112,7 @@ atexit.register(print_elapsed_time)
11121112

11131113

11141114
def purge_flaky_files():
1115-
paths_to_keep = ["build.ninja"]
1115+
paths_to_keep = [env["ninja_file"]]
11161116
for build_failure in GetBuildFailures():
11171117
path = build_failure.node.path
11181118
if os.path.isfile(path) and path not in paths_to_keep:

0 commit comments

Comments
 (0)
Please sign in to comment.