Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get build_dep working with new bypy cli

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-24 18:00:23 +05:30
parent 05c33adcd7
commit 4714c32263
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup/installers.py
View File

@ -95,6 +95,10 @@ def build_single(which='windows', bitness='64', shutdown=True, sign_installers=T
def build_dep(args): def build_dep(args):
base, bypy = get_paths() base, bypy = get_paths()
exe = get_exe() exe = get_exe()
pl = args[0]
args.insert(1, 'dependencies')
if '-' in pl:
args[0:1] = pl.split('-')[0], f'--arch={pl.split("-")[-1]}'
cmd = [exe, bypy] + list(args) cmd = [exe, bypy] + list(args)
ret = subprocess.Popen(cmd).wait() ret = subprocess.Popen(cmd).wait()
if ret != 0: if ret != 0:
@ -192,14 +196,15 @@ class BuildDep(Command):
description = ( description = (
'Build a calibre dependency. For example, build_dep windows expat.' 'Build a calibre dependency. For example, build_dep windows expat.'
' Without arguments builds all deps for specified platform. Use windows 32 for 32bit.' ' Without arguments builds all deps for specified platform. Use linux-arm64 for Linux ARM.'
' Use build_dep all somedep to build a dep for all platforms.' ' Use build_dep all somedep to build a dep for all platforms.'
) )
def run(self, opts): def run(self, opts):
args = opts.cli_args args = opts.cli_args
if args and args[0] == 'all': if args and args[0] == 'all':
for x in ('linux', 'linux 32', 'macos', 'windows', 'windows 32'): for x in ('linux', 'linux-arm64', 'macos', 'windows'):
build_dep(x.split() + list(args)[1:]) build_dep(x.split() + list(args)[1:])
else: else:
build_dep(args) build_dep(args)