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

Use <withKotlin/> instead of a separate task

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-08 17:15:55 +04:00
parent cfc07c300f
commit 135034ea86
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+2 -7
View File
@@ -33,7 +33,7 @@
<fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/> <fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
</path> </path>
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${boostrap.compiler.home}/lib/kotlin-ant.jar"/> <typedef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${boostrap.compiler.home}/lib/kotlin-ant.jar"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
<taskdef name="javac2" classname="org.apache.tools.ant.taskdefs.Javac"/> <taskdef name="javac2" classname="org.apache.tools.ant.taskdefs.Javac"/>
@@ -310,15 +310,10 @@
<cleandir dir="${output}/classes/compiler"/> <cleandir dir="${output}/classes/compiler"/>
<kotlinc output="${output}/classes/compiler">
<src refid="compilerSources.path"/>
<classpath refid="classpath"/>
</kotlinc>
<javac2 destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}"> <javac2 destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}">
<withKotlin/>
<src refid="compilerSources.path"/> <src refid="compilerSources.path"/>
<classpath refid="classpath"/> <classpath refid="classpath"/>
<classpath path="${output}/classes/compiler"/>
</javac2> </javac2>
<pack_compiler jarfile="${output}/kotlin-compiler-before-shrink.jar"/> <pack_compiler jarfile="${output}/kotlin-compiler-before-shrink.jar"/>