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

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

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

Modified Files:
	build.xml 
Log Message:
Close bug #496521, thanks Scott Stirling.


Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- build.xml	2002/02/06 20:42:19	1.6
+++ build.xml	2002/02/06 21:12:01	1.7
@@ -1,11 +1,11 @@
-<!-- JUnit build script using ant 1.3 -->
+<!-- JUnit build script using ant 1.4 -->
 <project name="junit" default="dist" basedir=".">
+	<property name="version" value="3.7" />
+	<property name="dist"  value="junit${version}" />
+	<property name="versionfile"  value="junit/runner/Version.java" />
+	<property name="zipfile"  value="${dist}.zip" />
 	<target name="init">
 		<tstamp/>
-		<property name="version" value="3.7" />
-		<property name="dist"  value="junit${version}" />
-		<property name="versionfile"  value="junit/runner/Version.java" />
-		<property name="zipfile"  value="${dist}.zip" />
 	</target>
 
 	<target name="versiontag" depends="init">
@@ -32,12 +32,12 @@
 		<jar 
 			jarfile="${dist}/src.jar"
 			basedir="."
-			excludes="${dist}/src.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, build.xml"
+			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, .classpath, .vcm_meta"
 		/>
 		<jar 
 			jarfile="${dist}/junit.jar"
 			basedir="."
-			excludes="${dist}/junit.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html, jar-manifest.txt"
+			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html,  build.xml, jar-manifest.txt, .classpath, .vcm_meta"
 		/>
 		<copy todir="${dist}/junit/samples">
 			<fileset dir="junit/samples" />
@@ -47,19 +47,12 @@
 		</copy>
 
 
-<delete file="${dist}/junit/tests/runner/test.jar"/> 
-<jar jarfile="${dist}/junit/tests/runner/test.jar" 
-basedir="." 
+		<delete file="${dist}/junit/tests/runner/test.jar"/> 
+		<jar jarfile="${dist}/junit/tests/runner/test.jar" 
+	 	     basedir="." 
+		     includes="junit/tests/runner/LoadedFromJar.class"
+		 /> 
 
-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="."
@@ -84,7 +77,7 @@
 		</java>
 	</target>
 	
-	<target name="zip" depends="init">
+	<target name="zip" depends="dist">
 		<zip 
 			zipfile="${zipfile}"
 			basedir="."
@@ -112,7 +105,7 @@
 		</java>
 	</target>
 
-	<target name="clean" depends="init">
+	<target name="clean">
 		<delete dir="${dist}" quiet="true"/>			
 		<delete file="${zipfile}" quiet="true"/> 
 		<delete>