diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 08:37:44 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 09:35:37 +0000 |
| commit | 559c56b140410bcfa0ce6f19b47d1ba0daa9a201 (patch) | |
| tree | b8bd0db0871713630ea685326df559d9fbd50a4c /build_scripts/platforms/unix.py | |
| parent | aabd19b0f58816a76f24d13a318a4952d45baba4 (diff) | |
build scripts: Introduce variables for the versions
Change-Id: Iac73fcf6e60f882968463d1c612f5ca5dc206222
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts/platforms/unix.py')
| -rw-r--r-- | build_scripts/platforms/unix.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 1e1c1e4a8..482f2b82c 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -47,6 +47,7 @@ from ..config import config from ..options import OPTION from ..utils import copydir, copyfile, makefile from ..utils import regenerate_qt_resources +from ..versions import PYSIDE, SHIBOKEN def prepare_packages_posix(self, vars): @@ -75,8 +76,8 @@ def prepare_packages_posix(self, vars): # <build>/shiboken6/doc/html/* -> # <setup>/{st_package_name}/docs/shiboken6 copydir( - "{build_dir}/shiboken6/doc/html", - "{st_build_dir}/{st_package_name}/docs/shiboken6", + f"{{build_dir}}/{SHIBOKEN}/doc/html", + f"{{st_build_dir}}/{{st_package_name}}/docs/{SHIBOKEN}", force=False, vars=vars) # <install>/lib/lib* -> {st_package_name}/ @@ -94,9 +95,7 @@ def prepare_packages_posix(self, vars): executables.extend(copydir( "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", - filter=[ - "shiboken6", - ], + filter=[SHIBOKEN], recursive=False, vars=vars)) # Used to create scripts directory. @@ -133,7 +132,7 @@ def prepare_packages_posix(self, vars): "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", filter=[ - "pyside2-lupdate", + f"{PYSIDE}-lupdate", "uic", "rcc", ], @@ -179,14 +178,14 @@ def prepare_packages_posix(self, vars): # <source>/pyside2/{st_package_name}/support/* -> # <setup>/{st_package_name}/support/* copydir( - "{build_dir}/pyside2/{st_package_name}/support", + f"{{build_dir}}/{PYSIDE}/{{st_package_name}}/support", "{st_build_dir}/{st_package_name}/support", vars=vars) # <source>/pyside2/{st_package_name}/*.pyi -> # <setup>/{st_package_name}/*.pyi copydir( - "{build_dir}/pyside2/{st_package_name}", + f"{{build_dir}}/{PYSIDE}/{{st_package_name}}", "{st_build_dir}/{st_package_name}", filter=["*.pyi", "py.typed"], vars=vars) |