diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-04 13:32:38 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-04 13:32:38 +0100 |
commit | 5d3369e095ff0a89e11dc24b038076e969473304 (patch) | |
tree | ab2b124ea4b05619fa0b70f42ade2544027b628a /modules | |
parent | 1598af566803f06d852b229c365aaf8a359edd8e (diff) | |
parent | 0ce9b6fd1d72139921ad3a20cb1933eb35873eb8 (diff) | |
download | redot-engine-5d3369e095ff0a89e11dc24b038076e969473304.tar.gz |
Merge pull request #85153 from Repiteo/scons-improve-logs
SCons: Add two new `COMSTR` environment variables
Diffstat (limited to 'modules')
-rw-r--r-- | modules/SCsub | 2 | ||||
-rw-r--r-- | modules/gdscript/editor/script_templates/SCsub | 2 | ||||
-rw-r--r-- | modules/mono/editor/script_templates/SCsub | 2 | ||||
-rw-r--r-- | modules/text_server_adv/gdextension_build/methods.py | 8 | ||||
-rw-r--r-- | modules/text_server_fb/gdextension_build/methods.py | 8 |
5 files changed, 18 insertions, 4 deletions
diff --git a/modules/SCsub b/modules/SCsub index 7c9946170f..87c59c3bcc 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -19,7 +19,6 @@ env.CommandNoCache( Value(env.module_list), env.Run( modules_builders.generate_modules_enabled, - "Generating enabled modules header.", # NOTE: No need to run in subprocess since this is still executed serially. subprocess=False, ), @@ -58,7 +57,6 @@ if env["tests"]: test_headers, env.Run( modules_builders.generate_modules_tests, - "Generating modules tests header.", # NOTE: No need to run in subprocess since this is still executed serially. subprocess=False, ), diff --git a/modules/gdscript/editor/script_templates/SCsub b/modules/gdscript/editor/script_templates/SCsub index 2266ef2d01..5db7e3fc3b 100644 --- a/modules/gdscript/editor/script_templates/SCsub +++ b/modules/gdscript/editor/script_templates/SCsub @@ -5,7 +5,7 @@ Import("env") import editor.template_builders as build_template_gd env["BUILDERS"]["MakeGDTemplateBuilder"] = Builder( - action=env.Run(build_template_gd.make_templates, "Generating GDScript templates header."), + action=env.Run(build_template_gd.make_templates), suffix=".h", src_suffix=".gd", ) diff --git a/modules/mono/editor/script_templates/SCsub b/modules/mono/editor/script_templates/SCsub index 39f6cb5c01..01c293c25d 100644 --- a/modules/mono/editor/script_templates/SCsub +++ b/modules/mono/editor/script_templates/SCsub @@ -5,7 +5,7 @@ Import("env") import editor.template_builders as build_template_cs env["BUILDERS"]["MakeCSharpTemplateBuilder"] = Builder( - action=env.Run(build_template_cs.make_templates, "Generating C# templates header."), + action=env.Run(build_template_cs.make_templates), suffix=".h", src_suffix=".cs", ) diff --git a/modules/text_server_adv/gdextension_build/methods.py b/modules/text_server_adv/gdextension_build/methods.py index e58bc3abec..327097a3df 100644 --- a/modules/text_server_adv/gdextension_build/methods.py +++ b/modules/text_server_adv/gdextension_build/methods.py @@ -42,6 +42,12 @@ def no_verbose(sys, env): java_library_message = "{}Creating Java Archive {}$TARGET{} ...{}".format( colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"] ) + compiled_resource_message = "{}Creating Compiled Resource {}$TARGET{} ...{}".format( + colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"] + ) + generated_file_message = "{}Generating {}$TARGET{} ...{}".format( + colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"] + ) env.Append(CXXCOMSTR=[compile_source_message]) env.Append(CCCOMSTR=[compile_source_message]) @@ -53,6 +59,8 @@ def no_verbose(sys, env): env.Append(LINKCOMSTR=[link_program_message]) env.Append(JARCOMSTR=[java_library_message]) env.Append(JAVACCOMSTR=[java_compile_source_message]) + env.Append(RCCOMSTR=[compiled_resource_message]) + env.Append(GENCOMSTR=[generated_file_message]) def disable_warnings(self): diff --git a/modules/text_server_fb/gdextension_build/methods.py b/modules/text_server_fb/gdextension_build/methods.py index e58bc3abec..327097a3df 100644 --- a/modules/text_server_fb/gdextension_build/methods.py +++ b/modules/text_server_fb/gdextension_build/methods.py @@ -42,6 +42,12 @@ def no_verbose(sys, env): java_library_message = "{}Creating Java Archive {}$TARGET{} ...{}".format( colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"] ) + compiled_resource_message = "{}Creating Compiled Resource {}$TARGET{} ...{}".format( + colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"] + ) + generated_file_message = "{}Generating {}$TARGET{} ...{}".format( + colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"] + ) env.Append(CXXCOMSTR=[compile_source_message]) env.Append(CCCOMSTR=[compile_source_message]) @@ -53,6 +59,8 @@ def no_verbose(sys, env): env.Append(LINKCOMSTR=[link_program_message]) env.Append(JARCOMSTR=[java_library_message]) env.Append(JAVACCOMSTR=[java_compile_source_message]) + env.Append(RCCOMSTR=[compiled_resource_message]) + env.Append(GENCOMSTR=[generated_file_message]) def disable_warnings(self): |