Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-17 20:54:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle special case for Qt 5.9.0

Browse Source 
Qt 5.9.0 installs to `5.9/arch`, rather than the expected `5.9.0/arch`.
This change adds some helper functions to BuildJob that compose the
expected binary directory with the appropriate logic to handle the
edge case for Qt 5.9.0.
This commit is contained in:
David Dalcino
2021-08-11 13:05:17 -07:00
parent d6127eb8a0
commit 3c08fa2d63
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ci/generate_azure_pipelines_matrices.py
View File

@@ -44,6 +44,14 @@ class BuildJob:
self.spec = spec self.spec = spec
self.output_dir = output_dir self.output_dir = output_dir
def qt_bindir(self, *, sep='/') -> str:
out_dir = f"$(Build.BinariesDirectory){sep}Qt" if not self.output_dir else self.output_dir
version_dir = "5.9" if self.qt_version == "5.9.0" else self.qt_version
return f"{out_dir}{sep}{version_dir}{sep}{self.archdir}{sep}bin"
def win_qt_bindir(self) -> str:
return self.qt_bindir(sep='\\')
class PlatformBuildJobs: class PlatformBuildJobs:
def __init__(self, platform, build_jobs): def __init__(self, platform, build_jobs):
@@ -291,24 +299,8 @@ for platform_build_job in all_platform_build_jobs:
("HAS_EXTENSIONS", build_job.list_options.get("HAS_EXTENSIONS", "False")), ("HAS_EXTENSIONS", build_job.list_options.get("HAS_EXTENSIONS", "False")),
("USE_EXTENSION", build_job.list_options.get("USE_EXTENSION", "None")), ("USE_EXTENSION", build_job.list_options.get("USE_EXTENSION", "None")),
("OUTPUT_DIR", build_job.output_dir if build_job.output_dir else ""), ("OUTPUT_DIR", build_job.output_dir if build_job.output_dir else ""),
( ("QT_BINDIR", build_job.qt_bindir()),
"QT_BINDIR", ("WIN_QT_BINDIR", build_job.win_qt_bindir()),
"{0}/{1.qt_version}/{1.archdir}/bin".format(
"$(Build.BinariesDirectory)/Qt"
if not build_job.output_dir
else build_job.output_dir,
build_job,
),
),
(
"WIN_QT_BINDIR",
"{0}\\{1.qt_version}\\{1.archdir}\\bin".format(
"$(Build.BinariesDirectory)\\Qt"
if not build_job.output_dir
else build_job.output_dir,
build_job,
),
),
] ]
) )