From 88b35a49212e4151b955a7604e20f67be0b62c9c Mon Sep 17 00:00:00 2001 From: Johanna Aijala Date: Wed, 28 Nov 2018 15:33:40 +0200 Subject: Update Squish to 6.4.3 Froglogic has not yet released Squish for Qt5.13 but we can use Squish packages build with Qt5.12. Remove msvc12 Squish, not needed. Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 5fb032f5..21dfea39 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,18 +38,18 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.3.2" +$version = "6.4.3" # Qt branch without dot (*.*) -$qtBranch = "510x" -# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point +$qtBranch = "512x" +# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. $targetDir = "C:\Utils\squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $squishBranchUrl = "$squishUrl\$qtBranch" $testSuite = "suite_test_squish" -$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z" +$testSuiteUrl = "$squishUrl\$testSuite.7z" # Squish license $licensePackage = ".squish-3-license" @@ -62,7 +62,10 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - + # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 + if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { + $qtBranch = "511x" + } $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" @@ -125,25 +128,24 @@ DownloadSquishLicence $squishUrl if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 msvc14 + DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 8.1 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } -- cgit v1.2.3 From 76c80866af78274eeb973ab38ad7b44f216b1a1e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Feb 2019 13:28:47 +0200 Subject: Provisioning: Help script for removing items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes items are locked (access denied) so we need to have function which waits and retry until removing is possible. Task-number: QTQAINFRA-2806 Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745 Reviewed-by: Tony Sarajärvi Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/windows/helpers.ps1 | 19 +++++++++++++++++++ coin/provisioning/common/windows/vc_redist.ps1 | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 76ad4867..f5318bcb 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -159,3 +159,22 @@ function IsProxyEnabled { function Get-Proxy { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer } + +function Remove { + + Param ( + [string]$Path = $(BadParam("a path")) + ) + Write-Host "Removing $Path" + $i = 0 + While ( Test-Path($Path) ){ + Try{ + remove-item -Force -Recurse -Path $Path -ErrorAction Stop + }catch{ + $i +=1 + if ($i -eq 5) {exit 1} + Write-Verbose "$Path locked, trying again in 5" + Start-Sleep -seconds 5 + } + } +} diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index f68846f0..1cd81a37 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." Run-Executable $package "/q" -Write-Host "Remove $package..." -Remove-Item -Force -Path $package +Remove $package -- cgit v1.2.3 From 675deb147463a9354aebd4a487783a41d578917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 8 Mar 2019 07:41:10 -0800 Subject: Add Squish for MSVC2017 x64 to Win10 x64 machines Also Squish for MinGW x86 on Win7 x86. Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 21dfea39..de04d242 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -129,6 +129,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" } else { DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" @@ -146,6 +147,8 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } DownloadAndInstallSquish $version win32 "msvc141" } -- cgit v1.2.3