From e7dc7ec005b1525490c98260a69244f4bb3ce972 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 8 Apr 2017 11:22:05 +0300
Subject: [PATCH] Rebuild sources for kotlin-daemon-client and
 compiler-client-embeddable in maven build

Do not build these sources in ant.
Do not require them as artifact dependencies.
---
 build.xml                                     | 28 -------------------
 .../kotlin-compiler-client-embeddable/pom.xml | 19 ++++++-------
 libraries/tools/kotlin-daemon-client/pom.xml  | 17 +++++------
 3 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/build.xml b/build.xml
index c6a96c57dad..7d7bfe85aac 100644
--- a/build.xml
+++ b/build.xml
@@ -576,20 +576,6 @@
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
-
-        <jar jarfile="${output}/kotlin-daemon-client-sources.jar">
-            <fileset dir="compiler/daemon/daemon-common/src"/>
-            <fileset dir="compiler/daemon/daemon-client/src"/>
-            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.daemon.client.sources}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
     </target>
 
     <target name="compiler-client-embeddable">
@@ -624,20 +610,6 @@
                 <attribute name="Class-Path" value="kotlin-stdlib.jar"/>
             </manifest>
         </jarjar>
-
-        <jar jarfile="${output}/kotlin-compiler-client-embeddable-sources.jar">
-            <fileset dir="compiler/cli/cli-common/src"/>
-            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-            <zipfileset src="${output}/kotlin-daemon-client-sources.jar"/>
-
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler.client.embeddable.sources}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
     </target>
 
     <target name="android-extensions-compiler">
diff --git a/libraries/tools/kotlin-compiler-client-embeddable/pom.xml b/libraries/tools/kotlin-compiler-client-embeddable/pom.xml
index 163d3370e37..91049f342cb 100644
--- a/libraries/tools/kotlin-compiler-client-embeddable/pom.xml
+++ b/libraries/tools/kotlin-compiler-client-embeddable/pom.xml
@@ -29,19 +29,17 @@
                 <version>1.7</version>
                 <executions>
                     <execution>
-                        <id>attach-artifacts</id>
-                        <phase>compile</phase>
+                        <id>add-sources</id>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>attach-artifact</goal>
+                            <goal>add-source</goal>
                         </goals>
                         <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${kotlin-dist}/kotlin-compiler-client-embeddable-sources.jar</file>
-                                    <type>jar</type>
-                                    <classifier>sources</classifier>
-                                </artifact>
-                            </artifacts>
+                            <sources>
+                                <source>${basedir}/../../../compiler/cli/cli-common/src</source>
+                                <source>${basedir}/../../../compiler/daemon/daemon-common/src</source>
+                                <source>${basedir}/../../../compiler/daemon/daemon-client/src</source>
+                            </sources>
                         </configuration>
                     </execution>
 
@@ -55,6 +53,7 @@
                 </executions>
             </plugin>
 
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
diff --git a/libraries/tools/kotlin-daemon-client/pom.xml b/libraries/tools/kotlin-daemon-client/pom.xml
index e57d95f4785..ba0158bd063 100644
--- a/libraries/tools/kotlin-daemon-client/pom.xml
+++ b/libraries/tools/kotlin-daemon-client/pom.xml
@@ -30,19 +30,16 @@
                 <version>1.7</version>
                 <executions>
                     <execution>
-                        <id>attach-artifacts</id>
-                        <phase>compile</phase>
+                        <id>add-sources</id>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>attach-artifact</goal>
+                            <goal>add-source</goal>
                         </goals>
                         <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${kotlin-dist}/kotlin-daemon-client-sources.jar</file>
-                                    <type>jar</type>
-                                    <classifier>sources</classifier>
-                                </artifact>
-                            </artifacts>
+                            <sources>
+                                <source>${basedir}/../../../compiler/daemon/daemon-common/src</source>
+                                <source>${basedir}/../../../compiler/daemon/daemon-client/src</source>
+                            </sources>
                         </configuration>
                     </execution>