KJS: move js part of "kotlin.js" and related files to "js.libraries" module
This commit is contained in:
@@ -41,9 +41,10 @@
|
|||||||
|
|
||||||
<include file="jslib_files.xml" />
|
<include file="jslib_files.xml" />
|
||||||
|
|
||||||
|
<property name="compiled.builtins.js" value="builtins.js"/>
|
||||||
<property name="compiled.stdlib.js" value="stdlib.js"/>
|
<property name="compiled.stdlib.js" value="stdlib.js"/>
|
||||||
<property name="compiled.stdlib.meta.js" value="kotlin.meta.js"/>
|
<property name="compiled.stdlib.meta.js" value="kotlin.meta.js"/>
|
||||||
<property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData"/>
|
<property name="stdlib.js.dir" value="${basedir}/js/js.libraries/src/js"/>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
The compiler produced on the first step of the build (Bootstrap No Tests) is only guaranteed to work against the OLD runtime
|
The compiler produced on the first step of the build (Bootstrap No Tests) is only guaranteed to work against the OLD runtime
|
||||||
@@ -366,16 +367,16 @@
|
|||||||
output="${js.stdlib.output.dir}/kotlin.js"
|
output="${js.stdlib.output.dir}/kotlin.js"
|
||||||
outputWrapperFile="${stdlib.js.dir}/closure-wrapper.txt">
|
outputWrapperFile="${stdlib.js.dir}/closure-wrapper.txt">
|
||||||
|
|
||||||
<sources dir="${stdlib.js.dir}">
|
<path>
|
||||||
<file name="kotlin_lib_ecma5.js"/>
|
<fileset dir="${stdlib.js.dir}">
|
||||||
<file name="kotlin_lib.js"/>
|
<include name="**/*.js"/>
|
||||||
<file name="long.js"/>
|
<exclude name="externs.js"/>
|
||||||
</sources>
|
</fileset>
|
||||||
|
<fileset dir="${js.stdlib.output.dir}">
|
||||||
<sources dir="${js.stdlib.output.dir}">
|
<include name="${compiled.builtins.js}"/>
|
||||||
<file name="builtins.js"/>
|
<include name="${compiled.stdlib.js}"/>
|
||||||
<file name="${compiled.stdlib.js}"/>
|
</fileset>
|
||||||
</sources>
|
</path>
|
||||||
|
|
||||||
<externs dir="${stdlib.js.dir}">
|
<externs dir="${stdlib.js.dir}">
|
||||||
<file name="externs.js"/>
|
<file name="externs.js"/>
|
||||||
@@ -426,7 +427,7 @@
|
|||||||
</src>
|
</src>
|
||||||
</new-kotlin2js>
|
</new-kotlin2js>
|
||||||
|
|
||||||
<move file="${js.stdlib.output.dir}/tmp-builtins/kotlin.js" tofile="${js.stdlib.output.dir}/builtins.js" />
|
<move file="${js.stdlib.output.dir}/tmp-builtins/kotlin.js" tofile="${js.stdlib.output.dir}/${compiled.builtins.js}" />
|
||||||
<move file="${js.stdlib.output.dir}/tmp/kotlin.js" tofile="${js.stdlib.output.dir}/${compiled.stdlib.js}" />
|
<move file="${js.stdlib.output.dir}/tmp/kotlin.js" tofile="${js.stdlib.output.dir}/${compiled.stdlib.js}" />
|
||||||
<move file="${js.stdlib.output.dir}/tmp/kotlin" todir="${js.stdlib.output.dir}" />
|
<move file="${js.stdlib.output.dir}/tmp/kotlin" todir="${js.stdlib.output.dir}" />
|
||||||
<move file="${js.stdlib.output.dir}/tmp/${compiled.stdlib.meta.js}" tofile="${js.stdlib.output.dir}/${compiled.stdlib.meta.js}" />
|
<move file="${js.stdlib.output.dir}/tmp/${compiled.stdlib.meta.js}" tofile="${js.stdlib.output.dir}/${compiled.stdlib.meta.js}" />
|
||||||
|
|||||||
Reference in New Issue
Block a user