summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThaddeus Crews <repiteo@outlook.com>2024-03-10 14:01:23 -0500
committerThaddeus Crews <repiteo@outlook.com>2024-03-10 14:01:23 -0500
commit8116d70d4b5fc505b540facb7afc6475918bccf4 (patch)
tree383babf08532bc6effffe67d85e2a3da4aad9b36
parent0ace0a129284ffc6646b199699c1607a316fcec0 (diff)
downloadredot-engine-8116d70d4b5fc505b540facb7afc6475918bccf4.tar.gz
SCons: Convert remaining `run_in_subprocess` to `env.Run`
-rw-r--r--core/extension/SCsub5
-rw-r--r--core/object/SCsub3
-rw-r--r--platform/ios/SCsub2
-rw-r--r--platform/linuxbsd/SCsub3
-rw-r--r--platform/macos/SCsub4
-rw-r--r--platform/windows/SCsub5
-rw-r--r--scene/theme/SCsub3
7 files changed, 10 insertions, 15 deletions
diff --git a/core/extension/SCsub b/core/extension/SCsub
index 361ce43a2c..901ceec1e8 100644
--- a/core/extension/SCsub
+++ b/core/extension/SCsub
@@ -4,13 +4,12 @@ Import("env")
import make_wrappers
import make_interface_dumper
-from platform_methods import run_in_subprocess
-env.CommandNoCache(["ext_wrappers.gen.inc"], "make_wrappers.py", run_in_subprocess(make_wrappers.run))
+env.CommandNoCache(["ext_wrappers.gen.inc"], "make_wrappers.py", env.Run(make_wrappers.run))
env.CommandNoCache(
"gdextension_interface_dump.gen.h",
["gdextension_interface.h", "make_interface_dumper.py"],
- run_in_subprocess(make_interface_dumper.run),
+ env.Run(make_interface_dumper.run),
)
env_extension = env.Clone()
diff --git a/core/object/SCsub b/core/object/SCsub
index dc116aeb19..7c00bb719e 100644
--- a/core/object/SCsub
+++ b/core/object/SCsub
@@ -3,9 +3,8 @@
Import("env")
import make_virtuals
-from platform_methods import run_in_subprocess
-env.CommandNoCache(["gdvirtual.gen.inc"], "make_virtuals.py", run_in_subprocess(make_virtuals.run))
+env.CommandNoCache(["gdvirtual.gen.inc"], "make_virtuals.py", env.Run(make_virtuals.run))
env_object = env.Clone()
diff --git a/platform/ios/SCsub b/platform/ios/SCsub
index 5a57f3840b..f38914434b 100644
--- a/platform/ios/SCsub
+++ b/platform/ios/SCsub
@@ -3,7 +3,7 @@
Import("env")
import os, json
-from platform_methods import run_in_subprocess, architectures, lipo, get_build_version, detect_mvk
+from platform_methods import architectures, lipo, get_build_version, detect_mvk
import subprocess
import shutil
diff --git a/platform/linuxbsd/SCsub b/platform/linuxbsd/SCsub
index a3ce773ac2..0802b528f4 100644
--- a/platform/linuxbsd/SCsub
+++ b/platform/linuxbsd/SCsub
@@ -2,7 +2,6 @@
Import("env")
-from platform_methods import run_in_subprocess
import platform_linuxbsd_builders
common_linuxbsd = [
@@ -42,4 +41,4 @@ if env["dbus"]:
prog = env.add_program("#bin/godot", ["godot_linuxbsd.cpp"] + common_linuxbsd)
if env["debug_symbols"] and env["separate_debug_symbols"]:
- env.AddPostAction(prog, run_in_subprocess(platform_linuxbsd_builders.make_debug_linuxbsd))
+ env.AddPostAction(prog, env.Run(platform_linuxbsd_builders.make_debug_linuxbsd))
diff --git a/platform/macos/SCsub b/platform/macos/SCsub
index 135779582d..59ef4ee85c 100644
--- a/platform/macos/SCsub
+++ b/platform/macos/SCsub
@@ -3,7 +3,7 @@
Import("env")
import os, json
-from platform_methods import run_in_subprocess, architectures, lipo, get_build_version
+from platform_methods import architectures, lipo, get_build_version
import platform_macos_builders
import subprocess
import shutil
@@ -125,7 +125,7 @@ files = [
prog = env.add_program("#bin/godot", files)
if env["debug_symbols"] and env["separate_debug_symbols"]:
- env.AddPostAction(prog, run_in_subprocess(platform_macos_builders.make_debug_macos))
+ env.AddPostAction(prog, env.Run(platform_macos_builders.make_debug_macos))
if env["generate_bundle"]:
generate_bundle_command = env.Command("generate_bundle", [], generate_bundle)
diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index 34c8f8e7a1..18c5878a1a 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -4,7 +4,6 @@ Import("env")
import os
from pathlib import Path
-from platform_methods import run_in_subprocess
import platform_windows_builders
sources = []
@@ -135,8 +134,8 @@ if env["d3d12"]:
if not os.getenv("VCINSTALLDIR"):
if env["debug_symbols"]:
- env.AddPostAction(prog, run_in_subprocess(platform_windows_builders.make_debug_mingw))
+ env.AddPostAction(prog, env.Run(platform_windows_builders.make_debug_mingw))
if env["windows_subsystem"] == "gui":
- env.AddPostAction(prog_wrap, run_in_subprocess(platform_windows_builders.make_debug_mingw))
+ env.AddPostAction(prog_wrap, env.Run(platform_windows_builders.make_debug_mingw))
env.platform_sources += sources
diff --git a/scene/theme/SCsub b/scene/theme/SCsub
index 34f60b449d..5f62ae4b05 100644
--- a/scene/theme/SCsub
+++ b/scene/theme/SCsub
@@ -2,7 +2,6 @@
Import("env")
-from platform_methods import run_in_subprocess
import default_theme_builders
@@ -14,5 +13,5 @@ env.Depends("#scene/theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiB
env.CommandNoCache(
"#scene/theme/default_font.gen.h",
"#thirdparty/fonts/OpenSans_SemiBold.woff2",
- run_in_subprocess(default_theme_builders.make_fonts_header),
+ env.Run(default_theme_builders.make_fonts_header),
)