From 30916e37ce46e2d945e1fc3a04939b12255e5015 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 24 Mar 2015 22:50:31 +0300
Subject: [PATCH] Move bootstrap runtime copying to 'prepare-dist' to fix
 dist-quick

---
 build.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/build.xml b/build.xml
index 9a7b3dc841f..b24f2623084 100644
--- a/build.xml
+++ b/build.xml
@@ -46,7 +46,7 @@
     located in dependencies/bootstrap-compiler/.../kotlin-runtime.jar, because the newly built compiler is just a Kotlin application,
     compiled by the old compiler with the old runtime in classpath. If you advance the ABI version, the newly built compiler will NOT work
     against the runtime it will produce on its own because they have different ABI versions.
-    So on the first step of bootstrap we copy that runtime to kotlin-runtime-internal-bootstrap.jar (see 'compiler' target) and change
+    So on the first step of bootstrap we copy that runtime to kotlin-runtime-internal-bootstrap.jar (see 'prepare-dist' target) and change
     the compiler classpath accordingly. On the second step this is believed to be not required, because there are
     little to no differences between the new and the newest runtime.
     -->
@@ -178,6 +178,23 @@
         <echo file="${kotlin-home}/build.txt" message="${build.number}"/>
 
         <chmod dir="${kotlin-home}/bin" excludes="**/*.bat" perm="755"/>
+
+        <if>
+            <istrue value="${bootstrap.or.local.build}"/>
+            <then>
+                <copy file="${bootstrap.runtime}" tofile="${kotlin-home}/lib/kotlin-runtime-internal-bootstrap.jar"/>
+                <copy file="${bootstrap.reflect}" tofile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar"/>
+                <jar destfile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar" update="true">
+                    <manifest>
+                        <attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
+                    </manifest>
+                </jar>
+            </then>
+            <else>
+                <copy file="${bootstrap.runtime}" todir="${kotlin-home}/lib"/>
+                <copy file="${bootstrap.reflect}" todir="${kotlin-home}/lib"/>
+            </else>
+        </if>
     </target>
 
     <target name="compiler-sources">
@@ -629,23 +646,6 @@
             </else>
         </if>
 
-        <if>
-            <istrue value="${bootstrap.or.local.build}"/>
-            <then>
-                <copy file="${bootstrap.runtime}" tofile="${kotlin-home}/lib/kotlin-runtime-internal-bootstrap.jar"/>
-                <copy file="${bootstrap.reflect}" tofile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar"/>
-                <jar destfile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar" update="true">
-                    <manifest>
-                        <attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
-                    </manifest>
-                </jar>
-            </then>
-            <else>
-                <copy file="${bootstrap.runtime}" todir="${kotlin-home}/lib"/>
-                <copy file="${bootstrap.reflect}" todir="${kotlin-home}/lib"/>
-            </else>
-        </if>
-
         <jar jarfile="${output}/kotlin-compiler-for-maven.jar">
             <!-- 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="**"/>