diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-08-21 15:14:00 +0300 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-01 13:02:12 +0000 |
commit | 3ca76587815797b1b101941537c090b9026bd418 (patch) | |
tree | 1b28bfceb426ebabcdedea7e0abed41ab78f6da3 /coin/provisioning/common/install-java.ps1 | |
parent | 1726ba16117fedaffc4c3d387d411851479fb22c (diff) |
Provision vanilla Windows 8.1 x86 and use it
Replaces existing Windows 8 x86 builds with
a vanilla tier 1 image that gets all needed
software provisioned except for VS2013 that is
pre-installed.
Also modifies existing provisioning scripts
under common to support this 32bit OS.
Task-number: QTQAINFRA-1383
Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/install-java.ps1')
-rw-r--r-- | coin/provisioning/common/install-java.ps1 | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 index 06bcf6a1..4b9dd097 100644 --- a/coin/provisioning/common/install-java.ps1 +++ b/coin/provisioning/common/install-java.ps1 @@ -33,14 +33,24 @@ . "$PSScriptRoot\..\common\helpers.ps1" -# This script will install Java +# This script will install Java RE +# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. $version = "7u7" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.exe" +if( (is64bitWinHost) -eq 1 ) { + $arch = "x64" + $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3" +} +else { + $arch = "i586" + $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219" +} + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe" $javaPackage = "C:\Windows\Temp\java-$version.exe" Copy-Item $url_cache $javaPackage cmd /c "$javaPackage /s SPONSORS=0" echo "Cleaning $javaPackage.." Remove-Item -Recurse -Force "$javaPackage" -echo "Java = $version" >> ~\versions.txt +echo "Java = $version $arch" >> ~\versions.txt |