diff options
Diffstat (limited to 'coin')
13 files changed, 102 insertions, 20 deletions
diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..284eb19d 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.16" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" -sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d" +sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 4a7a6837..b40c1922 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,9 +38,9 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.3.2" +version="6.4.3" # Branch version without dot -qtBranch="510x" +qtBranch="512x" squishFolder="/opt/squish" squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" squishFile="squish-$version-qt$qtBranch-linux64.run" 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/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 new file mode 100644 index 00000000..99862b3c --- /dev/null +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## Copyright (C) 2019 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\helpers.ps1" + +# This script will install gnuwin32 + +$prog = "gnuwin32" +$zipPackage = "$prog.zip" +$temp = "$env:tmp" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage" +$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage" +Download $externalUrl $internalUrl "$temp\$zipPackage" +Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" +Extract-7Zip "$temp\$zipPackage" C:\Utils + +Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 5fb032f5..de04d242 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,27 @@ DownloadSquishLicence $squishUrl if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 msvc14 + DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" + 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" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } 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 diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..331de489 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.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" + diff --git a/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + |