From 135034ea865846a7f7ce51de87aad11d736a6fd1 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 8 Oct 2013 17:15:55 +0400
Subject: [PATCH] Use <withKotlin/> instead of a separate task

---
 build.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 8234aaa266a..455ce077218 100644
--- a/build.xml
+++ b/build.xml
@@ -33,7 +33,7 @@
         <fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
     </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 name="javac2" classname="org.apache.tools.ant.taskdefs.Javac"/>
@@ -310,15 +310,10 @@
 
         <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}">
+            <withKotlin/>
             <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
-            <classpath path="${output}/classes/compiler"/>
         </javac2>
 
         <pack_compiler jarfile="${output}/kotlin-compiler-before-shrink.jar"/>