summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Jin <bjin@ctrl-d.org>2018-05-13 22:46:57 +0800
committersfan5 <sfan5@live.de>2018-05-17 13:23:26 +0200
commitd65b6cf077a6ae7132814f0111b3e7a26760ec66 (patch)
tree7c32ff67fb06fdfd948538553521a4af7eb1fda8
parentc0eea89b4d9625975578626cc4531a5f7b22fc4a (diff)
downloadmpv-d65b6cf077a6ae7132814f0111b3e7a26760ec66.tar.bz2
mpv-d65b6cf077a6ae7132814f0111b3e7a26760ec66.tar.xz
waftools: update clang_compilation_database
The old copy is broken with waf-1.9.8, update to the latest commit (waf-project/waf@5e4b86b81df3b9819738d757eb8d2c8646ef0ede) instead.
-rw-r--r--waftools/clang_compilation_database.py46
1 files changed, 33 insertions, 13 deletions
diff --git a/waftools/clang_compilation_database.py b/waftools/clang_compilation_database.py
index 1834767967..558b88a4a6 100644
--- a/waftools/clang_compilation_database.py
+++ b/waftools/clang_compilation_database.py
@@ -2,7 +2,7 @@
# encoding: utf-8
# Christoph Koke, 2013
# Original source: waflib/extras/clang_compilation_database.py from
-# waf git 15d14c7bdf2e (New BSD License)
+# waf git 5e4b86b81df3 (New BSD License)
"""
Writes the c and cpp compile commands into build/compile_commands.json
@@ -17,15 +17,11 @@ 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
+Task.Task.keep_last_cmd = True
-@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"
@@ -35,19 +31,20 @@ 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):
"Write the clang compilation database as JSON"
database_file = ctx.bldnode.make_node('compile_commands.json')
- Logs.info("Build commands will be stored in %s" % database_file.path_from(ctx.path))
+ Logs.info('Build commands will be stored in %s', database_file.path_from(ctx.path))
try:
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
@@ -56,12 +53,35 @@ def write_compilation_database(ctx):
directory = getattr(task, 'cwd', ctx.variant_dir)
f_node = task.inputs[0]
filename = os.path.relpath(f_node.abspath(), directory)
- cmd = " ".join(map(quote, cmd))
entry = {
"directory": directory,
- "command": cmd,
+ "arguments": cmd,
"file": filename,
}
clang_db[filename] = entry
root = list(clang_db.values())
database_file.write(json.dumps(root, indent=2))
+
+# Override the runnable_status function to do a dummy/dry run when the file doesn't need to be compiled.
+# This will make sure compile_commands.json is always fully up to date.
+# Previously you could end up with a partial compile_commands.json if the build failed.
+for x in ('c', 'cxx'):
+ if x not in Task.classes:
+ continue
+
+ t = Task.classes[x]
+
+ def runnable_status(self):
+ def exec_command(cmd, **kw):
+ pass
+
+ run_status = self.old_runnable_status()
+ if run_status == Task.SKIP_ME:
+ setattr(self, 'old_exec_command', getattr(self, 'exec_command', None))
+ setattr(self, 'exec_command', exec_command)
+ self.run()
+ setattr(self, 'exec_command', getattr(self, 'old_exec_command', None))
+ return run_status
+
+ setattr(t, 'old_runnable_status', getattr(t, 'runnable_status', None))
+ setattr(t, 'runnable_status', runnable_status)