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

include the maps.js standard JS file in the maven plugin (fixing up issues caused by the refactoring of kotlin_lib.js into 2 files)

Browse Source
This commit is contained in:
James Strachan
2012-10-25 16:56:13 +01:00
parent bf489c9ed8
commit 0506708e70
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-js-library/pom.xml
+2
View File
@@ -79,6 +79,8 @@
-->
</fileset>
</copy>
<copy tofile="${basedir}/target/generated-js-library/kotlin-maps.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/maps.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma3.js"
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+3
View File
@@ -40,6 +40,7 @@ import java.util.List;
* @noinspection UnusedDeclaration
*/
public class K2JSCompilerMojo extends KotlinCompileMojo {
public static final String KOTLIN_JS_MAPS = "kotlin-maps.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_ECMA5 = "kotlin-lib-ecma5.js";
@@ -96,6 +97,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
StringBuilder builder = new StringBuilder();
appendFile(KOTLIN_JS_LIB_ECMA3, builder);
appendFile(KOTLIN_JS_LIB, builder);
appendFile(KOTLIN_JS_MAPS, builder);
builder.append("\n");
builder.append(text);
Files.write(builder.toString(), file, charset);
@@ -106,6 +108,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
if (copyLibraryJS != null && copyLibraryJS.booleanValue()) {
getLog().info("Copying kotlin JS library to " + outputKotlinJSDir);
copyJsLibraryFile(KOTLIN_JS_MAPS);
copyJsLibraryFile(KOTLIN_JS_LIB);
copyJsLibraryFile(KOTLIN_JS_LIB_ECMA3);
copyJsLibraryFile(KOTLIN_JS_LIB_ECMA5);