mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-09 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38830 from akien-mga/scons-compilationdb-check

Browse Source 
SCons: Improve registration of compilation_db tool, check version
This commit is contained in:
Rémi Verschelde 2020-05-18 15:04:41 +02:00 committed by GitHub
commit 8ad648f5bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SConstruct
View File

@ -272,14 +272,13 @@ if selected_platform in platform_list:
else: else:
env = env_base.Clone() env = env_base.Clone()
# Custom tools are loaded automatically by SCons from site_scons/site_tools, # Compilation DB requires SCons 3.1.1+.
# but we want to use a different folder, so we register it manually. from SCons import __version__ as scons_raw_version
from SCons.Script.Main import _load_site_scons_dir
_load_site_scons_dir(".", "misc/scons") scons_ver = env._get_major_minor_revision(scons_raw_version)
if scons_ver >= (3, 1, 1):
env.Tool("compilation_db") env.Tool("compilation_db", toolpath=["misc/scons"])
env.Alias("compiledb", env.CompilationDatabase("compile_commands.json")) env.Alias("compiledb", env.CompilationDatabase("compile_commands.json"))
if env["dev"]: if env["dev"]:
env["verbose"] = True env["verbose"] = True

0
misc/scons/site_tools/compilation_db.py → misc/scons/compilation_db.py
View File