win zip artifacts with bundled jre for IU CE and PyCharm CE.

This commit is contained in:
Vladimir.Orlov
2015-06-25 14:03:33 +03:00
parent 113d77722e
commit c6933a0583
2 changed files with 4 additions and 3 deletions
+2 -2
View File
@@ -158,8 +158,8 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps =
layoutWin(args, home, paths)
layoutMac(args, home, paths)
layoutUnix(args, home, paths)
buildWinZip("$paths.artifacts/idea${args.buildNumber}.win.zip", [paths.distAll, paths.distWin])
List pathsDist = new File("${paths.sandbox}/bundled.win.jdk/jre").exists() ? [paths.distAll, paths.distWin, "${paths.sandbox}/bundled.win.jdk"] : [paths.distAll, paths.distWin]
buildWinZip("$paths.artifacts/idea${args.buildNumber}.win.zip", pathsDist)
buildCrossPlatformZip("$paths.artifacts/idea${args.buildNumber}.zip", "${paths.sandbox}/sandbox-ce", [paths.distAll],
paths.distWin, paths.distUnix, paths.distMac)
+2 -1
View File
@@ -171,7 +171,8 @@ public layoutCommunity(String classesPath, Set usedJars) {
buildWinLauncher("$ch", "$ch/bin/WinLauncher/WinLauncher64.exe", launcher64,
appInfo, "$pythonCommunityHome/build/pycharm64_community_launcher.properties", system_selector, resourcePaths)
buildWinZip("${paths.artifacts}/pycharmPC-${buildNumber}.zip", [paths.distAll, paths.distWin, "${home}/out/pycharm/bundled.win.jdk"])
List pathsDist = new File("${home}/out/pycharm/bundled.win.jdk/jre").exists() ? [paths.distAll, paths.distWin, "${home}/out/pycharm/bundled.win.jdk"] : [paths.distAll, paths.distWin]
buildWinZip("${paths.artifacts}/pycharmPC-${buildNumber}.zip", pathsDist)
String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}.tar", [paths.distAll, paths.distUnix])