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

JS backend: prepare long.js for use in translator

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-09-25 12:02:29 +04:00
parent f42d7319a5
commit d1d722546e
5 changed files with 794 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+1
View File
@@ -251,6 +251,7 @@
<file name="kotlin_lib_ecma5.js"/> <file name="kotlin_lib_ecma5.js"/>
<file name="kotlin_lib.js"/> <file name="kotlin_lib.js"/>
<file name="maps.js"/> <file name="maps.js"/>
<file name="long.js"/>
</sources> </sources>
</closure-compiler> </closure-compiler>
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
+1
View File
@@ -173,6 +173,7 @@ public final class RhinoUtils {
runFileWithRhino(getKotlinLibFile(version), context, scope); runFileWithRhino(getKotlinLibFile(version), context, scope);
runFileWithRhino(pathToTestFilesRoot() + "kotlin_lib.js", context, scope); runFileWithRhino(pathToTestFilesRoot() + "kotlin_lib.js", context, scope);
runFileWithRhino(pathToTestFilesRoot() + "maps.js", context, scope); runFileWithRhino(pathToTestFilesRoot() + "maps.js", context, scope);
runFileWithRhino(pathToTestFilesRoot() + "long.js", context, scope);
runFileWithRhino(pathToTestFilesRoot() + "jshint.js", context, scope); runFileWithRhino(pathToTestFilesRoot() + "jshint.js", context, scope);
for (String jsLibrary : jsLibraries) { for (String jsLibrary : jsLibraries) {
runFileWithRhino(jsLibrary, context, scope); runFileWithRhino(jsLibrary, context, scope);
js/js.translator/testData/long.js
+787 -761
View File
File diff suppressed because it is too large Load Diff
libraries/tools/kotlin-js-library/pom.xml
+2
View File
@@ -88,6 +88,8 @@
</copy> </copy>
<copy tofile="${basedir}/target/generated-js-library/kotlin-maps.js" <copy tofile="${basedir}/target/generated-js-library/kotlin-maps.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testData/maps.js"/> file="${kotlin-js-lib-srcdir}/../../js.translator/testData/maps.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-long.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testData/long.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js" <copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib.js"/> file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma5.js" <copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma5.js"
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+3
View File
@@ -42,6 +42,7 @@ import java.util.List;
*/ */
public class K2JSCompilerMojo extends KotlinCompileMojo { public class K2JSCompilerMojo extends KotlinCompileMojo {
public static final String KOTLIN_JS_MAPS = "kotlin-maps.js"; public static final String KOTLIN_JS_MAPS = "kotlin-maps.js";
public static final String KOTLIN_JS_LONG = "kotlin-long.js";
public static final String KOTLIN_JS_LIB = "kotlin-lib.js"; public static final String KOTLIN_JS_LIB = "kotlin-lib.js";
public static final String KOTLIN_JS_LIB_ECMA3 = "kotlin-lib-ecma3.js"; public static final String KOTLIN_JS_LIB_ECMA3 = "kotlin-lib-ecma3.js";
public static final String KOTLIN_JS_LIB_ECMA5 = "kotlin-lib-ecma5.js"; public static final String KOTLIN_JS_LIB_ECMA5 = "kotlin-lib-ecma5.js";
@@ -91,6 +92,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
appendFile(KOTLIN_JS_LIB_ECMA3, builder); appendFile(KOTLIN_JS_LIB_ECMA3, builder);
appendFile(KOTLIN_JS_LIB, builder); appendFile(KOTLIN_JS_LIB, builder);
appendFile(KOTLIN_JS_MAPS, builder); appendFile(KOTLIN_JS_MAPS, builder);
appendFile(KOTLIN_JS_LONG, builder);
builder.append("\n"); builder.append("\n");
builder.append(text); builder.append(text);
Files.write(builder.toString(), file, charset); Files.write(builder.toString(), file, charset);
@@ -102,6 +104,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
getLog().info("Copying kotlin JS library to " + outputKotlinJSDir); getLog().info("Copying kotlin JS library to " + outputKotlinJSDir);
copyJsLibraryFile(KOTLIN_JS_MAPS); copyJsLibraryFile(KOTLIN_JS_MAPS);
copyJsLibraryFile(KOTLIN_JS_LONG);
copyJsLibraryFile(KOTLIN_JS_LIB); copyJsLibraryFile(KOTLIN_JS_LIB);
copyJsLibraryFile(KOTLIN_JS_LIB_ECMA3); copyJsLibraryFile(KOTLIN_JS_LIB_ECMA3);
copyJsLibraryFile(KOTLIN_JS_LIB_ECMA5); copyJsLibraryFile(KOTLIN_JS_LIB_ECMA5);