MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 09:03:31 +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 14:54:08 +03:00
parent efd42ff4ff
commit 0d0a1da57a
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+4 -7
View File
@@ -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"))
} */
}
}