From 3f51338320484acad72f5719bf834963cd48956a Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 25 Jun 2014 00:06:50 +0400
Subject: [PATCH] Save executable flag of kotlinc-jvm and kotlinc-js after zip
 archiving

---
 TeamCityBuild.xml | 7 ++++---
 build.xml         | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 1d48a1a3d3b..337877a8f23 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -94,12 +94,13 @@
       <delete dir="${version_substitute_dir}" quiet="true"/>
   </target>
 
-    <target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts">
-    </target>
+    <target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts"/>
 
     <target name="zipArtifact">
         <zip destfile="${plugin.zip}">
-            <zipfileset prefix="Kotlin" dir="${artifact.output.path}/Kotlin"/>
+            <zipfileset prefix="Kotlin" dir="${artifact.output.path}/Kotlin" excludes="kotlinc/bin/*"/>
+            <zipfileset prefix="Kotlin/kotlinc/bin" dir="${artifact.output.path}/Kotlin/kotlinc/bin" includes="*.bat" filemode="644"/>
+            <zipfileset prefix="Kotlin/kotlinc/bin" dir="${artifact.output.path}/Kotlin/kotlinc/bin" excludes="*.bat" filemode="755"/>
         </zip>
         <delete dir="${artifact.output.path}/Kotlin" quiet="true"/>
     </target>
diff --git a/build.xml b/build.xml
index 0ed757c5698..201ee4dd6a6 100644
--- a/build.xml
+++ b/build.xml
@@ -636,7 +636,9 @@
 
     <target name="zip" depends="dist">
         <zip destfile="${output}/${output.name}.zip">
-            <zipfileset prefix="kotlinc" dir="${kotlin-home}"/>
+            <zipfileset prefix="kotlinc" dir="${kotlin-home}" excludes="bin/*"/>
+            <zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" includes="*.bat" filemode="644"/>
+            <zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" excludes="*.bat" filemode="755"/>
         </zip>
         <echo message="##teamcity[publishArtifacts '${output.relative}/${output.name}.zip']"/>
     </target>