Support partial source installation

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2020-11-22 09:52:58 +09:00
parent 814bfc5f39
commit df8c4a17ae
3 changed files with 7 additions and 9 deletions

View File

@@ -196,12 +196,8 @@ class Cli:
output_dir = args.outputdir output_dir = args.outputdir
mirror = args.base mirror = args.base
sevenzip = self._set_sevenzip(args) sevenzip = self._set_sevenzip(args)
if flavor in ['doc', 'examples']: modules = args.modules
modules = args.modules archives = args.archives
archives = args.archives
else:
modules = None
archives = None
self._run_common_part(output_dir, mirror) self._run_common_part(output_dir, mirror)
all_extra = True if modules is not None and 'all' in modules else False all_extra = True if modules is not None and 'all' in modules else False
if not self._check_qt_arg_versions(qt_version): if not self._check_qt_arg_versions(qt_version):
@@ -286,7 +282,7 @@ class Cli:
def _set_module_options(self, subparser): def _set_module_options(self, subparser):
subparser.add_argument('-m', '--modules', nargs='*', help="Specify extra modules to install") subparser.add_argument('-m', '--modules', nargs='*', help="Specify extra modules to install")
subparser.add_argument('--archives', nargs='*', 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): def _set_common_argument(self, subparser):
subparser.add_argument("qt_version", help="Qt version in the format of \"5.X.Y\"") 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) src_parser.set_defaults(func=self.run_src)
self._set_common_argument(src_parser) self._set_common_argument(src_parser)
self._set_common_options(src_parser) self._set_common_options(src_parser)
self._set_module_options(src_parser)
# #
tools_parser = subparsers.add_parser('tool') tools_parser = subparsers.add_parser('tool')
tools_parser.set_defaults(func=self.run_tool) tools_parser.set_defaults(func=self.run_tool)

View File

@@ -92,10 +92,11 @@ jobs:
displayName: Linux (source) displayName: Linux (source)
variables: variables:
PYTHON_VERSION: '3.8' PYTHON_VERSION: '3.8'
QT_VERSION: 5.15.0 QT_VERSION: 6.0.0
HOST: linux HOST: linux
TARGET: desktop TARGET: desktop
TOOL_NAME: src TOOL_NAME: src
SUBARCHIVES: qtdoc
pool: pool:
vmImage: 'ubuntu-18.04' vmImage: 'ubuntu-18.04'
steps: steps:

View File

@@ -100,7 +100,7 @@ steps:
sleep $number sleep $number
mkdir Qt mkdir Qt
cd Qt cd Qt
python -m aqt doc $(QT_VERSION) $(HOST) $(TARGET) python -m aqt doc $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES)
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
env: env:
AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini