build.xml.patch revision 318
318N/A--- junit4.5/build.xml Tue Aug 19 15:12:22 2008
318N/A+++ junit4.5/build.xml.new Mon Sep 1 10:39:18 2008
318N/A@@ -2,14 +2,14 @@
318N/A <tstamp />
318N/A
318N/A <property file="${user.home}/.junit.properties" />
318N/A- <property name="src" value="src/main/java" />
318N/A+ <property name="src" value="src/main" />
318N/A <property name="target" location="target" />
318N/A <property name="bin" location="${target}/main" />
318N/A <property name="version" value="4.5" />
318N/A- <property name="dist" value="junit${version}" />
318N/A+ <property name="dist" value="dist" />
318N/A <property name="versionfile" value="${src}/junit/runner/Version.java" />
318N/A <property name="zipfile" value="${dist}/${dist}.zip" />
318N/A- <property name="testsrc" location="src/test/java" />
318N/A+ <property name="testsrc" location="src/test" />
318N/A <property name="testbin" location="${target}/test/java" />
318N/A <property name="unjarred" value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
318N/A <property name="binjar" value="junit-${version}.jar" />
318N/A@@ -18,11 +18,18 @@
318N/A <property name="javadocdir" location="${dist}/javadoc" />
318N/A <property name="javadoczip" location="${dist}-javadoc.zip" />
318N/A <property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners, org.hamcrest.core, org.junit.matchers" />
318N/A- <property name="hamcrestlib" location="lib/hamcrest-core-1.1.jar" />
318N/A- <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
318N/A+ <property name="hamcrestsrc" location="temp.hamcrest.source" />
318N/A
318N/A <target name="init">
318N/A <tstamp/>
318N/A+ <unjar src="${srcjar}" dest="${src}" />
318N/A+ <copy todir="${testsrc}/org">
318N/A+ <fileset dir="org" />
318N/A+ </copy>
318N/A+ <copy todir="${testsrc}/junit">
318N/A+ <fileset dir="junit" />
318N/A+ </copy>
318N/A+
318N/A </target>
318N/A
318N/A <target name="versiontag" depends="init">
318N/A@@ -39,6 +46,8 @@
318N/A <!-- If two builds are made within a minute -->
318N/A <delete dir="${dist}" quiet="true" />
318N/A <!-- Delete all previous temporary build artifacts -->
318N/A+ <delete dir="${src}" quiet="true" />
318N/A+ <delete dir="${testsrc}" quiet="true" />
318N/A <delete dir="${target}" quiet="true" />
318N/A
318N/A <delete file="${zipfile}" quiet="true"/>
318N/A@@ -71,9 +80,9 @@
318N/A </macrodef>
318N/A
318N/A <target name="build" depends="versiontag">
318N/A- <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/>
318N/A- <unjar src="${hamcrestlib}" dest="${bin}" />
318N/A- <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/>
318N/A+ <junit_compilation srcdir="${hamcrestsrc}" destdir="${bin}" classpath=""/>
318N/A+ <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${bin}"/>
318N/A+ <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${bin}"/>
318N/A </target>
318N/A
318N/A <target name="jars">
318N/A@@ -97,16 +106,12 @@
318N/A
318N/A <target name="samples-and-tests">
318N/A <copy todir="${dist}">
318N/A- <fileset dir="${testbin}" />
318N/A <fileset dir="${testsrc}" />
318N/A </copy>
318N/A </target>
318N/A
318N/A- <target name="unjar.hamcrest">
318N/A- <unjar src="${hamcrestlib}" dest="${hamcrestsrc}" />
318N/A- </target>
318N/A
318N/A- <target name="javadoc" depends="unjar.hamcrest">
318N/A+ <target name="javadoc" >
318N/A <javadoc packagenames="${javadocpackages}"
318N/A destdir="${javadocdir}"
318N/A author="false"
318N/A@@ -113,7 +118,7 @@
318N/A version="false"
318N/A use="false"
318N/A windowtitle="JUnit API"
318N/A- stylesheetfile="stylesheet.css"
318N/A+ stylesheetfile="javadoc/stylesheet.css"
318N/A >
318N/A <sourcepath location="${src}" />
318N/A <sourcepath location="${hamcrestsrc}" />
318N/A@@ -134,7 +139,6 @@
318N/A </copy>
318N/A <copy file="README.html" tofile="${dist}/README.html" />
318N/A <copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
318N/A- <copy file="build.xml" tofile="${dist}/build.xml" />
318N/A </target>
318N/A
318N/A <target name="dist" depends="populate-dist">