Include IFW 3.1 to online repository build

In IFW 3.1 start using %MAINTENANCE_TOOL_VERSION%. Add also
3.0.6 (which previously used %MAINTENANCE_TOOL_VERSION%)
so it won't vanish

Change-Id: I9603ed2b3aa6f998610c4639ba3f3c7d02584a2f
Reviewed-by: Antti Kokko <antti.kokko@qt.io>

6 files changed, 46 insertions, 5 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 b28ff1db0..1397523cf 100644
--- a/packaging-tools/configurations/linux/x64/x86_64-tools-ifw-conf
+++ b/packaging-tools/configurations/linux/x64/x86_64-tools-ifw-conf
@@ -12,6 +12,16 @@ archive_name:           ifw-linux-x64.7z
 archives:               tools.ifw.30
 target_install_base:    /Tools/QtInstallerFramework/3.0
 [tools.ifw.30]
+archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-3.0.6-linux-x64.7z
+package_strip_dirs:     1
+target_install_dir:     /
+rpath_target:
+archive_name:           ifw-linux-x64.7z
+
+[qt.tools.ifw.31]
+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%-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 b18ae40fa..93fee1aac 100644
--- a/packaging-tools/configurations/mac/x64/x86_64-tools-ifw-conf
+++ b/packaging-tools/configurations/mac/x64/x86_64-tools-ifw-conf
@@ -12,8 +12,19 @@ archive_name:           ifw-mac-x64.7z
 archives:               tools.ifw.30
 target_install_base:    /Tools/QtInstallerFramework/3.0
 [tools.ifw.30]
+archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-3.0.6-mac-x64.7z
+package_strip_dirs:     1
+target_install_dir:     /
+rpath_target:
+archive_name:           ifw-mac-x64.7z
+
+[qt.tools.ifw.31]
+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
 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.30/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.30/meta/package.xml
index 293bb0cba..3e6172616 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.30/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.30/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>Qt Installer Framework 3.0</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%-1</Version>
+    <Version>3.0.6-1</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Default>false</Default>
     <SortingPriority>490</SortingPriority>
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
new file mode 100644
index 000000000..1b2238613
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.ifw.31/meta/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
+    <Default>false</Default>
+    <SortingPriority>500</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 2fde9e6b1..e8f18c73b 100644
--- a/packaging-tools/configurations/windows/x86/x86-tools-ifw-conf
+++ b/packaging-tools/configurations/windows/x86/x86-tools-ifw-conf
@@ -12,6 +12,16 @@ archive_name:           ifw-win-x86.7z
 archives:               tools.ifw.30
 target_install_base:    /Tools/QtInstallerFramework/3.0
 [tools.ifw.30]
+archive_uri:            /opensource/ifw/installer-framework/installer-framework-build-stripped-3.0.6-win-x86.7z
+package_strip_dirs:     1
+target_install_dir:     /
+rpath_target:
+archive_name:           ifw-win-x86.7z
+
+[qt.tools.ifw.31]
+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%-win-x86.7z
 package_strip_dirs:     1
 target_install_dir:     /
diff --git a/packaging-tools/releases/installerframework b/packaging-tools/releases/installerframework
index 94dd710bc..44d02c655 100644
--- a/packaging-tools/releases/installerframework
+++ b/packaging-tools/releases/installerframework
@@ -2,12 +2,12 @@
 ## Global defines
 ################################################################################
 [ifwtools]
-windows-x86:                installer-framework-build-tqtc_3.0.6-win-x86.7z
-linux-x64:                  installer-framework-build-tqtc_3.0.6-linux-x64.7z
-mac-x64:                    installer-framework-build-tqtc_3.0.6-mac-x64.7z
+windows-x86:                installer-framework-build-tqtc_3.1.0-win-x86.7z
+linux-x64:                  installer-framework-build-tqtc_3.1.0-linux-x64.7z
+mac-x64:                    installer-framework-build-tqtc_3.1.0-mac-x64.7z
 
 [release.global]
-version:                    3.0.6
+version:                    3.1.0
 version_tag:
 arg_substitution_list:      %MAINTENANCE_TOOL_VERSION%=%GLOBAL_VERSION%