From 8f6b12d296e117f072c31750c10fb24ae34dd85e Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Thu, 2 Oct 2014 23:16:25 +0400
Subject: [PATCH] Fixed maven build

---
 build.xml                                   | 42 +++----------
 jslib_files.xml                             | 33 ++++++++++
 libraries/pom.xml                           |  1 -
 libraries/tools/kotlin-js-library/build.xml | 23 +++++++
 libraries/tools/kotlin-js-library/pom.xml   | 68 +--------------------
 5 files changed, 65 insertions(+), 102 deletions(-)
 create mode 100644 jslib_files.xml
 create mode 100644 libraries/tools/kotlin-js-library/build.xml

diff --git a/build.xml b/build.xml
index 8b6fbabb726..a9fdbfc6a71 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,6 @@
 <project name="Kotlin" default="dist">
+    <include file="jslib_files.xml" />
+
     <property file="resources/manifest.properties"/>
 
     <!-- Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build -->
@@ -216,42 +218,14 @@
     </target>
 
     <target name="jslib">
-        <path id="js.lib">
-            <fileset dir="${basedir}/js/js.libraries/src">
-                <include name="**/*.kt" />
-            </fileset>
-
-            <fileset dir="${basedir}/core/reflection/src">
-                <include name="kotlin/**"/>
-            </fileset>
-
-            <fileset dir="${basedir}/libraries/stdlib/src">
-                <include name="**/*.kt" />
-
-                <!-- JVM specific -->
-                <exclude name="**/*JVM.kt" />
-                <exclude name="kotlin/jvm/**" />
-                <exclude name="kotlin/beans/**" />
-                <exclude name="kotlin/browser/**" />
-                <exclude name="kotlin/concurrent/**" />
-                <exclude name="kotlin/io/**" />
-                <exclude name="kotlin/math/**" />
-                <exclude name="kotlin/template/**" />
-                <exclude name="kotlin/util/**" />
-
-                <!-- Temporary disabled -->
-                <!--TODO fix: (84, 27) Unresolved reference: copyOf (_SpecialJVM.kt)-->
-                <exclude name="kotlin/collections/ImmutableArrayList.kt" />
-
-                <!-- TODO fix: AllModules is subclass of ThreadLocal. -->
-                <exclude name="kotlin/modules/**" />
-            </fileset>
-        </path>
-
-        <kotlin2js srcRef="js.lib" output="${basedir}/js/js.translator/testData/kotlin_lib_compiled.js" main="noCall" />
+        <kotlin2js output="${basedir}/js/js.translator/testData/kotlin_lib_compiled.js" main="noCall">
+            <src>
+                <resources refid="js.lib.files" />
+            </src>
+        </kotlin2js>
 
         <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
-            <path refid="js.lib" />
+            <resources refid="js.lib.files" />
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
 
             <manifest>
diff --git a/jslib_files.xml b/jslib_files.xml
new file mode 100644
index 00000000000..3a8a50de0bf
--- /dev/null
+++ b/jslib_files.xml
@@ -0,0 +1,33 @@
+<project>
+    <union id="js.lib.files">
+        <fileset dir="${basedir}/js/js.libraries/src">
+            <include name="**/*.kt" />
+        </fileset>
+
+        <fileset dir="${basedir}/core/reflection/src">
+            <include name="kotlin/**/*.kt"/>
+        </fileset>
+
+        <fileset dir="${basedir}/libraries/stdlib/src">
+            <include name="**/*.kt" />
+
+            <!-- JVM specific -->
+            <exclude name="**/*JVM.kt" />
+            <exclude name="kotlin/jvm/**" />
+            <exclude name="kotlin/beans/**" />
+            <exclude name="kotlin/browser/**" />
+            <exclude name="kotlin/concurrent/**" />
+            <exclude name="kotlin/io/**" />
+            <exclude name="kotlin/math/**" />
+            <exclude name="kotlin/template/**" />
+            <exclude name="kotlin/util/**" />
+
+            <!-- Temporary disabled -->
+            <!--TODO fix: (84, 27) Unresolved reference: copyOf (_SpecialJVM.kt)-->
+            <exclude name="kotlin/collections/ImmutableArrayList.kt" />
+
+            <!-- TODO fix: AllModules is subclass of ThreadLocal. -->
+            <exclude name="kotlin/modules/**" />
+        </fileset>
+    </union>
+</project>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 6068b15a657..2c64d020372 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -48,7 +48,6 @@
         <junit-version>4.10</junit-version>
         <kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version>
         <kotlin-dist>${project-root}/dist</kotlin-dist>
