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

Rename linux-launcher -> launcher

Browse Source 
Since the launcher is also used on macOS, rename it to something more generic.
This commit is contained in:
Luflosi 2019-05-18 19:10:34 +02:00
parent 9849a69afd
commit 581deb6073
No known key found for this signature in database
GPG Key ID: 14140F703B7D8362
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-launcher.c → launcher.c
View File

@ -1,5 +1,5 @@
/* /*
* linux-launcher.c * launcher.c
* Copyright (C) 2017 Kovid Goyal <kovid at kovidgoyal.net> * Copyright (C) 2017 Kovid Goyal <kovid at kovidgoyal.net>
* *
* Distributed under terms of the GPL3 license. * Distributed under terms of the GPL3 license.

8
setup.py
View File

@ -546,7 +546,7 @@ def build_asan_launcher(args):
run_tool(cmd, desc='Creating {} ...'.format(emphasis('asan-launcher'))) run_tool(cmd, desc='Creating {} ...'.format(emphasis('asan-launcher')))
def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False): def build_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
cflags = '-Wall -Werror -fpie'.split() cflags = '-Wall -Werror -fpie'.split()
cppflags = [] cppflags = []
libs = [] libs = []
@ -569,7 +569,7 @@ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=F
if for_freeze: if for_freeze:
ldflags += ['-Wl,-rpath,$ORIGIN/../lib'] ldflags += ['-Wl,-rpath,$ORIGIN/../lib']
cmd = [env.cc] + cppflags + cflags + [ cmd = [env.cc] + cppflags + cflags + [
'linux-launcher.c', '-o', 'launcher.c', '-o',
os.path.join(launcher_dir, exe) os.path.join(launcher_dir, exe)
] + ldflags + libs + pylib ] + ldflags + libs + pylib
run_tool(cmd) run_tool(cmd)
@ -666,7 +666,7 @@ def package(args, for_bundle=False, sh_launcher=False):
shutil.copy2('kitty/launcher/kitty', os.path.join(libdir, 'kitty', 'launcher')) shutil.copy2('kitty/launcher/kitty', os.path.join(libdir, 'kitty', 'launcher'))
launcher_dir = os.path.join(ddir, 'bin') launcher_dir = os.path.join(ddir, 'bin')
safe_makedirs(launcher_dir) safe_makedirs(launcher_dir)
build_linux_launcher(args, launcher_dir, for_bundle, sh_launcher, args.for_freeze) build_launcher(args, launcher_dir, for_bundle, sh_launcher, args.for_freeze)
if not is_macos: # {{{ linux desktop gunk if not is_macos: # {{{ linux desktop gunk
copy_man_pages(ddir) copy_man_pages(ddir)
copy_html_docs(ddir) copy_html_docs(ddir)
@ -874,7 +874,7 @@ def main():
if args.sanitize: if args.sanitize:
build_asan_launcher(args) build_asan_launcher(args)
if args.profile: if args.profile:
build_linux_launcher(args) build_launcher(args)
print('kitty profile executable is', 'kitty-profile') print('kitty profile executable is', 'kitty-profile')
elif args.action == 'test': elif args.action == 'test':
os.execlp( os.execlp(