mirror of
https://github.com/miurahr/aqtinstall.git
synced 2025-12-17 20:54:38 +03:00
Support explicit spec for extra modules
Original commit by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
committed by
Skycoder42
parent
2c6c8ed52e
commit
c85c9d0112
@@ -7,12 +7,13 @@ from itertools import product
|
||||
|
||||
|
||||
class BuildJob:
|
||||
def __init__(self, qt_version, host, target, arch, archdir):
|
||||
def __init__(self, qt_version, host, target, arch, archdir, module=None):
|
||||
self.qt_version = qt_version
|
||||
self.host = host
|
||||
self.target = target
|
||||
self.arch = arch
|
||||
self.archdir = archdir
|
||||
self.module = module
|
||||
|
||||
|
||||
class PlatformBuildJobs:
|
||||
@@ -95,6 +96,18 @@ for android_arch in ['android_x86', 'android_armv7']:
|
||||
BuildJob('5.13.1', 'linux', 'android', android_arch, android_arch)
|
||||
)
|
||||
|
||||
# Extra modules test
|
||||
linux_build_jobs.append(
|
||||
BuildJob('5.13.1', 'linux', 'desktop', 'gcc_64', 'gcc_64', module='qtnetworkauth')
|
||||
)
|
||||
mac_build_jobs.append(
|
||||
BuildJob('5.13.1', 'mac', 'desktop', 'clang_64', 'clang_64', module='qtnetworkauth')
|
||||
)
|
||||
windows_build_jobs.append(
|
||||
BuildJob('5.13.1', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64', module='qtnetworkauth')
|
||||
)
|
||||
|
||||
|
||||
matrices = {}
|
||||
|
||||
for platform_build_job in all_platform_build_jobs:
|
||||
@@ -103,6 +116,8 @@ for platform_build_job in all_platform_build_jobs:
|
||||
for build_job, python_version in product(platform_build_job.build_jobs, python_versions):
|
||||
key = 'QT {} {} {} {}'.format(build_job.qt_version, build_job.host, build_job.target,
|
||||
build_job.arch)
|
||||
if build_job.module:
|
||||
key = "{} ({})".format(key, build_job.module)
|
||||
matrix_dictionary[key] = collections.OrderedDict(
|
||||
[
|
||||
('PYTHON_VERSION', python_version),
|
||||
@@ -111,6 +126,7 @@ for platform_build_job in all_platform_build_jobs:
|
||||
('TARGET', build_job.target),
|
||||
('ARCH', build_job.arch),
|
||||
('ARCHDIR', build_job.archdir),
|
||||
('MODULE', build_job.module if build_job.module else '')
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user