diff options
| -rw-r--r-- | make/build-junit.xml | 5 | ||||
| -rwxr-xr-x | make/build.xml | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index da5fb53..de97027 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -174,17 +174,16 @@ </sequential> </macrodef> - <target name="junit.compile" depends="init"> + <target name="junit.compile.check" depends="init"> <uptodate property="junit.compile.skip"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${test.base.dir}" includes="**"/> <srcfiles file="${gluegen.jar}" /> <mapper type="merge" to="${gluegen-test.jar}"/> </uptodate> - <antcall target="junit.compile.impl" inheritRefs="true"/> </target> - <target name="junit.compile.impl" unless="junit.compile.skip"> + <target name="junit.compile" depends="junit.compile.check" unless="junit.compile.skip"> <antcall target="java.generate" inheritRefs="true"/> <antcall target="java.build" inheritRefs="true"/> <antcall target="native.build" inheritRefs="true"/> diff --git a/make/build.xml b/make/build.xml index a9a7d6a..e9333ab 100755 --- a/make/build.xml +++ b/make/build.xml @@ -11,6 +11,14 @@ --> <project name="GlueGen" basedir="." default="all"> + <fail message="Please build using Ant 1.8.0 or higher."> + <condition> + <not> + <antversion atleast="1.8.0"/> + </not> + </condition> + </fail> + <!-- This is the version of GlueGen you are building --> <property name="gluegen_base_version" value="1.0-beta07"/> @@ -482,7 +490,7 @@ </copy> </target> - <target name="gluegen.build" depends="init"> + <target name="gluegen.build.check" depends="init"> <uptodate property="gluegen.build.skip"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${src.java}" includes="**"/> @@ -490,10 +498,9 @@ <srcfiles dir= "${j.grammar}" includes="**/*.g"/> <mapper type="merge" to="${build}/gluegen.jar"/> </uptodate> - <antcall target="gluegen.build.impl" inheritRefs="true"/> </target> - <target name="gluegen.build.impl" unless="gluegen.build.skip"> + <target name="gluegen.build" depends="gluegen.build.check" unless="gluegen.build.skip"> <antcall target="pre-build" inheritRefs="true"/> <!-- Because ANTLR looks for importVocab files in the current |