From c495aabc055b1d74599995546e1abe19e1662bec Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Wed, 17 Feb 2010 22:44:34 +0000
Subject: [PATCH] clean up antlr build so that it doesn't re-build each time

---
 app/build.xml | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/app/build.xml b/app/build.xml
index c287f2ac3..3c92cd1c2 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -11,36 +11,20 @@
   </target>
 
   <target name="preproc" description="Compile ANTLR grammar">
-    <!-- invoke antlr manually instead of using the ant-task, 
-	 saves some trouble... -->
-    <java classpath="${basedir}/lib/antlr.jar" 
-	  classname="antlr.Tool" 
-	  failonerror="yes" 
-	  dir="${basedir}" 
-	  fork="yes">
-      <arg line="-o src/antlr/java src/antlr/java/java.g" />
-    </java>
+    <antlr target="${basedir}/src/antlr/java/java.g" 
+	   outputdirectory="${basedir}/src/antlr/java">
+      <classpath path="${basedir}/lib/antlr.jar" />
+    </antlr>
+
+    <!-- antlr wants this file nearby -->
     <copy todir="src/processing/app/preproc" 
 	  file="src/antlr/java/JavaTokenTypes.txt" />
 
-    <!-- This version does not work properly on Windows, 
-	 probably due to differences in how paths are handled. -->
-<!--
-    <java classpath="${basedir}/lib/antlr.jar" 
-	  classname="antlr.Tool" 
-	  failonerror="yes" 
-	  dir="${basedir}" 
-	  fork="yes">
-      <arg line="-o src/processing/app/preproc -glib src/antlr/java/java.g src/processing/app/preproc/pde.g" />
-    </java>
--->
-    <java classpath="${basedir}/lib/antlr.jar" 
-	  classname="antlr.Tool" 
-	  failonerror="yes" 
-	  dir="${basedir}/src/processing/app/preproc" 
-	  fork="yes">
-      <arg line="-glib ../../../antlr/java/java.g pde.g" />
-    </java>
+    <antlr target="${basedir}/src/processing/app/preproc/pde.g" 
+	   outputdirectory="${basedir}/src/processing/app/preproc"
+	   glib="${basedir}/src/antlr/java/java.g">
+      <classpath path="${basedir}/lib/antlr.jar" />
+    </antlr>
   </target>
 
   <target name="compile" depends="preproc" description="Compile sources">