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

Use simplified interface for freezing

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-03 12:03:21 +05:30
parent aab1d2268c
commit defa85e918
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bypy/linux/__main__.py
View File

@ -15,10 +15,7 @@ from functools import partial
from bypy.constants import ( from bypy.constants import (
OUTPUT_DIR, PREFIX, SRC as CALIBRE_DIR, is64bit, python_major_minor_version OUTPUT_DIR, PREFIX, SRC as CALIBRE_DIR, is64bit, python_major_minor_version
) )
from bypy.freeze import ( from bypy.freeze import extract_extension_modules, freeze_python, path_to_freeze_dir
extract_extension_modules, freeze_python, path_to_freeze_dir,
save_importer_src_to_header
)
from bypy.utils import ( from bypy.utils import (
create_job, get_dll_path, mkdtemp, parallel_build, py_compile, run, walk create_job, get_dll_path, mkdtemp, parallel_build, py_compile, run, walk
) )
@ -170,9 +167,8 @@ def copy_python(env, ext_dir):
print('Extracting extension modules from', env.py_dir, 'to', pdir) print('Extracting extension modules from', env.py_dir, 'to', pdir)
ext_map.update(extract_extension_modules(env.py_dir, pdir)) ext_map.update(extract_extension_modules(env.py_dir, pdir))
py_compile(env.py_dir) py_compile(env.py_dir)
freeze_python(env.py_dir, pdir, env.obj_dir) freeze_python(env.py_dir, pdir, env.obj_dir, ext_map, develop_mode_env_var='CALIBRE_DEVELOP_FROM')
shutil.rmtree(env.py_dir) shutil.rmtree(env.py_dir)
save_importer_src_to_header(env.obj_dir, ext_map, develop_mode_env_var='CALIBRE_DEVELOP_FROM')
def build_launchers(env): def build_launchers(env):

8
bypy/macos/__main__.py
View File

@ -22,10 +22,7 @@ from itertools import repeat
from bypy.constants import ( from bypy.constants import (
OUTPUT_DIR, PREFIX, PYTHON, SRC as CALIBRE_DIR, python_major_minor_version OUTPUT_DIR, PREFIX, PYTHON, SRC as CALIBRE_DIR, python_major_minor_version
) )
from bypy.freeze import ( from bypy.freeze import extract_extension_modules, freeze_python, path_to_freeze_dir
extract_extension_modules, freeze_python, path_to_freeze_dir,
save_importer_src_to_header
)
from bypy.utils import current_dir, mkdtemp, py_compile, timeit, walk from bypy.utils import current_dir, mkdtemp, py_compile, timeit, walk
abspath, join, basename, dirname = os.path.abspath, os.path.join, os.path.basename, os.path.dirname abspath, join, basename, dirname = os.path.abspath, os.path.join, os.path.basename, os.path.dirname
@ -648,9 +645,8 @@ class Freeze(object):
os.rename(join(src, x), join(pydir, x)) os.rename(join(src, x), join(pydir, x))
os.rmdir(src) os.rmdir(src)
py_compile(pydir) py_compile(pydir)
freeze_python(pydir, dest, self.inc_dir) freeze_python(pydir, dest, self.inc_dir, self.ext_map, develop_mode_env_var='CALIBRE_DEVELOP_FROM')
shutil.rmtree(pydir) shutil.rmtree(pydir)
save_importer_src_to_header(self.inc_dir, self.ext_map, develop_mode_env_var='CALIBRE_DEVELOP_FROM')
def create_app_clone(self, name, specialise_plist, remove_doc_types=False, base_dir=None): def create_app_clone(self, name, specialise_plist, remove_doc_types=False, base_dir=None):
print('\nCreating ' + name) print('\nCreating ' + name)

5
bypy/windows/__main__.py
View File

@ -21,7 +21,7 @@ from bypy.constants import (
) )
from bypy.freeze import ( from bypy.freeze import (
cleanup_site_packages, extract_extension_modules, freeze_python, cleanup_site_packages, extract_extension_modules, freeze_python,
path_to_freeze_dir, save_importer_src_to_header path_to_freeze_dir
) )
from bypy.utils import mkdtemp, py_compile, run, walk from bypy.utils import mkdtemp, py_compile, run, walk
@ -213,9 +213,8 @@ def freeze(env, ext_dir, incdir):
py_compile(env.lib_dir.replace(os.sep, '/')) py_compile(env.lib_dir.replace(os.sep, '/'))
# from bypy.utils import run_shell # from bypy.utils import run_shell
# run_shell(cwd=env.lib_dir) # run_shell(cwd=env.lib_dir)
freeze_python(env.lib_dir, env.dll_dir, incdir) freeze_python(env.lib_dir, env.dll_dir, incdir, ext_map, develop_mode_env_var='CALIBRE_DEVELOP_FROM')
shutil.rmtree(env.lib_dir) shutil.rmtree(env.lib_dir)
save_importer_src_to_header(incdir, ext_map, develop_mode_env_var='CALIBRE_DEVELOP_FROM')
def embed_manifests(env): def embed_manifests(env):