mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-22 00:08:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Linux CI build

Browse Source
This commit is contained in:
Kovid Goyal
2023-11-11 17:34:03 +05:30
parent 176ffc7f51
commit a3c8f32c1a
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/conf.py
View File

@@ -639,9 +639,9 @@ def setup_man_pages() -> None:
def build_extra_man_pages() -> None: def build_extra_man_pages() -> None:
base = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) base = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
kitten = os.path.join(base, 'kitty/launcher/kitten') kitten = os.environ.get('KITTEN_EXE_FOR_DOCS', os.path.join(base, 'kitty/launcher/kitten'))
if not os.path.exists(kitten): if not os.path.exists(kitten):
raise Exception('The kitten binary is not built cannot generate man pages') raise Exception(f'The kitten binary {kitten} is not built cannot generate man pages')
raw = subprocess.check_output([kitten, '-h']).decode() raw = subprocess.check_output([kitten, '-h']).decode()
started = 0 started = 0
names = set() names = set()

13
setup.py
View File

@@ -960,9 +960,6 @@ def build_static_kittens(
args: Options, launcher_dir: str, destination_dir: str = '', for_freeze: bool = False, args: Options, launcher_dir: str, destination_dir: str = '', for_freeze: bool = False,
for_platform: Optional[Tuple[str, str]] = None for_platform: Optional[Tuple[str, str]] = None
) -> str: ) -> str:
if args.skip_building_kitten:
print('Skipping building of the kitten binary because of a command line option. Build is incomplete', file=sys.stderr)
return ''
sys.stdout.flush() sys.stdout.flush()
sys.stderr.flush() sys.stderr.flush()
go = shutil.which('go') go = shutil.which('go')
@@ -974,6 +971,9 @@ def build_static_kittens(
raise SystemExit(f'The version of go on this system ({current_go_version}) is too old. go >= {required_go_version} is needed') raise SystemExit(f'The version of go on this system ({current_go_version}) is too old. go >= {required_go_version} is needed')
if not for_platform: if not for_platform:
update_go_generated_files(args, os.path.join(launcher_dir, appname)) update_go_generated_files(args, os.path.join(launcher_dir, appname))
if args.skip_building_kitten:
print('Skipping building of the kitten binary because of a command line option. Build is incomplete', file=sys.stderr)
return ''
cmd = [go, 'build', '-v'] cmd = [go, 'build', '-v']
vcs_rev = args.vcs_rev or get_vcs_rev() vcs_rev = args.vcs_rev or get_vcs_rev()
ld_flags: List[str] = [] ld_flags: List[str] = []
@@ -1155,7 +1155,11 @@ def compile_python(base_path: str) -> None:
def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None:
base = Path(ddir)
in_src_launcher = base / (f'{libdir_name}/kitty/kitty/launcher/kitty')
launcher = base / 'bin/kitty'
if not os.path.exists('docs/_build/html'): if not os.path.exists('docs/_build/html'):
os.environ['KITTEN_EXE_FOR_DOCS'] = os.path.join(os.path.dirname(str(launcher)), 'kitten')
make = 'gmake' if is_freebsd else 'make' make = 'gmake' if is_freebsd else 'make'
run_tool([make, 'docs']) run_tool([make, 'docs'])
copy_man_pages(ddir) copy_man_pages(ddir)
@@ -1199,9 +1203,6 @@ MimeType=image/*;application/x-sh;application/x-shellscript;inode/directory;text
''' '''
) )
base = Path(ddir)
in_src_launcher = base / (f'{libdir_name}/kitty/kitty/launcher/kitty')
launcher = base / 'bin/kitty'
if os.path.exists(in_src_launcher): if os.path.exists(in_src_launcher):
os.remove(in_src_launcher) os.remove(in_src_launcher)
os.makedirs(os.path.dirname(in_src_launcher), exist_ok=True) os.makedirs(os.path.dirname(in_src_launcher), exist_ok=True)