MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

updated jdk.* properties to support JRE/JDK bundle.

Browse Source
This commit is contained in:
Vladimir.Orlov
2016-01-25 15:21:27 +03:00
parent 7049585380
commit 14f2496638
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+2 -2
View File
@@ -883,14 +883,14 @@ binding.setVariable("bundledJDK64s"){
private bundledJDK(boolean win64) {
requireProperty("artifact.linux.no.jdk", "true")
requireProperty("artifact.mac.no.jdk", "true")
requireProperty("jdk.win", "1.8")
requireProperty("jdk.win", "jdk1.8")
requireProperty("jdk.mac", "openjdk.1.8")
requireProperty("jdk.linux", "1.8")
requireProperty("jdk.custom.linux", "openjdk.1.8")
if (new File("${home}/build/jdk").exists()) {
if (p("jdk.win") != "false") {
setProperty("winJDK", getPathToBundledJDK(new File("${home}/build/jdk/win"), "jdk" + p("jdk.win"), (win64 ? "x64.zip": "x32.zip") ))
setProperty("winJDK", getPathToBundledJDK(new File("${home}/build/jdk/win"), p("jdk.win"), (win64 ? "x64.zip": "x32.zip") ))
extractRedistJre(winJDK, "${paths.sandbox}/jdk.win/jre")
}
if (p("jdk.linux") != "false") {