2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-26 20:01:13 +01:00

Increase clang_compilation_database and swig compatibility

This commit is contained in:
Thomas Nagy 2021-01-13 17:39:52 +01:00
parent 0c31d99614
commit 99a041cb36

View File

@ -29,22 +29,9 @@ from waflib import Logs, TaskGen, Task, Build, Scripting
Task.Task.keep_last_cmd = True
@TaskGen.feature('c', 'cxx')
@TaskGen.after_method('process_use')
def collect_compilation_db_tasks(self):
"Add a compilation database entry for compiled tasks"
if not isinstance(self.bld, ClangDbContext):
return
tup = tuple(y for y in [Task.classes.get(x) for x in ('c', 'cxx')] if y)
for task in getattr(self, 'compiled_tasks', []):
if isinstance(task, tup):
self.bld.clang_compilation_database_tasks.append(task)
class ClangDbContext(Build.BuildContext):
'''generates compile_commands.json by request'''
cmd = 'clangdb'
clang_compilation_database_tasks = []
def write_compilation_database(self):
"""
@ -78,6 +65,8 @@ class ClangDbContext(Build.BuildContext):
Build dry run
"""
self.restore()
self.cur_tasks = []
self.clang_compilation_database_tasks = []
if not self.all_envs:
self.load_envs()
@ -103,8 +92,14 @@ class ClangDbContext(Build.BuildContext):
lst = [tg]
else: lst = tg.tasks
for tsk in lst:
if tsk.__class__.__name__ == "swig":
tsk.runnable_status()
if hasattr(tsk, 'more_tasks'):
lst.extend(tsk.more_tasks)
tup = tuple(y for y in [Task.classes.get(x) for x in ('c', 'cxx')] if y)
if isinstance(tsk, tup):
self.clang_compilation_database_tasks.append(tsk)
tsk.nocache = True
old_exec = tsk.exec_command
tsk.exec_command = exec_command