azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebuild sources for kotlin-daemon-client and compiler-client-embeddable in maven build

Browse Source 
Do not build these sources in ant.
Do not require them as artifact dependencies.
This commit is contained in:
Ilya Gorbunov
2017-04-08 11:22:05 +03:00
parent 5aabcb6ea3
commit e7dc7ec005
3 changed files with 16 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
-28
View File
@@ -576,20 +576,6 @@
<attribute name="Implementation-Version" value="${build.number}"/> <attribute name="Implementation-Version" value="${build.number}"/>
</manifest> </manifest>
</jar> </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>
<target name="compiler-client-embeddable"> <target name="compiler-client-embeddable">
@@ -624,20 +610,6 @@
<attribute name="Class-Path" value="kotlin-stdlib.jar"/> <attribute name="Class-Path" value="kotlin-stdlib.jar"/>
</manifest> </manifest>
</jarjar> </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>
<target name="android-extensions-compiler"> <target name="android-extensions-compiler">
libraries/tools/kotlin-compiler-client-embeddable/pom.xml
+9 -10
View File
@@ -29,19 +29,17 @@
<version>1.7</version> <version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>attach-artifacts</id> <id>add-sources</id>
<phase>compile</phase> <phase>prepare-package</phase>
<goals> <goals>
<goal>attach-artifact</goal> <goal>add-source</goal>
</goals> </goals>
<configuration> <configuration>
<artifacts> <sources>
<artifact> <source>${basedir}/../../../compiler/cli/cli-common/src</source>
<file>${kotlin-dist}/kotlin-compiler-client-embeddable-sources.jar</file> <source>${basedir}/../../../compiler/daemon/daemon-common/src</source>
<type>jar</type> <source>${basedir}/../../../compiler/daemon/daemon-client/src</source>
<classifier>sources</classifier> </sources>
</artifact>
</artifacts>
</configuration> </configuration>
</execution> </execution>
@@ -55,6 +53,7 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
libraries/tools/kotlin-daemon-client/pom.xml
+7 -10
View File
@@ -30,19 +30,16 @@
<version>1.7</version> <version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>attach-artifacts</id> <id>add-sources</id>
<phase>compile</phase> <phase>prepare-package</phase>
<goals> <goals>
<goal>attach-artifact</goal> <goal>add-source</goal>
</goals> </goals>
<configuration> <configuration>
<artifacts> <sources>
<artifact> <source>${basedir}/../../../compiler/daemon/daemon-common/src</source>
<file>${kotlin-dist}/kotlin-daemon-client-sources.jar</file> <source>${basedir}/../../../compiler/daemon/daemon-client/src</source>
<type>jar</type> </sources>
<classifier>sources</classifier>
</artifact>
</artifacts>
</configuration> </configuration>
</execution> </execution>