diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2017-04-12 14:25:31 +0300 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2017-04-13 12:31:58 +0000 |
commit | e48d65315076311b0e371efc4533aacb839b9418 (patch) | |
tree | 3e8d5d408d63cec2c73e4fb5081206e6918d6b13 /coin/pre-provisioning/qtci-windows-10-x86_64 | |
parent | b8211774d91aa64e1dcfab7c53135f45c2702878 (diff) |
Provisioning: Change tier1 templates for Windows 10
These tier 1 templates includes changes needed by 5.9, but we can use
these same tier 1 templates for 5.6 also
Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/pre-provisioning/qtci-windows-10-x86_64')
-rw-r--r-- | coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 | 2 | ||||
-rw-r--r-- | coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 | 49 |
2 files changed, 50 insertions, 1 deletions
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index 618c87c4..fb6a6594 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" # Install Visual Studio $version with $update_version # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 new file mode 100644 index 00000000..46675c23 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -0,0 +1,49 @@ +############################################################################ +## +## 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 + +$version = "2017" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" +$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" +$msvcPackage = "C:\Windows\Temp\$version.exe" + + +Download $url_cache $url_cache $msvcPackage +Verify-Checksum $msvcPackage $sha1 +cmd /c "$msvcPackage --all --norestart --quiet --wait" +echo "Cleaning $msvcPackage.." +Remove-Item -Recurse -Force "$msvcPackage" +echo "Visual Studio = $version" >> ~\versions.txt |