IFW: Include IFW 3.2 to online repository build

Change-Id: I649174b94d16ff0f8cf398a84436149c6506266d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

5 files changed, 41 insertions, 2 deletions

diff --git a/packaging-tools/configurations/linux/x64/x86_64-tools-ifw-conf b/packaging-tools/configurations/linux/x64/x86_64-tools-ifw-conf
index 1397523cf..1c2a5c537 100644
--- a/packaging-tools/configurations/linux/x64/x86_64-tools-ifw-conf
+++ b/packaging-tools/configurations/linux/x64/x86_64-tools-ifw-conf
@@ -22,6 +22,16 @@ archive_name:           ifw-linux-x64.7z
 archives:               tools.ifw.31
 target_install_base:    /Tools/QtInstallerFramework/3.1
 [tools.ifw.31]
+archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-3.1.1-linux-x64.7z
+package_strip_dirs:     1
+target_install_dir:     /
+rpath_target:
+archive_name:           ifw-linux-x64.7z
+
+[qt.tools.ifw.32]
+archives:               tools.ifw.32
+target_install_base:    /Tools/QtInstallerFramework/3.2
+[tools.ifw.32]
 archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-%MAINTENANCE_TOOL_VERSION%-linux-x64.7z
 package_strip_dirs:     1
 target_install_dir:     /
diff --git a/packaging-tools/configurations/mac/x64/x86_64-tools-ifw-conf b/packaging-tools/configurations/mac/x64/x86_64-tools-ifw-conf
index 93fee1aac..99a6953e9 100644
--- a/packaging-tools/configurations/mac/x64/x86_64-tools-ifw-conf
+++ b/packaging-tools/configurations/mac/x64/x86_64-tools-ifw-conf
@@ -22,9 +22,18 @@ archive_name:           ifw-mac-x64.7z
 archives:               tools.ifw.31
 target_install_base:    /Tools/QtInstallerFramework/3.1
 [tools.ifw.31]
-archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-%MAINTENANCE_TOOL_VERSION%-mac-x64.7z
+archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-3.1.1-mac-x64.7z
 package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
 archive_name:           ifw-mac-x64.7z
 
+[qt.tools.ifw.32]
+archives:               tools.ifw.32
+target_install_base:    /Tools/QtInstallerFramework/3.2
+[tools.ifw.32]
+archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-%MAINTENANCE_TOOL_VERSION%-mac-x64.7z
+package_strip_dirs:     1
+target_install_dir:     /
+rpath_target:
+archive_name:           ifw-mac-x64.7z
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.31/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.31/meta/package.xml
index 1b2238613..e126b15e5 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.31/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.31/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>Qt Installer Framework 3.1</DisplayName>
     <Description>The Qt Installer Framework provides a set of tools and utilities to create installers for the supported desktop Qt platforms: Linux, Microsoft Windows, and macOS.</Description>
-    <Version>%MAINTENANCE_TOOL_VERSION%</Version>
+    <Version>3.1.1</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Default>false</Default>
     <SortingPriority>500</SortingPriority>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.32/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.32/meta/package.xml
new file mode 100644
index 000000000..fa4d64d13
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.32/meta/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <DisplayName>Qt Installer Framework 3.2</DisplayName>
+    <Description>The Qt Installer Framework provides a set of tools and utilities to create installers for the supported desktop Qt platforms: Linux, Microsoft Windows, and macOS.</Description>
+    <Version>%MAINTENANCE_TOOL_VERSION%</Version>
+    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
+    <Default>false</Default>
+    <SortingPriority>520</SortingPriority>
+    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
+</Package>
diff --git a/packaging-tools/configurations/windows/x86/x86-tools-ifw-conf b/packaging-tools/configurations/windows/x86/x86-tools-ifw-conf
index e8f18c73b..dc9b4cebb 100644
--- a/packaging-tools/configurations/windows/x86/x86-tools-ifw-conf
+++ b/packaging-tools/configurations/windows/x86/x86-tools-ifw-conf
@@ -22,6 +22,16 @@ archive_name:           ifw-win-x86.7z
 archives:               tools.ifw.31
 target_install_base:    /Tools/QtInstallerFramework/3.1
 [tools.ifw.31]
+archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-3.1.1-win-x86.7z
+package_strip_dirs:     1
+target_install_dir:     /
+rpath_target:
+archive_name:           ifw-win-x86.7z
+
+[qt.tools.ifw.32]
+archives:               tools.ifw.32
+target_install_base:    /Tools/QtInstallerFramework/3.2
+[tools.ifw.32]
 archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-%MAINTENANCE_TOOL_VERSION%-win-x86.7z
 package_strip_dirs:     1
 target_install_dir:     /