Implement `verbose` toggle from godot repo
parent
b02124595f
commit
b05c21bb1d
|
@ -134,22 +134,22 @@ jobs:
|
||||||
|
|
||||||
- name: Generate godot-cpp sources only
|
- name: Generate godot-cpp sources only
|
||||||
run: |
|
run: |
|
||||||
scons platform=${{ matrix.platform }} build_library=no ${{ matrix.flags }}
|
scons platform=${{ matrix.platform }} verbose=yes build_library=no ${{ matrix.flags }}
|
||||||
scons -c
|
scons -c
|
||||||
|
|
||||||
- name: Build godot-cpp (debug)
|
- name: Build godot-cpp (debug)
|
||||||
run: |
|
run: |
|
||||||
scons platform=${{ matrix.platform }} target=template_debug ${{ matrix.flags }}
|
scons platform=${{ matrix.platform }} verbose=yes target=template_debug ${{ matrix.flags }}
|
||||||
|
|
||||||
- name: Build test without rebuilding godot-cpp (debug)
|
- name: Build test without rebuilding godot-cpp (debug)
|
||||||
run: |
|
run: |
|
||||||
cd test
|
cd test
|
||||||
scons platform=${{ matrix.platform }} target=template_debug ${{ matrix.flags }} build_library=no
|
scons platform=${{ matrix.platform }} verbose=yes target=template_debug ${{ matrix.flags }} build_library=no
|
||||||
|
|
||||||
- name: Build test and godot-cpp (release)
|
- name: Build test and godot-cpp (release)
|
||||||
run: |
|
run: |
|
||||||
cd test
|
cd test
|
||||||
scons platform=${{ matrix.platform }} target=template_release ${{ matrix.flags }}
|
scons platform=${{ matrix.platform }} verbose=yes target=template_release ${{ matrix.flags }}
|
||||||
|
|
||||||
- name: Download latest Godot artifacts
|
- name: Download latest Godot artifacts
|
||||||
uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9
|
uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9
|
||||||
|
|
|
@ -3,6 +3,7 @@ import os, sys, platform
|
||||||
from SCons.Variables import EnumVariable, PathVariable, BoolVariable
|
from SCons.Variables import EnumVariable, PathVariable, BoolVariable
|
||||||
from SCons.Variables.BoolVariable import _text2bool
|
from SCons.Variables.BoolVariable import _text2bool
|
||||||
from SCons.Tool import Tool
|
from SCons.Tool import Tool
|
||||||
|
from SCons.Action import Action
|
||||||
from SCons.Builder import Builder
|
from SCons.Builder import Builder
|
||||||
from SCons.Errors import UserError
|
from SCons.Errors import UserError
|
||||||
from SCons.Script import ARGUMENTS
|
from SCons.Script import ARGUMENTS
|
||||||
|
@ -66,6 +67,67 @@ def get_custom_platforms(env):
|
||||||
return platforms
|
return platforms
|
||||||
|
|
||||||
|
|
||||||
|
def no_verbose(env):
|
||||||
|
colors = {}
|
||||||
|
|
||||||
|
# Colors are disabled in non-TTY environments such as pipes. This means
|
||||||
|
# that if output is redirected to a file, it will not contain color codes
|
||||||
|
if sys.stdout.isatty():
|
||||||
|
colors["blue"] = "\033[0;94m"
|
||||||
|
colors["bold_blue"] = "\033[1;94m"
|
||||||
|
colors["reset"] = "\033[0m"
|
||||||
|
else:
|
||||||
|
colors["blue"] = ""
|
||||||
|
colors["bold_blue"] = ""
|
||||||
|
colors["reset"] = ""
|
||||||
|
|
||||||
|
# There is a space before "..." to ensure that source file names can be
|
||||||
|
# Ctrl + clicked in the VS Code terminal.
|
||||||
|
compile_source_message = "{}Compiling {}$SOURCE{} ...{}".format(
|
||||||
|
colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"]
|
||||||
|
)
|
||||||
|
java_compile_source_message = "{}Compiling {}$SOURCE{} ...{}".format(
|
||||||
|
colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"]
|
||||||
|
)
|
||||||
|
compile_shared_source_message = "{}Compiling shared {}$SOURCE{} ...{}".format(
|
||||||
|
colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"]
|
||||||
|
)
|
||||||
|
link_program_message = "{}Linking Program {}$TARGET{} ...{}".format(
|
||||||
|
colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"]
|
||||||
|
)
|
||||||
|
link_library_message = "{}Linking Static Library {}$TARGET{} ...{}".format(
|
||||||
|
colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"]
|
||||||
|
)
|
||||||
|
ranlib_library_message = "{}Ranlib Library {}$TARGET{} ...{}".format(
|
||||||
|
colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"]
|
||||||
|
)
|
||||||
|
link_shared_library_message = "{}Linking Shared Library {}$TARGET{} ...{}".format(
|
||||||
|
colors["blue"], colors["bold_blue"], colors["blue"], colors["reset"]
|
||||||
|
)
|
||||||
|
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])
|
||||||
|
env.Append(SHCCCOMSTR=[compile_shared_source_message])
|
||||||
|
env.Append(SHCXXCOMSTR=[compile_shared_source_message])
|
||||||
|
env.Append(ARCOMSTR=[link_library_message])
|
||||||
|
env.Append(RANLIBCOMSTR=[ranlib_library_message])
|
||||||
|
env.Append(SHLINKCOMSTR=[link_shared_library_message])
|
||||||
|
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])
|
||||||
|
|
||||||
|
|
||||||
platforms = ["linux", "macos", "windows", "android", "ios", "web"]
|
platforms = ["linux", "macos", "windows", "android", "ios", "web"]
|
||||||
|
|
||||||
# CPU architecture options.
|
# CPU architecture options.
|
||||||
|
@ -254,6 +316,7 @@ def options(opts, env):
|
||||||
)
|
)
|
||||||
opts.Add(BoolVariable("debug_symbols", "Build with debugging symbols", True))
|
opts.Add(BoolVariable("debug_symbols", "Build with debugging symbols", True))
|
||||||
opts.Add(BoolVariable("dev_build", "Developer build with dev-only debugging code (DEV_ENABLED)", False))
|
opts.Add(BoolVariable("dev_build", "Developer build with dev-only debugging code (DEV_ENABLED)", False))
|
||||||
|
opts.Add(BoolVariable("verbose", "Enable verbose output for the compilation", False))
|
||||||
|
|
||||||
# Add platform options (custom tools can override platforms)
|
# Add platform options (custom tools can override platforms)
|
||||||
for pl in sorted(set(platforms + custom_platforms)):
|
for pl in sorted(set(platforms + custom_platforms)):
|
||||||
|
@ -381,8 +444,16 @@ def generate(env):
|
||||||
env.Tool("compilation_db")
|
env.Tool("compilation_db")
|
||||||
env.Alias("compiledb", env.CompilationDatabase(normalize_path(env["compiledb_file"], env)))
|
env.Alias("compiledb", env.CompilationDatabase(normalize_path(env["compiledb_file"], env)))
|
||||||
|
|
||||||
|
# Formatting
|
||||||
|
if not env["verbose"]:
|
||||||
|
no_verbose(env)
|
||||||
|
|
||||||
# Builders
|
# Builders
|
||||||
env.Append(BUILDERS={"GodotCPPBindings": Builder(action=scons_generate_bindings, emitter=scons_emit_files)})
|
env.Append(
|
||||||
|
BUILDERS={
|
||||||
|
"GodotCPPBindings": Builder(action=Action(scons_generate_bindings, "$GENCOMSTR"), emitter=scons_emit_files)
|
||||||
|
}
|
||||||
|
)
|
||||||
env.AddMethod(_godot_cpp, "GodotCPP")
|
env.AddMethod(_godot_cpp, "GodotCPP")
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue