Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Include the piper binaries in the Linux binary build

Browse Source
This commit is contained in:
Kovid Goyal 2024-09-03 21:34:08 +05:30
parent 7fbc1d7184
commit 25620a7886
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bypy/linux/__main__.py
View File

@ -107,6 +107,11 @@ def import_site_packages(srcdir, dest):
shutil.copytree(f, j(dest, x), ignore=ignore_in_lib) shutil.copytree(f, j(dest, x), ignore=ignore_in_lib)
def copy_piper(env):
print('Copying piper...')
shutil.copytree(os.path.join(PREFIX, 'piper'), os.path.join(env.bin_dir, 'piper'))
def copy_libs(env): def copy_libs(env):
print('Copying libs...') print('Copying libs...')
@ -252,7 +257,7 @@ def strip_files(files, argv_max=(256 * 1024)):
def strip_binaries(env): def strip_binaries(env):
files = {j(env.bin_dir, x) for x in os.listdir(env.bin_dir)} | { files = {j(env.bin_dir, x) for x in os.listdir(env.bin_dir) if x != 'piper'} | {
x for x in { x for x in {
j(os.path.dirname(env.bin_dir), x) for x in os.listdir(env.bin_dir)} if os.path.exists(x)} j(os.path.dirname(env.bin_dir), x) for x in os.listdir(env.bin_dir)} if os.path.exists(x)}
for x in walk(env.lib_dir): for x in walk(env.lib_dir):
@ -304,6 +309,7 @@ def main():
env = Env() env = Env()
copy_libs(env) copy_libs(env)
copy_python(env, ext_dir) copy_python(env, ext_dir)
copy_piper(env)
build_launchers(env) build_launchers(env)
if not args.skip_tests: if not args.skip_tests:
run_tests(j(env.base, 'calibre-debug'), env.base) run_tests(j(env.base, 'calibre-debug'), env.base)

5
src/calibre/constants.py
View File

@ -488,7 +488,7 @@ def get_umask():
return mask return mask
# call this at startup as it changed process global state, which doesn't work # call this at startup as it changes process global state, which doesn't work
# with multi-threading. It's absurd there is no way to safely read the current # with multi-threading. It's absurd there is no way to safely read the current
# umask of a process. # umask of a process.
get_umask() get_umask()
@ -511,8 +511,7 @@ def bundled_binaries_dir() -> str:
def piper_cmdline() -> tuple[str, ...]: def piper_cmdline() -> tuple[str, ...]:
ext = '.exe' if iswindows else '' ext = '.exe' if iswindows else ''
if bbd := bundled_binaries_dir(): if bbd := bundled_binaries_dir():
# TODO: Add path to espeak-ng-data with -- return (os.path.join(bbd, 'piper', 'piper' + ext),)
return (os.path.join(bbd, 'piper' + ext),)
if pd := os.environ.get('PIPER_TTS_DIR'): if pd := os.environ.get('PIPER_TTS_DIR'):
return (os.path.join(pd, 'piper' + ext),) return (os.path.join(pd, 'piper' + ext),)
import shutil import shutil