Permalink
Browse files

Just use "junit.jar" instead of "junit4.jar"

  • Loading branch information...
1 parent 8fdf8aa commit ffcce13161e0ff3d162f6ffc5901f3b40d942f18 @purcell committed Sep 15, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 build.xml
View
@@ -10,7 +10,7 @@
<property name="javadoc.header" value='For updates and more see &lt;a target="_top" href="http://jargs.sourceforge.net/"&gt;jargs.sourceforge.net&lt;/a&gt;'/>
<property name="javadoc.bottom" value='Copyright &amp;copy; 2001-2003 Steve Purcell. Copyright &amp;copy; 2002 Vidar Holen. Copyright &amp;copy; 2002 Michal Ceresna. Copyright &amp;copy; 2005 Ewan Mellor. Copyright (c) 2010-2012 penSec.IT UG (haftungsbeschränkt). Released under the terms of the BSD licence.'/>
<property name="javadoc.packages" value="jargs.gnu"/>
- <property name="junit4.jar" value="/usr/share/java/junit4.jar"/>
+ <property name="junit.jar" value="/usr/share/java/junit.jar"/>
@penSecIT

penSecIT Sep 15, 2012

Contributor

Hi @purcell,

at least on Ubuntu 12.04 /usr/share/java/junit.jar contains JUnit 3.x, while JUnit 4.x can be found in /usr/share/java/junit4.jar

@purcell

purcell Sep 15, 2012

Owner

The path on my platform is different; the latest junit is always at /usr/share/java/junit.jar. Given that this can't automatically work the same everywhere, I prefer to assume that the junit.jar is a recent one. I guess that the properties can be overridden on the ant command line if necessary.

@penSecIT

penSecIT Sep 15, 2012

Contributor

Yes, I agree :-)

<target name="build" description="Build and test Jargs."
depends="compile,jars,javadoc,test" />
@@ -29,7 +29,7 @@
<mkdir dir="classes"/>
<javac destdir="${build.classes}" debug="${debug}"
source="${source-version}" target="${jdk-version}">
- <classpath path="${build.classes}:${junit4.jar}:${java.class.path}"/>
+ <classpath path="${build.classes}:${junit.jar}:${java.class.path}"/>
<src path="${build.src}/jargs/test" />
</javac>
</target>
@@ -61,7 +61,7 @@
<target name="test" depends="compile,compile-test">
<java classname="org.junit.runner.JUnitCore"
- classpath="${build.classes}:${junit4.jar}:${java.class.path}" >
+ classpath="${build.classes}:${junit.jar}:${java.class.path}" >
<arg value="jargs.test.gnu.AllTests"/>
</java>
</target>
@@ -97,7 +97,7 @@
footer="${javadoc.header}"
bottom="${javadoc.bottom}">
<package name="**.*" />
- <classpath path="${build.classes}:${junit4.jar}:${java.class.path}"/>
+ <classpath path="${build.classes}:${junit.jar}:${java.class.path}"/>
</javadoc>
</target>

0 comments on commit ffcce13

Please sign in to comment.