From 8116d70d4b5fc505b540facb7afc6475918bccf4 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Sun, 10 Mar 2024 14:01:23 -0500 Subject: [PATCH] SCons: Convert remaining `run_in_subprocess` to `env.Run` --- core/extension/SCsub | 5 ++--- core/object/SCsub | 3 +-- platform/ios/SCsub | 2 +- platform/linuxbsd/SCsub | 3 +-- platform/macos/SCsub | 4 ++-- platform/windows/SCsub | 5 ++--- scene/theme/SCsub | 3 +-- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/core/extension/SCsub b/core/extension/SCsub index 361ce43a2c6b..901ceec1e8d7 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 dc116aeb19d4..7c00bb719e3e 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 5a57f3840bd2..f38914434b21 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 a3ce773ac2f3..0802b528f4b0 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 135779582d76..59ef4ee85c4f 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 34c8f8e7a12c..18c5878a1abf 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 34f60b449d9a..5f62ae4b05a3 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), )