You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
SCons: Refactor running commands through builders
A new `env.Run` method is added which allows to control the verbosity of builders output automatically depending on whether the "verbose" option is set. It also allows to optionally run any SCons commands in a subprocess using the existing `run_in_subprocess` method, unifying the interface. `Action` objects wrap all builder functions to include a short build message associated with any action. Notably, this removes quite verbose output generated by `make_doc_header` and `make_editor_icons_action` builders.
This commit is contained in:
13
methods.py
13
methods.py
@@ -4,6 +4,11 @@ import glob
|
||||
import subprocess
|
||||
from collections import OrderedDict
|
||||
|
||||
# We need to define our own `Action` method to control the verbosity of output
|
||||
# and whenever we need to run those commands in a subprocess on some platforms.
|
||||
from SCons.Script import Action
|
||||
from platform_methods import run_in_subprocess
|
||||
|
||||
|
||||
def add_source_files(self, sources, files, warn_duplicates=True):
|
||||
# Convert string to list of absolute paths (including expanding wildcard)
|
||||
@@ -621,6 +626,14 @@ def CommandNoCache(env, target, sources, command, **args):
|
||||
return result
|
||||
|
||||
|
||||
def Run(env, function, short_message, subprocess=True):
|
||||
output_print = short_message if not env["verbose"] else ""
|
||||
if not subprocess:
|
||||
return Action(function, output_print)
|
||||
else:
|
||||
return Action(run_in_subprocess(function), output_print)
|
||||
|
||||
|
||||
def detect_darwin_sdk_path(platform, env):
|
||||
sdk_name = ""
|
||||
if platform == "osx":
|
||||
|
||||
Reference in New Issue
Block a user