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

JB jdk for windows by default.

Browse Source
This commit is contained in:
Vladimir.Orlov
2016-04-07 18:12:41 +03:00
parent 03b5d6dca8
commit 523a2e124b
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+9 -11
View File
@@ -884,23 +884,21 @@ binding.setVariable("bundledJDK64s"){
private bundledJDK(boolean win64) {
requireProperty("artifact.linux.no.jdk", "true")
requireProperty("artifact.mac.no.jdk", "true")
requireProperty("jdk.win", "jdk1.8")
requireProperty("jdk.custom.win", "false")
requireProperty("jdk.mac", "openjdk.1.8")
requireProperty("jdk.oracle.win", "jdk1.8")
requireProperty("jdk.win", "openjdk.1.8")
requireProperty("jdk.mac", "openjdk.1.8")
requireProperty("jdk.linux", "openjdk.1.8")
if (new File("${home}/build/jdk").exists()) {
def jdkDir = new File("${home}/build/jdk/win")
if (p("jdk.win") != "false") {
setProperty("winJDK", getPathToBundledJDK(jdkDir, p("jdk.win"), (win64 ? "x64.zip": "x32.zip") ))
extractRedistJre(winJDK, "${paths.sandbox}/jdk.win/jre")
if (p("jdk.oracle.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
setProperty("winJDK", getPathToBundledJDK(jdkDir, p("jdk.oracle.win"), (win64 ? "x64.zip": "x32.zip")))
extractRedistJre(winJDK, "${paths.sandbox}/jdk.oracle.win/jre")
}
jdkDir = new File("${home}/build/jdk/win/custom")
if (p("jdk.custom.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
setProperty("winCustomJDKx32", getPathToBundledJDK(jdkDir, p("jdk.custom.win"), "x32.tar.gz"))
extractRedistJre(winCustomJDKx32, "${paths.sandbox}/jdk.custom.win.x32")
setProperty("winCustomJDKx64", getPathToBundledJDK(jdkDir, p("jdk.custom.win"), "x64.tar.gz"))
extractRedistJre(winCustomJDKx64, "${paths.sandbox}/jdk.custom.win.x64")
if (p("jdk.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
setProperty("winCustomJDKx32", getPathToBundledJDK(jdkDir, p("jdk.win"), (win64 ? "x64.tar.gz": "x32.tar.gz")))
extractRedistJre(winCustomJDKx32, "${paths.sandbox}/jdk.win")
}
jdkDir = new File("${home}/build/jdk/mac/custom")
if (p("jdk.mac") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
python/build/pycharm_community_build.gant
+5
View File
@@ -175,6 +175,11 @@ public layoutCommunity(String classesPath, Set usedJars) {
List pathsDist = new File("${home}/out/pycharm/jdk.win/jre").exists() ? [paths.distAll, paths.distWin, "${home}/out/pycharm/jdk.win"] : [paths.distAll, paths.distWin]
buildWinZip("${paths.artifacts}/pycharmPC-${buildNumber}.zip", pathsDist)
//win oracle jdk
if (new File("${home}/out/pycharm/jdk.oracle.win/jre").exists()) {
buildWinZip("${paths.artifacts}/pycharmPC-${buildNumber}-oracle-win.zip", [paths.distAll, paths.distWin, "${home}/out/pycharm/jdk.oracle.win"])
}
String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}-no-jdk.tar", [paths.distAll, paths.distUnix])
requireProperty("jdk.linux", "false")
python/educational-python/build/pycharm_edu_build.gant
+4
View File
@@ -210,6 +210,10 @@ public layoutEducational(String classesPath, Set usedJars) {
buildNSIS([paths.distAll, paths.distWin],
"$pythonEduHome/build/strings.nsi", "$pythonEduHome/build/paths.nsi",
"pycharmEDU-", false, true, system_selector)
//win oracle jdk
if (new File("${home}/out/pycharm/jdk.oracle.win/jre").exists()) {
buildWinZip("${paths.artifacts}/pycharm${buildName}-oracle-win.zip", [paths.distAll, paths.distWin, "${home}/out/pycharm/jdk.oracle.win"])
}
String tarRoot = isEap() ? "pycharm-edu-$buildNumber" : "pycharm-edu-${p("component.version.major")}.${p("component.version.minor")}"
buildTarGz(tarRoot, "$paths.artifacts/pycharm${buildName}-no-jdk.tar", [paths.distAll, paths.distUnix])