Skip to content

Commit 428e3f5

Browse files
author
joeretro
committed
org.hamcrest.Matchers now automatically generated as part of build
1 parent 43df186 commit 428e3f5

File tree

2 files changed

+22
-210
lines changed

2 files changed

+22
-210
lines changed

build.xml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,29 @@
3232
</target>
3333

3434
<target name="library"
35-
depends="api"
35+
depends="api,generator"
3636
description="Build library of matchers">
3737
<java-to-jar srcdir="src/library"
3838
destjar="build/hamcrest-library-${version}.jar"
3939
classpath="build/hamcrest-api-${version}.jar"/>
40-
</target>
40+
<!-- Generate one class with all static imports -->
41+
<mkdir dir="build/generated-code"/>
42+
<java classname="org.hamcrest.generator.config.XmlConfigurator"
43+
fork="yes"
44+
classpath="
45+
build/hamcrest-api-${version}.jar;
46+
build/hamcrest-generator-${version}.jar;
47+
build/hamcrest-library-${version}.jar
48+
">
49+
<arg value="matchers.xml"/>
50+
<arg value="org.hamcrest.Matchers"/>
51+
<arg value="build/generated-code"/>
52+
</java>
53+
<!-- Append to library jar -->
54+
<java-to-jar srcdir="build/generated-code"
55+
destjar="build/hamcrest-library-${version}.jar"
56+
classpath="build/hamcrest-api-${version}.jar"/>
57+
</target>
4158

4259
<target name="integration"
4360
depends="api, library"
@@ -123,10 +140,11 @@
123140
<pathelement path="@{classpath}"/>
124141
</classpath>
125142
</javac>
143+
<copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
144+
<!-- Put Java source in Jars for user's convenience. -->
145+
<copydir src="@{srcdir}" dest="build/temp/@{destjar}.contents"/>
126146
<jar jarfile="@{destjar}">
127147
<fileset dir="build/temp/@{destjar}.contents"/>
128-
<fileset dir="@{srcdir}"/>
129-
<!-- Put Java source in Jars for user's convenience. -->
130148
</jar>
131149
</sequential>
132150
</macrodef>

src/library/org/hamcrest/Matchers.java

Lines changed: 0 additions & 206 deletions
This file was deleted.

0 commit comments

Comments
 (0)