ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.22 by tim, Wed May 14 21:30:37 2003 UTC vs.
Revision 1.80 by dl, Sat Aug 1 23:35:22 2009 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage">
2  
3    <description>
4 <    Build file for JSR-166
4 > ------------------------------------------------------------------------------
5 >  Build file for JSR-166
6  
7 <    JUnit 1.8 must be in ${ant.home}/lib for the test target to work.
7 <  </description>
7 >  Usage: ant [target]
8  
9 +  User-specific settings are read from user.properties.
10 +  See user.properties.sample for an explanation of some useful settings.
11 + ------------------------------------------------------------------------------
12 +  </description>
13  
14 <  <target name="usage" description="Prints this message">
15 <    <echo>
12 < ant [target], where target is one of:
13 <
14 < usage       (default) Prints this message
15 < compile     Compiles all sources to build folder
16 < jar         Builds library jar from compiled sources
17 < test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18 < docs        Builds javadocs with custom tags to build folder
19 < dist-docs   Builds javadocs without custom tags to dist folder
20 < dist        Puts all distributable products in single hierarchy
21 <
22 < clean       Removes all build products
23 < dist-clean  Removes all build and distribution products
24 <
25 < checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26 < doccheck    Reports on javadoc style errors (not working yet)
27 <    </echo>
14 >  <target name="usage" description="Advises user to run with -projecthelp">
15 >    <echo>Run "ant -projecthelp" for full usage information.</echo>
16    </target>
17  
18  
19 +  <!-- User-specific settings -->
20 +  <property file="user.properties"/>
21 +
22 +
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
24 >  <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
36  <!--
37  <property name="build.warnings"       value="true"/>
38  -->
28  
29    <!-- Build locations -->
30 <  <property name="build.dir"            location="build"/>
31 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
32 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
34 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
35 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
36 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
37 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
38 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
39 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40 >
41 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44 >
45 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48  
49    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>
51    <property name="test.src.dir"         location="${basedir}/src/test"/>
52 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
53 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
52 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
55    <property name="lib.dir"              location="${basedir}/lib"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>
57 <
57 >  <property name="topsrc.dir"           location="${basedir}/src"/>
58 >  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59 >  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60 >  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62    <!-- Distribution locations -->
63 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67  
68    <!-- Jar locations -->
69    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70 <  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
71 <  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
70 >  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71 >  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72 >  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
68  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
74  
75 <  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
75 >  <!-- Bootclasspath argument -->
76 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
78 <  <path id="javac.bootclasspath">
79 <    <pathelement location="${collect.jar}"/>
80 <    <pathelement location="${rt.jar}"/>
78 >  <!-- Test classpath -->
79 >  <path id="test.classpath">
80 >    <pathelement location="${build.testcases.dir}"/>
81 >    <pathelement location="${junit.jar}"/>
82    </path>
83  
84 <  <path id="test.classpath">
85 <    <pathelement location="${product.jar}"/>
84 >  <!-- ALoops classpath -->
85 >  <path id="loops.classpath">
86 >    <pathelement location="${build.loops.dir}"/>
87    </path>
88  
89  
90    <!-- Main targets -->
91  
92 <  <target name="compile" depends="init"
93 <          description="Compiles all sources to build folder">
92 >  <target name="dists"
93 >          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94 >          description="Builds all public jars and docs"/>
95 >
96 >  <target name="compile"
97 >          depends="init, configure-compiler"
98 >          description="Compiles main sources to build folder">
99 >
100      <mkdir dir="${build.classes.dir}"/>
101 +
102      <javac srcdir="${src.dir}"
103            destdir="${build.classes.dir}"
104              debug="${build.debug}"
# Line 92 | Line 107 | ant [target], where target is one of:
107             source="${build.sourcelevel}"
108               fork="true">
109  
110 <      <bootclasspath refid="javac.bootclasspath"/>
111 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
110 >      <include name="**/*.java"/>
111 >      <compilerarg value="-XDignore.symbol.file"/>
112 >
113 > <!--
114 >      <exclude name="java/lang/**"/>
115 >      <compilerarg line="${build.args}"/>
116 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 > -->
118  
119      </javac>
120 +
121    </target>
122  
123  
124 <  <target name="jar" depends="compile"
124 >
125 >  <target name="jar"
126 >          depends="compile"
127            description="Builds library jar from compiled sources">
128 +
129      <mkdir dir="${build.lib.dir}"/>
105    <jar basedir="${build.classes.dir}"
106        destfile="${product.jar}"
107    />
108  </target>
130  
131 +    <jar destfile="${product.jar}">
132 +      <fileset dir="${build.classes.dir}"/>
133 +    </jar>
134  
135 <  <target name="test" depends="init, check-junit, report-tests"
112 <          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
135 >  </target>
136  
137  
115  <target name="checkstyle" depends="filter-src"
116          description="Reports on style errors in Java source (verbose, mostly chaff)">
117    <taskdef resource="checkstyletask.properties"
118            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
119
120    <checkstyle>
121      <formatter type="plain"/>  <!-- also available: type="xml" -->
122      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
123    </checkstyle>
124  </target>
138  
139 +  <target name="test"
140 +          depends="init, configure-tests, report-tests"
141 +          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
142  
127  <target name="doccheck" depends="filter-src"
128          description="Reports on javadoc style errors (not working yet)">
129    <delete dir="${build.doccheck.dir}"/>
130    <mkdir dir="${build.doccheck.dir}"/>
131    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132         docletpath="${lib.dir}/doccheck.jar"
133            destdir="${build.doccheck.dir}">
134      <packageset dir="${build.filter.src.dir}"/>
135    </javadoc>
136  </target>
143  
144  
145 <  <target name="docs" depends="filter-src"
145 >  <target name="docs"
146            description="Builds javadocs with custom tags to build folder">
147 +
148      <delete dir="${build.javadocs.dir}"/>
149      <mkdir dir="${build.javadocs.dir}"/>
150 +
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
152 >                link="http://java.sun.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.sourcelevel}">
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >          
156  
157 <      <tag name="revised" description="Last revised:"/>
149 <      <tag name="spec" description="Specified by:"/>
150 <      <tag name="editor" description="Last edited by:"/>
151 <      <tag name="fixme" description="FIX ME:"/>
152 <      <packageset dir="${build.filter.src.dir}"/>
157 >      <packageset dir="${src.dir}"/>
158  
159      </javadoc>
160 +
161    </target>
162  
163  
158  <!--
159   # javac -s doesn't reliably generate compilable code. It generates
160   # bridge methods (marked as "synthetic") that can have identical
161   # signatures to existing methods except for the return value.
162   -->
163  <target name="strip" depends="init">
164    <mkdir dir="${build.stripped.dir}"/>
165    <javac srcdir="${src.dir}"
166          destdir="${build.stripped.dir}"
167            debug="${build.debug}"
168       debuglevel="${build.debuglevel}"
169      deprecation="${build.deprecation}"
170           source="${build.sourcelevel}"
171             fork="true">
164  
165 <      <bootclasspath refid="javac.bootclasspath"/>
166 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
165 >  <target name="dist"
166 >          depends="init, dist-clean, dist-jar, dist-docs"
167 >          description="Puts all distributable products in single hierarchy"/>
168  
176    </javac>
177  </target>
169  
170 +  <target name="release"
171 +          depends="dist"
172 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
173 +
174 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
175 +
176 +    <jar basedir="${basedir}" destfile="${release.jar}">
177 +      <!-- <exclude name="build/**"/> -->
178 +      <exclude name="${release.jar}"/>
179 +      <exclude name="user.properties"/>
180 +      <exclude name="etc/notes/**"/>
181 +      <exclude name="src/emulation/**"/>
182 +      <exclude name="**/SyntaxTest.java"/>
183 +      <exclude name="**/SuperfluousAbstract.java"/>
184 +    </jar>
185 +
186 +  </target>
187  
180  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
181          description="Puts all distributable products in single hierarchy"/>
188  
189  
190    <target name="clean"
191            description="Removes all build products">
192 +
193      <delete dir="${build.dir}"/>
194      <delete dir="${build.classes.dir}"/>
195      <delete dir="${build.lib.dir}"/>
196 +
197    </target>
198  
199  
200 +
201    <target name="dist-clean"
202            description="Removes all build and distribution products">
203 +
204      <delete dir="${dist.dir}"/>
205 +
206    </target>
207  
208  
198  <!-- Anthill targets -->
209  
210 <  <!-- Should really run the tests instead of just the jar target -->
211 <  <target name="anthill-build" depends="jar, docs, dist-docs"/>
210 >  <target name="dist-docs"
211 >          description="Builds javadocs without custom tags to dist folder">
212  
213 <  <target name="anthill-publish">
214 <    <copy todir="${deployDir}/docs/private">
205 <      <fileset dir="${build.javadocs.dir}"/>
206 <    </copy>
207 <    <copy todir="${deployDir}/docs/public">
208 <      <fileset dir="${dist.javadocs.dir}"/>
209 <    </copy>
210 <    <copy tofile="${deployDir}/index.html"
211 <          file="${basedir}/etc/anthill-index.html"/>
212 <    <copy todir="${deployDir}/notes">
213 <      <fileset dir="${basedir}/etc/notes"/>
214 <    </copy>
215 <  </target>
213 >    <delete dir="${dist.javadocs.dir}"/>
214 >    <mkdir dir="${dist.javadocs.dir}"/>
215  
216 +    <javadoc destdir="${dist.javadocs.dir}"
217 +            link="http://java.sun.com/javase/6/docs/api/"
218 +            overview="${src.dir}/intro.html"
219  
220 <  <!-- Internal targets -->
220 >            sourcepath="${src.dir}:${jdksrc.dir}"
221 >     >
222 > <!--
223 >      <packageset dir="${src.dir}" defaultexcludes="yes">
224 >      <include name="java/util/concurrent"/>
225 >      <include name="java/util/concurrent/atomic"/>
226 >      <include name="java/util/concurrent/locks"/>
227 >      </packageset>
228 > -->
229 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230 >      <include name="main/java/util/concurrent/*.java"/>
231 >      <include name="main/java/util/concurrent/atomic/*.java"/>
232 >      <include name="main/java/util/concurrent/locks/*.java"/>
233 >      <include name="main/java/util/*.java"/>
234 > <!--
235 >      <include name="main/java/util/concurrent/*.html"/>
236 >      <include name="main/java/util/concurrent/atomic/*.html"/>
237 >      <include name="main/java/util/concurrent/locks/*.html"/>
238 >      <include name="main/java/util/*.html"/>
239 > -->
240 > <!--      <include name="jsr166x/*.java"/> -->
241 >      </fileset>
242 >    </javadoc>
243  
220  <target name="set-warnings-if" if="build.warnings">
221    <property name="build.warnings.option" value="-warnunchecked"/>
244    </target>
245  
246  
225  <target name="set-warnings-unless" unless="build.warnings">
226    <property name="build.warnings.option" value=""/>
227  </target>
247  
248 +  <!-- Internal targets -->
249 +
250 +
251 +  <target name="init">
252  
230  <target name="init" depends="set-warnings-if, set-warnings-unless">
253      <!-- Version is kept in a separate file -->
254      <loadfile property="version" srcFile="version.properties"/>
255      <echo>Building JSR-166 version ${version}</echo>
256 +    <echo>java.home is ${java.home}</echo>
257 +
258    </target>
259  
260  
261 <  <target name="dist-jar" depends="clean, jar">
261 >  <target name="dist-jar"
262 >          depends="clean, jar">
263 >
264      <copy file="${product.jar}" todir="${dist.dir}"/>
265 +
266    </target>
267  
268  
269 <  <target name="dist-docs" depends="filter-src"
270 <          description="Builds javadocs without custom tags to dist folder">
244 <    <delete dir="${dist.javadocs.dir}"/>
245 <    <mkdir dir="${dist.javadocs.dir}"/>
246 <    <javadoc destdir="${dist.javadocs.dir}"
247 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
248 <            overview="${src.dir}/intro.html"
249 <              source="${build.sourcelevel}">
269 >  <target name="compile-tests"
270 >          depends="jar">
271  
272 <      <packageset dir="${build.filter.src.dir}"/>
272 >    <mkdir dir="${build.testcases.dir}"/>
273  
274 <    </javadoc>
275 <  </target>
274 >    <javac srcdir="${tck.src.dir}"
275 >          destdir="${build.testcases.dir}"
276 >            debug="${build.debug}"
277 >       debuglevel="${build.debuglevel}"
278 >      deprecation="${build.deprecation}"
279 >           source="${build.sourcelevel}"
280 >             fork="true">
281  
282 +      <compilerarg value="${bootclasspath.args}"/>
283 +      <compilerarg line="${build.args}"/>
284  
285 <  <target name="compile-ant-filter" depends="init">
258 <    <mkdir dir="${build.ant.dir}"/>
259 <    <javac srcdir="${ant.src.dir}"
260 <          destdir="${build.ant.dir}"
261 <           source="1.4"
262 <    />
263 <  </target>
285 >      <classpath refid="test.classpath"/>
286  
287 +    </javac>
288  
289 <  <target name="filter-src" depends="compile-ant-filter">
290 <    <mkdir dir="${build.filter.src.dir}"/>
291 <    <copy todir="${build.filter.src.dir}">
292 <      <fileset dir="${src.dir}">
293 <        <include name="**/*.java"/>
294 <      </fileset>
295 <      <filterchain>
273 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
274 <                      classpath="${build.ant.dir}">
275 <          <!--
276 <           # These arguments are to get rid of angle-bracketed type
277 <           # parameters so that javadoc can run on the result. The
278 <           # following heuristic that seems to work:
279 <           #
280 <           # For all lines not starting with space(s)-asterisk-space(s),
281 <           #   replace <something> with a space, where there may be more
282 <           #   than one right angle bracket at the end, and "something"
283 <           #   must not contain parens or pipes. (This may need some
284 <           #   tweaking.)
285 <           -->
286 <          <param name="notmatching" value="^\s+\*\s.*$"/>
287 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
288 <          <param name="replacement" value=" "/>
289 <        </filterreader>
290 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
291 <                      classpath="${build.ant.dir}">
292 <          <!--
293 <           # These arguments are to uncomment lines beginning with
294 <           # "//@" so that javadoc can see imports that are needed
295 <           # to resolve links but that shouldn't be in the compiled
296 <           # code.
297 <           -->
298 <          <param name="matching" value="^//@.*$"/>
299 <          <param name="pattern" value="^//@"/>
300 <          <param name="replacement" value=""/>
301 <        </filterreader>
302 <      </filterchain>
303 <    </copy>
304 <  </target>
289 >    <javac srcdir="${test.src.dir}"
290 >          destdir="${build.testcases.dir}"
291 >            debug="${build.debug}"
292 >       debuglevel="${build.debuglevel}"
293 >      deprecation="${build.deprecation}"
294 >           source="${build.sourcelevel}"
295 >             fork="true">
296  
297 +      <include name="jsr166/test/**"/>
298  
299 <  <target name="compile-tests" depends="jar">
300 <    <mkdir dir="${build.testcases.dir}"/>
301 <    <javac srcdir="${test.src.dir}"
299 >      <compilerarg value="${bootclasspath.args}"/>
300 >      <compilerarg line="${build.args}"/>
301 >
302 >      <classpath refid="test.classpath"/>
303 >
304 >    </javac>
305 >
306 > <!--
307 >    <javac srcdir="${jtreg.src.dir}"
308            destdir="${build.testcases.dir}"
309              debug="${build.debug}"
310         debuglevel="${build.debuglevel}"
# Line 314 | Line 312 | ant [target], where target is one of:
312             source="${build.sourcelevel}"
313               fork="true">
314  
315 <      <bootclasspath refid="javac.bootclasspath"/>
316 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
315 >      <compilerarg value="${bootclasspath.args}"/>
316 >      <compilerarg line="${build.args}"/>
317 >
318        <classpath refid="test.classpath"/>
319  
320      </javac>
321 + -->
322 +
323    </target>
324  
325  
326 <  <target name="run-tests" depends="compile-tests">
326 >  <target name="run-tests"
327 >          depends="compile-tests">
328 >
329 >    <!-- May be overridden by user.properties -->
330 >    <property name="testcase" value="*"/>
331 >
332      <mkdir dir="${build.reports.dir}"/>
333 +
334      <junit printsummary="true"
335               showoutput="true"
336            errorProperty="junit.failed"
# Line 331 | Line 338 | ant [target], where target is one of:
338                      dir="${build.reports.dir}"
339                     fork="true">
340  
341 <      <!--
342 <       ! This nastiness is so JUnit can test classes we are inserting
343 <       ! into the java.* packages.
344 <       -->
345 <      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
341 >      <jvmarg value="${bootclasspath.args}"/>
342 >      <jvmarg value="-server"/>
343 >      <jvmarg value="-showversion"/>
344 >
345 >      <classpath refid="test.classpath"/>
346  
347        <formatter type="xml"/>
348  
349 <      <batchtest todir="${build.reports.dir}">
349 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
350 >        <fileset dir="${tck.src.dir}">
351 >          <include name="**/${testcase}Test.java"/>
352 >        </fileset>
353 >      </batchtest>
354 >
355 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
356          <fileset dir="${test.src.dir}">
357 <          <include name="**/*Test.java"/>
357 >          <include name="jsr166/test/**/${testcase}Test.java"/>
358 >        </fileset>
359 >      </batchtest>
360 >
361 > <!--
362 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
363 >        <fileset dir="${jtreg.src.dir}">
364 >          <include name="**/${testcase}Test.java"/>
365          </fileset>
366        </batchtest>
367 + -->
368  
369      </junit>
370 +
371    </target>
372  
373  
374 <  <target name="report-tests" depends="run-tests">
375 <    <!-- Sets junit.report.format to frames if Xalan is present,
374 >  <target name="report-tests"
375 >          depends="run-tests">
376 >
377 >    <!-- Sets junit.report.format to frames if redirection is present,
378           otherwise sets it to noframes. -->
379      <available property="junit.report.format"
380                    value="frames"
# Line 362 | Line 386 | ant [target], where target is one of:
386        <fileset dir="${build.reports.dir}">
387          <include name="TEST-*.xml"/>
388        </fileset>
389 <      <report styledir="${stylesheet.dir}"
366 <                format="${junit.report.format}"
367 <                 todir="${build.reports.dir}"
389 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
390        />
391      </junitreport>
392  
393      <fail message="Test Cases Failed" if="junit.failed"/>
394 +
395    </target>
396  
397  
398 <  <target name="check-junit">
399 <    <!-- FIXME: this test isn't specific enough -->
398 >  <target name="configure-compiler">
399 >
400 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
401 >
402 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
403 >      <istrue value="${build.warnunchecked}"/>
404 >    </condition>
405 >
406 >    <property name="warnunchecked.arg" value=""/>
407 >
408 >
409 >    <!-- Common options in javac invocations -->
410 >    <property name="build.args" value="${warnunchecked.arg}"/>
411 >
412 >  </target>
413 >
414 >
415 >  <target name="configure-tests"
416 >       depends="configure-compiler">
417 >
418 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
419      <available property="junit.available"
420 <               classname="junit.framework.TestCase"/>
421 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
420 >               classname="junit.framework.Protectable"/>
421 >
422 >    <!-- Xalan -->
423 >    <available property="xalan.available"
424 >               classname="org.apache.xalan.Version"/>
425 >
426 >
427 >    <!-- Ant 1.6beta and later don't need or want this check -->
428 >    <!--
429 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
430 >          unless="junit.available"/>
431 >
432 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
433 >          unless="xalan.available"/>
434 >    -->
435 >
436    </target>
437  
438  
439 +  <!-- Various demos and test programs -->
440 +
441 +
442 +  <target name="loops" depends="init, configure-compiler"
443 +          description="Benchmark from Doug Lea's AQS paper">
444 +
445 +    <mkdir dir="${build.loops.dir}"/>
446 +
447 +    <javac srcdir="${loops.src.dir}"
448 +          destdir="${build.loops.dir}"
449 +            debug="${build.debug}"
450 +       debuglevel="${build.debuglevel}"
451 +      deprecation="${build.deprecation}"
452 +           source="${build.sourcelevel}"
453 +             fork="true">
454 +
455 +      <compilerarg line="${build.args}"/>
456 +      <classpath refid="loops.classpath"/>
457 +
458 +    </javac>
459 +
460 +    <java classname="ALoops" fork="true">
461 +      <classpath refid="loops.classpath"/>
462 +    </java>
463 +
464 +  </target>
465 +
466 +
467 +  <!-- jsr166x -->
468 +
469 +
470 +  <target name="jsr166xcompile"
471 +          depends="init, configure-compiler"
472 +          description="Compiles jsr166x sources">
473 +
474 +    <mkdir dir="${build.jsr166x.dir}"/>
475 +
476 +    <javac srcdir="${jsr166xsrc.dir}"
477 +          destdir="${build.jsr166x.dir}"
478 +            debug="${build.debug}"
479 +       debuglevel="${build.debuglevel}"
480 +      deprecation="${build.deprecation}"
481 +           source="${build.sourcelevel}"
482 +             fork="true">
483 +
484 +      <include name="**/*.java"/>
485 +      <compilerarg line="${build.args}"/>
486 +
487 +    </javac>
488 +
489 +  </target>
490 +
491 +
492 +
493 +  <target name="jsr166xjar"
494 +          depends="jsr166xcompile"
495 +          description="Builds library jar from compiled sources">
496 +
497 +    <mkdir dir="${build.jsr166xlib.dir}"/>
498 +
499 +    <jar destfile="${jsr166xproduct.jar}">
500 +      <fileset dir="${build.jsr166x.dir}"/>
501 +    </jar>
502 +
503 +  </target>
504 +
505 +
506 +
507 +  <target name="jsr166xdocs"
508 +          description="Builds javadocs with custom tags to build folder">
509 +
510 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
511 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
512 +
513 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
514 +             link="http://java.sun.com/javase/6/docs/api/"
515 +
516 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
517 +
518 +    >
519 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
520 +      <include name="jsr166x"/>
521 +      </packageset>
522 +
523 +
524 +    </javadoc>
525 +
526 +  </target>
527 +
528 +
529 +  <target name="jsr166xdist"
530 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
531 +          description="Puts all distributable products in single hierarchy"/>
532 +
533 +
534 +
535 +  <target name="jsr166xclean"
536 +          description="Removes all build products">
537 +
538 +    <delete dir="${build.jsr166x.dir}"/>
539 +    <delete dir="${build.jsr166xlib.dir}"/>
540 +
541 +  </target>
542 +
543 +
544 +
545 +  <target name="jsr166xdist-clean"
546 +          description="Removes all build and distribution products">
547 +
548 +  </target>
549 +
550 +
551 +
552 +  <target name="jsr166xdist-docs"
553 +          description="Builds javadocs without custom tags to dist folder">
554 +
555 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
556 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
557 +
558 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
559 +                link="http://java.sun.com/javase/6/docs/api/"
560 +              source="${build.sourcelevel}">
561 +
562 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
563 +      <include name="jsr166x"/>
564 +      </packageset>
565 +
566 +    </javadoc>
567 +
568 +  </target>
569 +
570 +  <target name="jsr166xdist-jar"
571 +          depends="jsr166xclean, jsr166xjar">
572 +
573 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
574 +
575 +  </target>
576 +
577 +  <!-- jsr166y -->
578 +
579 +
580 +  <target name="jsr166ycompile"
581 +          depends="init, configure-compiler"
582 +          description="Compiles jsr166y sources">
583 +
584 +    <mkdir dir="${build.jsr166y.dir}"/>
585 +
586 +    <javac srcdir="${jsr166ysrc.dir}"
587 +          destdir="${build.jsr166y.dir}"
588 +            debug="${build.debug}"
589 +       debuglevel="${build.debuglevel}"
590 +      deprecation="${build.deprecation}"
591 +           source="${build.sourcelevel}"
592 +             fork="true">
593 +
594 +      <include name="**/*.java"/>
595 +      <compilerarg line="${build.args}"/>
596 +      <compilerarg value="${bootclasspath.args}"/>
597 +
598 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
599 +
600 +    </javac>
601 +
602 +  </target>
603 +
604 +
605 +
606 +  <target name="jsr166yjar"
607 +          depends="jsr166ycompile"
608 +          description="Builds library jar from compiled sources">
609 +
610 +    <mkdir dir="${build.jsr166ylib.dir}"/>
611 +
612 +    <jar destfile="${jsr166yproduct.jar}" index="true">
613 +      <fileset dir="${build.jsr166y.dir}"/>
614 +    </jar>
615 +
616 +  </target>
617 +
618 +
619 +
620 +  <target name="jsr166ydocs"
621 +          description="Builds javadocs with custom tags to build folder">
622 +
623 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
624 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
625 +
626 +    <javadoc destdir="${build.jsr166yjavadocs.dir}"
627 +                link="http://java.sun.com/javase/6/docs/api/"
628 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
629 +
630 +    >
631 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
632 +      <include name="jsr166y"/>
633 +      </packageset>
634 +
635 +
636 +    </javadoc>
637 +
638 +  </target>
639 +
640 +
641 +  <target name="jsr166ydist"
642 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
643 +          description="Puts all distributable products in single hierarchy"/>
644 +
645 +
646 +
647 +  <target name="jsr166yclean"
648 +          description="Removes all build products">
649 +
650 +    <delete dir="${build.jsr166y.dir}"/>
651 +    <delete dir="${build.jsr166ylib.dir}"/>
652 +
653 +  </target>
654 +
655 +
656 +
657 +  <target name="jsr166ydist-clean"
658 +          description="Removes all build and distribution products">
659 +
660 +  </target>
661 +
662 +  <target name="jsr166ydist-docs"
663 +          description="Builds javadocs without custom tags to dist folder">
664 +
665 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
666 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
667 +
668 +    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
669 +                link="http://java.sun.com/javase/6/docs/api/"
670 +              source="${build.sourcelevel}"
671 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
672 +            >          
673 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
674 +      <include name="jsr166y/*.java"/>
675 +            </fileset>
676 +    </javadoc>
677 +
678 +  </target>
679 +
680 +  <target name="jsr166ydist-jar"
681 +          depends="jsr166yclean, jsr166yjar">
682 +
683 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
684 +
685 +  </target>
686 +
687 +  <!-- extra166y -->
688 +
689 +
690 +  <target name="extra166ycompile"
691 +          depends="init, configure-compiler, jsr166ycompile"
692 +          description="Compiles extra166y sources">
693 +
694 +    <mkdir dir="${build.extra166y.dir}"/>
695 +
696 +    <javac srcdir="${extra166ysrc.dir}"
697 +          destdir="${build.extra166y.dir}"
698 +            debug="${build.debug}"
699 +            classpath="${jsr166yproduct.jar}"
700 +       debuglevel="${build.debuglevel}"
701 +      deprecation="${build.deprecation}"
702 +           source="${build.sourcelevel}"
703 +             fork="true">
704 +
705 +      <include name="**/*.java"/>
706 +      <compilerarg line="${build.args}"/>
707 +      <compilerarg value="${bootclasspath.args}"/>
708 +
709 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
710 +
711 +    </javac>
712 +
713 +  </target>
714 +
715 +
716 +
717 +  <target name="extra166yjar"
718 +          depends="extra166ycompile"
719 +          description="Builds library jar from compiled sources">
720 +
721 +    <mkdir dir="${build.extra166ylib.dir}"/>
722 +
723 +    <jar destfile="${extra166yproduct.jar}" index="true">
724 +      <fileset dir="${build.extra166y.dir}"/>
725 +    </jar>
726 +
727 +  </target>
728 +
729 +
730 +
731 +  <target name="extra166ydocs"
732 +          description="Builds javadocs with custom tags to build folder">
733 +
734 +    <delete dir="${build.extra166yjavadocs.dir}"/>
735 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
736 +
737 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
738 +                link="http://java.sun.com/javase/6/docs/api/"
739 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
740 +
741 +    >
742 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
743 +      <include name="extra166y"/>
744 +      </packageset>
745 +
746 +
747 +    </javadoc>
748 +
749 +  </target>
750 +
751 +
752 +  <target name="extra166ydist"
753 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
754 +          description="Puts all distributable products in single hierarchy"/>
755 +
756 +
757 +
758 +  <target name="extra166yclean"
759 +          description="Removes all build products">
760 +
761 +    <delete dir="${build.extra166y.dir}"/>
762 +    <delete dir="${build.extra166ylib.dir}"/>
763 +
764 +  </target>
765 +
766 +
767 +
768 +  <target name="extra166ydist-clean"
769 +          description="Removes all build and distribution products">
770 +
771 +  </target>
772 +
773 +  <target name="extra166ydist-docs"
774 +          description="Builds javadocs without custom tags to dist folder">
775 +
776 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
777 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
778 +
779 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
780 +                link="http://java.sun.com/javase/6/docs/api/"
781 +              source="${build.sourcelevel}"
782 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
783 +            >
784 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
785 +      <include name="extra166y/*.java"/>
786 +            </fileset>
787 +    </javadoc>
788 +
789 +  </target>
790 +
791 +  <target name="extra166ydist-jar"
792 +          depends="extra166yclean, extra166yjar">
793 +
794 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
795 +
796 +  </target>
797 +
798   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines