From f9e552e3c2bb47a1bff4f69f61a7229896b61054 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 21 Jan 2017 00:51:48 +0300
Subject: [PATCH] Build kotlin-stdlib in addition to kotlin-runtime in ant
 build.

---
 TeamCityBuild.xml                   |  2 +-
 build.xml                           | 12 +++++++++---
 resources/kotlinManifest.properties |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 2697df2f043..02077239317 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -145,7 +145,7 @@
     </macrodef>
 
     <target name="printStatistics">
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-runtime.jar"/>
+        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib.jar"/>
         <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
 
         <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-jslib.jar"/>
diff --git a/build.xml b/build.xml
index de98672e20e..ad73a9839f1 100644
--- a/build.xml
+++ b/build.xml
@@ -1062,8 +1062,10 @@
 
     <target name="kotlin-test">
         <path id="kotlin-test-compile-classpath">
-            <pathelement location="${output}/classes/builtins"/>
             <pathelement location="${output}/builtins"/>
+            <pathelement location="${output}/classes/builtins"/>
+            <pathelement location="${output}/classes/stdlib"/>
+            <pathelement location="libraries/lib/junit-4.11.jar"/>
         </path>
 
         <java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true" maxmemory="${max.heap.size.for.forked.jvm}">
@@ -1088,6 +1090,7 @@
             <arg value="-Xmulti-platform"/>
             <arg value="libraries/kotlin.test/common/src/main/kotlin"/>
             <arg value="libraries/kotlin.test/jvm/src/main/kotlin"/>
+            <arg value="libraries/kotlin.test/junit/src/main/kotlin"/>
         </java>
 
         <pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}" runtime-component="Test">
@@ -1188,7 +1191,7 @@
     </macrodef>
 
     <target name="pack-runtime">
-        <pack-runtime-jar jar-name="kotlin-runtime.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime}">
+        <pack-runtime-jar jar-name="kotlin-stdlib.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime}">
             <jar-content>
                 <fileset dir="${output}/classes/builtins"/>
                 <fileset dir="${output}/classes/stdlib"/>
@@ -1199,6 +1202,7 @@
                 </zipfileset>
             </jar-content>
         </pack-runtime-jar>
+        <copy file="${kotlin-home}/lib/kotlin-stdlib.jar" tofile="${kotlin-home}/lib/kotlin-runtime.jar"/>
 
         <pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-before-jarjar.jar" implementation-title="${manifest.impl.title.kotlin.jvm.reflect}">
             <jar-content>
@@ -1274,7 +1278,7 @@
             </replaceregexp>
         </sequential>
 
-        <pack-runtime-jar jar-name="kotlin-runtime-sources.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime.sources}">
+        <pack-runtime-jar jar-name="kotlin-stdlib-sources.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime.sources}">
             <jar-content>
                 <fileset dir="${basedir}/core/builtins/native" includes="**/*"/>
                 <fileset dir="${basedir}/core/builtins/src" includes="**/*"/>
@@ -1284,6 +1288,8 @@
                 <fileset dir="${output}/core.src" includes="**/*"/>
             </jar-content>
         </pack-runtime-jar>
+        <copy file="${kotlin-home}/lib/kotlin-stdlib-sources.jar" tofile="${kotlin-home}/lib/kotlin-runtime-sources.jar"/>
+
 
         <pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-sources-for-maven.jar"
                           implementation-title="${manifest.impl.title.kotlin.jvm.reflect.sources}">
diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
index efa124bb2fb..823e385dc69 100644
--- a/resources/kotlinManifest.properties
+++ b/resources/kotlinManifest.properties
@@ -13,7 +13,7 @@ manifest.impl.title.kotlin.compiler.sources=Kotlin Compiler Sources
 
 manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks
 
-manifest.impl.title.kotlin.jvm.runtime=Kotlin Runtime
+manifest.impl.title.kotlin.jvm.runtime=Kotlin Standard Library
 manifest.impl.title.kotlin.jvm.reflect=Kotlin Reflect
 manifest.impl.title.kotlin.script.runtime=Kotlin Script Runtime
 manifest.impl.title.kotlin.jvm.runtime.sources=Kotlin Runtime Sources