1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
index f819d3d..6d4ea63 100644
--- a/hamcrest-1.1/build.xml
+++ b/hamcrest-1.1/build.xml
@@ -23,87 +23,28 @@
<target name="generator"
description="Build code generator tool">
- <java-to-jar srcdir="hamcrest-generator/src/main/java"
- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
- classpath="
- lib/generator/qdox-1.6.1.jar;
- "/>
- <taskdef name="jarjar"
- classname="com.tonicsystems.jarjar.JarJarTask"
- classpath="lib/generator/jarjar-1.0rc3.jar"/>
- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
- about it's existence. Uses JarJar to place classes under a different package
- to prevent conflict. -->
- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
- <rule pattern="com.thoughtworks.qdox.**"
- result="org.hamcrest.generator.qdox.@1"/>
- </jarjar>
</target>
<target name="core"
depends="generator"
description="Build core Hamcrest library">
- <java-to-jar srcdir="hamcrest-core/src/main/java"
- destjar="build/hamcrest-core-${version}.jar"/>
- <!-- Generate one class with all static imports -->
- <mkdir dir="build/temp/hamcrest-core/generated-code"/>
- <java classname="org.hamcrest.generator.config.XmlConfigurator"
- fork="yes"
- failonerror="yes"
- classpath="
- build/hamcrest-core-${version}.jar;
- build/hamcrest-generator-${version}.jar;
- ">
- <arg value="core-matchers.xml"/>
- <arg value="hamcrest-core/src/main/java"/>
- <arg value="org.hamcrest.CoreMatchers"/>
- <arg value="build/temp/hamcrest-core/generated-code"/>
- </java>
- <!-- Append to core jar -->
- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
- destjar="build/hamcrest-core-${version}.jar"
- classpath="build/hamcrest-core-${version}.jar"/>
</target>
<target name="library"
depends="core,generator"
description="Build library of matchers">
- <java-to-jar srcdir="hamcrest-library/src/main/java"
- destjar="build/hamcrest-library-${version}.jar"
- classpath="build/hamcrest-core-${version}.jar"/>
- <!-- Generate one class with all static imports -->
- <mkdir dir="build/temp/hamcrest-library/generated-code"/>
- <java classname="org.hamcrest.generator.config.XmlConfigurator"
- fork="yes"
- failonerror="yes"
- classpath="
- build/hamcrest-core-${version}.jar;
- build/hamcrest-generator-${version}.jar;
- build/hamcrest-library-${version}.jar;
- ">
- <arg value="matchers.xml"/>
- <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
- <arg value="org.hamcrest.Matchers"/>
- <arg value="build/temp/hamcrest-library/generated-code"/>
- </java>
- <!-- Append to library jar -->
- <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
- destjar="build/hamcrest-library-${version}.jar"
- classpath="build/hamcrest-core-${version}.jar"/>
</target>
- <target name="text"
- depends="core, library"
- description="Build text pattern matcher">
- <java-to-jar srcdir="hamcrest-text/src/main/java"
- destjar="build/hamcrest-text-${version}.jar"
- classpath="
- build/hamcrest-core-${version}.jar;
- build/hamcrest-library-${version}.jar"/>
- </target>
-
+ <target name="text"
+ depends="core, library"
+ description="Build text pattern matcher">
+ <java-to-jar srcdir="hamcrest-text/src/main/java"
+ destjar="build/hamcrest-text-${version}.jar"
+ classpath="
+ build/hamcrest-core-${version}.jar;
+ build/hamcrest-library-${version}.jar"/>
+ </target>
+
<target name="integration"
depends="core, library"
description="Build integration with external tools">
@@ -121,7 +62,7 @@
destjar="build/hamcrest-unit-test-${version}.jar"
classpath="
build/hamcrest-core-${version}.jar;
- build/hamcrest-library-${version}.jar;
+ build/hamcrest-library-${version}.jar;
build/hamcrest-text-${version}.jar;
build/hamcrest-integration-${version}.jar;
build/hamcrest-generator-${version}.jar"/>
@@ -164,7 +105,7 @@
<jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
<zipfileset src="build/hamcrest-core-${version}.jar"/>
<zipfileset src="build/hamcrest-library-${version}.jar"/>
- <zipfileset src="build/hamcrest-text-${version}.jar"/>
+ <zipfileset src="build/hamcrest-text-${version}.jar"/>
<zipfileset src="build/hamcrest-generator-${version}.jar"/>
<zipfileset src="build/hamcrest-integration-${version}.jar"/>
</jar>
@@ -221,7 +162,7 @@
<packageset dir="hamcrest-core/src/main/java"/>
<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
<packageset dir="hamcrest-integration/src/main/java"/>
<packageset dir="build/generated-code"/>
@@ -261,4 +202,4 @@
</sequential>
</macrodef>
-</project>
+</project>
|
GitWeb