diff options
Diffstat (limited to 'coin/provisioning/common/windows')
-rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 62 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan.ps1 | 79 | ||||
-rw-r--r-- | coin/provisioning/common/windows/openssl.ps1 | 8 | ||||
-rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 19 | ||||
-rw-r--r-- | coin/provisioning/common/windows/update-msvc2019.ps1 | 12 |
5 files changed, 71 insertions, 109 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index acb68a3b..d2fa74f2 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -45,47 +45,57 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.1.1g" +$version = "1.1.1k" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" +$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip") +$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945" $destination = "C:\Utils\openssl-android-master" +$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip" # msys unix style paths $ndkPath = "/c/Utils/Android/android-ndk-r21d" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip -Verify-Checksum $zip $sha1 +if ((Test-Path $prebuilt_url)) { + Download $prebuilt_url $prebuilt_url $prebuilt_zip + Verify-Checksum $prebuilt_zip $prebuilt_sha1 + Extract-7Zip $prebuilt_zip C:\Utils + Remove $prebuilt_zip +} else { + Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip + Verify-Checksum $zip $sha1 -Extract-7Zip $zip C:\Utils\tmp -Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp -Move-Item C:\Utils\tmp\openssl-${version} $destination -Remove-Item -Path $zip + Extract-7Zip $zip C:\Utils\tmp + Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp + Move-Item C:\Utils\tmp\openssl-${version} $destination + Remove "$zip" -Write-Host "Configuring OpenSSL $version for Android..." -Push-Location $destination -# $ must be escaped in powershell... + Write-Host "Configuring OpenSSL $version for Android..." + Push-Location $destination + # $ must be escaped in powershell... -function CheckExitCode { + function CheckExitCode { - param ( - $p - ) + param ( + $p + ) - if ($p.ExitCode) { - Write-host "Process failed with exit code: $($p.ExitCode)" - exit 1 + if ($p.ExitCode) { + Write-host "Process failed with exit code: $($p.ExitCode)" + exit 1 + } } -} -$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") -CheckExitCode $configure + $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") + CheckExitCode $configure -$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") -CheckExitCode $make + $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + CheckExitCode $make -Pop-Location + Pop-Location + Remove-item C:\Utils\tmp -Recurse -Confirm:$false +} Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" -Remove-item C:\Utils\tmp -Recurse -Confirm:$false Write-Output "Android OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 8b22ab1d..1e4f14e1 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -1,7 +1,6 @@ -############################################################################# +############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. -## Copyright (C) 2019 Konstantin Tokarev <annulen@yandex.ru> +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,68 +29,26 @@ ## ## $QT_END_LICENSE$ ## -############################################################################# +############################################################################ . "$PSScriptRoot\helpers.ps1" -$scriptsPath = "C:\Python36\Scripts" +# This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this -Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt" -Write-Output "Conan = 1.29.0" >> ~\versions.txt +$url_conan = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conan.zip" +$url_conan_home = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conanhome.zip" +$sha1_conan_compressed = "1abbe43e7a29ddd9906328702b5bc5231deeb721" +$sha1_conanhome_compressed = "f44c2ae21cb1c7dc139572e399b7b0eaf492af03" +$conan_compressed = "C:\.conan.zip" +$conanhome_compressed = "C:\.conanhome.zip" -# Use Qt Project repository by default -Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" +Download $url_conan $url_conan $conan_compressed +Verify-Checksum $conan_compressed $sha1_conan_compressed +Extract-7Zip $conan_compressed C:\ -Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" +Download $url_conan_home $url_conan_home $conanhome_compressed +Verify-Checksum $conanhome_compressed $sha1_conanhome_compressed +Extract-7Zip $conanhome_compressed C:\Users\qt -function Run-Conan-Install -{ - Param ( - [string]$ConanfilesDir, - [string]$BuildinfoDir, - [string]$Arch, - [string]$Compiler, - [string]$CompilerVersion, - [string]$CompilerRuntime, - [string]$CompilerLibcxx, - [string]$CompilerException, - [string]$CompilerThreads - ) - - if ($CompilerRuntime) { - $extraArgs += " -s compiler.runtime=$CompilerRuntime" - } - - if ($CompilerLibcxx) { - $extraArgs += " -s compiler.libcxx=$CompilerLibcxx" - } - - if ($CompilerException) { - $extraArgs += " -s compiler.exception=$CompilerException" - } - - if ($CompilerThreads) { - $extraArgs += " -s compiler.threads=$CompilerThreads" - } - - $manifestsDir = "$PSScriptRoot\conan_manifests" - $buildinfoRoot = "C:\Utils\conanbuildinfos" - - # Make up to 5 attempts for all download operations in conan - $env:CONAN_RETRY = "5" - - Get-ChildItem -Path "$ConanfilesDir\*.txt" | - ForEach-Object { - $conanfile = $_.FullName - $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)" - New-Item $outpwd -Type directory -Force | Out-Null - - Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" - Pop-Location - - Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" - } -} +Remove $conan_compressed +Remove $conanhome_compressed diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 08f7d60f..b7abf11c 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_1_1g" +$version = "1_1_1k" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "7643561c372720f55de51454a707ede334db086e" + $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" +$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c615f9eb..2005864c 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,12 +36,12 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.6.1" -$qtBranch = "515x" +$version = "6.7-20210319-0956" +$qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" # Squish license $licensePackage = ".squish-3-license" @@ -50,7 +50,7 @@ Write-Host "Installing Squish license to home directory" Copy-Item $licenseUrl\$licensePackage ~\$licensePackage if (Is64BitWinHost) { - $arch = "x64" + $arch = "x64" } else { $arch = "x86" } @@ -60,15 +60,10 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" - } else { - $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" - #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild - $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" + $sha1 = "61eca4950d24d9780e02cd4183c54009eda46114" } -} elseif ($OSVersion -eq "Windows 7 Enterprise") { - $winVersion = "win7" - $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2" +} else { + $winVersion = "n/a" } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 index 0b0f384d..c53fac05 100644 --- a/coin/provisioning/common/windows/update-msvc2019.ps1 +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,13 +37,13 @@ # NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt # MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release -$version = "16_7_5" +$version = "16_9_4" $urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe" -$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe" -$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00" +$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/3105fcfe-e771-41d6-9a1c-fc971e7d03a7/d60c42571053950bf742db19e30430f76354c95af06afb1364d5b2aab620f4e5/vs_Professional.exe" +$sha1_vsInstaller = "03e3896b790b1734434ab12c2e06ca458e67395f" $urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe" -$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe" -$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e" +$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/3105fcfe-e771-41d6-9a1c-fc971e7d03a7/e0c2f5b63918562fd959049e12dffe64bf46ec2e89f7cadde3214921777ce5c2/vs_BuildTools.exe" +$sha1_buildToolsInstaller = "59e62e552305e60420154395d79d5261d65f52dc" $installerPath = "C:\Windows\Temp\installer.exe" function Install { |