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

Get linux freeze working

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-16 22:28:28 +05:30
parent fb4c7db25e
commit 54fd2c6773
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
setup.py
View File

@ -336,7 +336,8 @@ def init_env(
extra_include_dirs: Iterable[str] = (), extra_include_dirs: Iterable[str] = (),
ignore_compiler_warnings: bool = False, ignore_compiler_warnings: bool = False,
build_universal_binary: bool = False, build_universal_binary: bool = False,
extra_library_dirs: Iterable[str] = () extra_library_dirs: Iterable[str] = (),
verbose: bool = True
) -> Env: ) -> Env:
native_optimizations = native_optimizations and not sanitize and not debug native_optimizations = native_optimizations and not sanitize and not debug
if native_optimizations and is_macos and is_arm: if native_optimizations and is_macos and is_arm:
@ -344,7 +345,8 @@ def init_env(
# -march=native is not supported when targeting Apple Silicon # -march=native is not supported when targeting Apple Silicon
native_optimizations = False native_optimizations = False
cc, ccver = cc_version() cc, ccver = cc_version()
print('CC:', cc, ccver) if verbose:
print('CC:', cc, ccver)
stack_protector = first_successful_compile(cc, '-fstack-protector-strong', '-fstack-protector') stack_protector = first_successful_compile(cc, '-fstack-protector-strong', '-fstack-protector')
missing_braces = '' missing_braces = ''
if ccver < (5, 2) and is_gcc(cc): if ccver < (5, 2) and is_gcc(cc):
@ -837,7 +839,7 @@ def init_env_from_args(args: Options, native_optimizations: bool = False) -> Non
args.debug, args.sanitize, native_optimizations, args.link_time_optimization, args.profile, args.debug, args.sanitize, native_optimizations, args.link_time_optimization, args.profile,
args.egl_library, args.startup_notification_library, args.canberra_library, args.fontconfig_library, args.egl_library, args.startup_notification_library, args.canberra_library, args.fontconfig_library,
args.extra_logging, args.extra_include_dirs, args.ignore_compiler_warnings, args.extra_logging, args.extra_include_dirs, args.ignore_compiler_warnings,
args.build_universal_binary, args.extra_library_dirs args.build_universal_binary, args.extra_library_dirs, verbose=args.verbose > 0
) )
@ -876,7 +878,7 @@ def safe_makedirs(path: str) -> None:
os.makedirs(path, exist_ok=True) os.makedirs(path, exist_ok=True)
def update_go_generated_files() -> None: def update_go_generated_files(args: Options, kitty_exe: str) -> None:
# update all the various auto-generated go files, if needed # update all the various auto-generated go files, if needed
rc_sources = [x for x in glob.glob('kitty/rc/*.py') if os.path.basename(x) not in ('base.py', '__init__.py')] rc_sources = [x for x in glob.glob('kitty/rc/*.py') if os.path.basename(x) not in ('base.py', '__init__.py')]
rc_objects = glob.glob('tools/cmd/at/*_generated.go') rc_objects = glob.glob('tools/cmd/at/*_generated.go')
@ -887,15 +889,16 @@ def update_go_generated_files() -> None:
newest_source = max(map(os.path.getmtime, sources)) newest_source = max(map(os.path.getmtime, sources))
if oldest_generated > newest_source and len(rc_sources) == len(rc_objects) and 'constants_generated.go' in generated: if oldest_generated > newest_source and len(rc_sources) == len(rc_objects) and 'constants_generated.go' in generated:
return return
print('Updating Go generated files...') if args.verbose:
subprocess.check_call([os.path.join(base, 'gen-rc-go.py')]) print('Updating Go generated files...')
subprocess.check_call([kitty_exe, '+launch', os.path.join(base, 'gen-rc-go.py')])
def build_kitty_tool(args: Options, launcher_dir: str = '.') -> None: def build_kitty_tool(args: Options, launcher_dir: str) -> None:
go = shutil.which('go') go = shutil.which('go')
if not go: if not go:
raise SystemExit('The go tool was not found on this system. Install Go') raise SystemExit('The go tool was not found on this system. Install Go')
update_go_generated_files() update_go_generated_files(args, os.path.join(launcher_dir, appname))
cmd = [go, 'build'] cmd = [go, 'build']
if args.verbose: if args.verbose:
cmd.append('-v') cmd.append('-v')
@ -905,7 +908,8 @@ def build_kitty_tool(args: Options, launcher_dir: str = '.') -> None:
ld_flags.append('-w') ld_flags.append('-w')
cmd += ['-ldflags', ' '.join(ld_flags)] cmd += ['-ldflags', ' '.join(ld_flags)]
cmd += ['-o', os.path.join(launcher_dir, 'kitty-tool'), os.path.abspath('tools/cmd')] cmd += ['-o', os.path.join(launcher_dir, 'kitty-tool'), os.path.abspath('tools/cmd')]
print(shlex.join(cmd)) if args.verbose:
print(shlex.join(cmd))
cp = subprocess.run(cmd) cp = subprocess.run(cmd)
if cp.returncode != 0: if cp.returncode != 0:
raise SystemExit(cp.returncode) raise SystemExit(cp.returncode)
@ -1349,7 +1353,6 @@ def package(args: Options, bundle_type: str) -> None:
args.compilation_database.build_all() args.compilation_database.build_all()
else: else:
build_launcher(args, launcher_dir, bundle_type) build_launcher(args, launcher_dir, bundle_type)
build_kitty_tool(args, launcher_dir=launcher_dir)
os.makedirs(os.path.join(libdir, 'logo')) os.makedirs(os.path.join(libdir, 'logo'))
build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') build_terminfo = runpy.run_path('build-terminfo', run_name='import_build')
for x in (libdir, os.path.join(ddir, 'share')): for x in (libdir, os.path.join(ddir, 'share')):
@ -1414,6 +1417,8 @@ def package(args: Options, bundle_type: str) -> None:
for f_ in files: for f_ in files:
path = os.path.join(root, f_) path = os.path.join(root, f_)
os.chmod(path, 0o755 if should_be_executable(path) else 0o644) os.chmod(path, 0o755 if should_be_executable(path) else 0o644)
if not for_freeze:
build_kitty_tool(args, launcher_dir=launcher_dir)
if not is_macos: if not is_macos:
create_linux_bundle_gunk(ddir, args.libdir_name) create_linux_bundle_gunk(ddir, args.libdir_name)
@ -1684,7 +1689,7 @@ def main() -> None:
init_env_from_args(args, False) init_env_from_args(args, False)
bundle_type = ('macos' if is_macos else 'linux') + '-freeze' bundle_type = ('macos' if is_macos else 'linux') + '-freeze'
build_launcher(args, launcher_dir=os.path.join(args.prefix, 'bin'), bundle_type=bundle_type) build_launcher(args, launcher_dir=os.path.join(args.prefix, 'bin'), bundle_type=bundle_type)
build_kitty_tool(args, launcher_dir=launcher_dir) build_kitty_tool(args, launcher_dir=os.path.join(args.prefix, 'bin'))
elif args.action == 'linux-package': elif args.action == 'linux-package':
build(args, native_optimizations=False) build(args, native_optimizations=False)
package(args, bundle_type='linux-package') package(args, bundle_type='linux-package')