Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCons: Convert remaining run_in_subprocess to env.Run

Browse Source
This commit is contained in:
Thaddeus Crews 2024-03-10 14:01:23 -05:00
parent 0ace0a1292
commit 8116d70d4b
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/extension/SCsub
View File

@ -4,13 +4,12 @@ Import("env")
import make_wrappers import make_wrappers
import make_interface_dumper 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( env.CommandNoCache(
"gdextension_interface_dump.gen.h", "gdextension_interface_dump.gen.h",
["gdextension_interface.h", "make_interface_dumper.py"], ["gdextension_interface.h", "make_interface_dumper.py"],
run_in_subprocess(make_interface_dumper.run), env.Run(make_interface_dumper.run),
) )
env_extension = env.Clone() env_extension = env.Clone()

3
core/object/SCsub
View File

@ -3,9 +3,8 @@
Import("env") Import("env")
import make_virtuals 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() env_object = env.Clone()

2
platform/ios/SCsub
View File

@ -3,7 +3,7 @@
Import("env") Import("env")
import os, json 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 subprocess
import shutil import shutil

3
platform/linuxbsd/SCsub
View File

@ -2,7 +2,6 @@
Import("env") Import("env")
from platform_methods import run_in_subprocess
import platform_linuxbsd_builders import platform_linuxbsd_builders
common_linuxbsd = [ common_linuxbsd = [
@ -42,4 +41,4 @@ if env["dbus"]:
prog = env.add_program("#bin/godot", ["godot_linuxbsd.cpp"] + common_linuxbsd) prog = env.add_program("#bin/godot", ["godot_linuxbsd.cpp"] + common_linuxbsd)
if env["debug_symbols"] and env["separate_debug_symbols"]: 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))

4
platform/macos/SCsub
View File

@ -3,7 +3,7 @@
Import("env") Import("env")
import os, json 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 platform_macos_builders
import subprocess import subprocess
import shutil import shutil
@ -125,7 +125,7 @@ files = [
prog = env.add_program("#bin/godot", files) prog = env.add_program("#bin/godot", files)
if env["debug_symbols"] and env["separate_debug_symbols"]: 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"]: if env["generate_bundle"]:
generate_bundle_command = env.Command("generate_bundle", [], generate_bundle) generate_bundle_command = env.Command("generate_bundle", [], generate_bundle)

5
platform/windows/SCsub
View File

@ -4,7 +4,6 @@ Import("env")
import os import os
from pathlib import Path from pathlib import Path
from platform_methods import run_in_subprocess
import platform_windows_builders import platform_windows_builders
sources = [] sources = []
@ -135,8 +134,8 @@ if env["d3d12"]:
if not os.getenv("VCINSTALLDIR"): if not os.getenv("VCINSTALLDIR"):
if env["debug_symbols"]: 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": 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 env.platform_sources += sources

3
scene/theme/SCsub
View File

@ -2,7 +2,6 @@
Import("env") Import("env")
from platform_methods import run_in_subprocess
import default_theme_builders import default_theme_builders
@ -14,5 +13,5 @@ env.Depends("#scene/theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiB
env.CommandNoCache( env.CommandNoCache(
"#scene/theme/default_font.gen.h", "#scene/theme/default_font.gen.h",
"#thirdparty/fonts/OpenSans_SemiBold.woff2", "#thirdparty/fonts/OpenSans_SemiBold.woff2",
run_in_subprocess(default_theme_builders.make_fonts_header), env.Run(default_theme_builders.make_fonts_header),
) )