From b42c4c7b125dc56249833b220a2053010e05aaba Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Thu, 6 Nov 2014 17:08:01 +0300 Subject: [PATCH] added artifact without jdk bundled for Mac for PyCharm EDU. --- python/edu/build/pycharm_edu_build.gant | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python/edu/build/pycharm_edu_build.gant b/python/edu/build/pycharm_edu_build.gant index 356df8c7d4c7..85889184ab09 100644 --- a/python/edu/build/pycharm_edu_build.gant +++ b/python/edu/build/pycharm_edu_build.gant @@ -144,8 +144,11 @@ target('default': "Build artifacts") { layoutEducational("${paths.sandbox}/classes/production", usedJars) - def extraArgs = ["build.code": "pycharm${buildName}", "build.number": "PE-$buildNumber", "artifacts.path": "${paths.artifacts}"] + signMacZip("pycharm", extraArgs) + notifyArtifactBuilt("${paths.artifacts}/pycharm${buildName}.sit") + buildDmg("pycharm", "${pythonEduHome}/build/DMG_background.png", extraArgs) + signMacZip("pycharm", extraArgs + ["sitFileName": "pycharm${buildName}-jdk-bundled", "jdk_archive_name": "jdk_mac_redist_for_${buildNumber}.tar"]) buildDmg("pycharm", "${pythonEduHome}/build/DMG_background.png", extraArgs + ["sitFileName": "pycharm${buildName}-jdk-bundled", "jdk_archive_name": "jdk_mac_redist_for_${buildNumber}.tar"]) @@ -206,7 +209,7 @@ public layoutEducational(String classesPath, Set usedJars) { String macAppRoot = isEap() ? "PyCharm Educational ${p("component.version.major")}.${p("component.version.minor")} EAP.app/Contents" : "PyCharm Educational.app/Contents" buildMacZip(macAppRoot, "${paths.artifacts}/pycharm${buildName}.sit", [paths.distAll], paths.distMac) ant.copy(file: "${paths.artifacts}/pycharm${buildName}.sit", tofile: "${paths.artifacts}/pycharm${buildName}-jdk-bundled.sit") - ant.delete(file: "${paths.artifacts}/pycharm${buildName}.sit") + //ant.delete(file: "${paths.artifacts}/pycharm${buildName}.sit") } private layoutPlugins(layouts) {