From 67292776a6cba219f5145db00b16e30015b4a33c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 5 Dec 2022 10:09:31 +0100 Subject: build system: Further introduce Pathlib Make it possible to pass a Path or a str to copyfile()/copydir() for both arguments or one of them. Turn the variables destination_dir, destination_qt_dir and destination_qt_lib_dir introduced by b32a791ea2c66ae9ef2896ea445d4752e4773f96 into Paths. Task-number: PYSIDE-2080 Change-Id: I13b27179746019b9cbe575d783a67a025dac1ee5 Reviewed-by: Cristian Maureira-Fredes Reviewed-by: Adrian Herrmann Reviewed-by: Qt CI Bot --- build_scripts/platforms/unix.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'build_scripts/platforms/unix.py') diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 9496b7747..1879f3072 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -43,9 +43,8 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): executables = [] libexec_executables = [] - destination_dir = "{st_build_dir}/{st_package_name}".format(**_vars) - destination_qt_dir = f"{destination_dir}/Qt" - destination_qt_lib_dir = f"{destination_qt_dir}/lib" + destination_dir = Path("{st_build_dir}/{st_package_name}".format(**_vars)) + destination_qt_dir = destination_dir / "Qt" # /lib/site-packages/{st_package_name}/* -> # /{st_package_name} @@ -151,7 +150,7 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): lib_exec_filters.append('QtWebEngineProcess') if lib_exec_filters: libexec_executables.extend(copydir("{qt_lib_execs_dir}", - f"{destination_qt_dir}/libexec", + destination_qt_dir / "libexec", _filter=lib_exec_filters, recursive=False, _vars=_vars)) -- cgit v1.2.3