From d40959f8ac6e321c282ebe987198e5fbba71d483 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 24 Oct 2016 16:24:38 +0300
Subject: [PATCH] build scripts: product-independent helper scripts for Mac OS
 distributions moved to platform

---
 .../jetbrains/intellij/build/MacDistributionBuilder.groovy  | 4 ++--
 .../org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy  | 6 +++---
 .../build-scripts/tools/mac/scripts}/makedmg.pl             | 0
 .../build-scripts/tools/mac/scripts}/makedmg.sh             | 0
 .../build-scripts/tools/mac/scripts}/signapp.sh             | 0
 .../build-scripts/tools/mac/scripts}/signbin.sh             | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename {build/mac => platform/build-scripts/tools/mac/scripts}/makedmg.pl (100%)
 rename {build/mac => platform/build-scripts/tools/mac/scripts}/makedmg.sh (100%)
 rename {build/mac => platform/build-scripts/tools/mac/scripts}/signapp.sh (100%)
 rename {build/mac => platform/build-scripts/tools/mac/scripts}/signbin.sh (100%)

diff --git a/build/groovy/org/jetbrains/intellij/build/MacDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/MacDistributionBuilder.groovy
index 62c1bf3ac216..f260ada69166 100644
--- a/build/groovy/org/jetbrains/intellij/build/MacDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/MacDistributionBuilder.groovy
@@ -76,7 +76,7 @@ class MacDistributionBuilder {
     ant.delete(file: dmgImageCopy)
 
     ftpAction("put", false, "777") {
-      ant.fileset(dir: "$communityHome/build/mac") {
+      ant.fileset(dir: "$communityHome/platform/build-scripts/tools/mac/scripts") {
         include(name: "makedmg.sh")
         include(name: "makedmg.pl")
       }
@@ -123,7 +123,7 @@ class MacDistributionBuilder {
     }
     ant.delete(file: sitFilePath)
     ftpAction("put", false, "777") {
-      ant.fileset(dir: "$communityHome/build/mac") {
+      ant.fileset(dir: "$communityHome/platform/build-scripts/tools/mac/scripts") {
         include(name: "signapp.sh")
       }
     }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
index 4ba90a923210..34edd25884cd 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
@@ -75,7 +75,7 @@ class MacDmgBuilder {
   private void doSignBinaryFiles(String macDistPath) {
     ftpAction("mkdir") {}
     ftpAction("put", false, "777") {
-      ant.fileset(file: "${buildContext.paths.communityHome}/build/mac/signbin.sh")
+      ant.fileset(file: "${buildContext.paths.communityHome}/platform/build-scripts/tools/mac/scripts/signbin.sh")
     }
 
     String signedFilesDir = "$buildContext.paths.temp/signed-files"
@@ -133,7 +133,7 @@ class MacDmgBuilder {
     ant.delete(file: dmgImageCopy)
 
     ftpAction("put", false, "777") {
-      ant.fileset(dir: "${buildContext.paths.communityHome}/build/mac") {
+      ant.fileset(dir: "${buildContext.paths.communityHome}/platform/build-scripts/tools/mac/scripts") {
         include(name: "makedmg.sh")
         include(name: "makedmg.pl")
       }
@@ -181,7 +181,7 @@ class MacDmgBuilder {
     }
     ant.delete(file: sitFilePath)
     ftpAction("put", false, "777") {
-      ant.fileset(dir: "${buildContext.paths.communityHome}/build/mac") {
+      ant.fileset(dir: "${buildContext.paths.communityHome}/platform/build-scripts/tools/mac/scripts") {
         include(name: "signapp.sh")
       }
     }
diff --git a/build/mac/makedmg.pl b/platform/build-scripts/tools/mac/scripts/makedmg.pl
similarity index 100%
rename from build/mac/makedmg.pl
rename to platform/build-scripts/tools/mac/scripts/makedmg.pl
diff --git a/build/mac/makedmg.sh b/platform/build-scripts/tools/mac/scripts/makedmg.sh
similarity index 100%
rename from build/mac/makedmg.sh
rename to platform/build-scripts/tools/mac/scripts/makedmg.sh
diff --git a/build/mac/signapp.sh b/platform/build-scripts/tools/mac/scripts/signapp.sh
similarity index 100%
rename from build/mac/signapp.sh
rename to platform/build-scripts/tools/mac/scripts/signapp.sh
diff --git a/build/mac/signbin.sh b/platform/build-scripts/tools/mac/scripts/signbin.sh
similarity index 100%
rename from build/mac/signbin.sh
rename to platform/build-scripts/tools/mac/scripts/signbin.sh