[Junit-devel] CVS: junit build.xml,1.25,1.25.2.1

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27118

Modified Files:
      Tag: Version431
	build.xml 
Log Message:
[Junit-trackers] [ junit-Bugs-1686931 ] JUnit 4.3 contains samples and tests in junit-4.3[-src].jar 


Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build.xml,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- build.xml	20 Mar 2007 14:12:23 -0000	1.25
+++ build.xml	27 Mar 2007 19:00:43 -0000	1.25.2.1
@@ -6,13 +6,14 @@
 	<property name="dist"  value="junit${version}" />
 	<property name="versionfile"  value="${src}/junit/runner/Version.java" />
 	<property name="zipfile"  value="${dist}.zip" />
-	<property name="testfiles" value="junit/samples/**, junit/tests/**" />
+	<property name="testfiles" value="junit/samples/**, junit/tests/**, org/junit/samples/**, org/junit/tests/**" />
 	<property name="unjarred" value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
-	<property name="jarfile" value="junit-${version}.jar" />
+	<property name="binjar" value="junit-${version}.jar" />
+	<property name="srcjar" value="junit-${version}-src.jar" />
 	<property name="javadocdir" value="${dist}/javadoc" />
 	<property name="javadoczip" value="${dist}-javadoc.zip" />
 	<property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners" />
-	
+
 	<target name="init">
 		<tstamp/>
 	</target>
@@ -27,6 +28,16 @@
 		/>
 	</target>
 
+	<target name="clean">
+		<delete dir="${dist}" quiet="true" />
+		<delete file="${zipfile}" quiet="true"/>
+		<delete>
+			<fileset dir="${basedir}" includes="**/*.class" />
+		</delete>
+
+		<delete file="${javadoczip}" />
+	</target>
+
 	<target name="build" depends="versiontag">
 		<mkdir dir="${bin}"/>
 		<javac 
@@ -37,57 +48,26 @@
 			<compilerarg value="-Xlint:unchecked" />
 		</javac>
 	</target>
-
-	<target name="distributeTestsAndExamples">
-		<copy todir="${dist}/${dir}">
-			<fileset dir="${bin}/${dir}" includes="${testfiles}" />
-			<fileset dir="${src}/${dir}" includes="${testfiles}" />
-		</copy>
-	</target>
-
-	<target name="populate-dist" depends="clean, build">
-		<delete dir="${dist}" />
+		
+	<target name="jars">
 		<mkdir dir="${dist}" />
 		<jar 
-			jarfile="${dist}/junit-${version}-src.jar"
+			jarfile="${dist}/${srcjar}"
 			basedir="${src}"
 			excludes="${unjarred}, **/*.class"
 		/>
 		<jar 
-			jarfile="${dist}/${jarfile}"
+			jarfile="${dist}/${binjar}"
 			basedir="${bin}"
 			excludes="${unjarred}, **/*.java, build.xml"
 		/>
-		<antcall target="distributeTestsAndExamples">
-			<param name="dir" value="." />
-		</antcall>
-		<antcall target="distributeTestsAndExamples">
-			<param name="dir" value="org" />
-		</antcall>
-
-		<antcall target="javadoc" />
-
-		<copy todir="${dist}/doc">
-			<fileset dir="doc"/>
-		</copy>
-		<copy file="README.html" tofile="${dist}/README.html" />
-		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
-	</target>
-
-	<target name="dist" depends="populate-dist">
-		<java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
-			<arg value="org.junit.tests.AllTests"/>
-			<classpath>
-				<pathelement location="${dist}" />
-				<pathelement location="${dist}/${jarfile}" />
-			</classpath>
-		</java>
 	</target>
 
-	<target name="javadoczip">
-		<delete file="${javadoczip}" />
-		<antcall target="javadoc" />
-		<zip basedir="${javadocdir}" file="${javadoczip}" />
+	<target name="samples-and-tests">
+		<copy todir="${dist}">
+			<fileset dir="${bin}" includes="${testfiles}" />
+			<fileset dir="${src}" includes="${testfiles}" />
+		</copy>
 	</target>
 
 	<target name="javadoc">
@@ -103,18 +83,34 @@
 		/>
 	</target>
 
-	<target name="zip" depends="dist">
-		<zip zipfile="${zipfile}" basedir="." includes="${dist}/**" />
+	<target name="javadoczip">
+		<delete file="${javadoczip}" />
+		<antcall target="javadoc" />
+		<zip basedir="${javadocdir}" file="${javadoczip}" />
+	</target>
+	
+	<target name="populate-dist" 
+		    depends="clean, build, jars, samples-and-tests, javadoc"
+	>
+		<copy todir="${dist}/doc">
+			<fileset dir="doc"/>
+		</copy>
+		<copy file="README.html" tofile="${dist}/README.html" />
+		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
 	</target>
 
-	<target name="clean">
-		<delete dir="${dist}" quiet="true" />
-		<delete file="${zipfile}" quiet="true"/>
-		<delete>
-			<fileset dir="${basedir}" includes="**/*.class" />
-		</delete>
+	<target name="dist" depends="populate-dist">
+		<java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
+			<arg value="org.junit.tests.AllTests"/>
+			<classpath>
+				<pathelement location="${dist}" />
+				<pathelement location="${dist}/${binjar}" />
+			</classpath>
+		</java>
+	</target>
 
-		<delete file="${javadoczip}" />
+	<target name="zip" depends="dist">
+		<zip zipfile="${zipfile}" basedir="." includes="${dist}/**" />
 	</target>
 
 	<target name="upload.to.sourceforge" depends="zip">