diff options
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | tools/android.py | 2 | ||||
| -rw-r--r-- | tools/godotcpp.py | 7 | ||||
| -rw-r--r-- | tools/javascript.py | 2 | ||||
| -rw-r--r-- | tools/macos.py | 2 |
5 files changed, 7 insertions, 7 deletions
@@ -5,7 +5,6 @@ import platform import sys import subprocess from binding_generator import scons_generate_bindings, scons_emit_files -from SCons.Errors import UserError EnsureSConsVersion(4, 0) diff --git a/tools/android.py b/tools/android.py index 4735345..0e68855 100644 --- a/tools/android.py +++ b/tools/android.py @@ -29,7 +29,7 @@ def generate(env): if env["arch"] not in ("arm64", "x86_64", "arm32", "x86_32"): print("Only arm64, x86_64, arm32, and x86_32 are supported on Android. Exiting.") - Exit() + env.Exit(1) if sys.platform == "win32" or sys.platform == "msys": my_spawn.configure(env) diff --git a/tools/godotcpp.py b/tools/godotcpp.py index 60cd34b..969f8c4 100644 --- a/tools/godotcpp.py +++ b/tools/godotcpp.py @@ -3,6 +3,7 @@ import os, sys, platform from SCons.Variables import EnumVariable, PathVariable, BoolVariable from SCons.Tool import Tool from SCons.Builder import Builder +from SCons.Errors import UserError from binding_generator import scons_generate_bindings, scons_emit_files @@ -226,7 +227,7 @@ def generate(env): env["arch"] = "x86_32" else: print("Unsupported CPU architecture: " + host_machine) - Exit() + env.Exit(1) print("Building for architecture " + env["arch"] + " on platform " + env["platform"]) @@ -284,8 +285,8 @@ def _godot_cpp(env): ) # Forces bindings regeneration. if env["generate_bindings"]: - AlwaysBuild(bindings) - NoCache(bindings) + env.AlwaysBuild(bindings) + env.NoCache(bindings) # Sources to compile sources = [] diff --git a/tools/javascript.py b/tools/javascript.py index 42c601d..1d8009e 100644 --- a/tools/javascript.py +++ b/tools/javascript.py @@ -8,7 +8,7 @@ def exists(env): def generate(env): if env["arch"] not in ("wasm32"): print("Only wasm32 supported on web. Exiting.") - Exit() + env.Exit(1) if "EM_CONFIG" in os.environ: env["ENV"] = os.environ diff --git a/tools/macos.py b/tools/macos.py index 34a755a..0c75e4a 100644 --- a/tools/macos.py +++ b/tools/macos.py @@ -20,7 +20,7 @@ def exists(env): def generate(env): if env["arch"] not in ("universal", "arm64", "x86_64"): print("Only universal, arm64, and x86_64 are supported on macOS. Exiting.") - Exit() + env.Exit(1) if sys.platform == "darwin": # Use clang on macOS by default |