From a65b9800c2d8bcf82dc306f67ca16f731634be37 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Wed, 19 Nov 2014 12:14:18 +0300
Subject: [PATCH] JS backend: put kotlin.js into jslib archive, add
 specification-title

  kotlin.js is now included in kotlin-jslib.jar, so closure-compiler outputs kotlin.js to dist folder instead of dist/kotlic/lib
---
 build.xml                     | 52 ++++++++++++++++++++++++-----------
 resources/manifest.properties |  1 +
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index a3bde7b1a49..c962fba9534 100644
--- a/build.xml
+++ b/build.xml
@@ -233,19 +233,6 @@
             </src>
         </kotlin2js>
 
-        <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
-            <resources refid="js.lib.files" />
-            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.javascript.stdlib}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
-
         <taskdef name="closure-compiler"
                  classname="com.google.javascript.jscomp.ant.CompileTask"
                  classpath="${dependencies.dir}/closure-compiler.jar"/>
@@ -260,7 +247,7 @@
             prettyprint="true"
             languagein="ECMASCRIPT5_STRICT"
             warning="${warningLevel}"
-            output="${kotlin-home}/lib/kotlin.js" >
+            output="${output}/kotlin.js" >
 
             <sources dir="${stdlib.js.dir}">
                 <file name="kotlin_lib_ecma5.js"/>
@@ -285,6 +272,39 @@
                 <file name="externs.js"/>
             </externs>
         </closure-compiler>
+
+        <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
+            <resources refid="js.lib.files" />
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+            <zipfileset file="${output}/kotlin.js" prefix=""/>
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.javascript.stdlib}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+                <attribute name="Specification-Title" value="${manifest.spec.title.kotlin.javascript.lib}"/>
+                <attribute name="Kotlin-JS-Module-Name" value="stdlib"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="jslib_sources">
+        <jar destfile="${kotlin-home}/lib/kotlin-jslib-sources.jar">
+            <resources refid="js.lib.files" />
+            <fileset refid="kotlin.builtin.files" />
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.jvm.runtime.sources}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+                <attribute name="Specification-Title" value="${manifest.spec.title.kotlin.javascript.lib}"/>
+                <attribute name="Kotlin-JS-Module-Name" value="stdlib"/>
+            </manifest>
+        </jar>
     </target>
 
     <target name="preloader">
@@ -728,12 +748,12 @@
     <target name="runtime" depends="builtins,stdlib,pack-runtime,pack-runtime-sources"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,jslib"
+            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,jslib,jslib_sources"
             description="Builds redistributables from sources"/>
 
     <!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc -->
     <target name="dist-quick"
-            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,jslib"/>
+            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,jslib,jslib_sources"/>
 
     <target name="dist-quick-compiler-only"
             depends="init,prepare-dist,preloader,serialize-builtins,compiler-quick"
diff --git a/resources/manifest.properties b/resources/manifest.properties
index d948a995e4d..c17385e9227 100644
--- a/resources/manifest.properties
+++ b/resources/manifest.properties
@@ -9,5 +9,6 @@ manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks
 manifest.impl.title.kotlin.jvm.runtime=Kotlin Runtime + StdLib
 manifest.impl.title.kotlin.jvm.runtime.sources=Kotlin Runtime + StdLib Sources
 manifest.impl.title.kotlin.javascript.stdlib=Kotlin JavaScript StdLib
+manifest.spec.title.kotlin.javascript.lib=Kotlin JavaScript Lib
 
 manifest.impl.title.kotlin.preloader=Kotlin Preloader