From b7e7a5393be66fa1355d111e531ddf3d5527a800 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 9 Aug 2017 16:40:54 +0300
Subject: [PATCH] build scripts: product-independent Mac script templates moved
 to platform/build-scripts

At the end community/build is supposed to contain IDEA-specific files only.
---
 .../intellij/build/impl/MacDistributionBuilder.groovy  | 10 +++++++---
 .../build-scripts/resources/mac/scripts}/format.sh     |  0
 .../build-scripts/resources/mac/scripts}/inspect.sh    |  0
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename {bin/mac => platform/build-scripts/resources/mac/scripts}/format.sh (100%)
 rename {bin/mac => platform/build-scripts/resources/mac/scripts}/inspect.sh (100%)

diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
index 05c854b469c4..ec343013491a 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
@@ -235,10 +235,14 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
       replacefilter(token: "@@bundled_help_attributes@@", value: bundledHelpAttributes)
     }
 
-    buildContext.ant.replace(dir: "$target/bin", includes: "inspect.sh,format.sh") {
-      replacefilter(token: "@@product_full@@", value: fullName)
-      replacefilter(token: "@@script_name@@", value: executable)
+    buildContext.ant.copy(todir: "$target/bin") {
+      fileset(dir: "$buildContext.paths.communityHome/platform/build-scripts/resources/mac/scripts")
+      filterset(begintoken: "@@", endtoken: "@@") {
+        filter(token: "product_full", value: fullName)
+        filter(token: "script_name", value: executable)
+      }
     }
+
     String inspectScript = buildContext.productProperties.inspectCommandName
     if (inspectScript != "inspect") {
       String targetPath = "$target/bin/${inspectScript}.sh"
diff --git a/bin/mac/format.sh b/platform/build-scripts/resources/mac/scripts/format.sh
similarity index 100%
rename from bin/mac/format.sh
rename to platform/build-scripts/resources/mac/scripts/format.sh
diff --git a/bin/mac/inspect.sh b/platform/build-scripts/resources/mac/scripts/inspect.sh
similarity index 100%
rename from bin/mac/inspect.sh
rename to platform/build-scripts/resources/mac/scripts/inspect.sh