Workaround for bootstrapping with changes in kotlin2js ant task and cli compiler.

2014-10-27 23:27:07 +03:00
parent adab0445de
commit a5b928782b
1 changed files with 20 additions and 6 deletions
@@ -221,12 +221,26 @@
        <property name="compiled.stdlib.js" value="stdlib.js" />
        <property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData" />

-        <kotlin2js output="${output}/${compiled.stdlib.js}" noStdlib="true" main="noCall">
-            <src>
-                <fileset refid="kotlin.builtin.files" />
-                <resources refid="js.lib.files" />
-            </src>
-        </kotlin2js>
+        <!-- TODO drop workaround for bootstrapping -->
+        <if>
+            <istrue value="${bootstrap.build.no.tests}"/>
+            <then>
+                <kotlin2js output="${output}/${compiled.stdlib.js}" main="noCall">
+                    <src>
+                        <fileset refid="kotlin.builtin.files" />
+                        <resources refid="js.lib.files" />
+                    </src>
+                </kotlin2js>
+            </then>
+            <else>
+                <kotlin2js output="${output}/${compiled.stdlib.js}" noStdlib="true" main="noCall">
+                    <src>
+                        <fileset refid="kotlin.builtin.files" />
+                        <resources refid="js.lib.files" />
+                    </src>
+                </kotlin2js>
+            </else>
+        </if>

        <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
            <resources refid="js.lib.files" />