JS: drop "-kjsm" flag, merge logic with "-meta-info"

#KT-16049 Fixed
This commit is contained in:
Alexander Udalov
2017-01-26 13:44:55 +03:00
parent 17b0b7704f
commit e5680565b3
18 changed files with 30 additions and 78 deletions
+1 -2
View File
@@ -420,7 +420,7 @@
</src>
</new-kotlin2js>
<new-kotlin2js output="${js.stdlib.output.dir}/tmp/kotlin.js" additionalOptions="-meta-info -kjsm">
<new-kotlin2js output="${js.stdlib.output.dir}/tmp/kotlin.js" additionalOptions="-meta-info">
<src>
<union>
<fileset refid="kotlin.builtin.files"/>
@@ -1119,7 +1119,6 @@
<arg value="${output}/classes/kotlin-test-js/kotlin-test.js"/>
<arg value="-version"/>
<arg value="-meta-info"/>
<arg value="-kjsm"/>
<arg line="-main noCall"/>
<arg line="-module-kind umd"/>
<arg value="-Xmulti-platform"/>