remove usages of ant-contrib from Ant build scripts
This commit is contained in:
Dmitry Jemerov
@@ -1,4 +1,4 @@
|
||||
<project name="Kotlin" default="dist">
|
||||
<project name="Kotlin" default="dist" xmlns:if="ant:if" xmlns:unless="ant:unless">
|
||||
<include file="jslib_files.xml" />
|
||||
|
||||
<property file="resources/kotlinManifest.properties"/>
|
||||
@@ -68,7 +68,6 @@
|
||||
</path>
|
||||
|
||||
<typedef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${bootstrap.compiler.home}/lib/kotlin-ant.jar"/>
|
||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${dependencies.dir}/ant-contrib.jar"/>
|
||||
|
||||
<path id="javac2.classpath">
|
||||
<pathelement location="${idea.sdk}/lib/javac2.jar"/>
|
||||
@@ -171,22 +170,20 @@
|
||||
|
||||
<chmod dir="${kotlin-home}/bin" excludes="**/*.bat" perm="755"/>
|
||||
|
||||
<if>
|
||||
<istrue value="${bootstrap.or.local.build}"/>
|
||||
<then>
|
||||
<copy file="${bootstrap.runtime}" tofile="${kotlin-home}/lib/kotlin-runtime-internal-bootstrap.jar"/>
|
||||
<copy file="${bootstrap.reflect}" tofile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar"/>
|
||||
<jar destfile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar" update="true">
|
||||
<manifest>
|
||||
<attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</then>
|
||||
<else>
|
||||
<copy file="${bootstrap.runtime}" todir="${kotlin-home}/lib"/>
|
||||
<copy file="${bootstrap.reflect}" todir="${kotlin-home}/lib"/>
|
||||
</else>
|
||||
</if>
|
||||
<sequential if:true="${bootstrap.or.local.build}">
|
||||
<copy file="${bootstrap.runtime}" tofile="${kotlin-home}/lib/kotlin-runtime-internal-bootstrap.jar"/>
|
||||
<copy file="${bootstrap.reflect}" tofile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar"/>
|
||||
<jar destfile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar" update="true">
|
||||
<manifest>
|
||||
<attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</sequential>
|
||||
|
||||
<sequential unless:true="${bootstrap.or.local.build}">
|
||||
<copy file="${bootstrap.runtime}" todir="${kotlin-home}/lib"/>
|
||||
<copy file="${bootstrap.reflect}" todir="${kotlin-home}/lib"/>
|
||||
</sequential>
|
||||
</target>
|
||||
|
||||
<target name="compiler-sources">
|
||||
@@ -226,42 +223,38 @@
|
||||
</manifest>
|
||||
</jar>
|
||||
|
||||
<if>
|
||||
<istrue value="${generate.javadoc}"/>
|
||||
<sequential if:true="${generate.javadoc}">
|
||||
<delete dir="${output}/kotlin-compiler-javadoc" failonerror="false"/>
|
||||
<javadoc destdir="${output}/kotlin-compiler-javadoc"
|
||||
sourcepathref="compilerSources.path"
|
||||
classpathref="classpath"
|
||||
linksource="yes"
|
||||
windowtitle="${manifest.impl.title.kotlin.compiler}"/>
|
||||
<jar jarfile="${output}/kotlin-compiler-javadoc.jar">
|
||||
<fileset dir="${output}/kotlin-compiler-javadoc"/>
|
||||
<zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
|
||||
|
||||
<then>
|
||||
<delete dir="${output}/kotlin-compiler-javadoc" failonerror="false"/>
|
||||
<javadoc destdir="${output}/kotlin-compiler-javadoc"
|
||||
sourcepathref="compilerSources.path"
|
||||
classpathref="classpath"
|
||||
linksource="yes"
|
||||
windowtitle="${manifest.impl.title.kotlin.compiler}"/>
|
||||
<jar jarfile="${output}/kotlin-compiler-javadoc.jar">
|
||||
<fileset dir="${output}/kotlin-compiler-javadoc"/>
|
||||
<zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
|
||||
<manifest>
|
||||
<attribute name="Built-By" value="${manifest.impl.vendor}"/>
|
||||
|
||||
<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.javadoc}"/>
|
||||
<attribute name="Implementation-Version" value="${build.number}"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</sequential>
|
||||
|
||||
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
|
||||
<attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler.javadoc}"/>
|
||||
<attribute name="Implementation-Version" value="${build.number}"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</then>
|
||||
<sequential unless:true="${generate.javadoc}">
|
||||
<jar jarfile="${output}/kotlin-compiler-javadoc.jar">
|
||||
<manifest>
|
||||
<attribute name="Built-By" value="${manifest.impl.vendor}"/>
|
||||
|
||||
<else>
|
||||
<jar jarfile="${output}/kotlin-compiler-javadoc.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.javadoc}"/>
|
||||
<attribute name="Implementation-Version" value="${build.number}"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</else>
|
||||
</if>
|
||||
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
|
||||
<attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler.javadoc}"/>
|
||||
<attribute name="Implementation-Version" value="${build.number}"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</sequential>
|
||||
</target>
|
||||
|
||||
<macrodef name="new-kotlin2js">
|
||||
@@ -511,24 +504,19 @@
|
||||
|
||||
<delete file="${kotlin-home}/lib/kotlin-compiler.jar" failonerror="false"/>
|
||||
|
||||
<if>
|
||||
<isfalse value="${shrink}"/>
|
||||
<copy file="${output}/kotlin-compiler-before-shrink.jar"
|
||||
tofile="${kotlin-home}/lib/kotlin-compiler.jar"
|
||||
unless:true="${shrink}" />
|
||||
|
||||
<then>
|
||||
<copy file="${output}/kotlin-compiler-before-shrink.jar"
|
||||
tofile="${kotlin-home}/lib/kotlin-compiler.jar"/>
|
||||
</then>
|
||||
<sequential if:true="${shrink}">
|
||||
<available property="rtjar" value="${java.home}/lib/rt.jar" file="${java.home}/lib/rt.jar"/>
|
||||
<available property="rtjar" value="${java.home}/../Classes/classes.jar" file="${java.home}/../Classes/classes.jar"/>
|
||||
|
||||
<else>
|
||||
<available property="rtjar" value="${java.home}/lib/rt.jar" file="${java.home}/lib/rt.jar"/>
|
||||
<available property="rtjar" value="${java.home}/../Classes/classes.jar" file="${java.home}/../Classes/classes.jar"/>
|
||||
<available property="jssejar" value="${java.home}/lib/jsse.jar" file="${java.home}/lib/jsse.jar"/>
|
||||
<available property="jssejar" value="${java.home}/../Classes/jsse.jar" file="${java.home}/../Classes/jsse.jar"/>
|
||||
|
||||
<available property="jssejar" value="${java.home}/lib/jsse.jar" file="${java.home}/lib/jsse.jar"/>
|
||||
<available property="jssejar" value="${java.home}/../Classes/jsse.jar" file="${java.home}/../Classes/jsse.jar"/>
|
||||
|
||||
<proguard configuration="${basedir}/compiler/compiler.pro"/>
|
||||
</else>
|
||||
</if>
|
||||
<proguard configuration="${basedir}/compiler/compiler.pro"/>
|
||||
</sequential>
|
||||
|
||||
<jar jarfile="${output}/kotlin-compiler-for-maven.jar">
|
||||
<!-- TODO: don't include both to the jar: it's impossible to test changes to core in the local maven build without bootstrap -->
|
||||
|
||||
Reference in New Issue
Block a user