summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-04-14 23:11:30 +0200
committerLiang Qi <liang.qi@qt.io>2019-04-14 23:11:30 +0200
commite10a2d4ffe7a1e55e660a487f8357070afd990c4 (patch)
tree75119e711cf3d38e891f62d8f931e386763f9e5b /coin/provisioning/qtci-windows-10-x86_64
parent74eab55ea83a9919e0a3085015d2e522bd351ac1 (diff)
parentf2af07b8edafa15594eed67afb68dc2481721541 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: .gitmodules Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps122
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps14
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps111
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps134
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps12
6 files changed, 15 insertions, 60 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
deleted file mode 100644
index e7f4c248..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
+++ /dev/null
@@ -1,22 +0,0 @@
-# The DirectX SDK installer requires .Net framework 3.5 which isn't installed
-# by default
-
-$netFeature = "NetFx3"
-try {
- $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State
- if ($netFeatureState -eq "Enabled") {
- Write-Host ".Net Framework is already installed"
- exit 0
- }
-} catch {
- Write-Host "Could not find .Net Framework Windows feature."
- exit 1
-}
-
-Write-Host "Installing .Net Framework client"
-try {
- Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart
-} catch {
- Write-Host "Could not install .Net framework"
- exit 1
-}
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1
deleted file mode 100644
index 6a398725..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe
-Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1
index d019fc92..72ac1ca7 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1
@@ -34,10 +34,10 @@
# Visual Studios are pre-provisioned to tier1 images
# MSVC 2015 Update 3
-Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt
+Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt
# MSVC 2017
-Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt
+Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt
# MSVC 2017 Build Tools
Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
new file mode 100644
index 00000000..5401b36a
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
@@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
+
+# This script will install MinGW 7.3.0
+
+$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0"
+$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532"
+$suffix = "_i686"
+
+InstallMinGW $release $sha1 $suffix
+
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
deleted file mode 100644
index fe1aec7d..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
+++ /dev/null
@@ -1,34 +0,0 @@
-#############################################################################
-##
-## 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\windows\msvc_2015_update3_patch.ps1"
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+