updated location of custom jdk/jre.

This commit is contained in:
Vladimir.Orlov
2016-01-25 10:40:22 +03:00
parent b147d7c2dd
commit bd219488fa
+2 -2
View File
@@ -897,11 +897,11 @@ private bundledJDK(boolean win64) {
setProperty("linuxJDK", getPathToBundledJDK(new File("${home}/build/jdk/linux"), "jdk" + p("jdk.linux"), ".tar"))
extractRedistJre(linuxJDK, "${paths.sandbox}/jdk.linux/jre")
}
def customJdkDir = new File("${home}/build/jdk/custom")
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"))
}
customJdkDir = new File("${home}/build/jdk/custom/linux")
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"))
extractRedistJre(linuxCustomJDK, "${paths.sandbox}/jdk.custom.linux")