From 244f37aa74990bda52eaf46d324b3827e82870ba Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 27 Apr 2015 18:30:01 +0300
Subject: [PATCH] Use preloader for JS compilation in build.xml

Similar to "new-kotlinc" macro. Before this change bootstrap-runtime appeared
earlier on the classpath than the newly built compiler, and so everything was
breaking when e.g. built-ins metadata had been updated (old version in the old
runtime was found earlier than the newer version in the compiler)
---
 build.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index e3a043da7ea..55dc0774554 100644
--- a/build.xml
+++ b/build.xml
@@ -271,14 +271,17 @@
 
             <pathconvert property="src.line" refid="src.path" pathsep=" "/>
 
-            <java classname="org.jetbrains.kotlin.cli.js.K2JSCompiler" 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.js.K2JSCompiler"/>
+                <arg line="4096 notime"/>
                 <arg line="${src.line}"/>
                 <arg value="-output"/>
                 <arg value="@{output}"/>