[Junit-devel] CVS: junit .classpath,1.8,1.9 build.xml,1.18,1.19

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

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

Modified Files:
	.classpath build.xml 
Log Message:
Created a separate src folder for sources, and adjusted Eclipse classpath and build file accordingly

Index: .classpath
===================================================================
RCS file: /cvsroot/junit/junit/.classpath,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- .classpath	17 Nov 2006 08:25:23 -0000	1.8
+++ .classpath	21 Nov 2006 18:53:41 -0000	1.9
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="bin/|doc/|junit4.*/**" kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- build.xml	16 Nov 2006 19:17:42 -0000	1.18
+++ build.xml	21 Nov 2006 18:53:41 -0000	1.19
@@ -1,10 +1,13 @@
 <project name="junit" default="dist" basedir=".">
 	<property file="${user.home}/.junit.properties" />
+	<property name="src" value="src" />
+	<property name="bin" value="bin" />
 	<property name="version" value="4.2" />
 	<property name="dist"  value="junit${version}" />
-	<property name="versionfile"  value="junit/runner/Version.java" />
+	<property name="versionfile"  value="${src}/junit/runner/Version.java" />
 	<property name="zipfile"  value="${dist}.zip" />
-	<property name="unjarred" value="**/*.jar, **/junit/tests/**, **/junit/samples/**, doc/**, README.html, .classpath, .project, cpl-v10.html" />
+	<property name="testfiles" value="junit/samples/**, junit/tests/**" />
+	<property name="unjarred" value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
 	<property name="jarfile" value="junit-${version}.jar" />
 	
 	<target name="init">
@@ -23,8 +26,8 @@
 
 	<target name="build" depends="versiontag">
 		<javac 
-			srcdir="."
-			destdir="."
+			srcdir="${src}"
+			destdir="${bin}"
 			debug="on"
   		>	
                   <compilerarg value="-Xlint:unchecked" />
@@ -33,7 +36,8 @@
 
         <target name="distributeTestsAndExamples">
         	<copy todir="${dist}/${dir}">
-                	<fileset dir="${dir}" includes="junit/samples/**, junit/tests/**" />
+                	<fileset dir="${bin}/${dir}" includes="${testfiles}" />
+                	<fileset dir="${src}/${dir}" includes="${testfiles}" />
                 </copy>
         </target>
 
@@ -42,12 +46,12 @@
 		<mkdir dir="${dist}" />
 		<jar 
 			jarfile="${dist}/junit-${version}-src.jar"
-			basedir="."
+			basedir="${src}"
 			excludes="${unjarred}, **/*.class"
 		/>
 		<jar 
 			jarfile="${dist}/${jarfile}"
-			basedir="."
+			basedir="${bin}"
 			excludes="${unjarred}, **/*.java, build.xml"
 		/>
                 <antcall target="distributeTestsAndExamples">
@@ -59,7 +63,7 @@
 
 		<mkdir dir="${dist}/javadoc" />
 		<javadoc 
-			sourcepath="."
+			sourcepath="${src}"
 			packagenames="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners"
 			destdir="${dist}/javadoc"
 			author="false"