From 5da08b2bbc7864c3845a61dd5d4cd1a0595f60a0 Mon Sep 17 00:00:00 2001
From: Evgeny Goldin <evgenyg@gmail.com>
Date: Wed, 7 Mar 2012 21:31:32 +0100
Subject: [PATCH 1/3] Build tools - "testlib-tests" task is commented out.

---
 build-tools/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-tools/build.xml b/build-tools/build.xml
index 50d59149b9c..66c9a2dcc2d 100644
--- a/build-tools/build.xml
+++ b/build-tools/build.xml
@@ -310,7 +310,7 @@
                 <then>
                     <!-- Batch tests -->
                     <if>
-                        <matches string="@{classpath}" pattern="/.jar$"/>
+                        <matches string="@{classpath}" pattern="\.jar$"/>
                         <then>
                             <!-- Batch tests from a jar -->
                             <echo>Running JUnit: classpath = "@{classpath}" (Jar)</echo>
@@ -488,7 +488,7 @@
         <hello-tests/>
         <longer-examples-tests/>
         <module-tests/>
-        <testlib-tests/>
+        <!--<testlib-tests/>-->
         <compilation-fail-test/>
     </target>
 </project>

From 96fad2693e3678e86d50e6d6a05c5289a4b66a81 Mon Sep 17 00:00:00 2001
From: Evgeny Goldin <evgenyg@gmail.com>
Date: Thu, 8 Mar 2012 02:21:38 +0100
Subject: [PATCH 2/3] 
 <kotlin-maven-plugin.version>0.2.3.8-beta-8</kotlin-maven-plugin.version>;
 "localKotlin" profile added - when activated "${kotlin-sdk}/lib" files are
 used.

---
 libraries/pom.xml | 80 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 67 insertions(+), 13 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index b767bc3c687..e4fa597ba82 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -13,11 +13,16 @@
     <properties>
         <junit-version>4.9</junit-version>
         <kotlin-compiler.version>0.2.3.8</kotlin-compiler.version>
-        <kotlin-maven-plugin.version>0.2.3.8-beta-7</kotlin-maven-plugin.version>
-        <kotlin-sdk>${project.basedir}/../../dist/kotlinc</kotlin-sdk>
-        <pegdown.version>1.1.0</pegdown.version>
+        <kotlin-maven-plugin.version>0.2.3.8-beta-8</kotlin-maven-plugin.version>
         <project-root>${project.basedir}/..</project-root>
+        <kotlin-sdk>${project-root}/../dist/kotlinc</kotlin-sdk>
+        <pegdown.version>1.1.0</pegdown.version>
         <surefire-version>2.5</surefire-version>
+
+        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+        <!-- Not to be used manually! Set to "true" by identically named profile, see below. -->
+        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+        <localKotlin>false</localKotlin>
     </properties>
 
     <repositories>
@@ -35,15 +40,6 @@
     </pluginRepositories>
 
     <dependencies>
-        <!-- TODO a dirty hack until we have the artifacts in a mvn repo -->
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-compiler</artifactId>
-            <version>${kotlin-compiler.version}</version>
-            <scope>system</scope>
-            <systemPath>${kotlin-sdk}/lib/kotlin-compiler.jar</systemPath>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -52,6 +48,7 @@
         </dependency>
     </dependencies>
 
+
     <modules>
         <module>stdlib</module>
         <module>kunit</module>
@@ -77,6 +74,7 @@
                             </goals>
                             <phase>initialize</phase>
                             <configuration>
+                                <runIf>{{ ! Boolean.valueOf( localKotlin ) }}</runIf>
                                 <ivyconf>${project-root}/etc/ivyconf.xml</ivyconf>
                                 <dependencies>
                                     <dependency>
@@ -108,7 +106,7 @@
                             <id>compile-kotlin-sources</id>
                             <goals>
                                 <goal>compile</goal>
-                                <goal>testCompile</goal>
+                                <!--<goal>testCompile</goal>-->
                             </goals>
                         </execution>
                     </executions>
@@ -135,4 +133,60 @@
         </plugins>
     </build>
 
+    <profiles>
+      <profile>
+        <id>localKotlin</id>
+
+        <properties>
+          <localKotlin>true</localKotlin>
+        </properties>
+
+        <build>
+          <pluginManagement>
+            <plugins>
+              <plugin>
+                  <groupId>com.goldin.plugins</groupId>
+                  <artifactId>kotlin-maven-plugin</artifactId>
+                  <version>${kotlin-maven-plugin.version}</version>
+                  <configuration>
+                    <kotlinJars>
+                      <jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
+                      <jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
+                      <jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
+                      <jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
+                      <jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
+                      <jar>${kotlin-sdk}/lib/trove4j.jar</jar>
+                    </kotlinJars>
+                  </configuration>
+              </plugin>
+            </plugins>
+          </pluginManagement>
+        </build>
+
+        <dependencies>
+          <dependency>
+              <groupId>org.jetbrains.kotlin</groupId>
+              <artifactId>kotlin-compiler</artifactId>
+              <version>${kotlin-compiler.version}</version>
+              <scope>system</scope>
+              <systemPath>${kotlin-sdk}/lib/kotlin-compiler.jar</systemPath>
+          </dependency>
+          <dependency>
+              <groupId>org.jetbrains.kotlin</groupId>
+              <artifactId>kotlin-runtime</artifactId>
+              <version>${kotlin-compiler.version}</version>
+              <scope>system</scope>
+              <systemPath>${kotlin-sdk}/lib/kotlin-runtime.jar</systemPath>
+          </dependency>
+          <dependency>
+              <groupId>org.jetbrains.kotlin</groupId>
+              <artifactId>intellij-core</artifactId>
+              <version>${kotlin-compiler.version}</version>
+              <scope>system</scope>
+              <systemPath>${kotlin-sdk}/lib/intellij-core.jar</systemPath>
+          </dependency>
+        </dependencies>
+      </profile>
+    </profiles>
+
 </project>

From 0a0cfcf6c59df0e80db10b419a7f4fbec168073a Mon Sep 17 00:00:00 2001
From: Evgeny Goldin <evgenyg@gmail.com>
Date: Thu, 8 Mar 2012 02:28:17 +0100
Subject: [PATCH 3/3] Libraries - "kotlin-compiler" dependency added.

---
 libraries/pom.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index e4fa597ba82..d14371bab5b 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -79,9 +79,9 @@
                                 <dependencies>
                                     <dependency>
                                         <groupId>ivy.org</groupId>
-                                        <artifactId>bt343</artifactId>
+                                        <artifactId>bt344</artifactId>
                                         <version>latest.lastSuccessful</version>
-                                        <classifier>core/intellij-core</classifier>
+                                        <classifier>kotlin-compiler</classifier>
                                     </dependency>
                                     <dependency>
                                         <groupId>ivy.org</groupId>
@@ -89,6 +89,12 @@
                                         <version>latest.lastSuccessful</version>
                                         <classifier>kotlin-runtime</classifier>
                                     </dependency>
+                                    <dependency>
+                                        <groupId>ivy.org</groupId>
+                                        <artifactId>bt343</artifactId>
+                                        <version>latest.lastSuccessful</version>
+                                        <classifier>core/intellij-core</classifier>
+                                    </dependency>
                                 </dependencies>
                                 <scope>compile</scope>
                                 <verbose>true</verbose>