From df8c4a17ae2defdbd924d8b60c1de3e9ee7ddec0 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Sun, 22 Nov 2020 09:52:58 +0900 Subject: [PATCH] Support partial source installation Signed-off-by: Hiroshi Miura --- aqt/installer.py | 11 ++++------- azure-pipelines.yml | 3 ++- ci/steps.yml | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/aqt/installer.py b/aqt/installer.py index 0bb53fb..cad2fdc 100644 --- a/aqt/installer.py +++ b/aqt/installer.py @@ -196,12 +196,8 @@ class Cli: output_dir = args.outputdir mirror = args.base sevenzip = self._set_sevenzip(args) - if flavor in ['doc', 'examples']: - modules = args.modules - archives = args.archives - else: - modules = None - archives = None + modules = args.modules + archives = args.archives self._run_common_part(output_dir, mirror) all_extra = True if modules is not None and 'all' in modules else False if not self._check_qt_arg_versions(qt_version): @@ -286,7 +282,7 @@ class Cli: def _set_module_options(self, subparser): subparser.add_argument('-m', '--modules', nargs='*', help="Specify extra modules to install") subparser.add_argument('--archives', nargs='*', - help="Specify subset modules to install(Default: all standard modules).") + help="Specify subset packages to install (Default: all standard and extra modules).") def _set_common_argument(self, subparser): subparser.add_argument("qt_version", help="Qt version in the format of \"5.X.Y\"") @@ -339,6 +335,7 @@ class Cli: src_parser.set_defaults(func=self.run_src) self._set_common_argument(src_parser) self._set_common_options(src_parser) + self._set_module_options(src_parser) # tools_parser = subparsers.add_parser('tool') tools_parser.set_defaults(func=self.run_tool) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0f110e5..2da3bb8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -92,10 +92,11 @@ jobs: displayName: Linux (source) variables: PYTHON_VERSION: '3.8' - QT_VERSION: 5.15.0 + QT_VERSION: 6.0.0 HOST: linux TARGET: desktop TOOL_NAME: src + SUBARCHIVES: qtdoc pool: vmImage: 'ubuntu-18.04' steps: diff --git a/ci/steps.yml b/ci/steps.yml index a173ea7..98b0653 100644 --- a/ci/steps.yml +++ b/ci/steps.yml @@ -100,7 +100,7 @@ steps: sleep $number mkdir Qt cd Qt - python -m aqt doc $(QT_VERSION) $(HOST) $(TARGET) + python -m aqt doc $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES) workingDirectory: $(Build.BinariesDirectory) env: AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini