Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
8ad648f5
Unverified
Commit
8ad648f5
authored
May 18, 2020
by
Rémi Verschelde
Committed by
GitHub
May 18, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #38830 from akien-mga/scons-compilationdb-check
SCons: Improve registration of compilation_db tool, check version
parents
d0cc9a74
22c718ab
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
SConstruct
SConstruct
+5
-6
compilation_db.py
misc/scons/compilation_db.py
+0
-0
No files found.
SConstruct
View file @
8ad648f5
...
@@ -272,13 +272,12 @@ if selected_platform in platform_list:
...
@@ -272,13 +272,12 @@ 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"
]:
...
...
misc/scons/
site_tools/
compilation_db.py
→
misc/scons/compilation_db.py
View file @
8ad648f5
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment