From 0df31f12236ab25c447d9332a1d1da1a7b6cf905 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 26 Jan 2017 05:19:26 +0300
Subject: [PATCH] Build kotlin-stdlib-js.jar in ant #KT-15940

---
 TeamCityBuild.xml                         | 2 +-
 build.xml                                 | 6 ++++--
 libraries/tools/kotlin-js-library/pom.xml | 4 ++--
 node_utils.xml                            | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 02077239317..ec12495f888 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -148,7 +148,7 @@
         <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"/>
+        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib-js.jar"/>
         <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/>
         <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.meta.js}"/>
         <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.js}"/>
diff --git a/build.xml b/build.xml
index ad73a9839f1..059f7c8af97 100644
--- a/build.xml
+++ b/build.xml
@@ -450,7 +450,7 @@
             <arg line="js-stdlib-merge" />
         </java>
 
-        <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar" duplicate="fail">
+        <jar jarfile="${kotlin-home}/lib/kotlin-stdlib-js.jar" duplicate="fail">
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
             <zipfileset dir="${js.stdlib.output.dir}" prefix="">
                 <include name="kotlin.js"/>
@@ -469,10 +469,11 @@
                 <attribute name="Specification-Title" value="${manifest.spec.title.kotlin.javascript.lib}"/>
             </manifest>
         </jar>
+        <copy file="${kotlin-home}/lib/kotlin-stdlib-js.jar" tofile="${kotlin-home}/lib/kotlin-jslib.jar" />
     </target>
 
     <target name="pack-js-stdlib-sources">
-        <jar destfile="${kotlin-home}/lib/kotlin-jslib-sources.jar" duplicate="fail">
+        <jar destfile="${kotlin-home}/lib/kotlin-stdlib-js-sources.jar" duplicate="fail">
             <resources refid="js.lib.files" />
             <fileset refid="kotlin.builtin.files" />
 
@@ -486,6 +487,7 @@
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
+        <copy file="${kotlin-home}/lib/kotlin-stdlib-js-sources.jar" tofile="${kotlin-home}/lib/kotlin-jslib-sources.jar" />
     </target>
 
     <target name="kotlin-js-stdlib" depends="js-stdlib,js-kotlin-test,pack-js-stdlib-sources"/>
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index 97cd45f49dd..ec477db953f 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -26,10 +26,10 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib.jar"
+                                <copy file="${kotlin-dist}/kotlinc/lib/kotlin-stdlib-js.jar"
                                       tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
                                       overwrite="true" verbose="true"/>
-                                <copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar"
+                                <copy file="${kotlin-dist}/kotlinc/lib/kotlin-stdlib-js-sources.jar"
                                       tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar"
                                       overwrite="true" verbose="true"/>
                             </tasks>
diff --git a/node_utils.xml b/node_utils.xml
index d48196a860f..8d4f94b78a7 100644
--- a/node_utils.xml
+++ b/node_utils.xml
@@ -118,6 +118,6 @@
 
     <!-- Used on TeamCity-->
     <target name="unzip-jslib.jar">
-        <unzip src="${output}/kotlinc/lib/kotlin-jslib.jar" dest="${js.stdlib.output.dir}"/>
+        <unzip src="${output}/kotlinc/lib/kotlin-stdlib-js.jar" dest="${js.stdlib.output.dir}"/>
     </target>
 </project>