FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Thomas Nagy 2016-07-29 23:02:15 +02:00
parent 76eac19c02
commit 3169e0bd4b
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
waflib/extras/clang_compilation_database.py
View File

@ -15,15 +15,14 @@ Usage:
"""
import sys, os, json, shlex, pipes
from waflib import Logs, TaskGen
from waflib.Tools import c, cxx
from waflib import Logs, TaskGen, Task
if sys.hexversion >= 0x3030000:
quote = shlex.quote
else:
quote = pipes.quote
@TaskGen.feature('*')
@TaskGen.feature('c', 'cxx')
@TaskGen.after_method('process_use')
def collect_compilation_db_tasks(self):
"Add a compilation database entry for compiled tasks"
@ -33,8 +32,9 @@ def collect_compilation_db_tasks(self):
clang_db = self.bld.clang_compilation_database_tasks = []
self.bld.add_post_fun(write_compilation_database)
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, (c.c, cxx.cxx)):
if isinstance(task, tup):
clang_db.append(task)
def write_compilation_database(ctx):
@ -45,7 +45,7 @@ def write_compilation_database(ctx):
root = json.load(database_file)
except IOError:
root = []
clang_db = dict((x["file"], x) for x in root)
clang_db = dict((x['file'], x) for x in root)
for task in getattr(ctx, 'clang_compilation_database_tasks', []):
try:
cmd = task.last_cmd