diff options
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
6 files changed, 43 insertions, 78 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 index f16b5ef4..37af7119 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 @@ -30,21 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx -# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe - -$version = "2015 update3 (KB3165756)" -$package = "C:\Windows\Temp\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" - -echo "Fetching patch for Visual Studio $version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing patch for Visual Studio $version..." -cmd /c "$package /norestart /Quiet" -remove-item $package diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 index 5e75f662..56b78f47 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -37,76 +37,52 @@ # Both x86 and x64 versions needed when x86 integrations are done on x64 machine $version = "5.6.11" -$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip" +$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip" $packagex86 = "C:\Windows\temp\mysql-$version-win32.zip" -function CheckAndRemovePreviousInstallation -{ - Param ( - [string]$InstallFolder - ) - echo "Check for previous installation..." - $FolderExists = Test-Path $ExistingInstallation - If ($FolderExists -eq $True) { - echo "Removing previous installation ($ExistingInstallation)" - Remove-Item $ExistingInstallation -recurse - } -} - function DownloadAndInstall { Param ( - [string]$arch, - [string]$externalUrl, [string]$internalUrl, [string]$package, - [string]$sha1, [string]$installPath ) - echo "Fetching from URL ..." - Download $externalUrl $internalUrl $package - Verify-Checksum $package $sha1 - Extract-Zip $package $installPath + echo "Fetching from URL ..." + Copy-Item $internalUrl $package + + $zipDir = [io.path]::GetFileNameWithoutExtension($package) + Extract-Dev-Folders-From-Zip $package $zipDir $installPath + + Remove-Item $package } +# Remove any leftovers +try { + Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted +} catch {} + # Install x64 bit version $architecture = "x64" -$installFolder = "C:\Utils\my_sql" -$existingInstallation = "$installFolder\my_sql" -$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64" -$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38" +$installFolder = "C:\Utils\my_sql\my_sql" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip" -echo "Check and remove previous installation ..." -CheckAndRemovePreviousInstallation $existingInstallation -DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder -Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql - -echo "Remove downloaded package ..." -Remove-Item $packagex64 +DownloadAndInstall $internalUrl $packagex64 $installFolder echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") # Install x86 bit version $architecture = "x86" -$installFolder = "C:\Utils\my_sql$architecture" -$existingInstallation = "$installFolder\my_sql" -$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32" -$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679" - -echo "Check and remove previous installation ..." -CheckAndRemovePreviousInstallation $existingInstallation -DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder -Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql +$installFolder = "C:\Utils\my_sql\my_sql$architecture" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip" -echo "Remove downloaded package ..." -Remove-Item $packagex86 +DownloadAndInstall $internalUrl $packagex86 $installFolder echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine") # Store version information to ~/versions.txt, which is used to print version information to provision log. echo "MySQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 index 079f26c3..fa2c753a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -40,7 +40,7 @@ $openglPackage = "C:\Windows\SysWOW64\opengl32.dll" $mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" $mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" -$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll" +$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll" $openglSha1 = "690730f973aa39bd80648e026248394fde07a753" Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 index 35340ca7..cd0115d2 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 @@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" $architecture = "x64" $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" -$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe" $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" echo "Fetching from URL ..." @@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..." $architecture = "x86" $installFolder = "C:\openssl$architecture" $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe" $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" echo "Fetching from URL ..." diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 index 9b1d5d4e..b73c3778 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -42,43 +42,48 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" # Install x64 bit versions $architecture = "x64" -$installFolder = "C:\Utils\postgresql" +$installFolder = "C:\Utils\postgresql\pgsql" $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" -$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" +# Delete any leftovers +try { + Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted +} catch {} + echo "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 Verify-Checksum $packagex64 $sha1 echo "Installing $packagex64 ..." -Extract-Zip $packagex64 $installFolder +Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder echo "Remove downloaded $packagex64 ..." Remove-Item $packagex64 echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") # Install x86 bit version $architecture = "x86" -$installFolder = "C:\Utils\postgresql$architecture" +$installFolder = "C:\Utils\postgresql$architecture\pgsql" $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" -$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip" $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" echo "Fetching from URL..." Download $externalUrl $internalUrl $packagex86 Verify-Checksum $packagex86 $sha1 echo "Installing $packagex86 ..." -Extract-Zip $packagex86 $installFolder +Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder echo "Remove downloaded $packagex86 ..." Remove-Item $packagex86 echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine") # Store version information to ~/versions.txt, which is used to print version information to provision log. echo "PostgreSQL = $version" >> ~/versions.txt |