Provisioning: MSVC 2017 Build Tools
authorHeikki Halmet <heikki.halmet@qt.io>
Wed, 19 Apr 2017 09:23:20 +0000 (12:23 +0300)
committerHeikki Halmet <heikki.halmet@qt.io>
Mon, 24 Apr 2017 05:17:04 +0000 (05:17 +0000)
MSVC 2017 build tools are pre-provisioned to windows 10 templates

Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 [new file with mode: 0644]
coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 [new file with mode: 0644]

index ae173eb..917a832 100644 (file)
@@ -6,8 +6,8 @@ qtci-windows-8-x86-2                                                MSVC2013
 qtci-windows-8-x86_64-2                                             MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
 qtci-windows-7-x86-2                                                MSVC2010    Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
 qtci-windows-7-x86-2                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86-4                                               MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64-5                                            MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86-5                                               MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86_64-6                                            MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
 qtci-windows-8-x86_64-2             Windows_Phone_8_1   armv4       MSVC2013    Packaging DebugAndRelease Release DisableTests
 qtci-windows-8-x86_64-2             WinRT_8_1                       MSVC2013    Packaging DebugAndRelease Release DisableTests
 qtci-linux-Ubuntu-14.04-x86_64                                      GCC         NoWidgets ForceDebugInfo
index 0494e96..77e9869 100644 (file)
@@ -1,8 +1,8 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -----------------------------------------------------------------------------------------------
 qtci-windows-8-x86_64-2     Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64-5    WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64-5    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-6    WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-6    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
 qtci-linux-RHEL-6.6-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86-2        Android_ANY         armv7       Mingw49     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-2        Android_ANY         x86         Mingw49     Packaging Release DisableTests OpenGLES2
@@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packagin
 qtci-windows-7-x86-2        QNX_660             armv7       Mingw49     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-2        QNX_660             x86         Mingw49     Packaging Release DisableTests OpenGLES2
 # target arch is used here only for documentation the value is ignored
-qtci-windows-10-x86_64-5    WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-6    WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests
 
 qtci-osx-10.11-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
new file mode 100644 (file)
index 0000000..556a352
--- /dev/null
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+
+$version = "2017_version_15.0"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
new file mode 100644 (file)
index 0000000..556a352
--- /dev/null
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+
+$version = "2017_version_15.0"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt