Add vcredistributables (32bit and 64bit) into Qt5 beta installers

Added Win configurations to bundle vcredistributables as part of
the installers.

Change-Id: I7970a32708d148754206eded87fccdc2966c00a2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

7 files changed, 94 insertions, 2 deletions

diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml
index 789ab31..216f7e3 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml
+++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml
@@ -5,7 +5,7 @@
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.desktop.500_beta.msvc2010</Name>
-    <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
+    <Dependencies>qt.sdk.misc.vcredist_x86</Dependencies>
     <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml
index 952676a..8b49eb3 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml
+++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml
@@ -5,7 +5,7 @@
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.desktop.500_beta.msvc2010_64</Name>
-    <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
+    <Dependencies>qt.sdk.misc.vcredist_x64</Dependencies>
     <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs
new file mode 100644
index 0000000..2cd4ad3
--- /dev/null
+++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs
@@ -0,0 +1,20 @@
+
+// constructor
+function Component()
+{
+    if (component.fromOnlineRepository)
+    {
+        // Commented line below used by the packaging scripts
+        //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
+    }
+}
+
+Component.prototype.createOperations = function()
+{
+    // Call the base createOperations and afterwards set some registry settings
+    // so that the simulator finds its fonts and applications find the simulator
+    component.createOperations();
+
+    //return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application
+    component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\vcredist\\vcredist_x64.exe", "/q");
+}
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml
new file mode 100644
index 0000000..7325c5e
--- /dev/null
+++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <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>
+    <ReleaseDate>2010-12-04</ReleaseDate>
+    <Script>installscript.qs</Script>
+    <Virtual>true</Virtual>
+    <!--<ForcedInstallation>true</ForcedInstallation>-->
+    <RequiresAdminRights>true</RequiresAdminRights>
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
+</Package>
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs
new file mode 100644
index 0000000..ada2bf4
--- /dev/null
+++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs
@@ -0,0 +1,20 @@
+
+// constructor
+function Component()
+{
+    if (component.fromOnlineRepository)
+    {
+        // Commented line below used by the packaging scripts
+        //%IFW_DOWNLOADABLE_ARCHIVE_NAMES%
+    }
+}
+
+Component.prototype.createOperations = function()
+{
+    // Call the base createOperations and afterwards set some registry settings
+    // so that the simulator finds its fonts and applications find the simulator
+    component.createOperations();
+
+    //return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application
+    component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\vcredist\\vcredist_x86.exe", "/q");
+}
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml
new file mode 100644
index 0000000..84ded56
--- /dev/null
+++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <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>
+    <ReleaseDate>2010-12-04</ReleaseDate>
+    <Script>installscript.qs</Script>
+    <Virtual>true</Virtual>
+    <!--<ForcedInstallation>true</ForcedInstallation>-->
+    <RequiresAdminRights>true</RequiresAdminRights>
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
+</Package>
diff --git a/release-tools/configurations/win_x86_beta b/release-tools/configurations/win_x86_beta
index 2095375..284a90e 100644
--- a/release-tools/configurations/win_x86_beta
+++ b/release-tools/configurations/win_x86_beta
@@ -120,3 +120,29 @@ 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
+