From 2898abb245c4e5ff1b2656f3ef6ffd446356bbca Mon Sep 17 00:00:00 2001 From: James Strachan Date: Tue, 29 May 2012 08:49:36 +0100 Subject: [PATCH] simplified the kotlin-js-library source generation so we can selectively include some of the kotlin standard library for use in JS compilation --- libraries/pom.xml | 4 ++ libraries/tools/kotlin-js-library/pom.xml | 38 ++++++++++++++++++- .../kotlin/maven/JSSourceJarMojo.java | 3 -- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/libraries/pom.xml b/libraries/pom.xml index ecb2b2fcc82..93e80eca007 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -64,8 +64,12 @@ docs/website examples/kotlin-java-example + + diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml index dcf97563e80..89d0d59ca94 100644 --- a/libraries/tools/kotlin-js-library/pom.xml +++ b/libraries/tools/kotlin-js-library/pom.xml @@ -17,12 +17,48 @@ + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + copy-sources + process-sources + + + + + + + + + + + + + + + + + + + + + + run + + + + + org.jetbrains.kotlin kotlin-maven-plugin ${project.version} - ${kotlin-js-lib-srcdir} + ${basedir}/target/generated-js-library diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/JSSourceJarMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/JSSourceJarMojo.java index 15ae9c920c5..647e8355ddb 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/JSSourceJarMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/JSSourceJarMojo.java @@ -46,9 +46,6 @@ public class JSSourceJarMojo extends AbstractMojo { FileUtils.copyDirectoryStructure(librarySourceDir, outputDir); - // lets copy the standard JS library source too - FileUtils.copyFile(new File(librarySourceDir, "../../js.translator/testFiles/kotlin_lib.js"), new File(outputDir, "kotlin-lib.js")); - // now lets generate the META-INF/services/org.jetbrains.kotlin.js.librarySource file PrintWriter writer = new PrintWriter(new FileWriter(metaInfFile)); appendSourceFiles(writer, outputDir.getCanonicalPath(), outputDir);