From 479a8b7578d72900d533fb5693d475fa1f9189fc Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 12 Sep 2017 18:44:09 +0300
Subject: [PATCH] Add property for plugin artifact dir to zip artifacts from
 KotlinUltimate

Do not delete artifact dir after packing as we may need them later for tests
---
 TeamCityBuild.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 059e4daa9bb..c9f522ac213 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -20,6 +20,7 @@
     <property name="compiler.ant.fork.jvmargs" value="-Xmx1024m"/>
 
     <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
+    <property name="pluginArtifactDir" value="Kotlin" />
 
     <macrodef name="echoprop">
         <attribute name="prop"/>
@@ -108,21 +109,21 @@
     <target name="zipArtifacts">
         <macrodef name="zipPlugin">
             <attribute name="filename"/>
+            <attribute name="prefix" />
             <attribute name="dir"/>
 
             <sequential>
                 <zip destfile="@{filename}">
-                    <zipfileset prefix="@{dir}" dir="${artifact.output.path}/@{dir}" excludes="kotlinc/bin/*"/>
-                    <zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" includes="*.bat"
+                    <zipfileset prefix="@{prefix}" dir="@{dir}" excludes="kotlinc/bin/*"/>
+                    <zipfileset prefix="@{prefix}/kotlinc/bin" dir="@{dir}/kotlinc/bin" includes="*.bat"
                                 filemode="644"/>
-                    <zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" excludes="*.bat"
+                    <zipfileset prefix="@{prefix}/kotlinc/bin" dir="@{dir}/kotlinc/bin" excludes="*.bat"
                                 filemode="755"/>
                 </zip>
-                <delete dir="${artifact.output.path}/@{dir}" quiet="true"/>
             </sequential>
         </macrodef>
 
-        <zipPlugin filename="${plugin.zip}" dir="Kotlin"/>
+        <zipPlugin filename="${plugin.zip}" prefix="Kotlin" dir="${artifact.output.path}/${pluginArtifactDir}"/>
     </target>
 
     <macrodef name="print-statistic">