diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-08 12:31:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-09 14:05:56 +0100 |
| commit | 90272a84aeeb02d5121a1b86dba607dfb57db45f (patch) | |
| tree | 0e6424005020faeb0712ef55e39691c19765a743 /coin/provisioning/common/install-java.ps1 | |
| parent | f1a9b684bf72282204987b3ed33922e36d693884 (diff) | |
| parent | 207494b1d32ec331383d08e6f490cd0b4cfcb82e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtdeclarative.txt
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh
Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
Diffstat (limited to 'coin/provisioning/common/install-java.ps1')
| -rw-r--r-- | coin/provisioning/common/install-java.ps1 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 index 4b9dd097..50f12c89 100644 --- a/coin/provisioning/common/install-java.ps1 +++ b/coin/provisioning/common/install-java.ps1 @@ -36,6 +36,8 @@ # 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" @@ -53,4 +55,8 @@ 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 |