From 5f84e790dd0b1bdd13bd27d5ef78448897b9324d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 12 May 2010 00:25:55 +0200
Subject: Use gluegen's junit.jar and antlr.jar if not specified otherwise in
 /home/sven/gluegen.properties

---
 make/build-common.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'make/build-common.xml')

diff --git a/make/build-common.xml b/make/build-common.xml
index ca4e9aa79..fc53e951b 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -102,8 +102,8 @@
         <echo message="Loaded ${user.properties.file}." />
         <property file="${user.home}/gluegen.properties" />
         <echo message="Loaded ${user.home}/gluegen.properties." />
-        <fail message="antlr.jar was not specified in jogl.properties or gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
         <echo message="antlr.jar=${antlr.jar}" />
+        <echo message="junit.jar=${junit.jar}" />
 
         <property name="target.sourcelevel" value="1.4" />
         <property name="host.sourcelevel"   value="1.5" />
@@ -129,7 +129,6 @@
         <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
         <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
         <property name="gluegen.jar"                value="${build.gluegen}/gluegen.jar" />
-        <property name="junit.jar"                  value="${gluegen.make}/lib/junit-4.5.jar" />
         <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
         <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
 
-- 
cgit v1.2.3