Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 13:14:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix use of version and version_dir

Browse Source 
This changes `Updater.update()` to use two separate variables:
`version`, which is a Semantic Version, and `version_dir`, which is
a string for the directory in which Qt is installed.

`version_dir` cannot just be `str(version)`; in the special case of
Qt 5.9.0, `version_dir` must be "5.9" to account for the way that this
version of Qt was packaged.
This commit is contained in:
David Dalcino
2021-08-11 12:13:45 -07:00
parent 1c4f96736c
commit d6127eb8a0
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
aqt/updater.py
View File

@@ -258,6 +258,7 @@ class Updater:
arch = target.arch arch = target.arch
version = Version(target.version) version = Version(target.version)
os_name = target.os_name os_name = target.os_name
version_dir = "5.9" if version == Version("5.9.0") else target.version
if arch is None: if arch is None:
arch_dir = "" arch_dir = ""
elif arch.startswith("win64_mingw"): elif arch.startswith("win64_mingw"):
@@ -276,9 +277,9 @@ class Updater:
else: else:
arch_dir = arch arch_dir = arch
try: try:
prefix = pathlib.Path(base_dir) / target.version / arch_dir prefix = pathlib.Path(base_dir) / version_dir / arch_dir
updater = Updater(prefix, logger) updater = Updater(prefix, logger)
updater.set_license(base_dir, target.version, arch_dir) updater.set_license(base_dir, version_dir, arch_dir)
if target.arch not in [ if target.arch not in [
"ios", "ios",
"android", "android",
@@ -288,7 +289,7 @@ class Updater:
"android_x86", "android_x86",
"android_armv7", "android_armv7",
]: # desktop version ]: # desktop version
updater.make_qtconf(base_dir, target.version, arch_dir) updater.make_qtconf(base_dir, version_dir, arch_dir)
updater.patch_qmake() updater.patch_qmake()
if target.os_name == "linux": if target.os_name == "linux":
updater.patch_pkgconfig("/home/qt/work/install", target.os_name) updater.patch_pkgconfig("/home/qt/work/install", target.os_name)
@@ -297,14 +298,14 @@ class Updater:
updater.patch_pkgconfig("/Users/qt/work/install", target.os_name) updater.patch_pkgconfig("/Users/qt/work/install", target.os_name)
updater.patch_libtool("/Users/qt/work/install/lib", target.os_name) updater.patch_libtool("/Users/qt/work/install/lib", target.os_name)
elif target.os_name == "windows": elif target.os_name == "windows":
updater.make_qtenv2(base_dir, target.version, arch_dir) updater.make_qtenv2(base_dir, version_dir, arch_dir)
if Version(target.version) < Version("5.14.0"): if version < Version("5.14.0"):
updater.patch_qtcore(target) updater.patch_qtcore(target)
elif Version(target.version) in SimpleSpec(">=5.0,<6.0"): elif version in SimpleSpec(">=5.0,<6.0"):
updater.patch_qmake() updater.patch_qmake()
else: # qt6 non-desktop else: # qt6 non-desktop
updater.patch_qmake_script(base_dir, target.version, target.os_name) updater.patch_qmake_script(base_dir, version_dir, target.os_name)
updater.patch_target_qt_conf(base_dir, target.version, arch_dir, target.os_name) updater.patch_target_qt_conf(base_dir, version_dir, arch_dir, target.os_name)
except IOError as e: except IOError as e:
raise e raise e