From d08570b8a8015adb9a46ed9abc08fd693d70e0cb Mon Sep 17 00:00:00 2001
From: ligee <ilya.chernikov@jetbrains.com>
Date: Thu, 2 Jul 2015 15:33:11 +0200
Subject: [PATCH] Adding new target - embeddable compiler (after jarjar), using
 it in the gradle plugin (cherry picked from commit bf4b26f)

---
 build.xml                                     | 10 ++
 .../kotlin-gradle-subplugin-example/pom.xml   |  2 +-
 libraries/pom.xml                             |  1 +
 .../tools/kotlin-compiler-embeddable/pom.xml  | 91 +++++++++++++++++++
 .../tools/kotlin-gradle-plugin-core/pom.xml   |  2 +-
 5 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 libraries/tools/kotlin-compiler-embeddable/pom.xml

diff --git a/build.xml b/build.xml
index f3478978e65..cc882df6aca 100644
--- a/build.xml
+++ b/build.xml
@@ -534,6 +534,16 @@
                 <attribute name="Main-Class" value="org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"/>
             </manifest>
         </jar>
+
+        <delete file="${output}/kotlin-compiler-embeddable.jar" failonerror="false"/>
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="dependencies/jarjar.jar"/>
+        <jarjar jarfile="${output}/kotlin-compiler-embeddable.jar" filesonly="true" filesetmanifest="merge">
+            <zipfileset src="${kotlin-home}/lib/kotlin-compiler.jar" includes="**"/>
+            <zipfileset src="${bootstrap.runtime}" includes="**" excludes="META-INF/**"/>
+            <zipfileset src="${bootstrap.reflect}" includes="**" excludes="META-INF/**"/>
+            <rule pattern="com.google.**" result="kotlin.compiler.jvm.internal.impl.com.google.protobuf.@1"/>
+            <rule pattern="javax.inject.**" result="kotlin.compiler.jvm.internal.impl.javax.inject.@1"/>
+        </jarjar>
     </target>
 
     <target name="android-compiler-plugin">
diff --git a/libraries/examples/kotlin-gradle-subplugin-example/pom.xml b/libraries/examples/kotlin-gradle-subplugin-example/pom.xml
index d2553cece8f..aed881a7690 100644
--- a/libraries/examples/kotlin-gradle-subplugin-example/pom.xml
+++ b/libraries/examples/kotlin-gradle-subplugin-example/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-compiler</artifactId>
+            <artifactId>kotlin-compiler-embeddable</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index c497fef5835..d2047e03b5c 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -72,6 +72,7 @@
 
     <modules>
         <module>tools/kotlin-compiler</module>
+        <module>tools/kotlin-compiler-embeddable</module>
         <module>tools/kotlin-jdk-annotations</module>
         <module>tools/kotlin-android-sdk-annotations</module>
         <module>tools/kotlin-maven-plugin</module>
diff --git a/libraries/tools/kotlin-compiler-embeddable/pom.xml b/libraries/tools/kotlin-compiler-embeddable/pom.xml
new file mode 100644
index 00000000000..7a00b991c88
--- /dev/null
+++ b/libraries/tools/kotlin-compiler-embeddable/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
+        <maven.version>3.0.4</maven.version>
+    </properties>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>kotlin-compiler-embeddable</artifactId>
+    <packaging>jar</packaging>
+
+    <description>the Kotlin compiler embeddable</description>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${kotlin-dist}/kotlin-compiler-sources.jar</file>
+                                    <type>jar</type>
+                                    <classifier>sources</classifier>
+                                </artifact>
+                                <artifact>
+                                    <file>${kotlin-dist}/kotlin-compiler-javadoc.jar</file>
+                                    <type>jar</type>
+                                    <classifier>javadoc</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>attach-empty-javadoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <skipAttach>true</skipAttach>
+                        </configuration>
+                    </execution>
+
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-jar</id>
+                        <phase>compile</phase>
+                        <configuration>
+                            <tasks>
+                                <copy file="${kotlin-dist}/kotlin-compiler-embeddable.jar"
+                                      tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
+                                      overwrite="true" verbose="true"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
diff --git a/libraries/tools/kotlin-gradle-plugin-core/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/pom.xml
index 8636d5d7c2a..62c431995ac 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/pom.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-compiler</artifactId>
+            <artifactId>kotlin-compiler-embeddable</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>