diff options
Diffstat (limited to 'build_scripts/platforms/unix.py')
| -rw-r--r-- | build_scripts/platforms/unix.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 9327e8bd7..b842510ff 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -44,8 +44,8 @@ from .linux import prepare_standalone_package_linux from .macos import prepare_standalone_package_macos from ..config import config -from ..options import * -from ..utils import copydir, copyfile, rmtree, makefile +from ..options import OPTION +from ..utils import copydir, copyfile, makefile from ..utils import regenerate_qt_resources @@ -144,8 +144,8 @@ def prepare_packages_posix(self, vars): executables.extend(copydir( "{install_dir}/bin/Designer.app", "{st_build_dir}/{st_package_name}/Designer.app", - filter=None, - recursive=True, vars=vars)) + filter=None, recursive=True, + force=False, vars=vars)) else: copyfile( "{install_dir}/bin/designer", @@ -188,10 +188,10 @@ def prepare_packages_posix(self, vars): copydir( "{build_dir}/pyside2/{st_package_name}", "{st_build_dir}/{st_package_name}", - filter=["*.pyi"], + filter=["*.pyi", "py.typed"], vars=vars) - if not OPTION_NOEXAMPLES: + if not OPTION["NOEXAMPLES"]: def pycache_dir_filter(dir_name, parent_full_path, dir_full_path): if fnmatch.fnmatch(dir_name, "__pycache__"): return False @@ -203,16 +203,13 @@ def prepare_packages_posix(self, vars): # Re-generate examples Qt resource files for Python 3 # compatibility if sys.version_info[0] == 3: - examples_path = "{st_build_dir}/{st_package_name}/examples".format( - **vars) - pyside_rcc_path = "{install_dir}/bin/rcc".format( - **vars) + examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) + pyside_rcc_path = "{install_dir}/bin/rcc".format(**vars) pyside_rcc_options = ['-g', 'python'] - regenerate_qt_resources(examples_path, pyside_rcc_path, - pyside_rcc_options) + regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) # Copy Qt libs to package - if OPTION_STANDALONE: + 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': |