diff options
Diffstat (limited to 'build_scripts/platforms/unix.py')
| -rw-r--r-- | build_scripts/platforms/unix.py | 225 |
1 files changed, 127 insertions, 98 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index f109732e3..3333f5f96 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -1,16 +1,17 @@ # Copyright (C) 2018 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -import fnmatch -import os import sys +from pathlib import Path +from ..log import log from ..config import config from ..options import OPTION -from ..utils import copydir, copyfile, makefile -from ..versions import PYSIDE, SHIBOKEN +from ..utils import copydir, copyfile, copy_qt_metatypes, makefile +from .. import PYSIDE, SHIBOKEN from .linux import prepare_standalone_package_linux from .macos import prepare_standalone_package_macos +from .. import PYSIDE_UNIX_BIN_TOOLS, PYSIDE_UNIX_LIBEXEC_TOOLS, PYSIDE_UNIX_BUNDLED_TOOLS def _macos_copy_gui_executable(name, _vars=None): @@ -38,24 +39,33 @@ def _copy_gui_executable(name, _vars=None): return _unix_copy_gui_executable(name, _vars) -def prepare_packages_posix(self, _vars): +def prepare_packages_posix(pyside_build, _vars, cross_build=False): + is_android = False + if str(OPTION['PLAT_NAME']).startswith('android'): + is_android = True + executables = [] libexec_executables = [] + log.info("Copying files...") + + destination_dir = Path("{st_build_dir}/{st_package_name}".format(**_vars)) + destination_qt_dir = destination_dir / "Qt" # <install>/lib/site-packages/{st_package_name}/* -> # <setup>/{st_package_name} # This copies the module .so/.dylib files and various .py files # (__init__, config, git version, etc.) copydir( - "{site_packages_dir}/{st_package_name}", - "{st_build_dir}/{st_package_name}", + "{site_packages_dir}/{st_package_name}", destination_dir, _vars=_vars) - generated_config = self.get_built_pyside_config(_vars) + generated_config = pyside_build.get_built_pyside_config(_vars) def adjusted_lib_name(name, version): postfix = '' - if sys.platform.startswith('linux'): + if config.is_cross_compile() and is_android: + postfix = ".so" + elif sys.platform.startswith('linux'): postfix = f".so.{version}" elif sys.platform == 'darwin': postfix = f".{version}.dylib" @@ -71,8 +81,7 @@ def prepare_packages_posix(self, _vars): # <install>/lib/lib* -> {st_package_name}/ copydir( - "{install_dir}/lib/", - "{st_build_dir}/{st_package_name}", + "{install_dir}/lib/", destination_dir, _filter=[ adjusted_lib_name("libshiboken*", generated_config['shiboken_library_soversion']), @@ -81,11 +90,10 @@ def prepare_packages_posix(self, _vars): if config.is_internal_shiboken_generator_build(): # <install>/bin/* -> {st_package_name}/ - executables.extend(copydir( - "{install_dir}/bin/", - "{st_build_dir}/{st_package_name}", + copydir( + "{install_dir}/bin/", destination_dir, _filter=[SHIBOKEN], - recursive=False, _vars=_vars)) + recursive=False, _vars=_vars) # Used to create scripts directory. makefile( @@ -106,119 +114,140 @@ def prepare_packages_posix(self, _vars): _vars=_vars) if config.is_internal_pyside_build(): - makefile( - "{st_build_dir}/{st_package_name}/scripts/__init__.py", - _vars=_vars) - - # For setting up setuptools entry points - for script in ("pyside_tool.py", "metaobjectdump.py", "project.py", "qml.py"): - src = f"{{install_dir}}/bin/{script}" - target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script}" - copyfile(src, target, force=False, _vars=_vars) - - # <install>/bin/* -> {st_package_name}/ - executables.extend(copydir( - "{install_dir}/bin/", - "{st_build_dir}/{st_package_name}", - _filter=[f"{PYSIDE}-lupdate"], - recursive=False, _vars=_vars)) - - lib_exec_filters = [] - if not OPTION['NO_QT_TOOLS']: - lib_exec_filters.extend(['uic', 'rcc', 'qmltyperegistrar']) + if not is_android: + makefile( + "{st_build_dir}/{st_package_name}/scripts/__init__.py", + _vars=_vars) + + scripts = ["pyside_tool.py", "metaobjectdump.py", "project.py", "qml.py", + "qtpy2cpp.py", "deploy.py"] + + script_dirs = ["qtpy2cpp_lib", "deploy_lib", "project"] + + if sys.platform.startswith("linux"): + scripts.append("android_deploy.py") + scripts.append("requirements-android.txt") + script_dirs.extend(["deploy_lib/android", + "deploy_lib/android/recipes/PySide6", + "deploy_lib/android/recipes/shiboken6",]) + + # For setting up setuptools entry points + for script in scripts: + src = f"{{install_dir}}/bin/{script}" + target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script}" + copyfile(src, target, force=False, _vars=_vars) + + for script_dir in script_dirs: + src = f"{{install_dir}}/bin/{script_dir}" + target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script_dir}" + # Exclude subdirectory tests + copydir(src, target, _filter=["*.py", "*.spec", "*.jpg", "*.icns", "*.ico"], + recursive=False, _vars=_vars) + + # <install>/bin/* -> {st_package_name}/ executables.extend(copydir( - "{install_dir}/bin/", - "{st_build_dir}/{st_package_name}", - _filter=["lrelease", "lupdate", "qmllint"], + "{install_dir}/bin/", destination_dir, + _filter=[f"{PYSIDE}-lupdate"], recursive=False, _vars=_vars)) - # Copying assistant/designer - executables.extend(_copy_gui_executable('assistant', _vars=_vars)) - executables.extend(_copy_gui_executable('designer', _vars=_vars)) - executables.extend(_copy_gui_executable('linguist', _vars=_vars)) - - # <qt>/lib/metatypes/* -> <setup>/{st_package_name}/Qt/lib/metatypes - destination_lib_dir = "{st_build_dir}/{st_package_name}/Qt/lib" - copydir("{qt_lib_dir}/metatypes", f"{destination_lib_dir}/metatypes", - _filter=["*.json"], - recursive=False, _vars=_vars, force_copy_symlinks=True) - - # Copy libexec - built_modules = self.get_built_pyside_config(_vars)['built_modules'] - if self.is_webengine_built(built_modules): - lib_exec_filters.append('QtWebEngineProcess') - if lib_exec_filters: - libexec_executables.extend(copydir("{qt_lib_execs_dir}", - "{st_build_dir}/{st_package_name}/Qt/libexec", - _filter=lib_exec_filters, - recursive=False, - _vars=_vars)) + + lib_exec_filters = [] + if not OPTION['NO_QT_TOOLS']: + lib_exec_filters.extend(PYSIDE_UNIX_LIBEXEC_TOOLS) + executables.extend(copydir( + "{install_dir}/bin/", destination_dir, + _filter=PYSIDE_UNIX_BIN_TOOLS, + recursive=False, _vars=_vars)) + + # Copying assistant/designer/linguist + for tool in PYSIDE_UNIX_BUNDLED_TOOLS: + executables.extend(_copy_gui_executable(tool, _vars=_vars)) + + copy_qt_metatypes(destination_qt_dir, _vars) + + # Copy libexec + built_modules = pyside_build.get_built_pyside_config(_vars)['built_modules'] + if pyside_build.is_webengine_built(built_modules): + lib_exec_filters.append('QtWebEngineProcess') + if lib_exec_filters: + libexec_executables.extend(copydir("{qt_lib_execs_dir}", + destination_qt_dir / "libexec", + _filter=lib_exec_filters, + recursive=False, + _vars=_vars)) # <install>/lib/lib* -> {st_package_name}/ copydir( - "{install_dir}/lib/", - "{st_build_dir}/{st_package_name}", + "{install_dir}/lib", destination_dir, _filter=[ adjusted_lib_name("libpyside*", generated_config['pyside_library_soversion']), ], recursive=False, _vars=_vars, force_copy_symlinks=True) - # <install>/share/{st_package_name}/typesystems/* -> - # <setup>/{st_package_name}/typesystems - copydir( - "{install_dir}/share/{st_package_name}/typesystems", - "{st_build_dir}/{st_package_name}/typesystems", - _vars=_vars) - - # <install>/share/{st_package_name}/glue/* -> - # <setup>/{st_package_name}/glue - copydir( - "{install_dir}/share/{st_package_name}/glue", - "{st_build_dir}/{st_package_name}/glue", - _vars=_vars) - - # <source>/pyside6/{st_package_name}/support/* -> - # <setup>/{st_package_name}/support/* + copydir("{qt_module_json_files_dir}", + destination_qt_dir / "modules", + _filter=["*.json"], _vars=_vars) + + if not config.is_cross_compile(): + # <install>/share/{st_package_name}/typesystems/* -> + # <setup>/{st_package_name}/typesystems + copydir( + "{install_dir}/share/{st_package_name}/typesystems", + "{st_build_dir}/{st_package_name}/typesystems", + _vars=_vars) + + # <install>/share/{st_package_name}/glue/* -> + # <setup>/{st_package_name}/glue + copydir( + "{install_dir}/share/{st_package_name}/glue", + "{st_build_dir}/{st_package_name}/glue", + _vars=_vars) + + if not is_android: + # <source>/pyside6/{st_package_name}/support/* -> + # <setup>/{st_package_name}/support/* + copydir( + f"{{build_dir}}/{PYSIDE}/{{st_package_name}}/support", + "{st_build_dir}/{st_package_name}/support", + _vars=_vars) + + # <source>/pyside6/{st_package_name}/QtAsyncio/* -> + # <setup>/{st_package_name}/QtAsyncio/* copydir( - f"{{build_dir}}/{PYSIDE}/{{st_package_name}}/support", - "{st_build_dir}/{st_package_name}/support", + "{site_packages_dir}/{st_package_name}/QtAsyncio", + "{st_build_dir}/{st_package_name}/QtAsyncio", _vars=_vars) # <source>/pyside6/{st_package_name}/*.pyi -> # <setup>/{st_package_name}/*.pyi copydir( - f"{{build_dir}}/{PYSIDE}/{{st_package_name}}", - "{st_build_dir}/{st_package_name}", + f"{{build_dir}}/{PYSIDE}/{{st_package_name}}", destination_dir, _filter=["*.pyi", "py.typed"], _vars=_vars) - if not OPTION["NOEXAMPLES"]: - def pycache_dir_filter(dir_name, parent_full_path, dir_full_path): - if fnmatch.fnmatch(dir_name, "__pycache__"): - return False - return True - # examples/* -> <setup>/{st_package_name}/examples - copydir(os.path.join(self.script_dir, "examples"), - "{st_build_dir}/{st_package_name}/examples", - force=False, _vars=_vars, dir_filter_function=pycache_dir_filter) + # copy the jar files + if is_android: + copydir( + "{install_dir}/lib/jar", + "{st_build_dir}/{st_package_name}/jar", + _vars=_vars) # Copy Qt libs to package if OPTION["STANDALONE"]: if config.is_internal_pyside_build() or config.is_internal_shiboken_generator_build(): _vars['built_modules'] = generated_config['built_modules'] if sys.platform == 'darwin': - prepare_standalone_package_macos(self, _vars) + prepare_standalone_package_macos(pyside_build, _vars) else: - prepare_standalone_package_linux(self, _vars) + prepare_standalone_package_linux(pyside_build, _vars, cross_build, + is_android=is_android) if config.is_internal_shiboken_generator_build(): # Copy over clang before rpath patching. - self.prepare_standalone_clang(is_win=False) + pyside_build.prepare_standalone_clang(is_win=False) # Update rpath to $ORIGIN - if sys.platform.startswith('linux') or sys.platform.startswith('darwin'): - rpath_path = "{st_build_dir}/{st_package_name}".format(**_vars) - self.update_rpath(rpath_path, executables) - self.update_rpath(rpath_path, self.package_libraries(rpath_path)) + if (sys.platform.startswith('linux') or sys.platform.startswith('darwin')) and not is_android: + pyside_build.update_rpath(executables) if libexec_executables: - self.update_rpath(rpath_path, libexec_executables, libexec=True) + pyside_build.update_rpath(libexec_executables, libexec=True) |