From 8295486fdb99e9de9315a327148348f1b3ac0f3b Mon Sep 17 00:00:00 2001 From: Adam Scott Date: Mon, 4 Sep 2023 15:00:42 -0400 Subject: [PATCH] Refactor compiledb implementation This comment enables the possibility to build the "compile_commands.json" file by only using `scons -Q compiledb`. No need to use the argument `compiledb=yes`. And when using the `compiledb=yes`, it will create a "compiled_commands.json" automatically. (cherry picked from commit 2d5024ac8ec623b91308df6225028de30a9cf2d0) --- tools/godotcpp.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/godotcpp.py b/tools/godotcpp.py index ac680e15..2b0c19c3 100644 --- a/tools/godotcpp.py +++ b/tools/godotcpp.py @@ -263,9 +263,8 @@ def generate(env): env["OBJSUFFIX"] = suffix + env["OBJSUFFIX"] # compile_commands.json - if env.get("compiledb", False): - env.Tool("compilation_db") - env.Alias("compiledb", env.CompilationDatabase(normalize_path(env["compiledb_file"], env))) + env.Tool("compilation_db") + env.Alias("compiledb", env.CompilationDatabase(normalize_path(env["compiledb_file"], env))) # Builders env.Append(BUILDERS={"GodotCPPBindings": Builder(action=scons_generate_bindings, emitter=scons_emit_files)}) @@ -304,7 +303,13 @@ def _godot_cpp(env): if env["build_library"]: library = env.StaticLibrary(target=env.File("bin/%s" % library_name), source=sources) - env.Default(library) + default_args = [library] + + # Add compiledb if the option is set + if env.get("compiledb", False): + default_args += ["compiledb"] + + env.Default(*default_args) env.AppendUnique(LIBS=[env.File("bin/%s" % library_name)]) return library