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

build scripts: reverted changes in 'bundledJDKs' methods to fix AppCode build (these functions aren't called from new scripts anymore)

Browse Source
This commit is contained in:
nik
2016-07-12 15:37:01 +03:00
parent bd99bd6180
commit 9d3bc93d90
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+6 -8
View File
@@ -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")
}
}
}