|
32 | 32 | </target>
|
33 | 33 |
|
34 | 34 | <target name="library"
|
35 |
| - depends="api" |
| 35 | + depends="api,generator" |
36 | 36 | description="Build library of matchers">
|
37 | 37 | <java-to-jar srcdir="src/library"
|
38 | 38 | destjar="build/hamcrest-library-${version}.jar"
|
39 | 39 | 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> |
41 | 58 |
|
42 | 59 | <target name="integration"
|
43 | 60 | depends="api, library"
|
|
123 | 140 | <pathelement path="@{classpath}"/>
|
124 | 141 | </classpath>
|
125 | 142 | </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"/> |
126 | 146 | <jar jarfile="@{destjar}">
|
127 | 147 | <fileset dir="build/temp/@{destjar}.contents"/>
|
128 |
| - <fileset dir="@{srcdir}"/> |
129 |
| - <!-- Put Java source in Jars for user's convenience. --> |
130 | 148 | </jar>
|
131 | 149 | </sequential>
|
132 | 150 | </macrodef>
|
|
0 commit comments