KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Key compilation database by output as well

Browse Source
This commit is contained in:
Kovid Goyal 2017-11-21 05:12:26 +05:30
parent 3b0d8ec500
commit bcd4c64b8a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup.py
View File

@ -348,14 +348,15 @@ def compile_c_extension(kenv, module, incremental, compilation_database, sources
cflgs.extend(map(define, defines)) cflgs.extend(map(define, defines))
cmd = [kenv.cc, '-MMD'] + cflgs cmd = [kenv.cc, '-MMD'] + cflgs
cmd_changed = compilation_database.get(original_src, [])[:-4] != cmd key = original_src, os.path.basename(dest)
cmd_changed = compilation_database.get(key, [])[:-4] != cmd
must_compile = not incremental or cmd_changed must_compile = not incremental or cmd_changed
src = os.path.join(base, src) src = os.path.join(base, src)
if must_compile or newer( if must_compile or newer(
dest, *dependecies_for(src, dest, headers) dest, *dependecies_for(src, dest, headers)
): ):
cmd += ['-c', src] + ['-o', dest] cmd += ['-c', src] + ['-o', dest]
compilation_database[original_src] = cmd compilation_database[key] = cmd
todo[original_src] = cmd todo[original_src] = cmd
if todo: if todo:
parallel_run(todo) parallel_run(todo)
@ -449,7 +450,7 @@ def build(args, native_optimizations=True):
except FileNotFoundError: except FileNotFoundError:
compilation_database = [] compilation_database = []
compilation_database = { compilation_database = {
k['file']: k['arguments'] for k in compilation_database (k['file'], k.get('output')): k['arguments'] for k in compilation_database
} }
env = init_env(args.debug, args.sanitize, native_optimizations, args.profile) env = init_env(args.debug, args.sanitize, native_optimizations, args.profile)
compile_c_extension( compile_c_extension(
@ -457,7 +458,7 @@ def build(args, native_optimizations=True):
) )
compile_glfw(args.incremental, compilation_database) compile_glfw(args.incremental, compilation_database)
compilation_database = [ compilation_database = [
{'file': k, 'arguments': v, 'directory': base} for k, v in compilation_database.items() {'file': k[0], 'arguments': v, 'directory': base, 'output': k[1]} for k, v in compilation_database.items()
] ]
with open('compile_commands.json', 'w') as f: with open('compile_commands.json', 'w') as f:
json.dump(compilation_database, f, indent=2, sort_keys=True) json.dump(compilation_database, f, indent=2, sort_keys=True)