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".
This commit is contained in:
Oliver Burn 2002-02-01 02:48:29 +00:00
parent a5abed5101
commit 8f5eb02840
1 changed files with 23 additions and 7 deletions

View File

@ -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>