From 713a7efcdff52c6bd6f0a01d3cd185844a2648d2 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Mon, 25 Apr 2016 15:19:49 +0300
Subject: [PATCH] KT-3008 Add support of module kind to Ant task. Repair Ant JS
 tests

---
 .../org/jetbrains/kotlin/ant/Kotlin2JsTask.kt |   3 +++
 .../jslib-example.jar                         | Bin 1498 -> 1778 bytes
 .../jslib-example/jslib-example.js            |   7 +++---
 .../amd.js                                    |  15 ++++++++++++
 .../build.log.expected                        |  14 +++++++++++
 .../build.xml                                 |  23 ++++++++++++++++++
 .../jslib-example/LibraryExample.kt           |   9 +++++++
 .../root1/foo.kt                              |  17 +++++++++++++
 .../kotlin/integration/AntTaskJsTest.java     |   4 +++
 9 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js
 create mode 100644 compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.log.expected
 create mode 100644 compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.xml
 create mode 100644 compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt
 create mode 100644 compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/root1/foo.kt

diff --git a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt
index af2234d71bd..c377ab3d976 100644
--- a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt
@@ -27,6 +27,7 @@ class Kotlin2JsTask : KotlinCompilerBaseTask() {
     var outputPostfix: File? = null
     var sourceMap: Boolean = false
     var metaInfo: Boolean = false
+    var moduleKind: String = "plain"
 
     /**
      * {@link K2JsArgumentConstants.CALL} (default) if need generate a main function call (main function will be auto detected)
@@ -73,5 +74,7 @@ class Kotlin2JsTask : KotlinCompilerBaseTask() {
         if (noStdlib) args.add("-no-stdlib")
         if (sourceMap) args.add("-source-map")
         if (metaInfo) args.add("-meta-info")
+
+        args += listOf("-module-kind", moduleKind)
     }
 }
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar b/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
index 9ab9caad358789fe738d0534695a599d4b63319a..9e5f07c06b9a2384b91599c739bb416eeb43bc75 100644
GIT binary patch
literal 1778
zcmWIWW@h1H0D(JQjvinJl;C8LVeoYgan$wnbJGtE;bdU8&srb0`lM`lX$3a}Bg+eB
z1_m$@05n1bsEGq?#AYVN+I>Kt5F-PF2(l5rj((nQuE8OCzHV^SR6b*vR(o!D-ys75
z)(iJ0{XeKG(#PTC<n6wKW4)4glu4ml(uCybZw(LLU$^O6oAG|mYHRC)E6GW<M`oPZ
z-Ky2yDdPQIKa$NLJ;d_#@%f9UB#8=2SjXDVtBdpT`@Aym^h_yPC5i5=r^z1#ExsQQ
z3JKrz=a6ZUXk*NzBwLnlW~;iDd!AXz@9#cuf6~z-{d|xKBk$Lgdk?1Hc;u986J4~b
zP1-~)C}Hc;u&(kouif6)ly6<}-5{mbb6Qkyc}1V6;!$}-Sa254^tiU9+2|)Q9Ja7B
zFbDv{BC9wjGf6kKA~ClhCsi-27#t2s|762K7%fz%hQ#JyHV~<OzkY{D#?J*Qv%g(i
zA(f%8V3OP9-lAl_GjsFKZ6A*>xbUxB=D6>pO<~dTk8T}*KCgIP?%u2`-(NUhO#3KT
zKY8l{iN6h&SK6lTddTxgKjw0q>W6YB0m;?{TXMW)pMLu<JTV}mr2VAU8tJxp%j@5l
z)Tns(%v@N)^*obHUSpG2WJ%S#6%09^o=?)m-r4Ol{w&SL#_&{R|171~-+E^<uw*_t
zzDi51P4e))b8eCyDJ{$sR`jMQY}z%^>#((TP()GKQ`-!4-imzQTHE}pS>KH>&$n0`
z@a>y-r^{nrRj<m=&MVcOc-x+Cd0YGJSuXe8@|fo#1(EUA!jrPsnLkqSX_&O0HT}ew
zr#A{$EZA=2ank*?@@C!nH$>`Bh>EJ5_#l~Vt9v+JearECzwhjN?#n7(V0$j*TIwX3
z&?P_3t3_{oV*R(MdC}(+^Q7)?we_{R;`b(Nii^AU`i`i(AGrKO^WHCWNnNq+?%osp
zAwMhaJs!R)64;W?&yxH9dBHiWw#8l_mn(*Bt(}}L_@(!?=qcgj2frR|OxXRkpd$JC
zt;xLU=>prA_g$B}yhwRpg~M-?omZ{R&rMtL{=55^b!F3p*z4-<uHM9A*K_WGMptI|
zh3852jo%+KsZLIKU}w$FC$~B}PO|IcL1CNLLyom_u68$%_TP1$<NuElk%T}wGLJ)V
zXB99z9S34TU=s4lOe#t&s&s{>q3jZTd8xO@knfNIkL&k2hmyHhu&-d~<ZbhcIp`ZB
zk{EQ_Z$j1YWou$3{{7GYQPuRXSD&eG@glvs58Y?XnQT<_#b7E+Q((TL$)&@aAN`#8
zi8CwqcAfN&hLYfr(*<i%o;(*RYg+h0zUgqBfPr#_+vc~`^DQTs#iy*${35*N+*(vm
z1T|FbnG5uQG%zoKij|<$#1!9Dz1$SI<6nKp$N+Qu4Y>|E2)O>9lXM_z`*!Y*sjUkV
zY;Vp@QO`*`e8$CQU*H-RY5ouQf9EqV7Jawv%YjV2D<<h*c;XJeS~M|-f1{tV_@xIa
zbq>c5JTlR+3g^_2bK^d?{%fyoyv^D@VV5>ebGa3zebxA7=k5<nccn31neo%FKDzE=
zxw2NoI&aSlf;z=c%UNz%X9^piI$*SBqOjxsD&7dYlNa{)zn`TZ;LXS+$Be7slmPk_
z1OyoVI)Z4VVw4q9jG|?Bh;g_IQHXKCuw&TL=!|R}N|8#~WXvK7*<^p91(*dC&{Qmi
z6S{j*Qz^2klYq4ZmNZM)v7p3{nr@Jd4QF9MPDQwkV`T#cKPwO}1^Uh$SPU~T002If
BhPnU%

delta 1162
zcmeywdyCsGz?+$ci-CcIfx%!+t1AN%;ACK7@O2Gw)b;dp)BkshfdQtJgFzptbTgA;
z?LMG#Aw~uUk;xlb#V1ZYqzy8OgTY{0t7{&I-p(qZ^l=~-1Y)1eq@u*4O4o|S+=84`
zz3h_7cbV(zA?mlRZgrJgvnOsoP@NjkI8GoPl$x00o2r+avb5ij`;Y^V+xLH64aIx!
zu2t~kYicUK<z20LJ;pQW<MZ2HlOH_!)cd|RpM7y^UUt<Zlk`=qxT~1-6H+hsy<v!*
znRaeT<I&8361^bnnb9}Cb@VYFJ)Ci{BKgkE%k@_ud*!Ok^XgmDYZ_!Tao$ee_(Rc3
z4sV6*U-)0wKVIj;>YaL0FsdoF?}Z3swffp!Ek+x7vOl<7SYO6G&EM|J``^FC5upO|
zw#aSGAGd*CC}w3~5CD23t2ie!NjDYh>#X9bA-D5{4Fzi7hw}to-CHlPZSAjV8d@v#
z6+*Tyk{7Ui?fK}@jbqcD6n>V=tlzww?`)Ud+UxTyr_bE@xm9>;YLLUf(5Q1RjP>Uj
zjM4>quCCd3^T_}G0=&jEoP>h|V+<PaFWJ(+<e%TP8QjNza_F5FvMUm~^5exPBL~I;
zv+FMT$1=aYJfo#n!okqCM)bJ3bA5<!oIIz4;4=F_tJ&5M=UB))hckzMdBk86wVZWD
z*1;_sKipf-b1mqCr}P$S)g9ma_RDUUIrdlSP5MdASJ&#+PK?;|_{fZmeT%CU?<9Jq
zho1>ayuaO`=C_S=>*}a?UYVIo@2*&!#B`--?GlH?^}qXqS=T=GJGG?zj`8l}!Lx7X
z*B2cY_00OwwNWhW!Fk5Fm0#?>zEfRXz`FhKte)AkMAStie?D2?6!EWp|C^4ISwB~H
z##$eEB3u5@f3uSH$vsMGrRth|hVS1mb9=nw>)pMxWL9?lE(|<$wp9H^!#s{#|GEX|
zm~yC3eZ=p+<K}nY^`V!{Gs9P~A5;9I%5tzw`tZZK_4jZ4o5jR9{4=OOb}P(#OMkm!
zO$5tDSC6{CHlL~*GPX~=VQih1vG}u+Y{R=Yk@S;FHD!txmA&s&OJzR4x%tELPs9F0
z0%^)KeqOlyu=MNe{Q=&LOd`y<^Aj*d0D%C*TSpM>YmS<|V0y7+FpzR6SkkBs%5L=t
zyRhdtgnDUUg2c#w$l9@GK!o-qK<)7C2-oHf&FJVU9-*&`2{Zi%c(byBRImb}A<*2(
HEFc~LRe-G@

diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js
index 8fb2ce81d48..74647a38a35 100644
--- a/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js
@@ -1,4 +1,4 @@
-(function (Kotlin) {
+this['jslib-example'] = function (Kotlin) {
   'use strict';
   var _ = Kotlin.defineRootPackage(null, /** @lends _ */ {
     library: Kotlin.definePackage(null, /** @lends _.library */ {
@@ -27,11 +27,12 @@
             return result;
           },
           equals_za3rmp$: function (other) {
-            return this === other || (other !== null && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value)));
+            return this === other || (other !== null && (typeof other === 'object' && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value))));
           }
         })
       })
     })
   });
   Kotlin.defineModule('jslib-example', _);
