diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-02-25 09:59:33 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-02-25 13:34:16 +0100 |
commit | 76dfa5db6ddd95bd4f8189425f64c1763970e7d3 (patch) | |
tree | 603c1744f66715187ede11ab9c1ea8b5006a4034 /build_scripts | |
parent | fc1fce230e60091da90feec01e5507f7c30f3555 (diff) |
PySide6: Do not install Qt Designer plugin when using PyPy
Task-number: PYSIDE-535
Change-Id: I681a79b684e15802294fd5094afe35de0ce92c8a
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts')
-rw-r--r-- | build_scripts/platforms/linux.py | 12 | ||||
-rw-r--r-- | build_scripts/platforms/macos.py | 12 | ||||
-rw-r--r-- | build_scripts/platforms/windows_desktop.py | 12 |
3 files changed, 21 insertions, 15 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 31e2613ef..a10200a3b 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -107,17 +107,19 @@ def prepare_standalone_package_linux(self, vars): vars=vars) if copy_plugins: + is_pypy = "pypy" in self.build_classifiers # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins plugins_target = "{st_build_dir}/{st_package_name}/Qt/plugins" copydir("{qt_plugins_dir}", plugins_target, filter=["*.so"], recursive=True, vars=vars) - copydir("{install_dir}/plugins/designer", - f"{plugins_target}/designer", - filter=["*.so"], - recursive=False, - vars=vars) + if not is_pypy: + copydir("{install_dir}/plugins/designer", + f"{plugins_target}/designer", + filter=["*.so"], + recursive=False, + vars=vars) copied_plugins = self.get_shared_libraries_in_path_recursively( plugins_target.format(**vars)) diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index 43a5f58d2..02c029bde 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -182,6 +182,7 @@ def prepare_standalone_package_macos(self, vars): qt_libexec_path, vars=vars) if copy_plugins: + is_pypy = "pypy" in self.build_classifiers # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins plugins_target = "{st_build_dir}/{st_package_name}/Qt/plugins" filters=["*.dylib"] @@ -191,11 +192,12 @@ def prepare_standalone_package_macos(self, vars): dir_filter_function=general_dir_filter, file_filter_function=file_variant_filter, vars=vars) - copydir("{install_dir}/plugins/designer", - f"{plugins_target}/designer", - filter=filters, - recursive=False, - vars=vars) + if not is_pypy: + copydir("{install_dir}/plugins/designer", + f"{plugins_target}/designer", + filter=filters, + recursive=False, + vars=vars) if copy_qml: # <qt>/qml/* -> <setup>/{st_package_name}/Qt/qml diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 33add51e0..c6cb637e7 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -420,6 +420,7 @@ def copy_qt_artifacts(self, copy_pdbs, vars): recursive=False, vars=vars) if copy_plugins: + is_pypy = "pypy" in self.build_classifiers # <qt>/plugins/* -> <setup>/{st_package_name}/plugins plugins_target = "{st_build_dir}/{st_package_name}/plugins" plugin_dll_patterns = ["*{}.dll"] @@ -430,11 +431,12 @@ def copy_qt_artifacts(self, copy_pdbs, vars): copydir("{qt_plugins_dir}", plugins_target, file_filter_function=plugin_dll_filter, vars=vars) - copydir("{install_dir}/plugins/designer", - f"{plugins_target}/designer", - filter=["*.dll"], - recursive=False, - vars=vars) + if not is_pypy: + copydir("{install_dir}/plugins/designer", + f"{plugins_target}/designer", + filter=["*.dll"], + recursive=False, + vars=vars) if copy_translations: # <qt>/translations/* -> <setup>/{st_package_name}/translations |