diff --git a/release-tools/configurations/all-os/doc-conf b/release-tools/configurations/all-os/doc-conf
new file mode 100644
index 0000000000000000000000000000000000000000..9b424c1a15f6a07f9efd7d84d6bc654a829b69bf
--- /dev/null
+++ b/release-tools/configurations/all-os/doc-conf
@@ -0,0 +1,23 @@
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list:
+
+[qt.500_beta2.doc]
+
+[qt.500_beta2.doc.qt]
+archives: doc.qt
+target_install_base: /5.0.0-beta2/Documents/Qt
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[doc.qt]
+archive_uri: /qt/5.0.0_opensource/src/doc/qt.qch
+package_strip_dirs:
+target_install_dir: /
+rpath_target:
+archive_name: doc_qt5.7z
+
diff --git a/release-tools/configurations/all-os/src-conf b/release-tools/configurations/all-os/src-conf
new file mode 100644
index 0000000000000000000000000000000000000000..89142fd3ca183028b3a2b16a863965102ce835f0
--- /dev/null
+++ b/release-tools/configurations/all-os/src-conf
@@ -0,0 +1,27 @@
+
+# for testing purposes
+[PackageIgnoreList]
+packages:
+
+[ExtraPackageConfigurationFiles]
+file_list:
+
+
+[qt]
+root_component: yes
+
+[qt.500_beta2]
+
+[qt.500_beta2.src]
+archives: 500_beta2.src
+target_install_base: /5.0.0-beta2/Src/
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.src]
+archive_uri: /qt/5.0.0_opensource/src/qt-everywhere-opensource-src-5.0.0.ARCHIVE_TAG
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: qt-everywhere-opensource-src-5.0.0.7z
+
diff --git a/release-tools/configurations/all-os/tools_src-conf b/release-tools/configurations/all-os/tools_src-conf
new file mode 100644
index 0000000000000000000000000000000000000000..ac0fb8bd9f31756c1d238b4138975dcd47ed5071
--- /dev/null
+++ b/release-tools/configurations/all-os/tools_src-conf
@@ -0,0 +1,14 @@
+[qt.tools.qtcreator]
+
+[qt.tools.qtcreator.src]
+archives: tools.qtcreator.src
+target_install_base: /Tools/Qt Creator/src
+version: 2.6.0
+version_tag: %QTCREATOR_VERSION%
+package_default: false
+[tools.qtcreator.src]
+archive_uri: http://origin.releases.qt-project.org/qtcreator/2.6.0-beta/qt-creator-2.6.0-beta-src.ARCHIVE_TAG
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: qt-creator-opensource-src-2.6.0.7z
diff --git a/release-tools/configurations/linux/config.xml.template.linux b/release-tools/configurations/linux/config.xml.template.linux
deleted file mode 100644
index f177fd53efe7af9a112dec00522819c418a542f5..0000000000000000000000000000000000000000
--- a/release-tools/configurations/linux/config.xml.template.linux
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<Installer>
- <Name>Qt SDK</Name>
- <Version>5.0.0 Beta 2</Version>
- <Title>Qt SDK</Title>
- <MaintenanceTitle>Maintain Qt SDK</MaintenanceTitle>
- <Publisher>Qt</Publisher>
- <Logo>logo.png</Logo>
- <LogoSmall>logo-small.png</LogoSmall>
- <Icon>logo-small</Icon>
- <License>license.txt</License>
- <Watermark>watermark.png</Watermark>
- <StartMenuDir>Qt SDK</StartMenuDir>
- <ProductUrl>qt.nokia.com</ProductUrl>
- <!--<Background>background.png</Background>-->
- <UninstallerName>SDKMaintenanceTool</UninstallerName>
- <RemoteRepositories>
- <Repository>
- <Url>%UPDATE_REPOSITORY_URL%</Url>
- <Required>false</Required>
- </Repository>
- </RemoteRepositories>
- <!-- @homeDir@ and @rootDir@ are some of the supported vars -->
- <TargetDir>@homeDir@/QtSDK</TargetDir>
- <AdminTargetDir>/opt/QtSDK</AdminTargetDir>
-</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 9adf8b0633347989489cc44ce30acc288c77d29c..eab80eb718296e18ce7a01555200344f74362475 100644
--- a/release-tools/configurations/linux/config.xml.template.linux.qt5-beta
+++ b/release-tools/configurations/linux/config.xml.template.linux.qt5-beta
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Installer>
<Name>Qt 5.0.0 Beta 2 Installer</Name>
- <Version>%SDK_VERSION_NUM%</Version>
+ <Version>5.0.0 Beta 2</Version>
<Title>Qt 5.0.0 Beta 2</Title>
<MaintenanceTitle>Maintain Qt 5.0.0 Beta 2</MaintenanceTitle>
<Publisher>Qt</Publisher>
diff --git a/release-tools/configurations/linux/installer-framework b/release-tools/configurations/linux/installer-framework
index 9c517bfb0ee37343d05c92e76312b51df0d76990..2b219197809256386f08b85bba76a2285d49f3cd 100644
--- a/release-tools/configurations/linux/installer-framework
+++ b/release-tools/configurations/linux/installer-framework
@@ -4,14 +4,14 @@ make_cmd: make -j8
[QtForInstallerFramework]
qt_src_package_url: http://origin.releases.qt-project.org/prebuilt/qt-everywhere-opensource-src-4.8.0-ifw-patch.tar.gz
-qt_source_dir: qt-everywhere-src
-qt_build_dir: qt-everywhere-build
+qt_source_dir: qt-src
+qt_build_dir: qt-bld
qt_installerfw_qt_configure_line: -static -release -opensource -confirm-license -silent -nomake examples -nomake demos -nomake tests -nomake docs -nomake plugins -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -no-nis -no-cups -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-webkit -no-declarative -no-declarative-debug -no-accessibility --prefix=
[InstallerFramework]
-installer_framework_url: https://git.gitorious.org/installer-framework/installer-framework.git
-installer_framework_source_dir: installer-framework-source
-installer_framework_build_dir: installer-framework-build
+installer_framework_url: git://gitorious.org/installer-framework/installer-framework.git
+installer_framework_source_dir: ifw-src
+installer_framework_build_dir: ifw-bld
installer_framework_version_tag: remotes/origin/qt5
installer_framework_qmake_args: -config release -config static -r
@@ -19,5 +19,3 @@ installer_framework_qmake_args: -config release -config static -r
installer_framework_archive_name: installer-framework-build-linux.7z
installerbase_archive_name: installerbase-linux.7z
qt_archive_name: qt-ifw-4.8.0-linux.7z
-macdeployqt_archive_name:
-qtmenunib_archive_name:
diff --git a/release-tools/configurations/linux/tools-conf b/release-tools/configurations/linux/tools-conf
new file mode 100644
index 0000000000000000000000000000000000000000..dde5c849849ac9215ac1f0f058b6a4fd90ce2fdf
--- /dev/null
+++ b/release-tools/configurations/linux/tools-conf
@@ -0,0 +1,14 @@
+[qt.tools]
+
+[qt.tools.qtcreator]
+archives: tools.qtcreator
+target_install_base: /Tools/Qt Creator/Desktop
+version: 2.6.0
+version_tag: %QTCREATOR_VERSION%
+package_default: true
+[tools.qtcreator]
+archive_uri: http://origin.releases.qt-project.org/qtcreator/2.6.0-beta/qt-creator-linux-x86-opensource-2.6.0-beta.7z
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: qt-creator-opensource-2.6.0.7z
diff --git a/release-tools/configurations/linux/tools_64-conf b/release-tools/configurations/linux/tools_64-conf
new file mode 100644
index 0000000000000000000000000000000000000000..06fa2cfb110e7b965dae70dff385ed61d5ed8fa0
--- /dev/null
+++ b/release-tools/configurations/linux/tools_64-conf
@@ -0,0 +1,14 @@
+[qt.tools]
+
+[qt.tools.qtcreator.desktop]
+archives: tools.qtcreator
+target_install_base: /Tools/Qt Creator/Desktop
+version: 2.6.0
+version_tag: %QTCREATOR_VERSION%
+package_default: true
+[tools.qtcreator]
+archive_uri: http://origin.releases.qt-project.org/qtcreator/2.6.0-beta/qt-creator-linux-x86_64-opensource-2.6.0-beta.7z
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: qt-creator-opensource-2.6.0.7z
diff --git a/release-tools/configurations/linux/x86_32 b/release-tools/configurations/linux/x86_32
deleted file mode 100644
index 64935121297e02d912a8f5743822cbed419fe95d..0000000000000000000000000000000000000000
--- a/release-tools/configurations/linux/x86_32
+++ /dev/null
@@ -1,78 +0,0 @@
-
-[com.qt]
-root_component: yes
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src.500]
-archives: qt.src.500
-target_install_base: /Src/Qt/5.0.0
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: false
-[qt.src.500]
-archive_uri: qt-everywhere-opensource-src-5.0.0.tar.gz
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[com.qt.desktop]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt.500]
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-
-[com.qt.desktop.qt.500.gcc]
-archives: qt.500.gcc
-target_install_base: /Desktop/Qt/5.0.0/gcc
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: true
-[qt.500.gcc]
-archive_uri: qt-5.0.0-desktop-gcc.7z
-package_strip_dirs: 4
-target_install_dir: /
-rpath_target: /lib
-archive_name: qt-5.0.0-desktop-gcc.7z
-
-
-[OfflinePackageExcludeList]
-package_list:
-
-[PackagesNamespace]
-name: com.qt
-
-[SdkUpdateRepository]
-repository_url:
-repository_url_rnd:
-
-[TargetArchitechture]
-instruction_set: x86_32
-
-[ConfigDir]
-template_name: config_qt5
-target_dir: config
-
-[ConfigXml]
-template_name: config.xml.template.linux
-
-[WorkingDirectories]
-packages_dir: pkg
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://<url_to>/installer-framework-build-linux-64bit.7z
-version: 1.2.0
-
-
diff --git a/release-tools/configurations/linux/x86_64 b/release-tools/configurations/linux/x86_64
deleted file mode 100644
index d54ac6b26e206dcdae330fafb6d48e7d3fdd45fc..0000000000000000000000000000000000000000
--- a/release-tools/configurations/linux/x86_64
+++ /dev/null
@@ -1,78 +0,0 @@
-
-[com.qt]
-root_component: yes
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src.500]
-archives: qt.src.500
-target_install_base: /Src/Qt/5.0.0
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: false
-[qt.src.500]
-archive_uri: qt-everywhere-opensource-src-5.0.0.tar.gz
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[com.qt.desktop]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt.500]
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-
-[com.qt.desktop.qt.500.gcc]
-archives: qt.500.gcc
-target_install_base: /Desktop/Qt/5.0.0/gcc
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: true
-[qt.500.gcc]
-archive_uri: qt-5.0.0-desktop-gcc.7z
-package_strip_dirs: 4
-target_install_dir: /
-rpath_target: /lib
-archive_name: qt-5.0.0-desktop-gcc.7z
-
-
-[OfflinePackageExcludeList]
-package_list:
-
-[PackagesNamespace]
-name: com.qt
-
-[SdkUpdateRepository]
-repository_url:
-repository_url_rnd:
-
-[TargetArchitechture]
-instruction_set: x86_64
-
-[ConfigDir]
-template_name: config_qt5
-target_dir: config
-
-[ConfigXml]
-template_name: config.xml.template.linux
-
-[WorkingDirectories]
-packages_dir: pkg
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://<url_to>/installer-framework-build-linux-32bit.7z
-version: 1.2.0
-
-
diff --git a/release-tools/configurations/linux_x86_32_beta b/release-tools/configurations/linux_x86_32_beta
deleted file mode 100644
index b0257a84f2433ba082b383820c8cafd604310a4f..0000000000000000000000000000000000000000
--- a/release-tools/configurations/linux_x86_32_beta
+++ /dev/null
@@ -1,90 +0,0 @@
-[PackageNamespace]
-name: qt.sdk
-
-[PlatformIdentifier]
-identifier: linux
-
-[ArchiveRemoteLocation.some_server_nickname_here]
-base_url: http://origin.releases.qt-project.org
-base_path:
-
-# for testing purposes
-[PackageIgnoreList]
-packages: foo.bar, foo.bar2, foo.bar3
-
-[ExtraPackageConfigurationFiles]
-file_list:
-
-[OfflinePackageExcludeList]
-package_list:
-
-[SdkUpdateRepository]
-repository_url_release: http://../qt5repository/linux/x32/online_qt5sdk_repo
-repository_url_rnd: http://../qt5repository/linux/x32/online_qt5sdk_repo
-
-[TargetArchitechture]
-instruction_set: x86_32
-
-[ConfigDir]
-template_name: config_qt5
-
-[ConfigXml]
-template_name: config.xml.template.linux.qt5-beta
-
-[WorkingDirectories]
-packages_dir: pkg_beta
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://<server_address_here>/packages/.../installer-framework-build-linux-32bit.7z
-version: 1.2.0
-
-
-
-
-[qt.sdk]
-root_component: yes
-
-[qt.sdk.readme]
-archives: sdk.readme
-target_install_base: /
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[sdk.readme]
-archive_uri: http://origin.releases.qt-project.org/prebuilt/readme_unix_line-endings.7z
-package_strip_dirs: 0
-target_install_dir: /
-rpath_target:
-archive_name: readme.7z
-
-[qt.sdk.src]
-
-[qt.sdk.src.qt.500_beta]
-archives: src.qt.500_beta
-target_install_base: /Src/Qt/5.0.0-beta2/
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[src.qt.500_beta]
-archive_uri: /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta2.tar.gz
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[qt.sdk.desktop]
-
-[qt.sdk.desktop.500_beta.gcc]
-archives: desktop.500_beta.gcc
-target_install_base: /Desktop/Qt/5.0.0-beta2/gcc
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[desktop.500_beta.gcc]
-archive_uri: /qt5.0-beta-snapshots/linux_32_release/qt5_desktop_bin_linux32_1110.7z
-package_strip_dirs: 4
-target_install_dir: /
-rpath_target: /lib
-archive_name: gcc_qt5_all.7z
-
diff --git a/release-tools/configurations/linux_x86_32_u1110_offline b/release-tools/configurations/linux_x86_32_u1110_offline
new file mode 100644
index 0000000000000000000000000000000000000000..06f88034c5edd7ca15b96bfc5ee3e08d5f84fcaa
--- /dev/null
+++ b/release-tools/configurations/linux_x86_32_u1110_offline
@@ -0,0 +1,75 @@
+[PackageNamespace]
+name: qt
+
+[PlatformIdentifier]
+identifier: linux
+
+[ArchiveRemoteLocation.dl241]
+base_url: http://it-dl241-hki.it.local/packages/
+base_path:
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list: doc-conf, src-conf, tools-conf, tools_src-conf
+
+[OfflinePackageExcludeList]
+package_list:
+
+[SdkUpdateRepository]
+repository_url_release: http://../qt5repository/linux/x32/online_qt5sdk_repo
+repository_url_rnd: http://../qt5repository/linux/x32/online_qt5sdk_repo
+
+[TargetArchitechture]
+instruction_set: x86_32
+
+[ConfigDir]
+template_name: config_qt5
+
+[ConfigXml]
+template_name: config.xml.template.linux.qt5-beta
+
+[WorkingDirectories]
+packages_dir: pkg
+
+[InstallerFrameworkTools]
+name: ifwt
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/linux_gcc_32_ubuntu1110/installer-framework-build-linux-32bit.7z
+version: 1.2.0
+
+
+[qt.readme]
+archives: readme
+target_install_base: /
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[readme]
+archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: readme.7z
+
+
+[qt.500_beta2.gcc]
+archives: 500_beta2.gcc, 500_beta2.gcc.icu
+target_install_base: /5.0.0-beta2/gcc
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.gcc]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_32_ubuntu1110/qt5_all.7z
+package_strip_dirs: 4
+target_install_dir: /
+rpath_target: /lib
+archive_name: gcc_qt5_all.7z
+[500_beta2.gcc.icu]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_32_ubuntu1110/libicu_x86_32_ubuntu1110.7z
+package_strip_dirs: 0
+target_install_dir: /lib
+rpath_target:
+archive_name: libicu_x86_32_ubuntu1110.7z
+
diff --git a/release-tools/configurations/linux_x86_32_u1204_offline b/release-tools/configurations/linux_x86_32_u1204_offline
new file mode 100644
index 0000000000000000000000000000000000000000..c50590b65db744c44e74a4d680e1490eb79b6964
--- /dev/null
+++ b/release-tools/configurations/linux_x86_32_u1204_offline
@@ -0,0 +1,75 @@
+[PackageNamespace]
+name: qt
+
+[PlatformIdentifier]
+identifier: linux
+
+[ArchiveRemoteLocation.dl241]
+base_url: http://it-dl241-hki.it.local/packages/
+base_path:
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list: doc-conf, src-conf, tools-conf, tools_src-conf
+
+[OfflinePackageExcludeList]
+package_list:
+
+[SdkUpdateRepository]
+repository_url_release: http://../qt5repository/linux/x32/online_qt5sdk_repo
+repository_url_rnd: http://../qt5repository/linux/x32/online_qt5sdk_repo
+
+[TargetArchitechture]
+instruction_set: x86_32
+
+[ConfigDir]
+template_name: config_qt5
+
+[ConfigXml]
+template_name: config.xml.template.linux.qt5-beta
+
+[WorkingDirectories]
+packages_dir: pkg
+
+[InstallerFrameworkTools]
+name: ifwt
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/linux_gcc_32_ubuntu1204/installer-framework-build-linux-32bit.7z
+version: 1.2.0
+
+
+[qt.readme]
+archives: readme
+target_install_base: /
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[readme]
+archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: readme.7z
+
+
+[qt.500_beta2.gcc]
+archives: 500_beta2.gcc, 500_beta2.gcc.icu
+target_install_base: /5.0.0-beta2/gcc
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.gcc]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_32_ubuntu1204/qt5_all.7z
+package_strip_dirs: 4
+target_install_dir: /
+rpath_target: /lib
+archive_name: gcc_qt5_all.7z
+[500_beta2.gcc.icu]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_32_ubuntu1204/libicu_x86_32_ubuntu1204.7z
+package_strip_dirs: 0
+target_install_dir: /lib
+rpath_target:
+archive_name: libicu_x86_32_ubuntu1204.7z
+
diff --git a/release-tools/configurations/linux_x86_64_beta b/release-tools/configurations/linux_x86_64_beta
deleted file mode 100644
index 2dc376b343d15e1d8d8c0f04e8fdb1315b6164eb..0000000000000000000000000000000000000000
--- a/release-tools/configurations/linux_x86_64_beta
+++ /dev/null
@@ -1,90 +0,0 @@
-[PackageNamespace]
-name: qt.sdk
-
-[PlatformIdentifier]
-identifier: linux
-
-[ArchiveRemoteLocation.some_server_nickname_here]
-base_url: http://origin.releases.qt-project.org
-base_path:
-
-# for testing purposes
-[PackageIgnoreList]
-packages: foo.bar, foo.bar2, foo.bar3
-
-[ExtraPackageConfigurationFiles]
-file_list:
-
-[OfflinePackageExcludeList]
-package_list:
-
-[SdkUpdateRepository]
-repository_url_release: http://../qt5repository/linux/x64/online_qt5sdk_repo
-repository_url_rnd: http://../qt5repository/linux/x64/online_qt5sdk_repo
-
-[TargetArchitechture]
-instruction_set: x86_64
-
-[ConfigDir]
-template_name: config_qt5
-
-[ConfigXml]
-template_name: config.xml.template.linux.qt5-beta
-
-[WorkingDirectories]
-packages_dir: pkg_beta
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://<server_address_here>/packages/.../installer-framework-build-linux-64bit.7z
-version: 1.2.0
-
-
-
-[qt.sdk]
-root_component: yes
-
-[qt.sdk.readme]
-archives: sdk.readme
-target_install_base: /
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[sdk.readme]
-archive_uri: http://origin.releases.qt-project.org/prebuilt/readme_unix_line-endings.7z
-package_strip_dirs: 0
-target_install_dir: /
-rpath_target:
-archive_name: readme.7z
-
-[qt.sdk.src]
-
-[qt.sdk.src.qt.500_beta]
-archives: src.qt.500_beta
-target_install_base: /Src/Qt/5.0.0-beta2/
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[src.qt.500_beta]
-archive_uri: /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta2.tar.gz
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[qt.sdk.desktop]
-
-[qt.sdk.desktop.500_beta.gcc_64]
-archives: desktop.500_beta.gcc_64
-target_install_base: /Desktop/Qt/5.0.0-beta2/gcc_64
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[desktop.500_beta.gcc_64]
-archive_uri: /qt5.0-beta-snapshots/linux_64_release/qt5_desktop_bin_linux64_1110.7z
-package_strip_dirs: 4
-target_install_dir: /
-rpath_target: /lib
-archive_name: gcc_64_qt5_all.7z
-
-
diff --git a/release-tools/configurations/linux_x86_64_u1110_offline b/release-tools/configurations/linux_x86_64_u1110_offline
new file mode 100644
index 0000000000000000000000000000000000000000..23bf272676454f943ff7882925d67bb4835d9cc6
--- /dev/null
+++ b/release-tools/configurations/linux_x86_64_u1110_offline
@@ -0,0 +1,75 @@
+[PackageNamespace]
+name: qt
+
+[PlatformIdentifier]
+identifier: linux
+
+[ArchiveRemoteLocation.dl241]
+base_url: http://it-dl241-hki.it.local/packages/
+base_path:
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list: doc-conf, src-conf, tools_64-conf, tools_src-conf
+
+[OfflinePackageExcludeList]
+package_list:
+
+[SdkUpdateRepository]
+repository_url_release: http://../qt5repository/linux/x64/online_qt5sdk_repo
+repository_url_rnd: http://../qt5repository/linux/x64/online_qt5sdk_repo
+
+[TargetArchitechture]
+instruction_set: x86_64
+
+[ConfigDir]
+template_name: config_qt5
+
+[ConfigXml]
+template_name: config.xml.template.linux.qt5-beta
+
+[WorkingDirectories]
+packages_dir: pkg
+
+[InstallerFrameworkTools]
+name: ifwt
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/linux_gcc_64_ubuntu1110/installer-framework-build-linux-64bit.7z
+version: 1.2.0
+
+
+[qt.readme]
+archives: readme
+target_install_base: /
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[readme]
+archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: readme.7z
+
+
+[qt.500_beta2.gcc_64]
+archives: 500_beta2.gcc_64, 500_beta2.gcc_64.icu
+target_install_base: /5.0.0-beta2/gcc_64
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.gcc_64]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_64_ubuntu1110/qt5_all.7z
+package_strip_dirs: 4
+target_install_dir: /
+rpath_target: /lib
+archive_name: gcc_64_qt5_all.7z
+[500_beta2.gcc_64.icu]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_64_ubuntu1110/libicu_x86_64_ubuntu1110.7z
+package_strip_dirs: 0
+target_install_dir: /lib
+rpath_target:
+archive_name: libicu_x86_64_ubuntu1110.7z
+
diff --git a/release-tools/configurations/linux_x86_64_u1204_offline b/release-tools/configurations/linux_x86_64_u1204_offline
new file mode 100644
index 0000000000000000000000000000000000000000..c03ef55de1dfd8717668842b48082577cd74893a
--- /dev/null
+++ b/release-tools/configurations/linux_x86_64_u1204_offline
@@ -0,0 +1,75 @@
+[PackageNamespace]
+name: qt
+
+[PlatformIdentifier]
+identifier: linux
+
+[ArchiveRemoteLocation.dl241]
+base_url: http://it-dl241-hki.it.local/packages/
+base_path:
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list: doc-conf, src-conf, tools_64-conf, tools_src-conf
+
+[OfflinePackageExcludeList]
+package_list:
+
+[SdkUpdateRepository]
+repository_url_release: http://../qt5repository/linux/x64/online_qt5sdk_repo
+repository_url_rnd: http://../qt5repository/linux/x64/online_qt5sdk_repo
+
+[TargetArchitechture]
+instruction_set: x86_64
+
+[ConfigDir]
+template_name: config_qt5
+
+[ConfigXml]
+template_name: config.xml.template.linux.qt5-beta
+
+[WorkingDirectories]
+packages_dir: pkg
+
+[InstallerFrameworkTools]
+name: ifwt
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/linux_gcc_64_ubuntu1204/installer-framework-build-linux-64bit.7z
+version: 1.2.0
+
+
+[qt.readme]
+archives: readme
+target_install_base: /
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[readme]
+archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: readme.7z
+
+
+[qt.500_beta2.gcc_64]
+archives: 500_beta2.gcc_64, 500_beta2.gcc_64.icu
+target_install_base: /5.0.0-beta2/gcc_64
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.gcc_64]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_64_ubuntu1204/qt5_all.7z
+package_strip_dirs: 4
+target_install_dir: /
+rpath_target: /lib
+archive_name: gcc_64_qt5_all.7z
+[500_beta2.gcc_64.icu]
+archive_uri: /qt/5.0.0_opensource/linux_gcc_64_ubuntu1204/libicu_x86_64_ubuntu1204.7z
+package_strip_dirs: 0
+target_install_dir: /lib
+rpath_target:
+archive_name: libicu_x86_64_ubuntu1204.7z
+
diff --git a/release-tools/configurations/mac/config.xml.template.mac b/release-tools/configurations/mac/config.xml.template.mac
deleted file mode 100644
index 01eba008da47178f0c3d8de6bef5f30c86193657..0000000000000000000000000000000000000000
--- a/release-tools/configurations/mac/config.xml.template.mac
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<Installer>
- <Name>Qt SDK</Name>
- <Version>5.0.0 Beta 2</Version>
- <Title>Qt SDK</Title>
- <MaintenanceTitle>Maintain Qt SDK</MaintenanceTitle>
- <Publisher>Qt</Publisher>
- <Logo>logo.png</Logo>
- <LogoSmall>logo-small.png</LogoSmall>
- <Icon>logo-small</Icon>
- <License>license.txt</License>
- <Watermark>watermark.png</Watermark>
- <StartMenuDir>Qt SDK</StartMenuDir>
- <ProductUrl>qt.nokia.com</ProductUrl>
- <!--<Background>background.png</Background>-->
- <UninstallerName>SDKMaintenanceTool</UninstallerName>
- <RemoteRepositories>
- <Repository>
- <Url>%UPDATE_REPOSITORY_URL%</Url>
- <Required>false</Required>
- </Repository>
- </RemoteRepositories>
- <!-- @homeDir@ and @rootDir@ are some of the supported vars -->
- <TargetDir>@homeDir@/QtSDK</TargetDir>
-</Installer>
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 ec5ae2166a845515d16f79bceb0dfe7fe306727f..1705df2b7992a124f04cd021054ef401cc120f94 100644
--- a/release-tools/configurations/mac/config.xml.template.mac.qt5-beta
+++ b/release-tools/configurations/mac/config.xml.template.mac.qt5-beta
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Installer>
<Name>Qt 5.0.0 Beta 2 Installer</Name>
- <Version>%SDK_VERSION_NUM%</Version>
+ <Version>5.0.0 Beta 2</Version>
<Title>Qt 5.0.0 Beta 2</Title>
<MaintenanceTitle>Maintain Qt 5.0.0 Beta 2</MaintenanceTitle>
<Publisher>Qt</Publisher>
diff --git a/release-tools/configurations/mac/installer-framework b/release-tools/configurations/mac/installer-framework
index dbb226a6b234031071ab72efb07d082bba5f0af6..99bc087d4859243d73ebfd93157d77557781fd2a 100644
--- a/release-tools/configurations/mac/installer-framework
+++ b/release-tools/configurations/mac/installer-framework
@@ -4,14 +4,14 @@ make_cmd: make -j8
[QtForInstallerFramework]
qt_src_package_url: http://origin.releases.qt-project.org/prebuilt/qt-everywhere-opensource-src-4.8.0-ifw-patch.tar.gz
-qt_source_dir: qt-everywhere-src
-qt_build_dir: qt-everywhere-build
+qt_source_dir: qt-src
+qt_build_dir: qt-bld
qt_installerfw_qt_configure_line: -static -release -opensource -confirm-license -silent -nomake examples -nomake demos -nomake tests -nomake docs -nomake plugins -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -no-nis -no-cups -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-webkit -no-declarative -no-declarative-debug -no-accessibility --prefix=
[InstallerFramework]
installer_framework_url: git://gitorious.org/installer-framework/installer-framework.git
-installer_framework_source_dir: installer-framework-source
-installer_framework_build_dir: installer-framework-build
+installer_framework_source_dir: ifw-src
+installer_framework_build_dir: ifw-bld
installer_framework_version_tag: remotes/origin/qt5
installer_framework_qmake_args: -config release -config static -r
diff --git a/release-tools/configurations/mac/tools-conf b/release-tools/configurations/mac/tools-conf
new file mode 100644
index 0000000000000000000000000000000000000000..7b3f5bef017a187833425c15530f437d428b04b5
--- /dev/null
+++ b/release-tools/configurations/mac/tools-conf
@@ -0,0 +1,14 @@
+[qt.tools]
+
+[qt.tools.qtcreator]
+archives: tools.qtcreator
+target_install_base: /Qt Creator
+version: 2.6.0
+version_tag: %QTCREATOR_VERSION%
+package_default: true
+[tools.qtcreator]
+archive_uri: http://origin.releases.qt-project.org/qtcreator/2.6.0-beta/qt-creator-mac-opensource-2.6.0-beta.7z
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: qt-creator-opensource-2.6.0.7z
diff --git a/release-tools/configurations/mac/x86_64 b/release-tools/configurations/mac/x86_64
deleted file mode 100644
index a7596818638fa72df259e1f6a89dd4f8d580bdc1..0000000000000000000000000000000000000000
--- a/release-tools/configurations/mac/x86_64
+++ /dev/null
@@ -1,78 +0,0 @@
-
-[com.qt]
-root_component: yes
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src.500]
-archives: qt.src.500
-target_install_base: /Src/Qt/5.0.0
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: false
-[qt.src.500]
-archive_uri: qt-everywhere-opensource-src-5.0.0.tar.gz
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[com.qt.desktop]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt.500]
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-
-[com.qt.desktop.qt.500.gcc]
-archives: qt.500.gcc
-target_install_base: /Desktop/Qt/5.0.0/gcc
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: true
-[qt.500.gcc]
-archive_uri: qt-5.0.0-desktop-gcc.7z
-package_strip_dirs: 4
-target_install_dir: /
-rpath_target: /lib
-archive_name: qt-5.0.0-desktop-gcc.7z
-
-
-[OfflinePackageExcludeList]
-package_list:
-
-[PackagesNamespace]
-name: com.qt
-
-[SdkUpdateRepository]
-repository_url:
-repository_url_rnd:
-
-[TargetArchitechture]
-instruction_set: x86_64
-
-[ConfigDir]
-template_name: config_qt5
-target_dir: config
-
-[ConfigXml]
-template_name: config.xml.template.mac
-
-[WorkingDirectories]
-packages_dir: pkg
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://<url_to>/installer-framework-build-mac.7z
-version: 1.2.0
-
-
diff --git a/release-tools/configurations/mac_x86_64_beta b/release-tools/configurations/mac_x86_64_beta
deleted file mode 100644
index fae5f188dbd0d46eac006f9ee3b367ef6fc7c49d..0000000000000000000000000000000000000000
--- a/release-tools/configurations/mac_x86_64_beta
+++ /dev/null
@@ -1,93 +0,0 @@
-[PackageNamespace]
-name: qt.sdk
-
-[PlatformIdentifier]
-identifier: mac
-
-[ArchiveRemoteLocation.some_server_nickname_here]
-base_url: http://origin.releases.qt-project.org
-base_path:
-
-# for testing purposes
-[PackageIgnoreList]
-packages: foo.bar, foo.bar2, foo.bar3
-
-[ExtraPackageConfigurationFiles]
-file_list:
-
-[OfflinePackageExcludeList]
-package_list:
-
-[qtmenunib]
-package_url: http://origin.releases.qt-project.org/utils/bin_tools/qt_menu.nib.7z
-
-[SdkUpdateRepository]
-repository_url_release: http://../qt5repository/macx/x64/online_qt5sdk_repo
-repository_url_rnd: http://../qt5repository/macx/x64/online_qt5sdk_repo
-
-[TargetArchitechture]
-instruction_set: x86_64
-
-[ConfigDir]
-template_name: config_qt5
-
-[ConfigXml]
-template_name: config.xml.template.mac.qt5-beta
-
-[WorkingDirectories]
-packages_dir: pkg_beta
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://origin.releases.qt-project.org/utils/bin_tools/pre_sdk_ifw/installer-framework-build-mac.7z
-version: 1.2.0
-
-
-
-
-
-[qt.sdk]
-root_component: yes
-
-[qt.sdk.readme]
-archives: sdk.readme
-target_install_base: /
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[sdk.readme]
-archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
-package_strip_dirs: 0
-target_install_dir: /
-rpath_target:
-archive_name: readme.7z
-
-[qt.sdk.src]
-
-[qt.sdk.src.qt.500_beta]
-archives: src.qt.500_beta
-target_install_base: /Src/Qt/5.0.0-beta2/
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[src.qt.500_beta]
-archive_uri: /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta2.tar.gz
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[qt.sdk.desktop]
-
-[qt.sdk.desktop.500_beta.gcc_64]
-archives: desktop.500_beta.gcc_64
-target_install_base: /Desktop/Qt/5.0.0-beta2/gcc_64
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[desktop.500_beta.gcc_64]
-archive_uri: /qt5.0-beta-snapshots/mac_64_release/qt-5.0.0-desktop-mac-cocoa-64bit.7z
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: gcc_64_mac_qt5_all.7z
diff --git a/release-tools/configurations/mac_x86_64_offline b/release-tools/configurations/mac_x86_64_offline
new file mode 100644
index 0000000000000000000000000000000000000000..dff7d0fabbdfbbf27b38673132a5b0f7c3a745d7
--- /dev/null
+++ b/release-tools/configurations/mac_x86_64_offline
@@ -0,0 +1,71 @@
+[PackageNamespace]
+name: qt
+
+[PlatformIdentifier]
+identifier: mac
+
+[ArchiveRemoteLocation.dl241]
+base_url: http://it-dl241-hki.it.local/packages/
+base_path:
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list: doc-conf, src-conf, tools-conf, tools_src-conf
+
+[OfflinePackageExcludeList]
+package_list:
+
+[qtmenunib]
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/qt_menu.nib.7z
+
+[SdkUpdateRepository]
+repository_url_release: http://../qt5repository/macx/x64/online_qt5sdk_repo
+repository_url_rnd: http://../qt5repository/macx/x64/online_qt5sdk_repo
+
+[TargetArchitechture]
+instruction_set: x86_64
+
+[ConfigDir]
+template_name: config_qt5
+
+[ConfigXml]
+template_name: config.xml.template.mac.qt5-beta
+
+[WorkingDirectories]
+packages_dir: pkg
+
+[InstallerFrameworkTools]
+name: ifwt
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/installer-framework-build-mac.7z
+version: 1.2.0
+
+
+[qt.readme]
+archives: readme
+target_install_base: /
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[readme]
+archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: readme.7z
+
+
+[qt.500_beta2.gcc_64]
+archives: 500_beta2.gcc_64
+target_install_base: /5.0.0-beta2/gcc_64
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.gcc_64]
+archive_uri: /qt/5.0.0_opensource/mac_cocoa_10.7/qt5_all.7z
+package_strip_dirs: 12
+target_install_dir: /
+rpath_target:
+archive_name: gcc_64_mac_qt5_all.7z
diff --git a/release-tools/configurations/pkg/com.qt.desktop.qt.500.gcc/meta/installscript.qs b/release-tools/configurations/pkg/com.qt.desktop.qt.500.gcc/meta/installscript.qs
deleted file mode 100644
index db8acd43c9f1e8c165cae7ffe752143c195a9ba2..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg/com.qt.desktop.qt.500.gcc/meta/installscript.qs
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This file is part of the Qt SDK
-
-*/
-
-// constructor
-function Component()
-{
- if (installer.value("os") == "win")
- {
- }
- if (component.fromOnlineRepository)
- {
- //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
- }
-}
-
-
-checkWhetherStopProcessIsNeeded = function()
-{
-}
-
-
-Component.prototype.createOperations = function()
-{
- component.createOperations();
-
- if (installer.value("os") == "x11") {
- try {
- // patch Qt binaries
- component.addOperation( "QtPatch", "linux", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
- } catch( e ) {
- print( e );
- }
- }
- if (installer.value("os") == "mac") {
- try {
- // patch Qt binaries
- component.addOperation( "QtPatch", "mac", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
- } catch( e ) {
- print( e );
- }
- }
- if (installer.value("os") == "win") {
- try {
- // patch Qt binaries
- component.addOperation( "QtPatch", "windows", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
- } catch( e ) {
- print( e );
- }
- }
-}
-
-
-Component.prototype.installationFinished = function()
-{
- if (installer.isInstaller() && component.selected)
- {
- }
-}
-
diff --git a/release-tools/configurations/pkg/com.qt.desktop.qt.500/meta/package.xml b/release-tools/configurations/pkg/com.qt.desktop.qt.500/meta/package.xml
deleted file mode 100644
index dee90b5389aac9623f662680b22375e3a1d9991a..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg/com.qt.desktop.qt.500/meta/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Package>
- <DisplayName>Qt %QT_VERSION_NUM%</DisplayName>
- <Description>Qt %QT_VERSION_NUM%</Description>
- <Version>%QT_VERSION_NUM%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>com.qt.desktop.qt.500</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <!--<Default></Default>-->
- <!--<AutoSelectOn></AutoSelectOn>-->
- <!--<Script>installscript.qs</Script>--> <!-- File name of a script being loaded - optional. -->
- <!--<Forced></Forced>-->
- <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
- <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
-</Package>
-
-
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
deleted file mode 100644
index 457fea5b37f3e9602b98e1f95b93de7e3b29551c..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Package>
- <DisplayName>Qt 5 Beta 2 Desktop Qt Components</DisplayName>
- <Description>Desktop Qt 5 Beta 2 Components</Description>
- <Version>%SDK_VERSION_NUM%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>com.qt.desktop.qt</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <!--<Default></Default>-->
- <!--<AutoSelectOn></AutoSelectOn>-->
- <!--<Script>installscript.qs</Script>--> <!-- File name of a script being loaded - optional. -->
- <!--<Forced></Forced>-->
- <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
- <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
-</Package>
-
-
diff --git a/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml b/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml
deleted file mode 100644
index 79c067b1321e3cf3ae3f7873c0d7af85fa639162..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<Package>
- <DisplayName>Desktop Components</DisplayName>
- <Description>Desktop Components</Description>
- <Version>%SDK_VERSION_NUM%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>com.qt.desktop</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <!--<Default></Default>-->
- <!--<AutoSelectOn></AutoSelectOn>-->
- <!--<Script>installscript.qs</Script>--> <!-- File name of a script being loaded - optional. -->
- <!--<Forced></Forced>-->
- <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
- <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
-</Package>
-
-
diff --git a/release-tools/configurations/pkg/com.qt.src.500/meta/installscript.qs b/release-tools/configurations/pkg/com.qt.src.500/meta/installscript.qs
deleted file mode 100644
index 3a6e523c1129885fea413daa602e0bd8262de1ef..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg/com.qt.src.500/meta/installscript.qs
+++ /dev/null
@@ -1,32 +0,0 @@
-/* This file is part of the Qt SDK
-
-*/
-
-// constructor
-function Component()
-{
- if (installer.value("os") == "win")
- {
- }
- if (component.fromOnlineRepository)
- {
- //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
- }
-}
-
-
-checkWhetherStopProcessIsNeeded = function()
-{
-}
-
-
-Component.prototype.createOperations = function()
-{
- component.createOperations();
-}
-
-
-Component.prototype.installationFinished = function()
-{
-}
-
diff --git a/release-tools/configurations/pkg/com.qt.src.500/meta/package.xml b/release-tools/configurations/pkg/com.qt.src.500/meta/package.xml
deleted file mode 100644
index 60c3319e068dfc3c40338ad293ab9734d733c158..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg/com.qt.src.500/meta/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<Package>
- <DisplayName>Qt 5.0.0 Source Package</DisplayName>
- <Description>Qt 5.0.0 Source Package</Description>
- <Version>%QT_VERSION_NUM%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>com.qt.src.500</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <!--<Default></Default>-->
- <!--<AutoSelectOn></AutoSelectOn>-->
- <!--<Script>installscript.qs</Script>--> <!-- File name of a script being loaded - optional. -->
- <!--<Forced></Forced>-->
- <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
- <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
-</Package>
-
-
diff --git a/release-tools/configurations/pkg/com.qt.src/meta/package.xml b/release-tools/configurations/pkg/com.qt.src/meta/package.xml
deleted file mode 100644
index cc39c0aea1d8de878beba65a48d947473c349c14..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg/com.qt.src/meta/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<Package>
- <DisplayName>Qt Source Components</DisplayName>
- <Description>Qt Source Components</Description>
- <Version>%SDK_VERSION_NUM%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>com.qt.src</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <!--<Default></Default>-->
- <!--<AutoSelectOn></AutoSelectOn>-->
- <!--<Script>installscript.qs</Script>--> <!-- File name of a script being loaded - optional. -->
- <!--<Forced></Forced>-->
- <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
- <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
-</Package>
-
-
diff --git a/release-tools/configurations/pkg/qt.500_beta2.doc.qt/meta/installscript.qs b/release-tools/configurations/pkg/qt.500_beta2.doc.qt/meta/installscript.qs
new file mode 100644
index 0000000000000000000000000000000000000000..546a3ebb8257a9b5d350d8e9aff41da173b00172
--- /dev/null
+++ b/release-tools/configurations/pkg/qt.500_beta2.doc.qt/meta/installscript.qs
@@ -0,0 +1,42 @@
+/* This file is part of the Qt SDK
+
+*/
+
+// constructor
+function Component()
+{
+ if (component.fromOnlineRepository)
+ {
+ // Commented line below used by the packaging scripts
+ //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
+ }
+}
+
+
+checkWhetherStopProcessIsNeeded = function()
+{
+}
+
+
+Component.prototype.createOperations = function()
+{
+ component.createOperations();
+ // If assistant binary exists, register documentation
+ if (installer.value("AssistantBinary")) {
+ try {
+ var operation = "-quiet -register ";
+ var qchFile = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/qt.qch";
+ installer.execute(installer.value("AssistantBinary"), new Array(operation + installer.value(qchFile)))[0];
+ } catch( e ) {
+ print( e );
+ }
+ }
+ else {
+ print("No assistant binary available -> not registering the documentation.")
+ }
+}
+
+
+Component.prototype.installationFinished = function()
+{
+}
diff --git a/release-tools/configurations/pkg/com.qt.desktop.qt.500.gcc/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.doc.qt/meta/package.xml
similarity index 59%
rename from release-tools/configurations/pkg/com.qt.desktop.qt.500.gcc/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.doc.qt/meta/package.xml
index 7e3fc28c409156cfcaafea6ed708c6b7111db828..372e7e34466873bcc4a623126f38b0ccfbc76eff 100644
--- a/release-tools/configurations/pkg/com.qt.desktop.qt.500.gcc/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.doc.qt/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt %QT_VERSION_NUM% (gcc)</DisplayName>
- <Description>Qt %QT_VERSION_NUM% (gcc)</Description>
- <Version>%QT_VERSION_NUM%</Version>
+ <DisplayName>Qt Documentation</DisplayName>
+ <Description>Qt 5.0.0 Beta 2 documentation</Description>
+ <Version>1.0.0</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>com.qt.desktop.qt.500.gcc</Name>
+ <Name>qt.500_beta2.doc.qt</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<!--<Default></Default>-->
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -12,7 +12,8 @@
<!--<Forced></Forced>-->
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>1</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
+ <InstallPriority>99</InstallPriority> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.doc/meta/package.xml
similarity index 60%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.doc/meta/package.xml
index 80a1683574332ccd8e59415b6f3f07f63afb30f8..9a96a87de6d9b62fdd1b2b3a2a08fa8e79bff115 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.doc/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Desktop Components</DisplayName>
- <Description>Qt 5.0.0 Beta 2 Desktop Components</Description>
+ <DisplayName>Documentation</DisplayName>
+ <Description>Documentation for various components included in the Qt SDK</Description>
<Version>1.0.0</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop</Name>
+ <Name>qt.500_beta2.doc</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<!--<Default></Default>-->
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -12,8 +12,8 @@
<!--<Forced></Forced>-->
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>90</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
+ <!--<InstallPriority>1</InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/installscript.qs b/release-tools/configurations/pkg/qt.500_beta2.gcc/meta/installscript.qs
similarity index 57%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.500_beta2.gcc/meta/installscript.qs
index 61c9ba4f489a0fae6b4bbf0232f33b9998841ab7..d4e625e944b306dcf5ee8b331bcc6b3ad75d7ea4 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/installscript.qs
+++ b/release-tools/configurations/pkg/qt.500_beta2.gcc/meta/installscript.qs
@@ -29,6 +29,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "/Desktop/Qt/5.0.0-beta2/gcc_64" + "/bin/assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "mac") {
try {
@@ -37,6 +45,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/Assistant.app/Contents/MacOS/Assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "win") {
try {
@@ -45,6 +61,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/assistant.exe";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
}
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.gcc/meta/package.xml
similarity index 81%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.gcc/meta/package.xml
index 656f791f3443981646aeb7d6c6384011a9fed5b0..e89c4723588ffb0d1f3f3e3f0f8feb609f9b401a 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.gcc/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt 5.0.0 Beta 2 (gcc)</DisplayName>
+ <DisplayName>gcc</DisplayName>
<Description>Qt 5.0.0 Beta 2 (gcc)</Description>
<Version>%QT_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop.500_beta.gcc</Name>
+ <Name>qt.500_beta2.gcc</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<Default>%PACKAGE_DEFAULT_TAG%</Default>
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -13,6 +13,7 @@
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
<!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>10</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/installscript.qs b/release-tools/configurations/pkg/qt.500_beta2.gcc_64/meta/installscript.qs
similarity index 57%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.500_beta2.gcc_64/meta/installscript.qs
index 61c9ba4f489a0fae6b4bbf0232f33b9998841ab7..d4e625e944b306dcf5ee8b331bcc6b3ad75d7ea4 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/installscript.qs
+++ b/release-tools/configurations/pkg/qt.500_beta2.gcc_64/meta/installscript.qs
@@ -29,6 +29,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "/Desktop/Qt/5.0.0-beta2/gcc_64" + "/bin/assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "mac") {
try {
@@ -37,6 +45,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/Assistant.app/Contents/MacOS/Assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "win") {
try {
@@ -45,6 +61,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/assistant.exe";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
}
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.gcc_64/meta/package.xml
similarity index 80%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.gcc_64/meta/package.xml
index c2e9e9f687e33e3eb2e659da6e00ec7712d580c7..e4fded256ed41b4411f94e43e664e4c2b0cd6138 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.gcc_64/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt 5.0.0 Beta 2 (gcc 64-bit)</DisplayName>
+ <DisplayName>gcc 64-bit</DisplayName>
<Description>Qt 5.0.0 Beta 2 (gcc 64-bit)</Description>
<Version>%QT_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop.500_beta.gcc_64</Name>
+ <Name>qt.500_beta2.gcc_64</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<Default>%PACKAGE_DEFAULT_TAG%</Default>
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -13,6 +13,7 @@
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
<!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>10</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.src/meta/package.xml
similarity index 78%
rename from release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.src/meta/package.xml
index 9444bf2b9d3accc9983c0d077c9532cb127deec2..6ccbaaa5236f00b283234d0b2207359ad9581875 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.src/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
<DisplayName>Source Components</DisplayName>
- <Description>Source Components</Description>
+ <Description>Qt 5.0.0 Beta 2 Source Components</Description>
<Version>1.0.0</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.src</Name>
+ <Name>qt.500_beta2.src</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<!--<Default></Default>-->
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -13,7 +13,7 @@
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
<!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <InstallPriority>50</InstallPriority> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/installscript.qs b/release-tools/configurations/pkg/qt.500_beta2.win32_mingw/meta/installscript.qs
similarity index 100%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.500_beta2.win32_mingw/meta/installscript.qs
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.win32_mingw/meta/package.xml
similarity index 80%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.win32_mingw/meta/package.xml
index 898526962640edc978c65279ee866278d7b509e6..593763cf6a6f9da0934aad3f30041f0de8195a84 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.win32_mingw/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt 5.0.0 Beta 2 (mingw)</DisplayName>
+ <DisplayName>mingw</DisplayName>
<Description>Qt 5.0.0 Beta 2 (mingw)</Description>
<Version>%QT_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop.500_beta.mingw</Name>
+ <Name>qt.500_beta2.win32_mingw</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<Default>%PACKAGE_DEFAULT_TAG%</Default>
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -13,6 +13,7 @@
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
<!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>10</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/installscript.qs b/release-tools/configurations/pkg/qt.500_beta2.win32_msvc2010/meta/installscript.qs
similarity index 75%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.500_beta2.win32_msvc2010/meta/installscript.qs
index ef986136dc69fb1bc0e67b27bcc20f5440e07d5b..a810986ad279f6ba18945955e9be961f4538d6a7 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/installscript.qs
+++ b/release-tools/configurations/pkg/qt.500_beta2.win32_msvc2010/meta/installscript.qs
@@ -66,6 +66,12 @@ createShortcuts = function()
component.addOperation( "CreateShortcut",
component_root_path + "/bin/linguist.exe",
"@StartMenuDir@/%QT_VERSION%/MSVC 2010/Linguist.lnk");
+
+
+ // Examples & Demos
+ //component.addOperation( "CreateShortcut",
+ // component_root_path + "/bin/qtdemo.exe",
+ // "@StartMenuDir@/%QT_VERSION%/MSVC 2010/Examples & Demos.lnk");
}
Component.prototype.createOperations = function()
@@ -79,6 +85,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "/Desktop/Qt/5.0.0-beta2/gcc_64" + "/bin/assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "mac") {
try {
@@ -87,17 +101,32 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/Assistant.app/Contents/MacOS/Assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "win") {
try {
// patch Qt binaries
component.addOperation( "QtPatch", "windows", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
-
// Create a batch file and shortcuts with the development environment
createShortcuts();
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/assistant.exe";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
}
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.win32_msvc2010/meta/package.xml
similarity index 79%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.win32_msvc2010/meta/package.xml
index 8a8dd59d42f2301e16ece292068a50dbde06a07e..444be37c1052306e37143e896495bbc8c7092013 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.win32_msvc2010/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt 5.0.0 Beta 2 (msvc2010 32-bit)</DisplayName>
+ <DisplayName>msvc2010 32-bit</DisplayName>
<Description>Qt 5.0.0 Beta 2 (msvc2010 32-bit)</Description>
<Version>%QT_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop.500_beta.msvc2010</Name>
+ <Name>qt.500_beta2.win32_msvc2010</Name>
<!--<Dependencies>qt.sdk.misc.vcredist_x86</Dependencies>-->
<Default>%PACKAGE_DEFAULT_TAG%</Default>
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -13,6 +13,7 @@
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
<!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>10</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/installscript.qs b/release-tools/configurations/pkg/qt.500_beta2.win64_msvc2010_64/meta/installscript.qs
similarity index 75%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.500_beta2.win64_msvc2010_64/meta/installscript.qs
index b5fb75730e34e372424e5161c5a3c86a18405fdb..a96723c0466b87fb1d19149a774d8e892b0c0493 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/installscript.qs
+++ b/release-tools/configurations/pkg/qt.500_beta2.win64_msvc2010_64/meta/installscript.qs
@@ -66,6 +66,12 @@ createShortcuts = function()
component.addOperation( "CreateShortcut",
component_root_path + "/bin/linguist.exe",
"@StartMenuDir@/%QT_VERSION%/MSVC 2010 (64-bit)/Linguist.lnk");
+
+ // Examples & Demos
+ //component.addOperation( "CreateShortcut",
+ // component_root_path + "/bin/qtdemo.exe",
+ // "@StartMenuDir@/%QT_VERSION%/MSVC 2010 (64-bit)/Examples & Demos.lnk");
+
}
Component.prototype.createOperations = function()
@@ -79,6 +85,14 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "/Desktop/Qt/5.0.0-beta2/gcc_64" + "/bin/assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "mac") {
try {
@@ -87,17 +101,32 @@ Component.prototype.createOperations = function()
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/Assistant.app/Contents/MacOS/Assistant";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
if (installer.value("os") == "win") {
try {
// patch Qt binaries
component.addOperation( "QtPatch", "windows", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
-
// Create a batch file and shortcuts with the development environment
createShortcuts();
} catch( e ) {
print( e );
}
+
+ try {
+ // set assistant binary path
+ var assistantBinary = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/bin/assistant.exe";
+ installer.setValue("AssistantBinary", assistantBinary);
+ } catch( e ) {
+ print( e );
+ }
}
}
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2.win64_msvc2010_64/meta/package.xml
similarity index 78%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2.win64_msvc2010_64/meta/package.xml
index a8267e71166fb806c5a893a9a1acd0fe0676d2d0..a3fb0fd85330dd56e28c9bcc69e4d32b86c259aa 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2.win64_msvc2010_64/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt 5.0.0 Beta 2 (msvc2010 64-bit)</DisplayName>
+ <DisplayName>msvc2010 64-bit</DisplayName>
<Description>Qt 5.0.0 Beta 2 (msvc2010 64-bit)</Description>
<Version>%QT_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop.500_beta.msvc2010_64</Name>
+ <Name>qt.500_beta2.win64_msvc2010_64</Name>
<!--<Dependencies>qt.sdk.misc.vcredist_x64</Dependencies>-->
<Default>%PACKAGE_DEFAULT_TAG%</Default>
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -13,6 +13,7 @@
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
<!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>10</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta/meta/package.xml b/release-tools/configurations/pkg/qt.500_beta2/meta/package.xml
similarity index 82%
rename from release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta/meta/package.xml
rename to release-tools/configurations/pkg/qt.500_beta2/meta/package.xml
index b624a7e32743b130ba3533b2e9395ab4753aa0f3..b478b60f40b9564f13f38b1c8db5bbe22d7ca3f0 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.500_beta2/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt %QT_VERSION%</DisplayName>
- <Description>Qt %QT_VERSION%</Description>
- <Version>%QT_VERSION%</Version>
+ <DisplayName>Qt 5.0.0 beta2</DisplayName>
+ <Description>Qt 5.0.0 beta2</Description>
+ <Version>1.0.0</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop.500_beta</Name>
+ <Name>qt.500_beta2</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<!--<Default></Default>-->
<!--<AutoSelectOn></AutoSelectOn>-->
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/data/qt-project-url.7z b/release-tools/configurations/pkg/qt.readme/data/qt-project-url.7z
similarity index 100%
rename from release-tools/configurations/pkg_beta/qt.sdk.readme/data/qt-project-url.7z
rename to release-tools/configurations/pkg/qt.readme/data/qt-project-url.7z
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/installscript.qs b/release-tools/configurations/pkg/qt.readme/meta/installscript.qs
similarity index 100%
rename from release-tools/configurations/pkg_beta/qt.sdk.readme/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.readme/meta/installscript.qs
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml b/release-tools/configurations/pkg/qt.readme/meta/package.xml
similarity index 97%
rename from release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml
rename to release-tools/configurations/pkg/qt.readme/meta/package.xml
index c4fbb3f8e15c4e8c3ebf4c49249833aa8f90fa88..781c4dfb97d9f1c7b93def76b5168d37d8239c4b 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.readme/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.0.0 Beta 2 Readme</Description>
<Version>%QT_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.readme</Name>
+ <Name>qt.readme</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<Default>%PACKAGE_DEFAULT_TAG%</Default>
<!--<AutoSelectOn></AutoSelectOn>-->
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui b/release-tools/configurations/pkg/qt.readme/meta/readmecheckboxform.ui
similarity index 100%
rename from release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui
rename to release-tools/configurations/pkg/qt.readme/meta/readmecheckboxform.ui
diff --git a/release-tools/configurations/pkg/qt.tools.qtcreator.desktop/meta/installscript.qs b/release-tools/configurations/pkg/qt.tools.qtcreator.desktop/meta/installscript.qs
new file mode 100644
index 0000000000000000000000000000000000000000..02e212b6415d7894dd954c9d65c1240139a33b38
--- /dev/null
+++ b/release-tools/configurations/pkg/qt.tools.qtcreator.desktop/meta/installscript.qs
@@ -0,0 +1,201 @@
+/* This file is part of the Qt SDK
+
+Copyright (c) 2011 Digia Plc and/or its subsidiary(-ies).
+
+*/
+
+var component_root_path = "/";
+var native_path_separator = "/";
+
+// constructor
+function Component()
+{
+ installer.installationFinished.connect( this, Component.prototype.installationFinished );
+ if (installer.value("os") == "win")
+ {
+ installer.setValue("QtCreatorInstallDir", "%TARGET_INSTALL_DIR%");
+ component.selectedChanged.connect( this, checkWhetherStopProcessIsNeeded );
+ //it can't be unselected so we need to check it manually
+ checkWhetherStopProcessIsNeeded();
+ }
+
+ if ( installer.value("os") == "x11" )
+ {
+ // set installation directory
+ installer.setValue( "EmbeddedInstallationRootDir", "/usr/local/Trolltech" );
+ installer.setValue( "EmbeddedToolchainDir", "/usr/local/angstrom/arm" );
+ installer.setValue("QtCreatorInstallDir", "%TARGET_INSTALL_DIR%");
+ }
+
+ if ( installer.value("os") == "mac" )
+ {
+ installer.setValue("QtCreatorInstallDir", "%TARGET_INSTALL_DIR%");
+ }
+
+ if ( component.fromOnlineRepository )
+ {
+ //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
+ }
+}
+
+buildNativeComponentRootPath = function()
+{
+ var target_install_dir = "%TARGET_INSTALL_DIR%";
+ if (installer.value("os") == "win")
+ {
+ native_path_separator = "\\";
+ target_install_dir = target_install_dir.replace(/\//g, "\\");
+ }
+ else
+ {
+ native_path_separator = "/";
+ }
+
+ component_root_path = installer.value("TargetDir") + target_install_dir;
+}
+
+checkWhetherStopProcessIsNeeded = function()
+{
+ if (installer.value("os") != "win")
+ return;
+
+ var path = component_root_path + native_path_separator + "bin" + native_path_separator;
+ if (component.installationRequested() || component.uninstallationRequested())
+ {
+ component.setStopProcessForUpdateRequest(path + "qtcreator.exe", true);
+ component.setStopProcessForUpdateRequest(path + "linguist.exe", true);
+ component.setStopProcessForUpdateRequest(path + "qmlviewer.exe", true);
+ }
+ else
+ {
+ component.setStopProcessForUpdateRequest(path + "qtcreator.exe", false);
+ component.setStopProcessForUpdateRequest(path + "linguist.exe", false);
+ component.setStopProcessForUpdateRequest(path + "qmlviewer.exe", false);
+ }
+}
+
+registerWindowsFileTypeExtensions = function()
+{
+ var headerExtensions = new Array("h", "hh", "hxx", "h++", "hpp", "hpp");
+ var path = component_root_path + native_path_separator + "bin" + native_path_separator;
+
+ for (var i = 0; i < headerExtensions.length; ++i) {
+ component.addOperation( "RegisterFileType",
+ headerExtensions[i],
+ path + "qtcreator.exe -client '%1'",
+ "C++ Header file",
+ "",
+ path + "qtcreator.exe,3");
+ }
+
+ var cppExtensions = new Array("cc", "cxx", "c++", "cp", "cpp");
+
+ for (var i = 0; i < cppExtensions.length; ++i) {
+ component.addOperation( "RegisterFileType",
+ cppExtensions[i],
+ path + "qtcreator.exe -client '%1'",
+ "C++ Source file",
+ "",
+ path + "qtcreator.exe,2");
+ }
+
+ component.addOperation( "RegisterFileType",
+ "c",
+ path + "qtcreator.exe -client '%1'",
+ "C Source file",
+ "",
+ path + "qtcreator.exe,1");
+ component.addOperation( "RegisterFileType",
+ "ui",
+ path + "qtcreator.exe -client '%1'",
+ "Qt UI file",
+ "",
+ path + "qtcreator.exe,4");
+ component.addOperation( "RegisterFileType",
+ "pro",
+ path + "qtcreator.exe -client '%1'",
+ "Qt Project file",
+ "",
+ path + "qtcreator.exe,5");
+ component.addOperation( "RegisterFileType",
+ "pri",
+ path + "qtcreator.exe -client '%1'",
+ "Qt Project Include file",
+ "",
+ path + "qtcreator.exe,6");
+ component.addOperation( "RegisterFileType",
+ "qs",
+ path + "qtcreator.exe -client '%1'",
+ "Qt Script file",
+ "",
+ path + "qtcreator.exe,0");
+ component.addOperation( "RegisterFileType",
+ "qml",
+ path + "qtcreator.exe -client '%1'",
+ "Qt Quick Markup language file",
+ "",
+ path + "qtcreator.exe,0");
+}
+
+Component.prototype.createOperations = function()
+{
+ // Call the base createOperations and afterwards set some registry settings
+ component.createOperations();
+ buildNativeComponentRootPath();
+ var path = component_root_path + native_path_separator;
+
+ if ( installer.value("os") == "win" )
+ {
+ component.addOperation( "SetPluginPathOnQtCore",
+ path + "bin",
+ path + "plugins");
+ component.addOperation( "SetImportsPathOnQtCore",
+ path + "bin",
+ path + "bin");
+ component.addOperation( "CreateShortcut",
+ path + "bin" + native_path_separator + "qtcreator.exe",
+ "@StartMenuDir@\\Qt Creator.lnk",
+ "workingDirectory=" + path + "bin");
+
+ registerWindowsFileTypeExtensions();
+ }
+ if ( installer.value("os") == "x11" )
+ {
+ component.addOperation( "SetPluginPathOnQtCore",
+ path + "lib" + native_path_separator + "qtcreator",
+ path + "lib" + native_path_separator + "qtcreator" + native_path_separator + "plugins");
+ component.addOperation( "SetImportsPathOnQtCore",
+ path + "lib" + native_path_separator + "qtcreator",
+ path + "bin");
+ component.addOperation( "InstallIcons", path + "icons" );
+ component.addOperation( "CreateDesktopEntry",
+ "qtcreator.desktop",
+ "Type=Application\nExec=" + path + "bin" + native_path_separator + "qtcreator\nPath=@homeDir@\nName=Qt Commercial Creator\nGenericName=The IDE of choice for development on Qt.\nIcon=Digia-QtCreator\nTerminal=false\nCategories=Development;IDE;Qt;\nMimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;"
+ );
+ }
+ if (installer.value("os") == "mac")
+ {
+ }
+}
+
+Component.prototype.installationFinished = function()
+{
+ if (installer.isInstaller() && component.selected)
+ {
+ var path = component_root_path + native_path_separator;
+ if (installer.value("os") == "win")
+ {
+ installer.setValue("RunProgram", path + "bin" + native_path_separator + "qtcreator.exe");
+ }
+ else if (installer.value("os") == "x11")
+ {
+ installer.setValue("RunProgram", path + "bin" + native_path_separator + "qtcreator");
+ }
+ else if (installer.value("os") == "mac")
+ {
+ installer.setValue("RunProgram", "\"" + installer.value("TargetDir") + "/Qt Creator.app/Contents/MacOS/Qt Creator\"");
+ }
+ installer.setValue("RunProgramDescription", "Launch Qt Creator");
+ }
+}
+
diff --git a/release-tools/configurations/pkg/com.qt/meta/package.xml b/release-tools/configurations/pkg/qt.tools.qtcreator.desktop/meta/package.xml
similarity index 59%
rename from release-tools/configurations/pkg/com.qt/meta/package.xml
rename to release-tools/configurations/pkg/qt.tools.qtcreator.desktop/meta/package.xml
index 4008eb3b2403711df2ecbbbf719fbfb4d2679b7b..fa9cbddf92bfed7f752c15596e7707373d629652 100644
--- a/release-tools/configurations/pkg/com.qt/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.tools.qtcreator.desktop/meta/package.xml
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt 5 Beta 2 Installer</DisplayName>
- <Description>Qt 5 Beta 2 Installer</Description>
- <Version>%SDK_VERSION_NUM%</Version>
+ <DisplayName>Qt Creator %QTCREATOR_VERSION%</DisplayName>
+ <Description>Qt Creator %QTCREATOR_VERSION% Desktop binaries</Description>
+ <Version>%QTCREATOR_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>com.qt</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <!--<Default></Default>-->
- <!--<AutoSelectOn></AutoSelectOn>-->
- <!--<Script>installscript.qs</Script>--> <!-- File name of a script being loaded - optional. -->
+ <Name>qt.tools.qtcreator.desktop</Name>
+ <Script>installscript.qs</Script>
+
<!--<Forced></Forced>-->
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
+ <Default>%PACKAGE_DEFAULT_TAG%</Default>
+ <!--<Forced></Forced>-->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
<SortingPriority>0</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
<!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
diff --git a/release-tools/configurations/pkg/qt.tools.qtcreator.src/meta/installscript.qs b/release-tools/configurations/pkg/qt.tools.qtcreator.src/meta/installscript.qs
new file mode 100644
index 0000000000000000000000000000000000000000..f677b4ef65fcf2090717f757d77f9208d3d24bb8
--- /dev/null
+++ b/release-tools/configurations/pkg/qt.tools.qtcreator.src/meta/installscript.qs
@@ -0,0 +1,13 @@
+/* This file is part of the Qt SDK
+
+*/
+
+// constructor
+function Component()
+{
+ if (component.fromOnlineRepository)
+ {
+ //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
+ }
+}
+
diff --git a/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml b/release-tools/configurations/pkg/qt.tools.qtcreator.src/meta/package.xml
similarity index 72%
rename from release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml
rename to release-tools/configurations/pkg/qt.tools.qtcreator.src/meta/package.xml
index 6ef4b1f985d934d91f3d7846bcd42e7e7016ab1a..600532f8b43c498d607046c8e09fde5c4ac37a22 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.tools.qtcreator.src/meta/package.xml
@@ -1,17 +1,15 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt 5.0.0 Beta 2</DisplayName>
- <Description>Qt 5.0.0 Beta 2 Installer</Description>
- <Version>1.0.0</Version>
+ <DisplayName>QtCreator source package</DisplayName>
+ <Description>QtCreator %QTCREATOR_VERSION% source package</Description>
+ <Version>%QTCREATOR_VERSION%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk</Name>
- <Licenses>
- <License name="Qt Installer Third Party Agreement" file="ThirdPartySoftware_Listing.txt" />
- </Licenses>
+ <Name>qt.tools.qtcreator.src</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <!--<Default></Default>-->
- <!--<AutoSelectOn></AutoSelectOn>-->
<Script>installscript.qs</Script>
+ <Default>%PACKAGE_DEFAULT_TAG%</Default>
+
+ <!--<AutoSelectOn></AutoSelectOn>-->
<!--<Forced></Forced>-->
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
diff --git a/release-tools/configurations/pkg/qt.tools.qtcreator/meta/package.xml b/release-tools/configurations/pkg/qt.tools.qtcreator/meta/package.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ea8f34434f31371ec74dd1b7815241fc92e45c2
--- /dev/null
+++ b/release-tools/configurations/pkg/qt.tools.qtcreator/meta/package.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<Package>
+ <DisplayName>Qt Creator</DisplayName>
+ <Description>Qt CreatorIDE for Qt application development</Description>
+ <Version>1.0.0</Version>
+ <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
+ <Name>qt.tools.qtcreator</Name>
+ <!--<Dependencies>com.digia.qtcommercial.sdk.tools.gdb->=7.2.0-4-2</Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
+ <!--<Script>installscript.qs</Script>-->
+ <!--<AutoDependOn>com.digia.qtcommercial.sdk.tools.gdb</AutoDependOn>-->
+ <!--<Forced></Forced>-->
+ <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
+ <!--<Default></Default>-->
+ <!--<Forced></Forced>-->
+ <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
+ <SortingPriority>0</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
+ <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+</Package>
+
+
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs b/release-tools/configurations/pkg/qt.tools.vcredist/meta/installscript.qs
similarity index 100%
rename from release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.tools.vcredist/meta/installscript.qs
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml b/release-tools/configurations/pkg/qt.tools.vcredist/meta/package.xml
similarity index 92%
rename from release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml
rename to release-tools/configurations/pkg/qt.tools.vcredist/meta/package.xml
index 02181cf71bfc64da6a7215c76b1558425676ea81..c9fb9e5207a5e3bd654a44d4f9eaa97f1c2b69df 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.tools.vcredist/meta/package.xml
@@ -3,7 +3,7 @@
<DisplayName>VCRedist for VS2010</DisplayName>
<Description>Needed by all included Qt applications.</Description>
<Version>%VCREDIST_X86_VERSION%</Version>
- <Name>qt.sdk.misc.vcredist_x86</Name>
+ <Name>qt.tools.vcredist</Name>
<ReleaseDate>2010-12-04</ReleaseDate>
<Script>installscript.qs</Script>
<!--<Virtual>true</Virtual>-->
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs b/release-tools/configurations/pkg/qt.tools.vcredist_64/meta/installscript.qs
similarity index 100%
rename from release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs
rename to release-tools/configurations/pkg/qt.tools.vcredist_64/meta/installscript.qs
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml b/release-tools/configurations/pkg/qt.tools.vcredist_64/meta/package.xml
similarity index 92%
rename from release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml
rename to release-tools/configurations/pkg/qt.tools.vcredist_64/meta/package.xml
index 4cc0103cdb2c6072d096e4985dbbd48e2faf243d..ee11c53aa1bb3f2562e958c92cd36b583a9f4ac5 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.tools.vcredist_64/meta/package.xml
@@ -3,7 +3,7 @@
<DisplayName>VCRedist for VS2010 64bit</DisplayName>
<Description>Needed by all included Qt applications.</Description>
<Version>%VCREDIST_X64_VERSION%</Version>
- <Name>qt.sdk.misc.vcredist_x64</Name>
+ <Name>qt.tools.vcredist_64</Name>
<ReleaseDate>2010-12-04</ReleaseDate>
<Script>installscript.qs</Script>
<!--<Virtual>true</Virtual>-->
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src.qt/meta/package.xml b/release-tools/configurations/pkg/qt.tools/meta/package.xml
similarity index 61%
rename from release-tools/configurations/pkg_beta/qt.sdk.src.qt/meta/package.xml
rename to release-tools/configurations/pkg/qt.tools/meta/package.xml
index 9e34b825c744c589e82c25631c2ee56b46fca123..eed03e8a6af5033a8331b0de177279ecb3e8492f 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.src.qt/meta/package.xml
+++ b/release-tools/configurations/pkg/qt.tools/meta/package.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
- <DisplayName>Qt Source Components</DisplayName>
- <Description>Qt Source Components</Description>
+ <DisplayName>Tools</DisplayName>
+ <Description>Various tools included in the Qt</Description>
<Version>1.0.0</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.src.qt</Name>
+ <Name>qt.tools</Name>
<!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
<!--<Default></Default>-->
<!--<AutoSelectOn></AutoSelectOn>-->
@@ -12,8 +12,8 @@
<!--<Forced></Forced>-->
<!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
<!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
+ <SortingPriority>90</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
+ <!--<InstallPriority>1</InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk/meta/ThirdPartySoftware_Listing.txt b/release-tools/configurations/pkg/qt/meta/ThirdPartySoftware_Listing.txt
similarity index 97%
rename from release-tools/configurations/pkg_beta/qt.sdk/meta/ThirdPartySoftware_Listing.txt
rename to release-tools/configurations/pkg/qt/meta/ThirdPartySoftware_Listing.txt
index ca70ecf4abc9ee79057479b0922b30f106a61375..4362b49151d7b34ef83b3067a8f9c9f877d72a0e 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk/meta/ThirdPartySoftware_Listing.txt
+++ b/release-tools/configurations/pkg/qt/meta/ThirdPartySoftware_Listing.txt
@@ -1,15 +1,5 @@
- GNU LESSER GENERAL PUBLIC LICENSE
-
- The Qt GUI Toolkit is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
- Contact: http://www.qt-project.org/
-
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
- GNU Lesser General Public License version 2.1, which is displayed below.
-
--------------------------------------------------------------------------
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -20,7 +10,7 @@
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -122,7 +112,7 @@ modification follow. Pay close attention to the difference between a
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
- GNU LESSER GENERAL PUBLIC LICENSE
+ GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
@@ -442,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -465,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
@@ -510,5 +500,3 @@ necessary. Here is a sample; alter the names:
Ty Coon, President of Vice
That's all there is to it!
-
-
diff --git a/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs b/release-tools/configurations/pkg/qt/meta/installscript.qs
similarity index 97%
rename from release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs
rename to release-tools/configurations/pkg/qt/meta/installscript.qs
index 6fa4365dde0dd03ce0f78c49db4bda421c37bd34..cac2e0d4a9fa555b736b707b5d6936640991322a 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs
+++ b/release-tools/configurations/pkg/qt/meta/installscript.qs
@@ -22,7 +22,7 @@ Component.prototype.createOperations = function()
component.addOperation( "CreateShortcut",
win_application,
- "@StartMenuDir@/Uninstall Qt 5.0.0 Beta 2.lnk",
+ "@StartMenuDir@/Uninstall Qt 5.0.0 Beta2.lnk",
" --uninstall");
} catch( e ) {
print( e );
diff --git a/release-tools/configurations/pkg/qt/meta/package.xml b/release-tools/configurations/pkg/qt/meta/package.xml
new file mode 100644
index 0000000000000000000000000000000000000000..391c243bbf4beb9ee566e075535e33403055fb16
--- /dev/null
+++ b/release-tools/configurations/pkg/qt/meta/package.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<Package>
+ <DisplayName>Qt</DisplayName>
+ <Description>Qt 5.0.0 Beta 2 Installer</Description>
+ <Version>1.0.0</Version>
+ <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
+ <Name>qt</Name>
+ <Script>installscript.qs</Script>
+ <Licenses>
+ <License name="Qt Installer Third Party Agreement" file="ThirdPartySoftware_Listing.txt" />
+ </Licenses>
+ <SortingPriority>0</SortingPriority> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
+</Package>
+
+
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/installscript.qs
deleted file mode 100644
index 61c9ba4f489a0fae6b4bbf0232f33b9998841ab7..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/installscript.qs
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file is part of the Qt SDK
-
-*/
-
-// constructor
-function Component()
-{
- if (component.fromOnlineRepository)
- {
- // Commented line below used by the packaging scripts
- //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
- }
-}
-
-
-checkWhetherStopProcessIsNeeded = function()
-{
-}
-
-
-Component.prototype.createOperations = function()
-{
- component.createOperations();
-
- if (installer.value("os") == "x11") {
- try {
- // patch Qt binaries
- component.addOperation( "QtPatch", "linux", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
- } catch( e ) {
- print( e );
- }
- }
- if (installer.value("os") == "mac") {
- try {
- // patch Qt binaries
- component.addOperation( "QtPatch", "mac", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
- } catch( e ) {
- print( e );
- }
- }
- if (installer.value("os") == "win") {
- try {
- // patch Qt binaries
- component.addOperation( "QtPatch", "windows", installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" );
- } catch( e ) {
- print( e );
- }
- }
-}
-
-
-Component.prototype.installationFinished = function()
-{
-}
-
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
deleted file mode 100644
index d9de195267a8571121c5bac19dfd7bd43c1ad9cd..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Package>
- <DisplayName>Qt 5.0.0 Beta 2 (msvc2008)</DisplayName>
- <Description>Qt 5.0.0 Beta 2 (msvc2008)</Description>
- <Version>%QT_VERSION%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.desktop.500_beta.msvc2008</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <Default>%PACKAGE_DEFAULT_TAG%</Default>
- <!--<AutoSelectOn></AutoSelectOn>-->
- <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
- <!--<Forced></Forced>-->
- <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
- <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
-</Package>
-
-
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/installscript.qs
deleted file mode 100644
index 1efd9c1cd98cd4cb35af5da2b6d3d2aa939e4f98..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/installscript.qs
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This file is part of the Qt SDK
-
-*/
-
-// constructor
-function Component()
-{
- if (component.fromOnlineRepository)
- {
- // Commented line below used by the packaging scripts
- //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
- }
-}
-
-
-checkWhetherStopProcessIsNeeded = function()
-{
-}
-
-
-Component.prototype.createOperations = function()
-{
- component.createOperations();
- // register qt5 documentation
- // TODO, this is temporary solution fot Beta only! In final the documentation should be
- // put in separate installable component
- component.addOperation("RegisterDocumentation" , installer.value("TargetDir") + "%TARGET_INSTALL_DIR%" + "/qtdoc/doc/qch/qt.qch"));
-}
-
-
-Component.prototype.installationFinished = function()
-{
-}
-
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
deleted file mode 100644
index 1e64cec69ac4a5a03dcbb1c33d86711921f97db8..0000000000000000000000000000000000000000
--- a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<Package>
- <DisplayName>Qt 5.0.0 Beta 2 Source Package</DisplayName>
- <Description>Qt 5.0.0 Beta 2 Source Package</Description>
- <Version>%QT_VERSION%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Name>qt.sdk.src.qt.500_beta</Name>
- <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
- <Default>%PACKAGE_DEFAULT_TAG%</Default>
- <!--<AutoSelectOn></AutoSelectOn>-->
- <!--<Script>installscript.qs</Script>--> <!-- File name of a script being loaded - optional. -->
- <!--<Forced></Forced>-->
- <!--<Virtual></Virtual>--> <!-- Set to true if this is a virtual component not showing up in the installer -->
- <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. -->
- <!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. -->
- <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. -->
-</Package>
-
-
diff --git a/release-tools/configurations/win_x86_32_offline b/release-tools/configurations/win_x86_32_offline
new file mode 100644
index 0000000000000000000000000000000000000000..e716c6ad323a495f332ebec319e82dd82afcd0d2
--- /dev/null
+++ b/release-tools/configurations/win_x86_32_offline
@@ -0,0 +1,83 @@
+[PackageNamespace]
+name: qt
+
+[PlatformIdentifier]
+identifier: windows
+
+[ArchiveRemoteLocation.dl241]
+base_url: http://it-dl241-hki.it.local/packages/
+base_path:
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list: doc-conf, src-conf, tools-conf, tools_src-conf
+
+[OfflinePackageExcludeList]
+package_list:
+
+[SdkUpdateRepository]
+repository_url_release: http://../qt5repository/windows/x32/online_qt5sdk_repo
+repository_url_rnd: http://../qt5repository/windows/x32/online_qt5sdk_repo
+
+[TargetArchitechture]
+instruction_set: x86
+
+[ConfigDir]
+template_name: config_qt5
+
+[ConfigXml]
+template_name: config.xml.template.windows.qt5-beta
+
+[WorkingDirectories]
+packages_dir: pkg
+
+[InstallerFrameworkTools]
+name: ifwt
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/installer-framework-build-win.7z
+version: 1.2.0
+
+
+[qt.readme]
+archives: readme, qt_project_url
+target_install_base: /
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[readme]
+archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: readme.7z
+[qt_project_url]
+archive_uri: qt-project-url.7z
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: qt-project-url.7z
+
+
+[qt.500_beta2.win32_msvc2010]
+archives: 500_beta2.msvc2010, icu_49.win_32
+target_install_base: /5.0.0-beta2/msvc2010
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.msvc2010]
+archive_uri: /qt/5.0.0_opensource/windows_vs2010_32/qt5_all.7z
+package_strip_dirs: 5
+target_install_dir: /
+rpath_target:
+archive_name: msvc2010_all.7z
+[icu_49.win_32]
+archive_uri: http://origin.releases.qt-project.org/prebuilt/icu_49_win_32.7z
+package_strip_dirs: 0
+target_install_dir: /bin
+rpath_target:
+archive_name: icu_49_win_32.7z
+
+
+
diff --git a/release-tools/configurations/win_x86_64_offline b/release-tools/configurations/win_x86_64_offline
new file mode 100644
index 0000000000000000000000000000000000000000..e3c879c6af3b386971ffaf1e90db473fb44c12b9
--- /dev/null
+++ b/release-tools/configurations/win_x86_64_offline
@@ -0,0 +1,83 @@
+[PackageNamespace]
+name: qt
+
+[PlatformIdentifier]
+identifier: windows
+
+[ArchiveRemoteLocation.dl241]
+base_url: http://it-dl241-hki.it.local/packages/
+base_path:
+
+# for testing purposes
+[PackageIgnoreList]
+packages: foo.bar, foo.bar2, foo.bar3
+
+[ExtraPackageConfigurationFiles]
+file_list: doc-conf, src-conf, tools_64-conf, tools_src-conf
+
+[OfflinePackageExcludeList]
+package_list:
+
+[SdkUpdateRepository]
+repository_url_release: http://../qt5repository/windows/x32/online_qt5sdk_repo
+repository_url_rnd: http://../qt5repository/windows/x32/online_qt5sdk_repo
+
+[TargetArchitechture]
+instruction_set: x86_64
+
+[ConfigDir]
+template_name: config_qt5
+
+[ConfigXml]
+template_name: config.xml.template.windows.qt5-beta
+
+[WorkingDirectories]
+packages_dir: pkg
+
+[InstallerFrameworkTools]
+name: ifwt
+package_url: http://it-dl241-hki.it.local/packages/sdk_packages_qt5_lgpl_release/ifw/1.2.0/installer-framework-build-win.7z
+version: 1.2.0
+
+
+[qt.readme]
+archives: readme, qt_project_url
+target_install_base: /
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[readme]
+archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: readme.7z
+[qt_project_url]
+archive_uri: qt-project-url.7z
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: qt-project-url.7z
+
+
+
+[qt.500_beta2.win64_msvc2010_64]
+archives: 500_beta2.msvc2010_64, icu_49.win_64
+target_install_base: /5.0.0-beta2/msvc2010_64
+version: 5.0.0
+version_tag: %QT_VERSION%
+package_default: true
+[500_beta2.msvc2010_64]
+archive_uri: /qt/5.0.0_opensource/windows_vs2010_64/qt5_all.7z
+package_strip_dirs: 5
+target_install_dir: /
+rpath_target:
+archive_name: msvc2010_64_all.7z
+[icu_49.win_64]
+archive_uri: http://origin.releases.qt-project.org/prebuilt/icu_49_win_64.7z
+package_strip_dirs: 0
+target_install_dir: /bin
+rpath_target:
+archive_name: icu_49_win_64.7z
+
+
diff --git a/release-tools/configurations/win_x86_beta b/release-tools/configurations/win_x86_beta
deleted file mode 100644
index 9b5aadde2c30ec7161ed304a0f23b9c1465e2c44..0000000000000000000000000000000000000000
--- a/release-tools/configurations/win_x86_beta
+++ /dev/null
@@ -1,148 +0,0 @@
-[PackageNamespace]
-name: qt.sdk
-
-[PlatformIdentifier]
-identifier: windows
-
-[ArchiveRemoteLocation.some_server_nickname_here]
-base_url: http://origin.releases.qt-project.org
-base_path:
-
-# for testing purposes
-[PackageIgnoreList]
-packages: foo.bar, foo.bar2, foo.bar3
-
-[ExtraPackageConfigurationFiles]
-file_list:
-
-[OfflinePackageExcludeList]
-package_list:
-
-[SdkUpdateRepository]
-repository_url_release: http://../qt5repository/windows/x32/online_qt5sdk_repo
-repository_url_rnd: http://../qt5repository/windows/x32/online_qt5sdk_repo
-
-[TargetArchitechture]
-instruction_set: x86
-
-[ConfigDir]
-template_name: config_qt5
-
-[ConfigXml]
-template_name: config.xml.template.windows.qt5-beta
-
-[WorkingDirectories]
-packages_dir: pkg_beta
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://origin.releases.qt-project.org/utils/bin_tools/pre_sdk_ifw/installer-framework-build-win.7z
-version: 1.2.0
-
-
-
-
-
-[qt.sdk]
-root_component: yes
-
-[qt.sdk.readme]
-archives: sdk.readme, sdk.qt_project_url
-target_install_base: /
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[sdk.readme]
-archive_uri: http://qt.gitorious.org/qt/qtrepotools/blobs/raw/master/release-tools/dist/README.txt
-package_strip_dirs: 0
-target_install_dir: /
-rpath_target:
-archive_name: readme.7z
-[sdk.qt_project_url]
-archive_uri: qt-project-url.7z
-package_strip_dirs: 0
-target_install_dir: /
-rpath_target:
-archive_name: qt-project-url.7z
-
-[qt.sdk.src]
-
-[qt.sdk.src.qt.500_beta]
-archives: src.qt.500_beta
-target_install_base: /Src/Qt/5.0.0-beta2/
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[src.qt.500_beta]
-archive_uri: /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta2.zip
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[qt.sdk.desktop]
-
-[disabled.while.bins.not.available.qt.sdk.desktop.500_beta.msvc2010_64]
-archives: desktop.500_beta.msvc2010_64, icu_49.win_64
-target_install_base: /Desktop/Qt/5.0.0-beta2/msvc2010_64
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[disabled.while.bins.not.available.desktop.500_beta.msvc2010_64]
-archive_uri: /qt5.0-beta-snapshots/win_release/qt5_desktop_bin_win7.7z
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: msvc2010_64_all.7z
-[icu_49.win_64]
-archive_uri: http://origin.releases.qt-project.org/prebuilt/icu_49_win_64.7z
-package_strip_dirs: 0
-target_install_dir: /bin
-rpath_target:
-archive_name: icu_49_win_64.7z
-
-[qt.sdk.desktop.500_beta.msvc2010]
-archives: desktop.500_beta.msvc2010, icu_49.win_32
-target_install_base: /Desktop/Qt/5.0.0-beta2/msvc2010
-version: 5.0.0
-version_tag: %QT_VERSION%
-package_default: true
-[desktop.500_beta.msvc2010]
-archive_uri: /qt5.0-beta-snapshots/win_release/qt5_desktop_bin_win7.7z
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: msvc2010_all.7z
-[icu_49.win_32]
-archive_uri: http://origin.releases.qt-project.org/prebuilt/icu_49_win_32.7z
-package_strip_dirs: 0
-target_install_dir: /bin
-rpath_target:
-archive_name: icu_49_win_32.7z
-
-[qt.sdk.misc.vcredist_x86]
-archives: sdk.misc.vcredist_x86
-target_install_base: /vcredist
-version: 2010-12-4
-version_tag: %VCREDIST_X86_VERSION%
-package_default: false
-[sdk.misc.vcredist_x86]
-archive_uri: http://origin.releases.qt-project.org/prebuilt/vcredist_x86.7z
-package_strip_dirs: 0
-target_install_dir: /
-rpath_target:
-archive_name: vcredist_x86.7z
-
-[qt.sdk.misc.vcredist_x64]
-archives: sdk.misc.vcredist_x64
-target_install_base: /vcredist
-version: 2010-12-4
-version_tag: %VCREDIST_X64_VERSION%
-package_default: false
-[sdk.misc.vcredist_x64]
-archive_uri: http://origin.releases.qt-project.org/prebuilt/vcredist_x64.7z
-package_strip_dirs: 0
-target_install_dir: /
-rpath_target:
-archive_name: vcredist_x64.7z
-
diff --git a/release-tools/configurations/windows/config.xml.template.windows b/release-tools/configurations/windows/config.xml.template.windows
deleted file mode 100644
index 01eba008da47178f0c3d8de6bef5f30c86193657..0000000000000000000000000000000000000000
--- a/release-tools/configurations/windows/config.xml.template.windows
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<Installer>
- <Name>Qt SDK</Name>
- <Version>5.0.0 Beta 2</Version>
- <Title>Qt SDK</Title>
- <MaintenanceTitle>Maintain Qt SDK</MaintenanceTitle>
- <Publisher>Qt</Publisher>
- <Logo>logo.png</Logo>
- <LogoSmall>logo-small.png</LogoSmall>
- <Icon>logo-small</Icon>
- <License>license.txt</License>
- <Watermark>watermark.png</Watermark>
- <StartMenuDir>Qt SDK</StartMenuDir>
- <ProductUrl>qt.nokia.com</ProductUrl>
- <!--<Background>background.png</Background>-->
- <UninstallerName>SDKMaintenanceTool</UninstallerName>
- <RemoteRepositories>
- <Repository>
- <Url>%UPDATE_REPOSITORY_URL%</Url>
- <Required>false</Required>
- </Repository>
- </RemoteRepositories>
- <!-- @homeDir@ and @rootDir@ are some of the supported vars -->
- <TargetDir>@homeDir@/QtSDK</TargetDir>
-</Installer>
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 ec5ae2166a845515d16f79bceb0dfe7fe306727f..1705df2b7992a124f04cd021054ef401cc120f94 100644
--- a/release-tools/configurations/windows/config.xml.template.windows.qt5-beta
+++ b/release-tools/configurations/windows/config.xml.template.windows.qt5-beta
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Installer>
<Name>Qt 5.0.0 Beta 2 Installer</Name>
- <Version>%SDK_VERSION_NUM%</Version>
+ <Version>5.0.0 Beta 2</Version>
<Title>Qt 5.0.0 Beta 2</Title>
<MaintenanceTitle>Maintain Qt 5.0.0 Beta 2</MaintenanceTitle>
<Publisher>Qt</Publisher>
diff --git a/release-tools/configurations/windows/tools-conf b/release-tools/configurations/windows/tools-conf
new file mode 100644
index 0000000000000000000000000000000000000000..6b4019815e72a66996c3f3adbda0ffdb27f43d88
--- /dev/null
+++ b/release-tools/configurations/windows/tools-conf
@@ -0,0 +1,28 @@
+[qt.tools]
+
+[qt.tools.vcredist]
+archives: tools.vcredist
+target_install_base: /vcredist
+version: 2010-12-4
+version_tag: %VCREDIST_X86_VERSION%
+package_default: false
+[tools.vcredist]
+archive_uri: http://origin.releases.qt-project.org/prebuilt/vcredist_x86.7z
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: vcredist_x86.7z
+
+
+[qt.tools.qtcreator]
+archives: tools.qtcreator
+target_install_base: /Tools/Qt Creator
+version: 2.6.0
+version_tag: %QTCREATOR_VERSION%
+package_default: true
+[tools.qtcreator]
+archive_uri: http://origin.releases.qt-project.org/qtcreator/2.6.0-beta/qt-creator-windows-opensource-2.6.0-beta.7z
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: qt-creator-opensource-2.6.0.7z
diff --git a/release-tools/configurations/windows/tools_64-conf b/release-tools/configurations/windows/tools_64-conf
new file mode 100644
index 0000000000000000000000000000000000000000..1e7ec83c540e7f77655761424c5143071b1f0281
--- /dev/null
+++ b/release-tools/configurations/windows/tools_64-conf
@@ -0,0 +1,27 @@
+[qt.tools]
+
+[qt.tools.vcredist_64]
+archives: tools.vcredist_64
+target_install_base: /vcredist
+version: 2010-12-4
+version_tag: %VCREDIST_X64_VERSION%
+package_default: false
+[tools.vcredist_64]
+archive_uri: http://origin.releases.qt-project.org/prebuilt/vcredist_x64.7z
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: vcredist_x64.7z
+
+[qt.tools.qtcreator]
+archives: tools.qtcreator
+target_install_base: /Tools/Qt Creator
+version: 2.6.0
+version_tag: %QTCREATOR_VERSION%
+package_default: true
+[tools.qtcreator]
+archive_uri: http://origin.releases.qt-project.org/qtcreator/2.6.0-beta/qt-creator-windows-opensource-2.6.0-beta.7z
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: qt-creator-opensource-2.6.0.7z
diff --git a/release-tools/configurations/windows/x86_32 b/release-tools/configurations/windows/x86_32
deleted file mode 100644
index 84ce877c0ad4e81ddd6c4d1f1a3d2f7b31c9dd9a..0000000000000000000000000000000000000000
--- a/release-tools/configurations/windows/x86_32
+++ /dev/null
@@ -1,78 +0,0 @@
-
-[com.qt]
-root_component: yes
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.src.500]
-archives: qt.src.500
-target_install_base: /Src/Qt/5.0.0
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: false
-[qt.src.500]
-archive_uri: qt-everywhere-opensource-src-5.0.0.zip
-package_strip_dirs: 1
-target_install_dir: /
-rpath_target:
-archive_name: qt-everywhere-opensource-src-5.0.0.7z
-
-[com.qt.desktop]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt]
-version: 1.0.0
-version_tag: %SDK_VERSION_NUM%
-
-[com.qt.desktop.qt.500]
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-
-[com.qt.desktop.qt.500.gcc]
-archives: qt.500.gcc
-target_install_base: /Desktop/Qt/5.0.0/gcc
-version: 5.0.0
-version_tag: %QT_VERSION_NUM%
-package_default: true
-[qt.500.gcc]
-archive_uri: qt-5.0.0-desktop-gcc.7z
-package_strip_dirs: 4
-target_install_dir: /
-rpath_target: /lib
-archive_name: qt-5.0.0-desktop-gcc.7z
-
-
-[OfflinePackageExcludeList]
-package_list:
-
-[PackagesNamespace]
-name: com.qt
-
-[SdkUpdateRepository]
-repository_url:
-repository_url_rnd:
-
-[TargetArchitechture]
-instruction_set: x86_32
-
-[ConfigDir]
-template_name: config_qt5
-target_dir: config
-
-[ConfigXml]
-template_name: config.xml.template.windows
-
-[WorkingDirectories]
-packages_dir: pkg
-
-[InstallerFrameworkTools]
-name: ifwt
-package_url: http://<url_to>/installer-framework-build-win-32bit.7z
-version: 1.2.0
-
-