From f1b6e93a0441a1d056ba6247c03277f87b089b73 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 5 Jan 2013 14:35:37 -0600
Subject: [PATCH] Revert "Ant build.xml: Faster build if we don't fork the
 ANTLR task"

This reverts commit 6e9129848eb9df5b015e07b8a84257295585c966.
---
 build.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 4f36d82a7..9b04a42a8 100644
--- a/build.xml
+++ b/build.xml
@@ -40,15 +40,12 @@ build.sysclasspath=ignore
 
 	<target name="antlr" depends="init">
 		<echo>parse grammars</echo>
-		<java classname="org.antlr.Tool" fork="false" failonerror="true">
+		<java classname="org.antlr.Tool" fork="true" failonerror="true" maxmemory="300m"
+			dir="${basedir}/tool/src/org/antlr/v4/parse">
 			<arg value="-verbose"/>
 			<arg value="-make"/>
 			<arg value="-o"/>
 			<arg value="${antlr3.gen.dir}/org/antlr/v4/parse"/>
-			<arg value="-in"/>
-			<arg value="${basedir}/tool/src/org/antlr/v4/parse"/>
-			<arg value="-lib"/>
-			<arg value="${basedir}/tool/src/org/antlr/v4/parse"/>
 			<arg value="ANTLRParser.g"/>
 			<arg value="ANTLRLexer.g"/>
 			<arg value="ActionSplitter.g"/>
@@ -63,13 +60,12 @@ build.sysclasspath=ignore
 		</java>
 
 		<echo>codegen grammars</echo>
-		<java classname="org.antlr.Tool" fork="false" failonerror="true">
+		<java classname="org.antlr.Tool" fork="true" failonerror="true" maxmemory="300m"
+			dir="${basedir}/tool/src/org/antlr/v4/codegen">
 			<arg value="-verbose"/>
 			<arg value="-make"/>
 			<arg value="-o"/>
 			<arg value="${antlr3.gen.dir}/org/antlr/v4/codegen"/>
-			<arg value="-in"/>
-			<arg value="${basedir}/tool/src/org/antlr/v4/codegen"/>
 			<arg value="-lib"/>
 			<arg value="${antlr3.gen.dir}/org/antlr/v4/parse"/>
 			<arg value="SourceGenTriggers.g"/>