From 8f5eb028400783eb7c6c829c3dfae505a770ddb4 Mon Sep 17 00:00:00 2001
From: Oliver Burn <oliver@puppycrawl.com>
Date: Fri, 1 Feb 2002 02:48:29 +0000
Subject: [PATCH] Changed so you no longer need to have ANTLR in your classpath
 when running ANT. This cleans up the really ugly hack of using the
 reverseloader + makes it easier to make build "out-of-the-box".

---
 build.xml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index ab9c2d838..097abedda 100644
--- a/build.xml
+++ b/build.xml
@@ -70,14 +70,30 @@
   <!-- ANTLR targets -->
   <!-- -->
 
-  <target name="antlr">
-    <antlr target="${checkstyle.dir}/java.g" dir="${checkstyle.dir}" />
+  <!-- Checks whether the grammar file is newer that the generated code -->
+  <target name="check.antlr">
+    <uptodate property="uptodate.antlr"
+              targetfile="${checkstyle.dir}/GeneratedJavaLexer.java" >
+      <srcfiles dir= "${checkstyle.dir}" includes="java.g"/>
+    </uptodate>
+  </target>
+
+  <!-- Conditionally will compile the grammar. Deliberately do not use the -->
+  <!-- <antlr> task as it required the ANTLR classes to be in the classpath -->
+  <!-- which creates lots of problems. -->
+  <target name="build.antlr" depends="check.antlr" unless="uptodate.antlr">
+    <java classname="antlr.Tool"
+          classpath="${antlr.home}"
+          fork="yes"
+          dir="${checkstyle.dir}">
+      <arg value="java.g" />
+    </java>
   </target>
 
   <!-- -->
   <!-- COMPILE TARGETS -->
   <!-- -->
-  <target name="compile.checkstyle" depends="antlr">
+  <target name="compile.checkstyle" depends="build.antlr">
     <mkdir dir="classes/checkstyle" />
     <depend srcdir="src/checkstyle" destdir="classes/checkstyle" closure="yes"/>
     <javac srcdir="src/checkstyle"
@@ -111,7 +127,7 @@
   </target>
 
   <target name="checkstyle.simple" depends="compile.tests">
-    <taskdef name="checkstyle" reverseloader="true"
+    <taskdef name="checkstyle"
              classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
       <classpath refid="run.classpath"/>
     </taskdef>
@@ -119,7 +135,7 @@
   </target>
 
   <target name="checkstyle.import" depends="compile.tests">
-      <taskdef name="checkstyle" reverseloader="true"
+      <taskdef name="checkstyle"
 	       classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
 	  <classpath refid="run.classpath"/>
       </taskdef>
@@ -130,7 +146,7 @@
   </target>
 
   <target name="checkstyle.checkstyle" depends="compile.checkstyle">
-    <taskdef name="checkstyle" reverseloader="true"
+    <taskdef name="checkstyle"
              classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
       <classpath refid="run.classpath"/>
     </taskdef>
@@ -150,7 +166,7 @@
   </target>
 
   <target name="checkstyle.noargs" depends="compile.checkstyle">
-    <taskdef name="checkstyle" reverseloader="true"
+    <taskdef name="checkstyle"
              classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
       <classpath refid="run.classpath"/>
     </taskdef>