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

Also redo linking if the link command changes

Browse Source
This commit is contained in:
Kovid Goyal 2019-07-05 19:09:10 +05:30
parent c3e210c80f
commit 93b62c4dfd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ build
linux-package linux-package
kitty.app kitty.app
compile_commands.json compile_commands.json
link_commands.json
glad/out glad/out
kitty/launcher kitty/launcher
*.dSYM *.dSYM

13
setup.py
View File

@ -421,7 +421,7 @@ class CompilationDatabase:
self.link_commands = [] self.link_commands = []
def add_command(self, desc, cmd, is_newer_func, key=None, on_success=None, keyfile=None): def add_command(self, desc, cmd, is_newer_func, key=None, on_success=None, keyfile=None):
queue = self.link_commands if key is None else self.compile_commands queue = self.link_commands if keyfile is None else self.compile_commands
queue.append(Command(desc, cmd, is_newer_func, on_success, key, keyfile)) queue.append(Command(desc, cmd, is_newer_func, on_success, key, keyfile))
def build_all(self): def build_all(self):
@ -450,15 +450,22 @@ class CompilationDatabase:
def __enter__(self): def __enter__(self):
self.all_keys = set() self.all_keys = set()
self.dbpath = os.path.abspath('compile_commands.json') self.dbpath = os.path.abspath('compile_commands.json')
self.linkdbpath = os.path.join(os.path.dirname(self.dbpath), 'link_commands.json')
try: try:
with open(self.dbpath) as f: with open(self.dbpath) as f:
compilation_database = json.load(f) compilation_database = json.load(f)
except FileNotFoundError: except FileNotFoundError:
compilation_database = [] compilation_database = []
try:
with open(self.linkdbpath) as f:
link_database = json.load(f)
except FileNotFoundError:
link_database = []
compilation_database = { compilation_database = {
CompileKey(k['file'], k['output']): k['arguments'] for k in compilation_database CompileKey(k['file'], k['output']): k['arguments'] for k in compilation_database
} }
self.db = compilation_database self.db = compilation_database
self.linkdb = {k['output']: k['arguments'] for k in link_database}
return self return self
def __exit__(self, *a): def __exit__(self, *a):
@ -470,6 +477,8 @@ class CompilationDatabase:
] ]
with open(self.dbpath, 'w') as f: with open(self.dbpath, 'w') as f:
json.dump(compilation_database, f, indent=2, sort_keys=True) json.dump(compilation_database, f, indent=2, sort_keys=True)
with open(self.linkdbpath, 'w') as f:
json.dump([{'output': c.key, 'arguments': c.cmd, 'directory': base} for c in self.link_commands], f, indent=2, sort_keys=True)
def compile_c_extension(kenv, module, compilation_database, sources, headers, desc_prefix=''): def compile_c_extension(kenv, module, compilation_database, sources, headers, desc_prefix=''):
@ -508,7 +517,7 @@ def compile_c_extension(kenv, module, compilation_database, sources, headers, de
def on_success(): def on_success():
os.rename(dest, real_dest) os.rename(dest, real_dest)
compilation_database.add_command(desc, cmd, partial(newer, real_dest, *objects), on_success=on_success) compilation_database.add_command(desc, cmd, partial(newer, real_dest, *objects), on_success=on_success, key=module + '.so')
def find_c_files(): def find_c_files():