diff options
author | Antti Kokko <antti.kokko@qt.io> | 2017-09-28 12:57:59 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-10-04 05:00:29 +0000 |
commit | 9550d5a9533cf095ff422d55fffc55a456996e8c (patch) | |
tree | 1f3f95555120c25d4dcc335a517b1e3e69c6ddd6 | |
parent | 13b236762a5340f243a5a893cb10afafa9e49d69 (diff) |
Prepare for Qt5.9.2 releasev5.9.2-packaging
Remove package dispalyname and description logic since the
component is set virtual.
Change-Id: I1a8d37240a9bc3390ec370c39824f40bdbd9a1ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_592/qt.592/meta/installscript.qs | 6 | ||||
-rw-r--r-- | packaging-tools/releases/release-592 | 22 |
2 files changed, 12 insertions, 16 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_592/qt.592/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_592/qt.592/meta/installscript.qs index a15c48485..d9cd7afac 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_592/qt.592/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_592/qt.592/meta/installscript.qs @@ -36,11 +36,7 @@ function Component() snapshotBuild = true; if (snapshotBuild) { - // Indicate in DisplayName and Description that this is a snapshot build - var displayName = component.value("DisplayName"); - var description = component.value("Description"); - component.setValue("DisplayName", displayName + " snapshot (#%BUILD_NUMBER%)") - component.setValue("Description", description + " snapshot (#%BUILD_NUMBER%)") + // hide main node when in snapshot mode component.setValue("Virtual", "true") } } diff --git a/packaging-tools/releases/release-592 b/packaging-tools/releases/release-592 index 410f7d1f2..4e72c2d39 100644 --- a/packaging-tools/releases/release-592 +++ b/packaging-tools/releases/release-592 @@ -70,20 +70,20 @@ rta_key_list: Qt_RTA_opensource_offlineInstallerSmoke-592_tests_wi ################################################################################ [release.592.repository.linux.x64] arg_configurations_file: repository_configs/desktop_qt5/linux_x64_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: linux_x64/desktop/qt5_592 rta_key_list: [release.592.repository.linux.x64.src_doc_examples] arg_configurations_file: repository_configs/desktop_qt5/repository_592_src_doc_examples -arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: linux_x64/desktop/qt5_592_src_doc_examples [release.592.repository.linux.x64.android] arg_configurations_file: repository_configs/android_qt5/linux_x64_android_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: linux_x64/android/qt5_592 rta_key_list: @@ -93,27 +93,27 @@ rta_key_list: ################################################################################ [release.592.repository.windows.x86] arg_configurations_file: repository_configs/desktop_qt5/win_x86_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: windows_x86/desktop/qt5_592 rta_key_list: [release.592.repository.windows.x86.src_doc_examples] arg_configurations_file: repository_configs/desktop_qt5/repository_592_src_doc_examples -arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: windows_x86/desktop/qt5_592_src_doc_examples [release.592.repository.windows.x86.android] arg_configurations_file: repository_configs/android_qt5/win_x86_android_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: windows_x86/android/qt5_592 rta_key_list: [release.592.repository.windows.x86.winrt] arg_configurations_file: repository_configs/winrt_qt5/win_x64_winrt_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=zip, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: windows_x86/winrt/qt5_592 rta_key_list: @@ -123,27 +123,27 @@ rta_key_list: ################################################################################ [release.592.repository.mac.x64] arg_configurations_file: repository_configs/desktop_qt5/mac_x64_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: mac_x64/desktop/qt5_592 rta_key_list: [release.592.repository.mac.x64.src_doc_examples] arg_configurations_file: repository_configs/desktop_qt5/repository_592_src_doc_examples -arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: mac_x64/desktop/qt5_592_src_doc_examples [release.592.repository.mac.x64.android] arg_configurations_file: repository_configs/android_qt5/mac_x64_android_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: mac_x64/android/qt5_592 rta_key_list: [release.592.repository.mac.x64.ios] arg_configurations_file: repository_configs/ios_qt5/mac_x64_ios_repository_592 -arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=true +arg_substitution_list: %SRC_ARCHIVE_TYPE%=tar.xz, %ONLINE_SNAPSHOT_BUILD%=false repo_components_to_update: qt.592.* repo_url_specifier: mac_x64/ios/qt5_592 rta_key_list: |