From 3aa177fbeb2b6a54796f0adb676ced09b7a74ed8 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 18 Jul 2011 19:16:08 +0200
Subject: [PATCH] Run CE build script same way as a build server (fix missing
 javac error)

---
 build.xml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index fa2c7bd0ee23..a4d0df3a3172 100644
--- a/build.xml
+++ b/build.xml
@@ -16,21 +16,13 @@
   <macrodef name="call_gant">
     <attribute name="script" />
     <sequential>
-      <java failonerror="true" classname="org.apache.tools.ant.Main" fork="true">
-        <jvmarg line="-Xms64m -Xmx512m"/>
-        <jvmarg line="&quot;-Dgant.script=@{script}&quot;"/>
-        <jvmarg line="&quot;-Dteamcity.build.tempDir=${tmp.dir}&quot;"/>
-        <jvmarg line="&quot;-Didea.test.group=ALL_EXCLUDE_DEFINED&quot;"/>
-
-        <classpath>
-          <fileset dir="${project.home}/lib/ant/lib">
-            <include name="*.jar"/>
-          </fileset>
-          <fileset dir="${gant.home}/lib">
-            <include name="*.jar"/>
-          </fileset>
-        </classpath>
+      <java failonerror="true" jar="${project.home}/lib/ant/lib/ant-launcher.jar" fork="true">
+        <jvmarg line="-Xmx512m -XX:MaxPermSize=152m"/>
 
+        <arg line="&quot;-Dgant.script=@{script}&quot;"/>
+        <arg line="&quot;-Dteamcity.build.tempDir=${tmp.dir}&quot;"/>
+        <arg line="&quot;-Didea.test.group=ALL_EXCLUDE_DEFINED&quot;"/>
+        <arg line="-lib ${gant.home}/lib/"/>
         <arg value="-f"/>
         <arg value="${project.home}/build/gant.xml"/>
       </java>