started compiling more of the kotlin library to JS; now testing the String methods in JS

This commit is contained in:
James Strachan
2012-06-19 07:23:42 -05:00
parent 33b5e46201
commit 071e276e08
18 changed files with 705 additions and 362 deletions
+10
View File
@@ -32,6 +32,7 @@
<copy todir="${basedir}/target/generated-js-definitions">
<fileset dir="${kotlin-js-lib-srcdir}">
<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"/>
@@ -39,18 +40,23 @@
<exclude name="dom/html5/canvas.kt"/>
<exclude name="dom/html/window.kt"/>
<exclude name="stdlib/test.kt"/>
<exclude name="stdlib/dom.kt"/>
</fileset>
</copy>
<copy todir="${basedir}/target/generated-js-library">
<fileset dir="${kotlin-js-lib-srcdir}">
<include name="stdlib/test.kt"/>
<include name="stdlib/dom.kt"/>
<include name="core/strings.kt"/>
</fileset>
</copy>
<copy todir="${basedir}/target/generated-js-library/kotlin">
<!--
<fileset dir="${basedir}/../../stdlib/src/kotlin/dom">
<include name="**/*.kt"/>
<exclude name="**/*JVM.kt"/>
</fileset>
-->
<fileset dir="${basedir}/../../stdlib/src/kotlin/support">
<include name="**/*.kt"/>
<exclude name="**/*JVM.kt"/>
@@ -61,6 +67,10 @@
</fileset>
<fileset dir="${basedir}/../../stdlib/src/kotlin">
<include name="Preconditions.kt"/>
<!--
<include name="Ordering.kt"/>
-->
<include name="Strings.kt"/>
</fileset>
</copy>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js"
+12
View File
@@ -39,10 +39,22 @@
<target>
<mkdir dir="${basedir}/target/tests"/>
<copy todir="${basedir}/target/tests">
<!--
<fileset dir="${basedir}/../../stdlib/test/js">
<include name="**/*.kt"/>
<exclude name="**/*JVM.kt"/>
</fileset>
-->
<!--
<fileset dir="${basedir}/../../stdlib/test/dom">
<include name="**/*.kt"/>
<exclude name="**/DomBuilderTest.kt"/>
<exclude name="**/*JVM.kt"/>
</fileset>
-->
<fileset dir="${basedir}/../../stdlib/test">
<include name="StringTest.kt"/>
</fileset>
</copy>
</target>
</configuration>
+28
View File
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kotlin-js-tools</artifactId>
<packaging>pom</packaging>
<description>
A project to make it easier to compile and test the JS standard library as a single, repeatable build
</description>
<modules>
<module>kotlin-js-library</module>
<module>kotlin-js-tests</module>
<module>kotlin-js-tests-junit</module>
</modules>
</project>