ant task fixes + first integration test
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<project name="Kotlin" default="dist">
|
||||
|
||||
<!-- Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build -->
|
||||
<property name="shrink" value="false" />
|
||||
<property name="shrink" value="false"/>
|
||||
|
||||
<property name="output" value="${basedir}/dist"/>
|
||||
<property name="kotlin-home" value="${output}/kotlinc"/>
|
||||
@@ -155,11 +155,11 @@
|
||||
<delete file="${kotlin-home}/lib/kotlin-compiler.jar" failonerror="false"/>
|
||||
|
||||
<if>
|
||||
<isfalse value="${shrink}" />
|
||||
<isfalse value="${shrink}"/>
|
||||
|
||||
<then>
|
||||
<copy file="${output}/kotlin-compiler-jarjar.jar"
|
||||
tofile="${kotlin-home}/lib/kotlin-compiler.jar" />
|
||||
tofile="${kotlin-home}/lib/kotlin-compiler.jar"/>
|
||||
</then>
|
||||
|
||||
<else>
|
||||
@@ -267,10 +267,20 @@
|
||||
</classpath>
|
||||
</javac>
|
||||
|
||||
<delete file="${kotlin-home}/lib/kotlin-ant.jar" failonerror="false" />
|
||||
<delete file="${kotlin-home}/lib/kotlin-ant.jar" failonerror="false"/>
|
||||
<jar destfile="${kotlin-home}/lib/kotlin-ant.jar">
|
||||
<fileset dir="${output}/classes/buildTools"/>
|
||||
<fileset dir="${basedir}/build-tools/ant/src" includes="**/*.xml"/>
|
||||
|
||||
<manifest>
|
||||
<attribute name="Built-By" value="JetBrains"/>
|
||||
|
||||
<attribute name="Implementation-Vendor" value="JetBrains"/>
|
||||
<attribute name="Implementation-Title" value="Kotlin Compiler Ant Tasks"/>
|
||||
<attribute name="Implementation-Version" value="${build.number}"/>
|
||||
|
||||
<attribute name="Class-Path" value="kotlin-compiler.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
@@ -289,7 +299,7 @@
|
||||
<arg value="jdkHeaders"/>
|
||||
</java>
|
||||
|
||||
<delete file="${kotlin-home}/lib/alt/kotlin-jdk-headers.jar" failonerror="false" />
|
||||
<delete file="${kotlin-home}/lib/alt/kotlin-jdk-headers.jar" failonerror="false"/>
|
||||
<jar destfile="${kotlin-home}/lib/alt/kotlin-jdk-headers.jar">
|
||||
<fileset dir="${output}/classes/jdk-headers"/>
|
||||
</jar>
|
||||
@@ -317,7 +327,7 @@
|
||||
<arg value="${output}/classes/runtime"/>
|
||||
</java>
|
||||
|
||||
<delete file="${kotlin-home}/lib/kotlin-runtime.jar" failonerror="false" />
|
||||
<delete file="${kotlin-home}/lib/kotlin-runtime.jar" failonerror="false"/>
|
||||
<jar destfile="${kotlin-home}/lib/kotlin-runtime.jar">
|
||||
<fileset dir="${output}/classes/runtime"/>
|
||||
<fileset dir="${output}/classes/stdlib"/>
|
||||
|
||||
Reference in New Issue
Block a user