[freenet-cvs] r11461 - trunk/freenet

[nextgens at freenetproject.org]

Author: nextgens
Date: 2006-12-17 13:46:50 +0000 (Sun, 17 Dec 2006)
New Revision: 11461

Modified:
   trunk/freenet/build.xml
Log:
build.xml: We ought to do junit testing only if available. (resolves 1023: ant now depends on junit and always builds the 'test' files)

Modified: trunk/freenet/build.xml
===================================================================
--- trunk/freenet/build.xml	2006-12-17 12:06:34 UTC (rev 11460)
+++ trunk/freenet/build.xml	2006-12-17 13:46:50 UTC (rev 11461)
@@ -18,6 +18,7 @@
 	<property name="svn.revision" value="@custom@"/>
 	<property name="CSSTokenizerFilter.relative.jflex" value="freenet/clients/http/filter/CSSTokenizerFilter.jflex"/>
 	<property name="CSSTokenizerFilter.java" value="${src}/freenet/clients/http/filter/CSSTokenizerFilter.java"/>
+	<property name="junit.location" value="/usr/share/java/junit.jar"/>
 
 
 	<target name="mkdir">
@@ -29,6 +30,7 @@
 	<target name="env" depends="mkdir"   description="Learn about the environment">
 		<available file="${lib}/freenet-ext.jar" property="freenet-ext.present"/>
 		<available file="${CSSTokenizerFilter.java}" property="CSSTokenizerFilter.present"/>
+		<available file="${junit.location}" property="junit.present"/>
 	</target>
 
 	<target name="generate-CSSTokenizerFilter" depends="env" unless="CSSTokenizerFilter.present">
@@ -122,7 +124,7 @@
 		</javac>
 	</target>
 
-	<target name="unit" depends="unit-build">
+	<target name="unit" depends="unit-build" if="junit.present">
 		<junit printsummary="yes" fork="yes" haltonfailure="yes">
 			<classpath>
 				<pathelement path="${build}"/>