K2JS: introduce "no-stdlb" parameter and use stdlib from compiler by default.

2014-10-27 22:58:27 +03:00
parent e457eea438
commit adab0445de
29 changed files with 82 additions and 20 deletions
@@ -2,7 +2,7 @@
    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

    <target name="build">
-        <kotlin2js src="${test.data}/hello.kt"  output="${temp}/out.js">
+        <kotlin2js src="${test.data}/hello.kt" noStdlib="true" output="${temp}/out.js">
            <compilerarg value="-Xno-inline"/>
        </kotlin2js>
    </target>
@@ -2,6 +2,10 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix" outputPostfix="${test.data}/postfix" />
+    <kotlin2js src="${test.data}/root1"
+               noStdlib="true"
+               output="${temp}/out.js"
+               outputPrefix="${test.data}/prefix"
+               outputPostfix="${test.data}/postfix" />
  </target>
 </project>
@@ -2,7 +2,7 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" >
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" >
       <src>
         <pathelement path="${test.data}/bar.kt"/>
         <fileset dir="${test.data}/root2">
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js"  outputPostfix="${test.data}/postfix" />
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"  outputPostfix="${test.data}/postfix" />
  </target>
 </project>
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
  </target>
 </project>
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js"/>
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/>
  </target>
 </project>
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" main="call"/>
  </target>
 </project>
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
  </target>
 </project>
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,7 @@
+<project name="Ant Task Test" default="build">
+  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+  <target name="build">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+  </target>
+</project>
@@ -0,0 +1,12 @@
+package foo
+
+var ok = "FAIL"
+
+val hello = Pair("Hello", "World")
+
+fun main(args: Array<String>) {
+    ok = "OK"
+    println(hello.first + " " + hello.second)
+}
+
+fun box(): String = ok
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
  </target>
 </project>
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" sourcemap="true"/>
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" sourcemap="true"/>
  </target>
 </project>
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" verbose="true"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" verbose="true"/>
  </target>
 </project>
@@ -2,6 +2,6 @@
  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>

  <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" printVersion="true"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" printVersion="true"/>
  </target>
 </project>