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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2022-06-01 08:47:19 +05:30
parent 5c4abe749b
commit 56f8a06362
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
setup.py
View File

@ -19,8 +19,8 @@ from contextlib import suppress
from functools import lru_cache, partial from functools import lru_cache, partial
from pathlib import Path from pathlib import Path
from typing import ( from typing import (
Callable, Dict, FrozenSet, Iterable, Iterator, List, Optional, Sequence, Callable, Dict, FrozenSet, Iterable, List, Optional, Sequence, Set, Tuple,
Set, Tuple, Union Union
) )
from glfw import glfw from glfw import glfw
@ -500,20 +500,14 @@ def get_vcs_rev_defines(env: Env, src: str) -> List[str]:
return ans return ans
def get_library_defines(env: Env, src: str) -> Optional[List[str]]: def get_source_specific_defines(env: Env, src: str) -> Tuple[str, Optional[List[str]]]:
try: if src == 'kitty/parser_dump.c':
return env.library_paths[src] return 'kitty/parser.c', ['DUMP_COMMANDS']
except KeyError: if src == 'kitty/data-types.c':
return None return src, get_vcs_rev_defines(env, src)
with suppress(KeyError):
return src, env.library_paths[src]
SPECIAL_SOURCES: Dict[str, Tuple[str, Union[List[str], Callable[[Env, str], Union[Optional[List[str]], Iterator[str]]]]]] = { return src, None
'glfw/egl_context.c': ('glfw/egl_context.c', get_library_defines),
'kitty/desktop.c': ('kitty/desktop.c', get_library_defines),
'kitty/fontconfig.c': ('kitty/fontconfig.c', get_library_defines),
'kitty/parser_dump.c': ('kitty/parser.c', ['DUMP_COMMANDS']),
'kitty/data-types.c': ('kitty/data-types.c', get_vcs_rev_defines),
}
def newer(dest: str, *sources: str) -> bool: def newer(dest: str, *sources: str) -> bool:
@ -699,13 +693,9 @@ def compile_c_extension(
for original_src, dest in zip(sources, objects): for original_src, dest in zip(sources, objects):
src = original_src src = original_src
cppflags = kenv.cppflags[:] cppflags = kenv.cppflags[:]
is_special = src in SPECIAL_SOURCES src, defines = get_source_specific_defines(kenv, src)
if is_special: if defines is not None:
src, defines_ = SPECIAL_SOURCES[src] cppflags.extend(map(define, defines))
defines = defines_(kenv, src) if callable(defines_) else defines_
if defines is not None:
cppflags.extend(map(define, defines))
cmd = kenv.cc + ['-MMD'] + cppflags + kenv.cflags cmd = kenv.cc + ['-MMD'] + cppflags + kenv.cflags
cmd += ['-c', src] + ['-o', dest] cmd += ['-c', src] + ['-o', dest]
key = CompileKey(original_src, os.path.basename(dest)) key = CompileKey(original_src, os.path.basename(dest))