From 0d0a1da57ae23bf8c8bc8fbd9cc8281c813df5f7 Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Mon, 25 Jan 2016 14:54:08 +0300 Subject: [PATCH] updated jdk.* properties to support JRE/JDK bundle. --- build/scripts/utils.gant | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index a63b606da136..602ea51b5c4e 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -884,9 +884,9 @@ private bundledJDK(boolean win64) { requireProperty("artifact.linux.no.jdk", "true") requireProperty("artifact.mac.no.jdk", "true") requireProperty("jdk.win", "1.8") - requireProperty("jdk.mac", "1.8") + requireProperty("jdk.mac", "openjdk.1.8") requireProperty("jdk.linux", "1.8") - requireProperty("jdk.custom.linux", "1.8") + requireProperty("jdk.custom.linux", "openjdk.1.8") if (new File("${home}/build/jdk").exists()) { if (p("jdk.win") != "false") { @@ -899,16 +899,13 @@ private bundledJDK(boolean win64) { } def customJdkDir = new File("${home}/build/jdk/mac/custom") if (p("jdk.mac") != "false" && (customJdkDir.exists() && customJdkDir.isDirectory())) { - setProperty("macCustomJDK", getPathToBundledJDK(customJdkDir, "openjdk.1.8", ".tar.gz")) + setProperty("macCustomJDK", getPathToBundledJDK(customJdkDir, p("jdk.mac"), ".tar.gz")) } customJdkDir = new File("${home}/build/jdk/linux/custom") if (p("jdk.custom.linux") != "false" && (customJdkDir.exists() && customJdkDir.isDirectory())) { - setProperty("linuxCustomJDK", getPathToBundledJDK(customJdkDir, "openjdk.1.8", ".tar.gz")) + setProperty("linuxCustomJDK", getPathToBundledJDK(customJdkDir, p("jdk.custom.linux"), ".tar.gz")) extractRedistJre(linuxCustomJDK, "${paths.sandbox}/jdk.custom.linux") } -/* if (p("jdk.bundled.mac") != "false") { - setProperty("macJDK", getPathToBundledJDK(new File("${home}/build/jdk/mac"), "jdk" + p("jdk.bundled.mac"), ".tar")) - } */ } }