From 444b461ba74d9884b42513e90cbdf3199f8a93b5 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 16 Mar 2015 17:54:53 +0300
Subject: [PATCH] Run preloader in new-kotlinc, fix reflect->runtime class-path
 reference

---
 build.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 80b40aa3de2..b793801b6d7 100644
--- a/build.xml
+++ b/build.xml
@@ -634,7 +634,16 @@
             <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">
@@ -740,14 +749,16 @@
             <local name="src.line"/>
             <pathconvert property="src.line" refid="src.dirset" pathsep=" "/>
 
-            <java classname="org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" failonerror="true" fork="true" maxmemory="${max.heap.size.for.forked.jvm}">
+            <java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true" maxmemory="${max.heap.size.for.forked.jvm}">
                 <classpath>
-                    <file file="${bootstrap.runtime}"/>
-                    <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
+                    <pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
                 </classpath>
                 <assertions>
                     <enable/>
                 </assertions>
+                <arg value="${kotlin-home}/lib/kotlin-compiler.jar"/>
+                <arg value="org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"/>
+                <arg line="4096 notime"/>
                 <arg line="${src.line}"/>
                 <arg value="-d"/>
                 <arg value="@{output}"/>
@@ -831,6 +842,8 @@
         <element name="jar-content"/>
 
         <sequential>
+            <delete file="${kotlin-home}/lib/@{jar-name}" failonerror="false"/>
+
             <jar destfile="${kotlin-home}/lib/@{jar-name}" duplicate="fail">
                 <jar-content/>
                 <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>