IDEA-149996 IDEA 16 144.2608.2 cannot be compiled via ant: jdk.linux does not exist

This commit is contained in:
Vladimir.Orlov
2016-01-18 17:51:31 +03:00
parent b6db249ff6
commit d70538eaa7
2 changed files with 4 additions and 0 deletions
+2
View File
@@ -204,9 +204,11 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps =
buildMacZip(macAppRoot, macZip, [paths.distAll], paths.distMac, productProperties.extraMacBins)
buildTarGz(linuxAppRoot, "$paths.artifacts/${archiveName}-no-jdk.tar", [paths.distAll, paths.distUnix], productProperties.extraLinuxBins)
requireProperty("jdk.linux", "false")
if (p("jdk.linux") != "false") {
buildTarGz(linuxAppRoot, "$paths.artifacts/${archiveName}.tar", [paths.distAll, paths.distUnix, "${paths.sandbox}/jdk.linux"], ["jre/jre/bin/*"] + productProperties.extraLinuxBins)
}
requireProperty("jdk.custom.linux", "false")
if (p("jdk.custom.linux") != "false") {
buildTarGz(linuxAppRoot, "$paths.artifacts/${archiveName}-custom-jdk-linux.tar", [paths.distAll, paths.distUnix, "${paths.sandbox}/jdk.custom.linux"], ["jre/jre/bin/*"] + productProperties.extraLinuxBins)
}
@@ -177,9 +177,11 @@ public layoutCommunity(String classesPath, Set usedJars) {
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")
if (p("jdk.linux") != "false") {
buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}.tar", [paths.distAll, paths.distUnix, "${home}/out/pycharm/jdk.linux"], ["jre/jre/bin/*"])
}
requireProperty("jdk.custom.linux", "false")
if (p("jdk.custom.linux") != "false") {
buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}-custom-jdk-linux.tar", [paths.distAll, paths.distUnix, "${home}/out/pycharm/jdk.custom.linux"], ["jre/jre/bin/*"])
}