From b71101942e288ddb44a66d9af58ba4901b5e4cc9 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Mon, 1 Dec 2014 19:07:15 +0300
Subject: [PATCH] JS backend: maven projects: extract library js-files to
 target/js/lib, set scope=test for stdlib in browser-example*

---
 .../browser-example-with-library/pom.xml      |  8 +++---
 .../browser-example-with-library/sample.html  |  4 +--
 libraries/examples/browser-example/pom.xml    | 22 ++++++----------
 .../examples/browser-example/sample.html      |  2 +-
 libraries/tools/kotlin-js-library/pom.xml     | 26 +++----------------
 libraries/tools/kotlin-js-tests/pom.xml       |  2 +-
 .../kotlin-js-tests/src/test/web/index.html   |  4 +--
 7 files changed, 21 insertions(+), 47 deletions(-)

diff --git a/libraries/examples/browser-example-with-library/pom.xml b/libraries/examples/browser-example-with-library/pom.xml
index 3cbd3741aca..af2afb1ef1b 100644
--- a/libraries/examples/browser-example-with-library/pom.xml
+++ b/libraries/examples/browser-example-with-library/pom.xml
@@ -26,13 +26,13 @@
             <version>${project.version}</version>
         </dependency>
 
+        <!-- testing -->
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
             <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
-
-        <!-- testing -->
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
@@ -90,14 +90,14 @@
                                     <groupId>org.jetbrains.kotlin</groupId>
                                     <artifactId>kotlin-js-library</artifactId>
                                     <version>${project.version}</version>
-                                    <outputDirectory>${project.build.directory}/js</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
                                     <includes>*.js</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.jetbrains.kotlin</groupId>
                                     <artifactId>kotlin-js-library-example</artifactId>
                                     <version>${project.version}</version>
-                                    <outputDirectory>${project.build.directory}/js</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
                                     <includes>*.js</includes>
                                 </artifactItem>
                             </artifactItems>
diff --git a/libraries/examples/browser-example-with-library/sample.html b/libraries/examples/browser-example-with-library/sample.html
index 8b9fa333d20..0c3cf97a246 100644
--- a/libraries/examples/browser-example-with-library/sample.html
+++ b/libraries/examples/browser-example-with-library/sample.html
@@ -9,8 +9,8 @@
 </div>
 
 <script type="text/javascript" src="src/js/jquery.js"></script>
-<script src="target/js/kotlin.js"></script>
-<script src="target/js/kotlin-js-library-example.js"></script>
+<script src="target/js/lib/kotlin.js"></script>
+<script src="target/js/lib/kotlin-js-library-example.js"></script>
 <script type="text/javascript" src="target/js/browser-example-with-library.js"></script>
 
 <!--
diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml
index f034dea84ff..4943f8841a6 100644
--- a/libraries/examples/browser-example/pom.xml
+++ b/libraries/examples/browser-example/pom.xml
@@ -17,11 +17,17 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
+            <artifactId>kotlin-js-library</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- testing -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
@@ -34,11 +40,6 @@
             <version>${selenium.version}</version>
             <scope>test</scope>
         </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-js-library</artifactId>
-                <version>${project.version}</version>
-            </dependency>
     </dependencies>
 
     <build>
@@ -58,13 +59,6 @@
                             <goal>js</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>test-compile</id>
                         <phase>test-compile</phase>
@@ -91,7 +85,7 @@
                                     <groupId>org.jetbrains.kotlin</groupId>
                                     <artifactId>kotlin-js-library</artifactId>
                                     <version>${project.version}</version>
-                                    <outputDirectory>${project.build.directory}/js</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
                                     <includes>*.js</includes>
                                 </artifactItem>
                             </artifactItems>
diff --git a/libraries/examples/browser-example/sample.html b/libraries/examples/browser-example/sample.html
index 869440d86c5..f8c59c90eaf 100644
--- a/libraries/examples/browser-example/sample.html
+++ b/libraries/examples/browser-example/sample.html
@@ -9,7 +9,7 @@
 </div>
 
 <script type="text/javascript" src="src/js/jquery.js"></script>
-<script src="target/js/kotlin.js"></script>
+<script src="target/js/lib/kotlin.js"></script>
 <script type="text/javascript" src="target/js/browser-example.js"></script>
 
 <!--
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index f80c6e0e50f..07b4e4f6dd2 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -29,6 +29,9 @@
                                 <copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib.jar"
                                       tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
                                       overwrite="true" verbose="true"/>
+                                <copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar"
+                                      tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar"
+                                      overwrite="true" verbose="true"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -37,29 +40,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <version>2.3.1</version>
-                <executions>
-                    <execution>
-                        <id>install-library</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                        <configuration>
-                            <file>${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar</file>
-                            <classifier>sources</classifier>
-                            <groupId>${groupId}</groupId>
-                            <artifactId>${artifactId}</artifactId>
-                            <version>${version}</version>
-                            <packaging>jar</packaging>
-                            <generatePom>false</generatePom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/libraries/tools/kotlin-js-tests/pom.xml b/libraries/tools/kotlin-js-tests/pom.xml
index 943bde501cc..1e325c7354d 100644
--- a/libraries/tools/kotlin-js-tests/pom.xml
+++ b/libraries/tools/kotlin-js-tests/pom.xml
@@ -125,7 +125,7 @@
                                     <groupId>org.jetbrains.kotlin</groupId>
                                     <artifactId>kotlin-js-library</artifactId>
                                     <version>${project.version}</version>
-                                    <outputDirectory>${project.build.directory}/js</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
                                     <includes>*.js</includes>
                                 </artifactItem>
                             </artifactItems>
diff --git a/libraries/tools/kotlin-js-tests/src/test/web/index.html b/libraries/tools/kotlin-js-tests/src/test/web/index.html
index 2ad5550d054..16d00a9ba59 100644
--- a/libraries/tools/kotlin-js-tests/src/test/web/index.html
+++ b/libraries/tools/kotlin-js-tests/src/test/web/index.html
@@ -7,8 +7,8 @@
 
     <script src="qunit.js"></script>
 
-    <script src="../../../target/js/kotlin.js"></script>
-    <script src="../../../target/js/kotlin-js-tests.js"></script>
+    <script src="../../../target/js/lib/kotlin.js"></script>
+    <script src="../../../target/js/lib/kotlin-js-tests.js"></script>
 
     <script src="deepEqual.js"></script>
     <script src="swarminject.js"></script>