author | Srinivasa Sarva <srinivasa.sarva@oracle.com> |
Mon, 20 Jun 2011 12:13:31 -0700 | |
changeset 318 | 3ed992b12a6c |
child 772 | 96235751b5d2 |
permissions | -rw-r--r-- |
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
1 |
--- junit4.5/build.xml Tue Aug 19 15:12:22 2008 |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
2 |
+++ junit4.5/build.xml.new Mon Sep 1 10:39:18 2008 |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
3 |
@@ -2,14 +2,14 @@ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
4 |
<tstamp /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
5 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
6 |
<property file="${user.home}/.junit.properties" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
7 |
- <property name="src" value="src/main/java" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
8 |
+ <property name="src" value="src/main" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
9 |
<property name="target" location="target" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
10 |
<property name="bin" location="${target}/main" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
11 |
<property name="version" value="4.5" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
12 |
- <property name="dist" value="junit${version}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
13 |
+ <property name="dist" value="dist" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
14 |
<property name="versionfile" value="${src}/junit/runner/Version.java" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
15 |
<property name="zipfile" value="${dist}/${dist}.zip" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
16 |
- <property name="testsrc" location="src/test/java" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
17 |
+ <property name="testsrc" location="src/test" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
18 |
<property name="testbin" location="${target}/test/java" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
19 |
<property name="unjarred" value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
20 |
<property name="binjar" value="junit-${version}.jar" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
21 |
@@ -18,11 +18,18 @@ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
22 |
<property name="javadocdir" location="${dist}/javadoc" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
23 |
<property name="javadoczip" location="${dist}-javadoc.zip" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
24 |
<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" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
25 |
- <property name="hamcrestlib" location="lib/hamcrest-core-1.1.jar" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
26 |
- <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
27 |
+ <property name="hamcrestsrc" location="temp.hamcrest.source" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
28 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
29 |
<target name="init"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
30 |
<tstamp/> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
31 |
+ <unjar src="${srcjar}" dest="${src}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
32 |
+ <copy todir="${testsrc}/org"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
33 |
+ <fileset dir="org" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
34 |
+ </copy> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
35 |
+ <copy todir="${testsrc}/junit"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
36 |
+ <fileset dir="junit" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
37 |
+ </copy> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
38 |
+ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
39 |
</target> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
40 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
41 |
<target name="versiontag" depends="init"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
42 |
@@ -39,6 +46,8 @@ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
43 |
<!-- If two builds are made within a minute --> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
44 |
<delete dir="${dist}" quiet="true" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
45 |
<!-- Delete all previous temporary build artifacts --> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
46 |
+ <delete dir="${src}" quiet="true" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
47 |
+ <delete dir="${testsrc}" quiet="true" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
48 |
<delete dir="${target}" quiet="true" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
49 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
50 |
<delete file="${zipfile}" quiet="true"/> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
51 |
@@ -71,9 +80,9 @@ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
52 |
</macrodef> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
53 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
54 |
<target name="build" depends="versiontag"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
55 |
- <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
56 |
- <unjar src="${hamcrestlib}" dest="${bin}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
57 |
- <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
58 |
+ <junit_compilation srcdir="${hamcrestsrc}" destdir="${bin}" classpath=""/> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
59 |
+ <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${bin}"/> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
60 |
+ <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${bin}"/> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
61 |
</target> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
62 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
63 |
<target name="jars"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
64 |
@@ -97,16 +106,12 @@ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
65 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
66 |
<target name="samples-and-tests"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
67 |
<copy todir="${dist}"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
68 |
- <fileset dir="${testbin}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
69 |
<fileset dir="${testsrc}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
70 |
</copy> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
71 |
</target> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
72 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
73 |
- <target name="unjar.hamcrest"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
74 |
- <unjar src="${hamcrestlib}" dest="${hamcrestsrc}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
75 |
- </target> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
76 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
77 |
- <target name="javadoc" depends="unjar.hamcrest"> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
78 |
+ <target name="javadoc" > |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
79 |
<javadoc packagenames="${javadocpackages}" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
80 |
destdir="${javadocdir}" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
81 |
author="false" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
82 |
@@ -113,7 +118,7 @@ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
83 |
version="false" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
84 |
use="false" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
85 |
windowtitle="JUnit API" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
86 |
- stylesheetfile="stylesheet.css" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
87 |
+ stylesheetfile="javadoc/stylesheet.css" |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
88 |
> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
89 |
<sourcepath location="${src}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
90 |
<sourcepath location="${hamcrestsrc}" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
91 |
@@ -134,7 +139,6 @@ |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
92 |
</copy> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
93 |
<copy file="README.html" tofile="${dist}/README.html" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
94 |
<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
95 |
- <copy file="build.xml" tofile="${dist}/build.xml" /> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
96 |
</target> |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
97 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
98 |
<target name="dist" depends="populate-dist"> |