diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-10-21 11:53:08 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-29 14:57:31 +0000 |
| commit | 082500cb931aaf4c6ca5fa5c2a9b9b96c58d04bf (patch) | |
| tree | f7541fb47c5ccab9b0f4d1d52163dbb28d2d3ed5 | |
| parent | 8a0f13d7aead4beb4466c6e69d6cb5182aae64ba (diff) | |
Provisioning: Remove unused code from JDK installation script
Amends abd2e0b381a3b78b2c801c1d97e06bd6ff82bc3f
Change-Id: Ica9078571cfc9851bada36474cc80e1fcc642dbb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 36a58374d6976e51b962af6aa171da872dd96735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/provisioning/common/windows/install-jdk.ps1 | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 13a65018..7a58fe0c 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 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. @@ -48,25 +48,15 @@ if (Is64BitWinHost) { $installdir = "C:\Program Files\Java\jdk-$version" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe" +# NOTE! Official URL is behind login portal. It can't be used whit this script instead it need to be fetched to $url_cache first # java 11: https://www.oracle.com/java/technologies/downloads/#java11-windows # java 8: $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe" $javaPackage = "C:\Windows\Temp\jdk-$version.exe" Write-Host "Fetching Java SE $version..." $ProgressPreference = 'SilentlyContinue' -try { - Write-Host "...from local cache" - Download $url_cache $url_cache $javaPackage -} catch { - Write-Host "...from oracle.com" - $client = new-object System.Net.WebClient - $cookie = "oraclelicense=accept-securebackup-cookie" - $client.Headers.Add("Cookie", $cookie) - $client.DownloadFile($official_url, $javaPackage) - - Download $official_url $official_url $javaPackage -} - +Write-Host "...from local cache" +Download $url_cache $url_cache $javaPackage Verify-Checksum $javaPackage $sha1 Run-Executable "$javaPackage" "/s SPONSORS=0" |