azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit a5b928782b.
This commit is contained in:
Zalim Bashorov
2014-11-07 16:34:25 +03:00
parent 42257218b6
commit ab8979c614
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+6 -20
View File
@@ -221,26 +221,12 @@
<property name="compiled.stdlib.js" value="stdlib.js" /> <property name="compiled.stdlib.js" value="stdlib.js" />
<property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData" /> <property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData" />
<!-- TODO drop workaround for bootstrapping --> <kotlin2js output="${output}/${compiled.stdlib.js}" noStdlib="true" main="noCall">
<if> <src>
<istrue value="${bootstrap.build.no.tests}"/> <fileset refid="kotlin.builtin.files" />
<then> <resources refid="js.lib.files" />
<kotlin2js output="${output}/${compiled.stdlib.js}" main="noCall"> </src>
<src> </kotlin2js>
<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"> <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
<resources refid="js.lib.files" /> <resources refid="js.lib.files" />