From ada909932df1690c077d4c19e5aa5564c6d4a883 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 9 Oct 2017 11:42:37 +0300 Subject: Provisioning: Update Java to version 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current version of Java isn't installing correctly during provisioning. Silent installation needs parameters which are added to script. Without those the installation process tries to open Java3BillDevices.jpg unsuccessfully and the installation fails Task-number: QTQAINFRA-1498 Task-number: QTQAINFRA-1394 Change-Id: I5672d230eb348186345887da81cdd97a4f59bce8 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-java.ps1 | 62 ---------------------- .../qtci-windows-10-x86_64/08-install-java.ps1 | 1 - .../qtci-windows-10-x86_64/08-install-jdk.ps1 | 1 + .../qtci-windows-8.1-x86/08-install-java.ps1 | 1 - .../qtci-windows-8.1-x86/08-install-jdk.ps1 | 1 + .../qtci-windows-8.1-x86_64/08-install-java.ps1 | 1 - .../qtci-windows-8.1-x86_64/08-install-jdk.ps1 | 1 + 7 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 coin/provisioning/common/install-java.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 deleted file mode 100644 index 50f12c89..00000000 --- a/coin/provisioning/common/install-java.ps1 +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 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\..\common\helpers.ps1" - -# This script will install Java RE -# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. - -$installdir = "C:\Program Files\Java\jre7" - -$version = "7u7" -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" - -[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) -Add-Path "$installdir\bin" - -echo "Java = $version $arch" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" -- cgit v1.2.3