diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-04-14 10:21:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-04-17 09:50:18 +0200 |
| commit | b80c7822c61b70d9704b42db64db0d9637fa7079 (patch) | |
| tree | f251b795fad71d41bd4dca2cac33b601e951d3b5 /build_scripts | |
| parent | fab71f285c3470c98fd48bd61cae52bcebdd4328 (diff) | |
Copy Qt module JSON files for usage by create_wheels.py
Pick-to: 6.5
Change-Id: I147609680589019c6db9dc13add64bf3e0dbab94
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/main.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 4 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 4 | ||||
| -rw-r--r-- | build_scripts/qtinfo.py | 6 |
4 files changed, 15 insertions, 0 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index f71eebd52..58bd40787 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -913,6 +913,7 @@ class PysideBuild(_build, CommandMixin, BuildInfoCollectorMixin): "qt_data_dir": self.qtinfo.data_dir, "qt_doc_dir": self.qtinfo.docs_dir, "qt_lib_dir": self.qtinfo.libs_dir, + "qt_module_json_files_dir": self.qtinfo.module_json_files_dir, "qt_metatypes_dir": self.qtinfo.metatypes_dir, "qt_lib_execs_dir": self.qtinfo.lib_execs_dir, "qt_plugins_dir": self.qtinfo.plugins_dir, diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 60924161e..50a6fadc6 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -181,6 +181,10 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): ], recursive=False, _vars=_vars, force_copy_symlinks=True) + 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 diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index ef6a44a79..ed6acafb7 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -141,6 +141,10 @@ def prepare_packages_win32(pyside_build, _vars): _filter=["pyside*.lib"], recursive=False, _vars=_vars) + copydir("{qt_module_json_files_dir}", + destination_qt_dir / "modules", + _filter=["*.json"], _vars=_vars) + # <install>/share/{st_package_name}/typesystems/* -> # <setup>/{st_package_name}/typesystems copydir( diff --git a/build_scripts/qtinfo.py b/build_scripts/qtinfo.py index 6424b9e0d..46ee27a94 100644 --- a/build_scripts/qtinfo.py +++ b/build_scripts/qtinfo.py @@ -74,6 +74,12 @@ class QtInfo(object): return self.get_property("QT_INSTALL_LIBS") @property + def module_json_files_dir(self): + install_libs = self.get_property("QT_INSTALL_LIBS") + result = Path(install_libs).parent / "modules" + return os.fspath(result) + + @property def metatypes_dir(self): parent = self.arch_data if self.version_tuple >= (6, 5, 0) else self.libs_dir return os.fspath(Path(parent) / "metatypes") |