diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index 594ee94fa111..4e7deb43a979 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -876,16 +876,14 @@ binding.setVariable("signExecutableFiles", { String binDir -> }) binding.setVariable("bundledJDKs"){ - bundledJDK(false, paths.sandbox) + bundledJDK(false) } binding.setVariable("bundledJDK64s"){ - bundledJDK(true, paths.sandbox) + bundledJDK(true) } -binding.setVariable("prepareBundledJDKs", { String targetDir -> bundledJDK(false, targetDir)}) - -private bundledJDK(boolean win64, String targetDir) { +private bundledJDK(boolean win64) { requireProperty("artifact.linux.no.jdk", "true") requireProperty("artifact.mac.no.jdk", "true") requireProperty("jdk.oracle.win", "jdk8u") @@ -897,11 +895,11 @@ private bundledJDK(boolean win64, String targetDir) { def jdkDir = new File("${home}/build/jdk/win") if (p("jdk.oracle.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) { setProperty("winJDK", getPathToBundledJDK(jdkDir, p("jdk.oracle.win"), (win64 ? "x64.tar.gz": "x86.tar.gz"))) - extractRedistJre(winJDK, "$targetDir/jdk.oracle.win/jre") + extractRedistJre(winJDK, "${paths.sandbox}/jdk.oracle.win/jre") } if (p("jdk.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) { setProperty("winCustomJDKx32", getPathToBundledJDK(jdkDir, p("jdk.win"), (win64 ? "x64.tar.gz": "x86.tar.gz"))) - extractRedistJre(winCustomJDKx32, "$targetDir/jdk.win/jre") + extractRedistJre(winCustomJDKx32, "${paths.sandbox}/jdk.win/jre") } jdkDir = new File("${home}/build/jdk/mac") if (p("jdk.mac") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) { @@ -910,7 +908,7 @@ private bundledJDK(boolean win64, String targetDir) { jdkDir = new File("${home}/build/jdk/linux") if (p("jdk.linux") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) { setProperty("linuxJDK", getPathToBundledJDK(jdkDir, p("jdk.linux"), ".tar.gz")) - extractRedistJre(linuxJDK, "$targetDir/jdk.linux/jre") + extractRedistJre(linuxJDK, "${paths.sandbox}/jdk.linux/jre") } } }