diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-04-19 16:06:28 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-04-21 06:33:11 +0000 |
| commit | a0464541b859c450baeee154c4d55d224f0f181d (patch) | |
| tree | df0ac13ef487b0fbf35cd636371f5659498b674f | |
| parent | 5cc41473af2e2649c7bed65f5673e5a1db242c35 (diff) | |
Add substitution for Extract operationv6.1.0-rc1-packaging
Add new substition (archives_extract_dir) that can be used
together with Extract operation.
archives_extract_dir: %QT_VERSION%/Boot2Qt/%MACHINE%/toolchain
<Operationname="Extract">
<Argument>@TargetDir@/%ARCHIVES_EXTRACT_DIR%</Argument>
</Operation>
Change-Id: If364ab48ec5c130e9d43ec218eac00804bebc2bd
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/create_installer.py | 4 | ||||
| -rw-r--r-- | packaging-tools/sdkcomponent.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/packaging-tools/create_installer.py b/packaging-tools/create_installer.py index f2280f428..6cef6d63f 100644 --- a/packaging-tools/create_installer.py +++ b/packaging-tools/create_installer.py @@ -99,6 +99,7 @@ CREATE_MAINTENANCE_TOOL_RESOURCE_FILE = False LICENSE_TYPE = '' TARGET_INSTALL_DIR_NAME_TAG = '%TARGET_INSTALL_DIR%' +ARCHIVES_EXTRACT_DIR_NAME_TAG = '%ARCHIVES_EXTRACT_DIR%' PACKAGE_DEFAULT_TAG = '%PACKAGE_DEFAULT_TAG%' SDK_VERSION_NUM_TAG = '%SDK_VERSION_NUM%' UPDATE_REPOSITORY_URL_TAG = '%UPDATE_REPOSITORY_URL%' @@ -690,6 +691,9 @@ def create_metadata_map(sdk_component): # target install dir substitution if sdk_component.target_install_base: component_metadata_tag_pair_list.append([TARGET_INSTALL_DIR_NAME_TAG, sdk_component.target_install_base]) + # archives extract dir substitution + if sdk_component.archives_extract_dir: + component_metadata_tag_pair_list.append([ARCHIVES_EXTRACT_DIR_NAME_TAG, sdk_component.archives_extract_dir]) # component sha1 substitution if sdk_component.component_sha1: component_metadata_tag_pair_list.append([COMPONENT_SHA1_TAG, sdk_component.component_sha1]) diff --git a/packaging-tools/sdkcomponent.py b/packaging-tools/sdkcomponent.py index cda008ccd..48dd596a0 100644 --- a/packaging-tools/sdkcomponent.py +++ b/packaging-tools/sdkcomponent.py @@ -100,6 +100,7 @@ class SdkComponent: self.packages_full_path_list = packages_full_path_list self.archives = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'archives') self.archives = self.archives.replace(' ', '').replace('\n', '') + self.archives_extract_dir = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'archives_extract_dir') self.archive_server_name = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'archive_server_name') self.downloadable_archive_list = [] self.target_install_base = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'target_install_base') |