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

Add piper to binary macOS builds

Browse Source
This commit is contained in:
Kovid Goyal 2024-09-04 22:11:34 +05:30
parent e5b6603b45
commit 95854ebc16
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bypy/linux/__main__.py
View File

@ -15,7 +15,8 @@ from functools import partial
from bypy.constants import LIBDIR, OUTPUT_DIR, PREFIX, python_major_minor_version
from bypy.constants import SRC as CALIBRE_DIR
from bypy.freeze import extract_extension_modules, fix_pycryptodome, freeze_python, is_package_dir, path_to_freeze_dir
from bypy.utils import copy_binaries, create_job, get_dll_path, mkdtemp, parallel_build, py_compile, run, walk
from bypy.pkgs.piper import copy_piper_dir
from bypy.utils import create_job, get_dll_path, mkdtemp, parallel_build, py_compile, run, walk
j = os.path.join
self_dir = os.path.dirname(os.path.abspath(__file__))
@ -109,11 +110,7 @@ def import_site_packages(srcdir, dest):
def copy_piper(env):
print('Copying piper...')
src = os.path.join(PREFIX, 'piper')
dest = os.path.join(env.bin_dir, 'piper')
copy_binaries(os.path.join(src, 'lib*'), dest)
copy_binaries(os.path.join(src, 'piper*'), dest)
shutil.copytree(os.path.join(src, 'espeak-ng-data'), os.path.join(dest, 'espeak-ng-data'))
copy_piper_dir(PREFIX, env.bin_dir)
def copy_libs(env):

18
bypy/macos/__main__.py
View File

@ -22,6 +22,7 @@ from itertools import repeat
from bypy.constants import OUTPUT_DIR, PREFIX, PYTHON, python_major_minor_version
from bypy.constants import SRC as CALIBRE_DIR
from bypy.freeze import extract_extension_modules, fix_pycryptodome, freeze_python, is_package_dir, path_to_freeze_dir
from bypy.pkgs.piper import copy_piper_dir
from bypy.utils import current_dir, get_arches_in_binary, mkdtemp, py_compile, timeit, walk
abspath, join, basename, dirname = os.path.abspath, os.path.join, os.path.basename, os.path.dirname
@ -527,6 +528,15 @@ class Freeze:
@flush
def add_misc_libraries(self):
def add_lib(src):
x = os.path.basename(src)
print('\nAdding', x)
shutil.copy2(src, self.frameworks_dir)
dest = join(self.frameworks_dir, x)
self.set_id(dest, self.FID + '/' + x)
self.fix_dependencies_in_lib(dest)
for x in (
'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0',
'icudata.73', 'icui18n.73', 'icuio.73', 'icuuc.73', 'hyphen.0', 'uchardet.0',
@ -534,13 +544,9 @@ class Freeze:
'brotlicommon.1', 'brotlidec.1', 'brotlienc.1', 'zstd.1', 'jbig.2.1', 'tiff.6',
'crypto.3', 'ssl.3', 'iconv.2', # 'ltdl.7'
):
print('\nAdding', x)
x = 'lib%s.dylib' % x
src = join(PREFIX, 'lib', x)
shutil.copy2(src, self.frameworks_dir)
dest = join(self.frameworks_dir, x)
self.set_id(dest, self.FID + '/' + x)
self.fix_dependencies_in_lib(dest)
add_lib(src)
# OpenSSL modules and engines
for x in ('ossl-modules', 'engines-3'):
@ -551,6 +557,8 @@ class Freeze:
dylib = join(dest, dylib)
self.set_id(dylib, self.FID + '/' + x + '/' + os.path.basename(dylib))
self.fix_dependencies_in_lib(dylib)
# Piper TTS
copy_piper_dir(PREFIX, self.frameworks_dir)
@flush
def add_site_packages(self):

2
src/calibre/constants.py
View File

@ -511,6 +511,8 @@ def bundled_binaries_dir() -> str:
def piper_cmdline() -> tuple[str, ...]:
ext = '.exe' if iswindows else ''
if bbd := bundled_binaries_dir():
if ismacos:
return (os.path.join(sys.frameworks_dir, 'piper', 'piper'),)
return (os.path.join(bbd, 'piper', 'piper' + ext),)
if pd := os.environ.get('PIPER_TTS_DIR'):
return (os.path.join(pd, 'piper' + ext),)

2
src/calibre/test_build.py
View File

@ -123,7 +123,7 @@ class BuildTest(unittest.TestCase):
from speechd.client import SSIPClient
del SSIPClient
@unittest.skipUnless(islinux, 'Piper only used on Linux')
@unittest.skipIf(iswindows, 'Piper not available on windows')
def test_piper(self):
import subprocess