Skip to content

Commit

Permalink
SCons: pass ninja_file variable in tool instead of default name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dustdfg committed Nov 18, 2024
1 parent 5efd124 commit 1250681
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 1250681

Please sign in to comment.