From 0660a25cca3c922346653e1bc486a0c8aa59f5aa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Feb 2019 14:00:21 +0200 Subject: Provisioning: Make gnuwin32 available for windows machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script will install gnuwin32 to the windows machines so it can be removed from qt5 Task-number: QTBUG-73422 Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199 Reviewed-by: Juha Karjalainen Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') 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" + -- cgit v1.2.3 From c654e63c87d83577116431e165115e0c6ceb723d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 7 Sep 2018 09:17:02 +0300 Subject: Update Windows 10, MSVC 2015 and MSVC 2017 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 10 updated to build 1809 msvc2015 update 3 14.0.25431.01 msvc2015 update 3 (KB3165756) msvc2017 5.18.2 4.7.03056 ms-zune is no longer available in the latest Windows 10 version dotnet and msvc 2015 update patch installation moved to pre-provisioning. Msvc 2015 update patch installation seems to be flaky with this windows version. Task-number: QTBUG-68190 Task-number: QTQAINFRA-2255 Task-number: QTBUG-71125 Change-Id: I87defffa488cb75f7de0909020073b35476bea80 Reviewed-by: Tony Sarajärvi --- .../01-enable-dotnet-framework.ps1 | 22 -------------- .../qtci-windows-10-x86_64/01-remove-ms-zune.ps1 | 2 -- .../qtci-windows-10-x86_64/05-msvc.ps1 | 4 +-- .../10-msvc_2015_update3_patch.ps1 | 34 ---------------------- 4 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') 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/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" - -- cgit v1.2.3 From 338fce191ac1e14b9365068021b4f7ec7ad50646 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 5 Apr 2019 10:12:36 +0200 Subject: Provisioning: Install i686 mingw on Windows 10 X64 Required to compile 32-bit binaries. Fixes: QTQAINFRA-2896 Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f Reviewed-by: Heikki Halmet --- .../qtci-windows-10-x86_64/09-install-mingw730.ps1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') 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 + + -- cgit v1.2.3