diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant index 434defdb6e8b..0a321dc513b3 100644 --- a/build/scripts/dist.gant +++ b/build/scripts/dist.gant @@ -123,7 +123,7 @@ def layoutAll(Map args, String home, String out, Paths _paths = null) { buildWinZip("$paths.artifacts/idea${args.buildNumber}.win.zip", [paths.distAll, paths.distWin]) def macAppRoot = isEap() ? "${p("component.version.codename")}-${args.buildNumber}.app" : "IntelliJ IDEA ${p("component.version.major")} CE.app" - buildMacZip(macAppRoot, "$paths.artifacts/idea${args.buildNumber}.mac.zip", [paths.distAll, paths.distMac]) + buildMacZip(macAppRoot, "$paths.artifacts/idea${args.buildNumber}.mac.zip", [paths.distAll], paths.distMac) buildTarGz("idea-${args.buildNumber}", "$paths.artifacts/idea${args.buildNumber}.tar", [paths.distAll, paths.distUnix]) } diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index e2efd7693385..5fbfdb4ab917 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -626,11 +626,12 @@ binding.setVariable("buildWinZip", { String zipPath, List paths -> notifyArtifactBuilt(zipPath) }) -binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths, List extraBins = [] -> +binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths, List macPath, List extraBins = [] -> projectBuilder.stage(".mac.zip") + allPaths = paths + [macPath] ant.zip(zipfile: zipPath) { - paths.each { + allPaths.each { zipfileset(dir: it, prefix: zipRoot) { exclude(name: "bin/*.sh") exclude(name: "bin/fsnotifier") @@ -639,10 +640,13 @@ binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths, extraBins.each { exclude(name: it) } + if (it != macPath) { + exclude(name: "bin/idea.properties") + } } } - paths.each { + allPaths.each { zipfileset(dir: it, filemode: "755", prefix: zipRoot) { include(name: "bin/*.sh") include(name: "bin/fsnotifier")