From 90eb229036bdf0407cdba7280da32f50add220e5 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 15 Dec 2016 12:01:01 +0300
Subject: [PATCH] Extract compiler-for-maven target in build.xml

To be used after "compiler-quick" to quickly test changes to the compiler in
the Maven build
---
 build.xml | 60 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/build.xml b/build.xml
index c555cdd2ac4..5d80f49a632 100644
--- a/build.xml
+++ b/build.xml
@@ -643,35 +643,45 @@
             <proguard configuration="${basedir}/compiler/compiler.pro"/>
         </sequential>
 
-        <jar jarfile="${output}/kotlin-compiler-for-maven.jar" duplicate="preserve">
-            <patternset id="lib.metainf.patternset">
-                <include name="**"/>
-                <exclude name="META-INF/build.txt"/>
-                <exclude name="META-INF/MANIFEST.MF"/>
-            </patternset>
+        <pack-compiler-for-maven/>
+    </target>
 
-            <!-- TODO: don't include both to the jar: it's impossible to test changes to core in the local maven build without bootstrap -->
-            <zipfileset src="${kotlin-home}/lib/kotlin-compiler.jar" includes="**"/>
-            <zipfileset src="${bootstrap.runtime}">
-                <patternset refid="lib.metainf.patternset"/>
-            </zipfileset>
-            <zipfileset src="${bootstrap.reflect}">
-                <patternset refid="lib.metainf.patternset"/>
-            </zipfileset>
-            <zipfileset src="${bootstrap.script.runtime}">
-                <patternset refid="lib.metainf.patternset"/>
-            </zipfileset>
+    <macrodef name="pack-compiler-for-maven">
+        <sequential>
+            <jar jarfile="${output}/kotlin-compiler-for-maven.jar" duplicate="preserve">
+                <patternset id="lib.metainf.patternset">
+                    <include name="**"/>
+                    <exclude name="META-INF/build.txt"/>
+                    <exclude name="META-INF/MANIFEST.MF"/>
+                </patternset>
 
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+                <!-- TODO: don't include both to the jar: it's impossible to test changes to core in the local maven build without bootstrap -->
+                <zipfileset src="${kotlin-home}/lib/kotlin-compiler.jar" includes="**"/>
+                <zipfileset src="${bootstrap.runtime}">
+                    <patternset refid="lib.metainf.patternset"/>
+                </zipfileset>
+                <zipfileset src="${bootstrap.reflect}">
+                    <patternset refid="lib.metainf.patternset"/>
+                </zipfileset>
+                <zipfileset src="${bootstrap.script.runtime}">
+                    <patternset refid="lib.metainf.patternset"/>
+                </zipfileset>
 
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
+                <manifest>
+                    <attribute name="Built-By" value="${manifest.impl.vendor}"/>
 
-                <attribute name="Main-Class" value="org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"/>
-            </manifest>
-        </jar>
+                    <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                    <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler}"/>
+                    <attribute name="Implementation-Version" value="${build.number}"/>
+
+                    <attribute name="Main-Class" value="org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"/>
+                </manifest>
+            </jar>
+        </sequential>
+    </macrodef>
+
+    <target name="compiler-for-maven">
+        <pack-compiler-for-maven/>
     </target>
 
     <target name="kotlin-build-common">