[Junit-devel] CVS: junit build.xml,1.5,1.6

[Erik M. <em...@us...>]

Update of /cvsroot/junit/junit
In directory usw-pr-cvs1:/tmp/cvs-serv19460

Modified Files:
	build.xml 
Log Message:
Close bug #496519, thanks to Scott Stirling.  Added a clean target, fixed
the hardcoded values in the zip target by making the target dependent on
the init target.


Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build.xml	2001/05/21 19:50:15	1.5
+++ build.xml	2002/02/06 20:42:19	1.6
@@ -45,12 +45,21 @@
 		<copy todir="${dist}/junit/tests">
 			<fileset dir="junit/tests" />
 		</copy>
+
+
+<delete file="${dist}/junit/tests/runner/test.jar"/> 
+<jar jarfile="${dist}/junit/tests/runner/test.jar" 
+basedir="." 
+
+includes="junit/tests/runner/LoadedFromJar.class"/> 
+<!--
 		<delete file="${dist}/junit/tests/test.jar"/>
 		<jar 
 			jarfile="${dist}/junit/tests/test.jar"
 			basedir="."
 			includes="junit/tests/LoadedFromJar.class"
 		/>
+-->
 		<mkdir dir="${dist}/javadoc" />
 		<javadoc 
 			sourcepath="."
@@ -75,12 +84,11 @@
 		</java>
 	</target>
 	
-	<target name="zip">
-		<!-- !!! hard code names, variable substitution doesn't work !!! -->
+	<target name="zip" depends="init">
 		<zip 
-			zipfile="junit3.6.zip"
+			zipfile="${zipfile}"
 			basedir="."
-			includes="junit3.6/**"
+			includes="${dist}/**"
 		/>
 	</target>
 	
@@ -102,5 +110,13 @@
 				<pathelement location="${dist}/junit.jar" />
 			</classpath>
 		</java>
+	</target>
+
+	<target name="clean" depends="init">
+		<delete dir="${dist}" quiet="true"/>			
+		<delete file="${zipfile}" quiet="true"/> 
+		<delete>
+			<fileset dir="${basedir}" includes="**/*.class" /> 
+		</delete>
 	</target>
 </project>