From aaf31945ded520ceee4ec81637c6f3e0b4fa4449 Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Sun, 22 Sep 2013 11:41:07 +0400
Subject: [PATCH] Fix std lib generator: allow executing from command line.

---
 libraries/stdlib/ReadMe.md                |  6 ++--
 libraries/stdlib/pom.xml                  | 19 +-----------
 libraries/tools/kotlin-stdlib-gen/pom.xml | 35 +++++++++++++++++++++++
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/libraries/stdlib/ReadMe.md b/libraries/stdlib/ReadMe.md
index bfe5c6a96fd..da7440e97ae 100644
--- a/libraries/stdlib/ReadMe.md
+++ b/libraries/stdlib/ReadMe.md
@@ -8,7 +8,7 @@ We use some code generation to apply the various collection-like methods to vari
 
 To run the code generator from a kotlin checkout
 
-    cd libraries/stdlib
-    mvn test-compile exec:java
+    cd libraries/tools/kotlin-stdlib-gen
+    mvn compile exec:java
 
-This then runs the [GenerateStandardLib.kt](https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt) script to create the source from the files for java.lang.Iterable<T> and java.util.Collection etc.
\ No newline at end of file
+This then runs the [GenerateStandardLib.kt](https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt) script to create the source from the files for java.lang.Iterable<T> and java.util.Collection etc.
\ No newline at end of file
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index e539dcf82bb..0b03eac4279 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -26,24 +26,7 @@
         <testSourceDirectory>test</testSourceDirectory>
 
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.jetbrains.kotlin.tools.ToolsPackage</mainClass>
-                    <classpathScope>test</classpathScope>
-                </configuration>
-            </plugin>
-
-            <plugin>
+             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${project.version}</version>
diff --git a/libraries/tools/kotlin-stdlib-gen/pom.xml b/libraries/tools/kotlin-stdlib-gen/pom.xml
index 4184d4ff781..8c3bed54878 100644
--- a/libraries/tools/kotlin-stdlib-gen/pom.xml
+++ b/libraries/tools/kotlin-stdlib-gen/pom.xml
@@ -26,6 +26,7 @@
     </dependencies>
 
     <build>
+        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -33,6 +34,40 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>${exec-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>generators.GeneratorsPackage</mainClass>
+                    <classpathScope>compile</classpathScope>
+                    <arguments>
+                        <argument>${project.parent.basedir}/..</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
         </plugins>
     </build>