refactored the JS kotlin code so that we've a simple naming convention (*Code.kt") to refer to library code which needs to generate JS code to separate those files from the pure definitions which just refer to existing JS code already - this will help make it easier to keep the maven build and the js test cases in sync

This commit is contained in:
James Strachan
2012-07-05 10:34:00 +01:00
parent 038f79a77a
commit 925e5b2236
12 changed files with 93 additions and 66 deletions
+10 -9
View File
@@ -31,25 +31,20 @@
<mkdir dir="${basedir}/target/generated-js-definitions"/>
<copy todir="${basedir}/target/generated-js-definitions">
<fileset dir="${kotlin-js-lib-srcdir}">
<exclude name="**/*Code.kt"/>
<exclude name="core/dom/core.kt"/>
<exclude name="core/strings.kt"/>
<exclude name="html5/localstorage.kt"/>
<exclude name="jquery/common.kt"/>
<exclude name="jquery/ui.kt"/>
<exclude name="dom/html/htmlcore.kt"/>
<exclude name="dom/html5/canvas.kt"/>
<exclude name="dom/html/window.kt"/>
<exclude name="stdlib/test.kt"/>
<exclude name="stdlib/dom.kt"/>
<exclude name="stdlib/jutil.kt"/>
</fileset>
</copy>
<copy todir="${basedir}/target/generated-js-library">
<fileset dir="${kotlin-js-lib-srcdir}">
<include name="stdlib/test.kt"/>
<include name="stdlib/jutil.kt"/>
<include name="stdlib/dom.kt"/>
<include name="core/strings.kt"/>
<include name="**/*Code.kt"/>
<exclude name="**/JUtilMapsCode.kt"/>
</fileset>
</copy>
<copy todir="${basedir}/target/generated-js-library/kotlin">
@@ -70,16 +65,22 @@
<include name="Iterators.kt"/>
<include name="JUtil.kt"/>
<include name="JUtilCollections.kt"/>
<!--
<include name="JUtilMaps.kt"/>
-->
<include name="JLangIterables.kt"/>
<include name="JLangIterablesLazy.kt"/>
<include name="JLangIterablesSpecial.kt"/>
<include name="JLangIterablesSpecial.kkt"/>
<!--
<include name="Ordering.kt"/>
-->
<include name="Standard.kt"/>
<include name="Strings.kt"/>
</fileset>
<fileset dir="${basedir}/../../stdlib/src/generated">
<include name="JUtilIteratorsFromJLangIterables.kt"/>
<include name="JUtilIterablesFromJUtilCollections.kt"/>
</fileset>
</copy>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib.js"/>