From b6006dbe617c66af646f7137e86b2d7222341ed3 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Wed, 13 Jun 2012 08:04:51 +0300 Subject: Fine tune Qt 5 Beta installer configurations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some fine tuning into Qt5 Beta installer configurations. Updated component description texts and removed unnecessary item from install tree. Change-Id: I71a5121cb99b66353dda00064835dc9e4d4e2901 Reviewed-by: Simo Fält --- release-tools/configurations/all-os/common | 4 ++-- .../configurations/linux/config.xml.template.linux.qt5-beta | 12 ++++++------ release-tools/configurations/linux_x86_32_beta | 4 ---- release-tools/configurations/linux_x86_64_beta | 4 ---- .../configurations/mac/config.xml.template.mac.qt5-beta | 10 +++++----- release-tools/configurations/mac_x86_64_beta | 4 ---- .../configurations/pkg/com.qt.desktop.qt/meta/package.xml | 4 ++-- .../configurations/pkg/com.qt.desktop/meta/package.xml | 4 ++-- release-tools/configurations/pkg/com.qt/meta/package.xml | 4 ++-- .../pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml | 8 ++++---- .../pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml | 6 +++--- .../pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml | 6 +++--- .../qt.sdk.desktop.500_beta.msvc2008/meta/package.xml | 6 +++--- .../qt.sdk.desktop.500_beta.msvc2010/meta/package.xml | 6 +++--- .../qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml | 6 +++--- .../configurations/pkg_beta/qt.sdk.desktop/meta/package.xml | 4 ++-- .../pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml | 6 +++--- .../configurations/pkg_beta/qt.sdk.src/meta/package.xml | 4 ++-- .../configurations/pkg_beta/qt.sdk/meta/package.xml | 4 ++-- release-tools/configurations/win_x86_beta | 4 ---- .../windows/config.xml.template.windows.qt5-beta | 10 +++++----- 21 files changed, 52 insertions(+), 68 deletions(-) diff --git a/release-tools/configurations/all-os/common b/release-tools/configurations/all-os/common index c9cff3d..9dcfd32 100644 --- a/release-tools/configurations/all-os/common +++ b/release-tools/configurations/all-os/common @@ -1,5 +1,5 @@ [SdkCommon] -version: 1.0.0 -name: Qt5-Installer +version: 5.0.0-beta +name: Qt-Installer diff --git a/release-tools/configurations/linux/config.xml.template.linux.qt5-beta b/release-tools/configurations/linux/config.xml.template.linux.qt5-beta index a81970d..bd7a361 100644 --- a/release-tools/configurations/linux/config.xml.template.linux.qt5-beta +++ b/release-tools/configurations/linux/config.xml.template.linux.qt5-beta @@ -1,16 +1,16 @@ - Qt5 Beta Installer + Qt 5.0.0 Beta Installer %SDK_VERSION_NUM% - Qt5 Beta Installer - Maintain Qt5 Beta + Qt 5.0.0 Beta + Maintain Qt 5.0.0 Beta Qt logo.png logo-small.png logo-small license.txt watermark.png - Qt5 Beta + Qt 5.0.0 Beta qt.nokia.com MaintenanceTool @@ -21,6 +21,6 @@ --> - /opt/Qt5-beta - /opt/Qt5-beta + @homeDir@/Qt5.0.0beta + /opt/Qt5.0.0beta diff --git a/release-tools/configurations/linux_x86_32_beta b/release-tools/configurations/linux_x86_32_beta index 7ebefc4..a089661 100644 --- a/release-tools/configurations/linux_x86_32_beta +++ b/release-tools/configurations/linux_x86_32_beta @@ -62,10 +62,6 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop] -[qt.sdk.desktop.500_beta] -version: 5.0.0 -version_tag: %QT_VERSION% - [qt.sdk.desktop.500_beta.gcc] archives: desktop.500_beta.gcc target_install_base: /Desktop/Qt/5.0.0-beta/gcc diff --git a/release-tools/configurations/linux_x86_64_beta b/release-tools/configurations/linux_x86_64_beta index 945bd1a..b6fc3e2 100644 --- a/release-tools/configurations/linux_x86_64_beta +++ b/release-tools/configurations/linux_x86_64_beta @@ -61,10 +61,6 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop] -[qt.sdk.desktop.500_beta] -version: 5.0.0 -version_tag: %QT_VERSION% - [qt.sdk.desktop.500_beta.gcc_64] archives: desktop.500_beta.gcc_64 target_install_base: /Desktop/Qt/5.0.0-beta/gcc_64 diff --git a/release-tools/configurations/mac/config.xml.template.mac.qt5-beta b/release-tools/configurations/mac/config.xml.template.mac.qt5-beta index 775bb71..9ac5fc5 100644 --- a/release-tools/configurations/mac/config.xml.template.mac.qt5-beta +++ b/release-tools/configurations/mac/config.xml.template.mac.qt5-beta @@ -1,16 +1,16 @@ - Qt5 Beta Installer + Qt 5.0.0 Beta Installer %SDK_VERSION_NUM% - Qt5 Beta Installer - Maintain Qt5 Beta + Qt 5.0.0 Beta + Maintain Qt 5.0.0 Beta Qt logo.png logo-small.png logo-small license.txt watermark.png - Qt5 Beta + Qt 5.0.0 Beta qt.nokia.com MaintenanceTool @@ -21,5 +21,5 @@ --> - /opt/Qt5-beta + @homeDir@/Qt5.0.0beta diff --git a/release-tools/configurations/mac_x86_64_beta b/release-tools/configurations/mac_x86_64_beta index 51eb229..f85dbba 100644 --- a/release-tools/configurations/mac_x86_64_beta +++ b/release-tools/configurations/mac_x86_64_beta @@ -66,10 +66,6 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop] -[qt.sdk.desktop.500_beta] -version: 5.0.0 -version_tag: %QT_VERSION% - [qt.sdk.desktop.500_beta.gcc_64] archives: desktop.500_beta.gcc_64 target_install_base: /Desktop/Qt/5.0.0-beta/gcc_64 diff --git a/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml b/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml index e1d9feb..186c649 100644 --- a/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml +++ b/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml @@ -1,7 +1,7 @@ - Qt Desktop Qt Components - Qt Desktop Qt Components + Qt 5 Beta Desktop Qt Components + Desktop Qt 5 Beta Components %SDK_VERSION_NUM% %PACKAGE_CREATION_DATE% com.qt.desktop.qt diff --git a/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml b/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml index 9e9b762..79c067b 100644 --- a/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml +++ b/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml @@ -1,7 +1,7 @@ - Qt Desktop Components - Qt Desktop Components + Desktop Components + Desktop Components %SDK_VERSION_NUM% %PACKAGE_CREATION_DATE% com.qt.desktop diff --git a/release-tools/configurations/pkg/com.qt/meta/package.xml b/release-tools/configurations/pkg/com.qt/meta/package.xml index a2c44e3..cad836f 100644 --- a/release-tools/configurations/pkg/com.qt/meta/package.xml +++ b/release-tools/configurations/pkg/com.qt/meta/package.xml @@ -1,7 +1,7 @@ - Qt Installer - Qt Installer5 + Qt 5 Beta Installer + Qt 5 Beta Installer %SDK_VERSION_NUM% %PACKAGE_CREATION_DATE% com.qt diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml index d1241c8..8fdbc15 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml @@ -1,12 +1,12 @@ - Qt %QT_VERSION% (gcc) - Qt %QT_VERSION% (gcc) + Qt 5.0.0 Beta (gcc) + Qt 5.0.0 Beta (gcc) %QT_VERSION% %PACKAGE_CREATION_DATE% - qt.sdk.desktop.500_beta_gcc + qt.sdk.desktop.500_beta.gcc - + %PACKAGE_DEFAULT_TAG% diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml index 5599a9d..aa962d4 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml @@ -1,12 +1,12 @@ - Qt %QT_VERSION% (gcc 64-bit) - Qt %QT_VERSION% (gcc 64-bit) + Qt 5.0.0 Beta (gcc 64-bit) + Qt 5.0.0 Beta (gcc 64-bit) %QT_VERSION% %PACKAGE_CREATION_DATE% qt.sdk.desktop.500_beta.gcc_64 - + %PACKAGE_DEFAULT_TAG% diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml index 1493686..00231c7 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml @@ -1,12 +1,12 @@ - Qt %QT_VERSION% (mingw) - Qt %QT_VERSION% (mingw) + Qt 5.0.0 Beta (mingw) + Qt 5.0.0 Beta (mingw) %QT_VERSION% %PACKAGE_CREATION_DATE% qt.sdk.desktop.500_beta.mingw - + %PACKAGE_DEFAULT_TAG% diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml index c1d1648..f80d849 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml @@ -1,12 +1,12 @@ - Qt %QT_VERSION% (msvc2008) - Qt %QT_VERSION% (msvc2008) + Qt 5.0.0 Beta (msvc2008) + Qt 5.0.0 Beta (msvc2008) %QT_VERSION% %PACKAGE_CREATION_DATE% qt.sdk.desktop.500_beta.msvc2008 - + %PACKAGE_DEFAULT_TAG% diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml index ef6303e..789ab31 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml @@ -1,12 +1,12 @@ - Qt %QT_VERSION% (msvc2010 32-bit) - Qt %QT_VERSION% (msvc2010 32-bit) + Qt 5.0.0 Beta (msvc2010 32-bit) + Qt 5.0.0 Beta (msvc2010 32-bit) %QT_VERSION% %PACKAGE_CREATION_DATE% qt.sdk.desktop.500_beta.msvc2010 - + %PACKAGE_DEFAULT_TAG% diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml index c874642..952676a 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml @@ -1,12 +1,12 @@ - Qt %QT_VERSION% (msvc2010 64-bit) - Qt %QT_VERSION% (msvc2010 64-bit) + Qt 5.0.0 Beta (msvc2010 64-bit) + Qt 5.0.0 Beta (msvc2010 64-bit) %QT_VERSION% %PACKAGE_CREATION_DATE% qt.sdk.desktop.500_beta.msvc2010_64 - + %PACKAGE_DEFAULT_TAG% diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml index f50be75..0b12f53 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml @@ -1,7 +1,7 @@ - Qt5 Desktop Components - Qt5 Desktop Components + Desktop Components + Qt 5 Beta Desktop Components 1.0.0 %PACKAGE_CREATION_DATE% qt.sdk.desktop diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml index 78d8816..a285132 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml @@ -1,12 +1,12 @@ - Qt %QT_VERSION% Source Package - Qt %QT_VERSION% Source Package + Qt 5.0.0 Beta Source Package + Qt 5.0.0 Beta Source Package %QT_VERSION% %PACKAGE_CREATION_DATE% qt.sdk.src.qt.500_beta - + %PACKAGE_DEFAULT_TAG% diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml index da5ba44..9444bf2 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml @@ -1,7 +1,7 @@ - Qt Source Components - Qt Source Components + Source Components + Source Components 1.0.0 %PACKAGE_CREATION_DATE% qt.sdk.src diff --git a/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml index 9532283..4a6e089 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml @@ -1,7 +1,7 @@ - Qt5 - Qt5 Installer + Qt 5 Beta + Qt 5 Beta Installer 1.0.0 %PACKAGE_CREATION_DATE% qt.sdk diff --git a/release-tools/configurations/win_x86_beta b/release-tools/configurations/win_x86_beta index 9126d58..0eb2650 100644 --- a/release-tools/configurations/win_x86_beta +++ b/release-tools/configurations/win_x86_beta @@ -63,10 +63,6 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop] -[qt.sdk.desktop.500_beta] -version: 5.0.0 -version_tag: %QT_VERSION% - [qt.sdk.desktop.500_beta.msvc2010_64] archives: desktop.500_beta.msvc2010_64 target_install_base: /Desktop/Qt/5.0.0-beta/msvc2010_64 diff --git a/release-tools/configurations/windows/config.xml.template.windows.qt5-beta b/release-tools/configurations/windows/config.xml.template.windows.qt5-beta index 00802c7..9ac5fc5 100644 --- a/release-tools/configurations/windows/config.xml.template.windows.qt5-beta +++ b/release-tools/configurations/windows/config.xml.template.windows.qt5-beta @@ -1,16 +1,16 @@ - Qt5 Beta Installer + Qt 5.0.0 Beta Installer %SDK_VERSION_NUM% - Qt5 Beta Installer - Maintain Qt5 Beta + Qt 5.0.0 Beta + Maintain Qt 5.0.0 Beta Qt logo.png logo-small.png logo-small license.txt watermark.png - Qt5 Beta + Qt 5.0.0 Beta qt.nokia.com MaintenanceTool @@ -21,5 +21,5 @@ --> - @rootDir@/Qt/5.0.0-beta + @homeDir@/Qt5.0.0beta -- cgit v1.2.3