-}(Kotlin));
+  return _;
+}(kotlin);
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js
new file mode 100644
index 00000000000..4eff8adf66b
--- /dev/null
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js
@@ -0,0 +1,15 @@
+(function(global) {
+    var modules = {};
+    modules.kotlin = kotlin;
+
+    function define(name, dependencies, body) {
+        var resolvedDependencies = [];
+        for (var i = 0; i < dependencies.length; ++i) {
+            resolvedDependencies[i] = modules[dependencies[i]];
+        }
+        modules[name] = body.apply(body, resolvedDependencies);
+    }
+    define.amd = {};
+
+    global.define = define;
+})(this);
\ No newline at end of file
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.log.expected b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.log.expected
new file mode 100644
index 00000000000..3dc293a7e9d
--- /dev/null
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.log.expected
@@ -0,0 +1,14 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+    [mkdir] Created dir: [Temp]/lib
+[kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js]
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+     [copy] Copying 2 files to [Temp]
+     [copy] Copying 1 file to [Temp]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.xml b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.xml
new file mode 100644
index 00000000000..4effa950e3d
--- /dev/null
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.xml
@@ -0,0 +1,23 @@
+<project name="Ant Task Test" default="build">
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <property name="library.path" value="${test.data}/jslib-example"/>
+  <property name="temp.library.path" value="${temp}/lib"/>
+  <target name="build">
+    <mkdir dir="${temp.library.path}"/>
+
+    <kotlin2js src="${library.path}" output="${temp.library.path}/jslib-example.js" metaInfo="true" moduleKind="umd"/>
+
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call" moduleKind="amd">
+      <library>
+        <pathelement path="${temp.library.path}/jslib-example.meta.js"/>
+      </library>
+    </kotlin2js>
+    <copy todir="${temp}">
+      <fileset dir="${temp.library.path}">
+        <include name="**/*.js"/>
+        <exclude name="META-INF/**"/>
+      </fileset>
+    </copy>
+    <copy todir="${temp}" file="${test.data}/amd.js"/>
+  </target>
+</project>
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt
new file mode 100644
index 00000000000..f77e26551f9
--- /dev/null
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt
@@ -0,0 +1,9 @@
+package library.sample
+
+import kotlin.js.Date
+
+public class ClassA() {
+    val value: Int = 100
+}
+
+public fun Date.extFun(): Int = 100
\ No newline at end of file
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/root1/foo.kt
new file mode 100644
index 00000000000..743fab365aa
--- /dev/null
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/root1/foo.kt
@@ -0,0 +1,17 @@
+package foo
+
+import library.sample.*
+import kotlin.js.Date
+
+var ok = "FAIL"
+
+fun main(args: Array<String>) {
+    val x = ClassA().value
+    if (x == 100) {
+        ok = "OK"
+    }
+    val date = Date()
+    println(date.extFun())
+}
+
+fun box(): String = ok
diff --git a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java b/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java
index 4b36b901c82..73d00da2936 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java
@@ -120,6 +120,10 @@ public class AntTaskJsTest extends AbstractAntTaskTest {
         doJsAntTest("jslib-example.js");
     }
 
+    public void testSimpleWithStdlibAndJsFileAsAnotherLibModuleKind() throws Exception {
+        doJsAntTest("amd.js", "jslib-example.js");
+    }
+
     public void testSimpleWithStdlibAndTwoJsFilesAsLibraries() throws Exception {
         doJsAntTest("jslib-example1.js", "jslib-example2.js");
     }