From 32f76d62e2195301a8e53dfde7c539f830f6eb46 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 22 Jul 2016 20:49:58 +0300
Subject: [PATCH] build scripts: extracted common suffix from
 MacDistributionCustomizer::rootDirectoryName, default implementation
 specified

---
 .../jetbrains/intellij/build/IdeaCommunityProperties.groovy  | 4 ++--
 .../intellij/build/MacDistributionCustomizer.groovy          | 5 ++++-
 .../intellij/build/impl/MacDistributionBuilder.groovy        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
index 6e15ed2290c1..df741e51f26d 100644
--- a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
@@ -91,8 +91,8 @@ class IdeaCommunityProperties extends ProductProperties {
 
       @Override
       String rootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber) {
-        applicationInfo.isEAP ? "IntelliJ IDEA ${applicationInfo.majorVersion}.${applicationInfo.minorVersion} CE EAP.app/Contents"
-                              : "IntelliJ IDEA CE.app/Contents"
+        applicationInfo.isEAP ? "IntelliJ IDEA ${applicationInfo.majorVersion}.${applicationInfo.minorVersion} CE EAP.app"
+                              : "IntelliJ IDEA CE.app"
       }
     }
   }
diff --git a/build/groovy/org/jetbrains/intellij/build/MacDistributionCustomizer.groovy b/build/groovy/org/jetbrains/intellij/build/MacDistributionCustomizer.groovy
index ebcaf33435f1..ae4a5e88304a 100644
--- a/build/groovy/org/jetbrains/intellij/build/MacDistributionCustomizer.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/MacDistributionCustomizer.groovy
@@ -104,7 +104,10 @@ abstract class MacDistributionCustomizer {
    * @param buildNumber current build number
    * @return application bundle directory name
    */
-  abstract String rootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber)
+  String rootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber) {
+    String suffix = applicationInfo.isEAP ? " ${applicationInfo.majorVersion}.${applicationInfo.minorVersion} EAP" : ""
+    "$applicationInfo.productName${suffix}.app"
+  }
 
   /**
    * Custom properties to be added to the properties file. They will be used for launched product, e.g. you can add additional logging in EAP builds
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
index 568c693c819d..02de8b87b9dd 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
@@ -213,7 +213,7 @@ class MacDistributionBuilder {
     return buildContext.messages.block("Build zip archive for Mac OS") {
       def extraBins = customizer.extraExecutables
       def allPaths = [buildContext.paths.distAll, macDistPath]
-      def zipRoot = customizer.rootDirectoryName(buildContext.applicationInfo, buildContext.buildNumber)
+      String zipRoot = "${customizer.rootDirectoryName(buildContext.applicationInfo, buildContext.buildNumber)}/Contents"
       def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}.mac.zip"
       buildContext.ant.zip(zipfile: targetPath) {
         allPaths.each {