From c6933a0583bb145c50c9488ef26989830ec2d282 Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Thu, 25 Jun 2015 14:03:33 +0300 Subject: [PATCH] win zip artifacts with bundled jre for IU CE and PyCharm CE. --- build/scripts/dist.gant | 4 ++-- python/build/pycharm_community_build.gant | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant index d6c2a8e01f2f..373b1e6512aa 100644 --- a/build/scripts/dist.gant +++ b/build/scripts/dist.gant @@ -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) diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant index de95e62a420a..997c151df8c0 100644 --- a/python/build/pycharm_community_build.gant +++ b/python/build/pycharm_community_build.gant @@ -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])