diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-11-15 11:12:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-11-15 13:46:24 +0000 |
| commit | 4d8cba1e10d8ae7034dd155e5548485969b26aaf (patch) | |
| tree | b16973899e8140bbb62f9e390fb1ebf78ea1286e | |
| parent | eeef334ef2caa3565b10fa6a748b4a0810eb749d (diff) | |
install_qt: Get explicit temporary path back
We re-use the downloaded Qt archives for separate plugin builds in
the Qt Creator build. So we want to download them into a more
persistent location.
Amends f35311d0f76d870c4db2e790903de345cf374900
Change-Id: I12afa173ebd9352d68aea59e963bb889110c9844
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/build_wrapper.py | 1 | ||||
| -rw-r--r-- | packaging-tools/install_qt.py | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index d790d42ea..cb5e96fac 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -771,6 +771,7 @@ def handle_qt_creator_build(option_dict: Dict[str, str], qtcreator_plugins: List install_qt( qt_path=qt_path, qt_modules=qt_module_urls, + temp_path=qt_temp, icu_url=icu_libs if is_linux() else None, d3d_url=option_dict["D3D_URL"] if is_windows() else None, opengl_url=option_dict["OPENGLSW_URL"] if is_windows() else None, diff --git a/packaging-tools/install_qt.py b/packaging-tools/install_qt.py index a2b3d1b06..b130a454e 100644 --- a/packaging-tools/install_qt.py +++ b/packaging-tools/install_qt.py @@ -75,6 +75,7 @@ def install_qt( d3d_url: Optional[str] = None, opengl_url: Optional[str] = None, openssl_url: Optional[str] = None, + temp_path: Optional[str] = None ) -> None: """ Install Qt to directory qt_path with the specified module and library packages. @@ -86,6 +87,7 @@ def install_qt( d3d_url: Local or remote URI to Windows d3dcompiler libraries (.7z) opengl_url: Local or remote URI to Windows OpenGL libraries (.7z) openssl_url: Local or remote URI to Windows OpenSSL libraries (.7z) + temp_path: Temporary path used for saving downloaded archives Raises: SystemExit: When qt_modules list is empty @@ -103,10 +105,15 @@ def install_qt( opengl32sw7z=opengl_url, openssl7z=openssl_url, ) - with TemporaryDirectory() as temp_path: + if temp_path: dl_pkgs_work.add_task_object( create_qt_download_task(qt_modules, qt_path, temp_path, opts) ) + else: + with TemporaryDirectory() as temp_path: + dl_pkgs_work.add_task_object( + create_qt_download_task(qt_modules, qt_path, temp_path, opts) + ) # run task if needed if dl_pkgs_work.task_number != 0: |