diff options
author | Andrii Doroshenko (Xrayez) <xrayez@gmail.com> | 2020-07-27 21:00:26 +0300 |
---|---|---|
committer | Andrii Doroshenko (Xrayez) <xrayez@gmail.com> | 2020-07-28 00:09:21 +0300 |
commit | d86de6c98e435d31bfdebc50d2db6d4d4048be40 (patch) | |
tree | df495708bfab8bb48cc6926c34c0785ea996feb7 /main/SCsub | |
parent | f93c04d8efef1bdfff5d5839569eb7e22c667be6 (diff) |
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.
Diffstat (limited to 'main/SCsub')
-rw-r--r-- | main/SCsub | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/main/SCsub b/main/SCsub index 97f77840f1..ebadefd450 100644 --- a/main/SCsub +++ b/main/SCsub @@ -2,7 +2,6 @@ Import("env") -from platform_methods import run_in_subprocess import main_builders env.main_sources = [] @@ -15,15 +14,21 @@ if env["tests"]: env_main.Append(CPPDEFINES=["TESTS_ENABLED"]) env_main.Depends("#main/splash.gen.h", "#main/splash.png") -env_main.CommandNoCache("#main/splash.gen.h", "#main/splash.png", run_in_subprocess(main_builders.make_splash)) +env_main.CommandNoCache( + "#main/splash.gen.h", "#main/splash.png", env.Run(main_builders.make_splash, "Building splash screen header."), +) env_main.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png") env_main.CommandNoCache( - "#main/splash_editor.gen.h", "#main/splash_editor.png", run_in_subprocess(main_builders.make_splash_editor) + "#main/splash_editor.gen.h", + "#main/splash_editor.png", + env.Run(main_builders.make_splash_editor, "Building editor splash screen header."), ) env_main.Depends("#main/app_icon.gen.h", "#main/app_icon.png") -env_main.CommandNoCache("#main/app_icon.gen.h", "#main/app_icon.png", run_in_subprocess(main_builders.make_app_icon)) +env_main.CommandNoCache( + "#main/app_icon.gen.h", "#main/app_icon.png", env.Run(main_builders.make_app_icon, "Building application icon."), +) lib = env_main.add_library("main", env.main_sources) env.Prepend(LIBS=[lib]) |