-        <kotlin-js-lib-srcdir>${project-root}/js/js.libraries/src</kotlin-js-lib-srcdir>
         <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
diff --git a/libraries/tools/kotlin-js-library/build.xml b/libraries/tools/kotlin-js-library/build.xml
new file mode 100644
index 00000000000..3e588643b79
--- /dev/null
+++ b/libraries/tools/kotlin-js-library/build.xml
@@ -0,0 +1,23 @@
+<project name="maven-antrun-" default="main">
+
+<import file="${basedir}/jslib_files.xml"/>
+
+<target name="main">
+    <delete dir="${project.build.directory}/classes" failonerror="false" />
+    <delete dir="${project.build.directory}/generated-js-library" failonerror="false" />
+
+    <copy todir="${project.build.directory}/generated-js-library">
+        <resources refid="js.lib.files" />
+    </copy>
+
+    <copy tofile="${project.build.directory}/generated-js-library/kotlin-maps.js"
+          file="${basedir}/js/js.translator/testData/maps.js"/>
+    <copy tofile="${project.build.directory}/generated-js-library/kotlin-long.js"
+          file="${basedir}/js/js.translator/testData/long.js"/>
+    <copy tofile="${project.build.directory}/generated-js-library/kotlin-lib.js"
+          file="${basedir}/js/js.translator/testData/kotlin_lib.js"/>
+    <copy tofile="${project.build.directory}/generated-js-library/kotlin-lib-ecma5.js"
+          file="${basedir}/js/js.translator/testData/kotlin_lib_ecma5.js"/>
+
+</target>
+</project>
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index 4bc6de5e258..9717a1894e3 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -27,73 +27,7 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <target>
-                                <delete dir="${project.build.directory}/classes" failonerror="false" />
-                                <delete dir="${project.build.directory}/generated-js-library" failonerror="false" />
-                                <delete dir="${project.build.directory}/generated-js-definitions" failonerror="false" />
-
-                                <mkdir dir="${basedir}/target/generated-js-library"/>
-                                <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"/>
-                                    </fileset>
-                                    <fileset dir="${basedir}/../../../core/reflection/src">
-                                        <include name="kotlin/**"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="${basedir}/target/generated-js-library">
-                                    <fileset dir="${kotlin-js-lib-srcdir}">
-                                        <include name="**/*Code.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/test">
-                                        <include name="**/*.kt"/>
-                                        <exclude name="**/*JVM.kt"/>
-                                    </fileset>
-                                    <fileset dir="${basedir}/../../stdlib/src/kotlin">
-                                        <include name="Preconditions.kt"/>
-                                        <include name="Functions.kt"/>
-                                        <include name="Integers.kt"/>
-                                        <include name="collections/AbstractIterator.kt"/>
-                                        <include name="collections/Iterators.kt"/>
-                                        <include name="collections/Arrays.kt"/>
-                                        <include name="collections/JUtil.kt"/>
-                                        <include name="collections/Maps.kt"/>
-                                        <include name="collections/Exceptions.kt"/>
-                                        <include name="collections/Stream.kt"/>
-                                        <include name="collections/MutableCollections.kt"/>
-                                        <include name="Functions.kt"/>
-<!--
-                                        <include name="Ordering.kt"/>
--->
-                                        <include name="Standard.kt"/>
-                                        <include name="text/Strings.kt"/>
-                                        <include name="text/StringBuilder.kt"/>
-                                    </fileset>
-                                    <fileset dir="${basedir}/../../stdlib/src/generated">
-                                        <include name="*.kt"/>
-                                        <exclude name="*JVM.kt"/>
-                                        <exclude name="DownTo.kt"/>
-<!--
-                                        <include name="IteratorsFromJLangIterables.kt"/>
-                                        <include name="IterablesFromCollections.kt"/>
--->
-                                    </fileset>
-                                </copy>
-                                <copy tofile="${basedir}/target/generated-js-library/kotlin-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"
-                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib.js"/>
-                               <copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma5.js"
-                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib_ecma5.js"/>
+                                <ant antfile="${basedir}/build.xml" dir="${project-root}"/>
                             </target>
                         </configuration>
                         <goals>