From 581deb6073754a4b3f543963d1b666967b6f7208 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 18 May 2019 19:10:34 +0200 Subject: [PATCH] Rename linux-launcher -> launcher Since the launcher is also used on macOS, rename it to something more generic. --- linux-launcher.c => launcher.c | 2 +- setup.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename linux-launcher.c => launcher.c (99%) diff --git a/linux-launcher.c b/launcher.c similarity index 99% rename from linux-launcher.c rename to launcher.c index 0d1a771a1..6dfa2c531 100644 --- a/linux-launcher.c +++ b/launcher.c @@ -1,5 +1,5 @@ /* - * linux-launcher.c + * launcher.c * Copyright (C) 2017 Kovid Goyal * * Distributed under terms of the GPL3 license. diff --git a/setup.py b/setup.py index 99d5c4c18..b6312cd41 100755 --- a/setup.py +++ b/setup.py @@ -546,7 +546,7 @@ def build_asan_launcher(args): 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() cppflags = [] libs = [] @@ -569,7 +569,7 @@ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=F if for_freeze: ldflags += ['-Wl,-rpath,$ORIGIN/../lib'] cmd = [env.cc] + cppflags + cflags + [ - 'linux-launcher.c', '-o', + 'launcher.c', '-o', os.path.join(launcher_dir, exe) ] + ldflags + libs + pylib 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')) launcher_dir = os.path.join(ddir, 'bin') 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 copy_man_pages(ddir) copy_html_docs(ddir) @@ -874,7 +874,7 @@ def main(): if args.sanitize: build_asan_launcher(args) if args.profile: - build_linux_launcher(args) + build_launcher(args) print('kitty profile executable is', 'kitty-profile') elif args.action == 'test': os.execlp(