Qt Creator/master: Adapt MSVC version

Change-Id: I7fff7613f09276ad95016ea7ce3481efbcbf5b6a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

8 files changed, 282 insertions, 8 deletions

diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x64 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x64
new file mode 100644
index 000000000..a33af680c
--- /dev/null
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x64
@@ -0,0 +1,50 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+[PackageNamespace]
+name:                   qt
+
+[PlatformIdentifier]
+identifier:             windows
+
+[PackageConfigurationFiles]
+file_list:              qt-conf,
+                        qtcreator-license-conf,
+                        x64-tools-qtcreator-standalone-master-conf,
+                        tools-qtcreatorcdbext-standalone-master-conf,
+                        x86-tools-vcredist_msvc2017-conf,
+                        x64-tools-vcredist_msvc2017-conf
+
+[ConfigDir]
+template_name:          config_qtcreator
+
+[ConfigXml]
+template_name:          config.xml.template.windows.qtcreator.x64
+
+[PackageTemplates]
+template_dirs:          pkg_qtcreator_standalone, pkg_tools
diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x86 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x86
new file mode 100644
index 000000000..8284d8967
--- /dev/null
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x86
@@ -0,0 +1,50 @@
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+[PackageNamespace]
+name:                   qt
+
+[PlatformIdentifier]
+identifier:             windows
+
+[PackageConfigurationFiles]
+file_list:              qt-conf,
+                        qtcreator-license-conf,
+                        x86-tools-qtcreator-standalone-master-conf,
+                        tools-qtcreatorcdbext-standalone-master-conf,
+                        x86-tools-vcredist_msvc2017-conf,
+                        x64-tools-vcredist_msvc2017-conf
+
+[ConfigDir]
+template_name:          config_qtcreator
+
+[ConfigXml]
+template_name:          config.xml.template.windows.qtcreator
+
+[PackageTemplates]
+template_dirs:          pkg_qtcreator_standalone, pkg_tools
diff --git a/packaging-tools/configurations/repository_configs/tools_desktop/preview_win_x86_repository_tools_qtcreator b/packaging-tools/configurations/repository_configs/tools_desktop/preview_win_x86_repository_tools_qtcreator
index 7f1134140..c4fee5399 100644
--- a/packaging-tools/configurations/repository_configs/tools_desktop/preview_win_x86_repository_tools_qtcreator
+++ b/packaging-tools/configurations/repository_configs/tools_desktop/preview_win_x86_repository_tools_qtcreator
@@ -34,8 +34,7 @@ identifier:             windows
 
 [PackageConfigurationFiles]
 file_list:              x86-tools-qtcreator-online-preview-conf,
-                        tools-qtcreatorcdbext-msvc2015-preview-conf
+                        tools-qtcreatorcdbext-online-preview-conf
 
 [PackageTemplates]
 template_dirs:          preview_pkg_qtcreator
-
diff --git a/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-msvc2015-preview-conf b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-online-preview-conf
index d7fcf472e..5860d71ec 100644
--- a/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-msvc2015-preview-conf
+++ b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-online-preview-conf
@@ -32,14 +32,14 @@ archives:               tools.qtcreatorcdbext32,
 target_install_base:    /Tools/Preview/Qt Creator %QTC_DISPLAY_VERSION%
 
 [tools.qtcreatorcdbext32]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_32/qtcreatorcdbext.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/qtcreatorcdbext.7z
 package_strip_dirs:     0
 target_install_dir:     /
 rpath_target:
 archive_name:           preview-qtcreatorcdbext32.7z
 
 [tools.qtcreatorcdbext64]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_64/qtcreatorcdbext.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/qtcreatorcdbext.7z
 package_strip_dirs:     0
 target_install_dir:     /
 rpath_target:
diff --git a/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-standalone-master-conf b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-standalone-master-conf
new file mode 100644
index 000000000..08a2622d6
--- /dev/null
+++ b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-standalone-master-conf
@@ -0,0 +1,47 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+[qt.tools.qtcreatorcdbext]
+archives:               tools.qtcreatorcdbext32,
+                        tools.qtcreatorcdbext64
+target_install_base:    /
+package_default:        true
+
+[tools.qtcreatorcdbext32]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/qtcreatorcdbext.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           qtcreatorcdbext32.7z
+
+[tools.qtcreatorcdbext64]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/qtcreatorcdbext.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           qtcreatorcdbext64.7z
diff --git a/packaging-tools/configurations/windows/x64/x64-tools-qtcreator-standalone-master-conf b/packaging-tools/configurations/windows/x64/x64-tools-qtcreator-standalone-master-conf
new file mode 100644
index 000000000..26c8dd98f
--- /dev/null
+++ b/packaging-tools/configurations/windows/x64/x64-tools-qtcreator-standalone-master-conf
@@ -0,0 +1,64 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+[qt.tools.qtcreator]
+archives:               tools.qtcreator,
+                        tools.qtcreator.wininterrupt32,
+                        tools.qtcreator.wininterrupt64,
+                        tools.sdktool
+target_install_base:    /
+package_default:        true
+
+[tools.qtcreator]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/qtcreator.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           qtcreator.7z
+
+[tools.qtcreator.wininterrupt32]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/wininterrupt.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           wininterrupt32.7z
+
+[tools.qtcreator.wininterrupt64]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/wininterrupt.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           wininterrupt64.7z
+
+[tools.sdktool]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/sdktool.7z
+package_strip_dirs:
+target_install_dir:     /bin
+rpath_target:
+archive_name:           qtcreator_sdktool.7z
diff --git a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-preview-conf b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-preview-conf
index 3487b14a2..7b09b71c9 100644
--- a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-preview-conf
+++ b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-preview-conf
@@ -34,28 +34,28 @@ archives:               tools.qtcreator,
 target_install_base:    /Tools/Preview/Qt Creator %QTC_DISPLAY_VERSION%
 
 [tools.qtcreator]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_32/qtcreator.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/qtcreator.7z
 package_strip_dirs:     0
 target_install_dir:     /
 rpath_target:
 archive_name:           preview-qtcreator.7z
 
 [tools.qtcreator.wininterrupt32]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_32/wininterrupt.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/wininterrupt.7z
 package_strip_dirs:     0
 target_install_dir:     /
 rpath_target:
 archive_name:           preview-wininterrupt32.7z
 
 [tools.qtcreator.wininterrupt64]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_64/wininterrupt.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/wininterrupt.7z
 package_strip_dirs:     0
 target_install_dir:     /
 rpath_target:
 archive_name:           preview-wininterrupt64.7z
 
 [tools.sdktool]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_32/sdktool.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/sdktool.7z
 package_strip_dirs:
 target_install_dir:     /bin
 rpath_target:
diff --git a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-standalone-master-conf b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-standalone-master-conf
new file mode 100644
index 000000000..628fae602
--- /dev/null
+++ b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-standalone-master-conf
@@ -0,0 +1,64 @@
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+[qt.tools.qtcreator]
+archives:               tools.qtcreator,
+                        tools.qtcreator.wininterrupt32,
+                        tools.qtcreator.wininterrupt64,
+                        tools.sdktool
+target_install_base:    /
+package_default:        true
+
+[tools.qtcreator]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/qtcreator.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           qtcreator.7z
+
+[tools.qtcreator.wininterrupt32]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/wininterrupt.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           wininterrupt32.7z
+
+[tools.qtcreator.wininterrupt64]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/wininterrupt.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           wininterrupt64.7z
+
+[tools.sdktool]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/sdktool.7z
+package_strip_dirs:
+target_install_dir:     /bin
+rpath_target:
+archive_name:           qtcreator_sdktool.7z