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.25 by tim, Mon May 19 11:33:20 2003 UTC vs.
Revision 1.85 by jsr166, Sat May 28 00:57:34 2011 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 <  <property name="testcase" value="*"/>
21 >
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
35 <  <property name="build.docsourcelevel" value="1.4"/>
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"/>
39  <!--
40  <property name="build.warnings"       value="true"/>
41  -->
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"/>
71  <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 95 | 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=true"/>
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}"/>
108    <jar basedir="${build.classes.dir}"
109        destfile="${product.jar}"
110    />
111  </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"
115 <          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
135 >  </target>
136  
137  
118  <target name="checkstyle" depends="filter-src"
119          description="Reports on style errors in Java source (verbose, mostly chaff)">
120    <taskdef resource="checkstyletask.properties"
121            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
122
123    <checkstyle>
124      <formatter type="plain"/>  <!-- also available: type="xml" -->
125      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
126    </checkstyle>
127  </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  
130  <target name="doccheck" depends="filter-src"
131          description="Reports on javadoc style errors (not working yet)">
132    <delete dir="${build.doccheck.dir}"/>
133    <mkdir dir="${build.doccheck.dir}"/>
134    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
135         docletpath="${lib.dir}/doccheck.jar"
136            destdir="${build.doccheck.dir}">
137      <packageset dir="${build.filter.src.dir}"/>
138    </javadoc>
139  </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://download.oracle.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.docsourcelevel}">
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >
156  
157 <      <tag name="revised" description="Last revised:"/>
152 <      <tag name="spec" description="Specified by:"/>
153 <      <tag name="editor" description="Last edited by:"/>
154 <      <tag name="fixme" description="FIX ME:"/>
155 <      <packageset dir="${build.filter.src.dir}"/>
157 >      <packageset dir="${src.dir}"/>
158  
159      </javadoc>
160 +
161    </target>
162  
163  
161  <!--
162   # javac -s doesn't reliably generate compilable code. It generates
163   # bridge methods (marked as "synthetic") that can have identical
164   # signatures to existing methods except for the return value.
165   -->
166  <target name="strip" depends="init">
167    <mkdir dir="${build.stripped.dir}"/>
168    <javac srcdir="${src.dir}"
169          destdir="${build.stripped.dir}"
170            debug="${build.debug}"
171       debuglevel="${build.debuglevel}"
172      deprecation="${build.deprecation}"
173           source="${build.sourcelevel}"
174             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  
179    </javac>
180  </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  
183  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
184          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  
201  <!-- 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">
208 <      <fileset dir="${build.javadocs.dir}"/>
209 <    </copy>
210 <    <copy todir="${deployDir}/docs/public">
211 <      <fileset dir="${dist.javadocs.dir}"/>
212 <    </copy>
213 <    <copy tofile="${deployDir}/index.html"
214 <          file="${basedir}/etc/anthill-index.html"/>
215 <    <copy todir="${deployDir}/notes">
216 <      <fileset dir="${basedir}/etc/notes"/>
217 <    </copy>
218 <  </target>
213 >    <delete dir="${dist.javadocs.dir}"/>
214 >    <mkdir dir="${dist.javadocs.dir}"/>
215  
216 +    <javadoc destdir="${dist.javadocs.dir}"
217 +            link="http://download.oracle.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  
223  <target name="set-warnings-if" if="build.warnings">
224    <property name="build.warnings.option" value="-warnunchecked"/>
244    </target>
245  
246  
228  <target name="set-warnings-unless" unless="build.warnings">
229    <property name="build.warnings.option" value=""/>
230  </target>
247  
248 +  <!-- Internal targets -->
249 +
250 +
251 +  <target name="init">
252  
233  <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">
247 <    <delete dir="${dist.javadocs.dir}"/>
248 <    <mkdir dir="${dist.javadocs.dir}"/>
249 <    <javadoc destdir="${dist.javadocs.dir}"
250 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
251 <            overview="${src.dir}/intro.html"
252 <              source="${build.docsourcelevel}">
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 +      <compilerarg value="-XDignore.symbol.file=true"/>
285  
286 <  <target name="compile-ant-filter" depends="init">
261 <    <mkdir dir="${build.ant.dir}"/>
262 <    <javac srcdir="${ant.src.dir}"
263 <          destdir="${build.ant.dir}"
264 <           source="1.4"
265 <    />
266 <  </target>
286 >      <classpath refid="test.classpath"/>
287  
288 +    </javac>
289  
290 <  <target name="filter-src" depends="compile-ant-filter">
291 <    <mkdir dir="${build.filter.src.dir}"/>
292 <    <copy todir="${build.filter.src.dir}">
293 <      <fileset dir="${src.dir}">
294 <        <include name="**/*.java"/>
295 <      </fileset>
296 <      <filterchain>
276 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
277 <                      classpath="${build.ant.dir}">
278 <          <!--
279 <           # These arguments are to get rid of angle-bracketed type
280 <           # parameters so that javadoc can run on the result. The
281 <           # following heuristic that seems to work:
282 <           #
283 <           # For all lines not starting with space(s)-asterisk-space(s),
284 <           #   replace <something> with a space, where there may be more
285 <           #   than one right angle bracket at the end, and "something"
286 <           #   must not contain parens or pipes. (This may need some
287 <           #   tweaking.)
288 <           -->
289 <          <param name="notmatching" value="^\s+\*\s.*$"/>
290 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
291 <          <param name="replacement" value=" "/>
292 <        </filterreader>
293 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
294 <                      classpath="${build.ant.dir}">
295 <          <!--
296 <           # These arguments are to uncomment lines beginning with
297 <           # "//@" so that javadoc can see imports that are needed
298 <           # to resolve links but that shouldn't be in the compiled
299 <           # code.
300 <           -->
301 <          <param name="matching" value="^//@.*$"/>
302 <          <param name="pattern" value="^//@"/>
303 <          <param name="replacement" value=""/>
304 <        </filterreader>
305 <      </filterchain>
306 <    </copy>
307 <  </target>
290 >    <javac srcdir="${test.src.dir}"
291 >          destdir="${build.testcases.dir}"
292 >            debug="${build.debug}"
293 >       debuglevel="${build.debuglevel}"
294 >      deprecation="${build.deprecation}"
295 >           source="${build.sourcelevel}"
296 >             fork="true">
297  
298 +      <include name="jsr166/test/**"/>
299  
300 <  <target name="compile-tests" depends="jar">
301 <    <mkdir dir="${build.testcases.dir}"/>
302 <    <javac srcdir="${test.src.dir}"
300 >      <compilerarg value="${bootclasspath.args}"/>
301 >      <compilerarg line="${build.args}"/>
302 >      <compilerarg value="-XDignore.symbol.file=true"/>
303 >
304 >      <classpath refid="test.classpath"/>
305 >
306 >    </javac>
307 >
308 > <!--
309 >    <javac srcdir="${jtreg.src.dir}"
310            destdir="${build.testcases.dir}"
311              debug="${build.debug}"
312         debuglevel="${build.debuglevel}"
# Line 317 | Line 314 | ant [target], where target is one of:
314             source="${build.sourcelevel}"
315               fork="true">
316  
317 <      <bootclasspath refid="javac.bootclasspath"/>
318 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
317 >      <compilerarg value="${bootclasspath.args}"/>
318 >      <compilerarg line="${build.args}"/>
319 >      <compilerarg value="-XDignore.symbol.file=true"/>
320 >
321        <classpath refid="test.classpath"/>
322  
323      </javac>
324 + -->
325 +
326    </target>
327  
328  
329 <  <target name="run-tests" depends="compile-tests">
329 >  <target name="run-tests"
330 >          depends="compile-tests">
331 >
332 >    <!-- May be overridden by user.properties -->
333 >    <property name="testcase" value="*"/>
334 >
335      <mkdir dir="${build.reports.dir}"/>
336 +
337      <junit printsummary="true"
338               showoutput="true"
339            errorProperty="junit.failed"
# Line 334 | Line 341 | ant [target], where target is one of:
341                      dir="${build.reports.dir}"
342                     fork="true">
343  
344 <      <!--
345 <       ! This nastiness is so JUnit can test classes we are inserting
346 <       ! into the java.* packages.
347 <       -->
348 <      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
344 >      <jvmarg value="${bootclasspath.args}"/>
345 >      <jvmarg value="-server"/>
346 >      <jvmarg value="-showversion"/>
347 >
348 >      <classpath refid="test.classpath"/>
349  
350        <formatter type="xml"/>
351  
352 <      <batchtest todir="${build.reports.dir}">
352 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
353 >        <fileset dir="${tck.src.dir}">
354 >          <include name="**/${testcase}Test.java"/>
355 >        </fileset>
356 >      </batchtest>
357 >
358 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
359          <fileset dir="${test.src.dir}">
360 +          <include name="jsr166/test/**/${testcase}Test.java"/>
361 +        </fileset>
362 +      </batchtest>
363 +
364 + <!--
365 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
366 +        <fileset dir="${jtreg.src.dir}">
367            <include name="**/${testcase}Test.java"/>
368          </fileset>
369        </batchtest>
370 + -->
371  
372      </junit>
373 +
374    </target>
375  
376  
377 <  <target name="report-tests" depends="run-tests">
378 <    <!-- Sets junit.report.format to frames if Xalan is present,
377 >  <target name="report-tests"
378 >          depends="run-tests">
379 >
380 >    <!-- Sets junit.report.format to frames if redirection is present,
381           otherwise sets it to noframes. -->
382      <available property="junit.report.format"
383                    value="frames"
# Line 365 | Line 389 | ant [target], where target is one of:
389        <fileset dir="${build.reports.dir}">
390          <include name="TEST-*.xml"/>
391        </fileset>
392 <      <report styledir="${stylesheet.dir}"
369 <                format="${junit.report.format}"
370 <                 todir="${build.reports.dir}"
392 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
393        />
394      </junitreport>
395  
396      <fail message="Test Cases Failed" if="junit.failed"/>
397 +
398    </target>
399  
400  
401 <  <target name="check-junit">
402 <    <!-- FIXME: this test isn't specific enough -->
401 >  <target name="configure-compiler">
402 >
403 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
404 >
405 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
406 >      <istrue value="${build.warnunchecked}"/>
407 >    </condition>
408 >
409 >    <property name="warnunchecked.arg" value=""/>
410 >
411 >
412 >    <!-- Common options in javac invocations -->
413 >    <property name="build.args" value="${warnunchecked.arg}"/>
414 >
415 >  </target>
416 >
417 >
418 >  <target name="configure-tests"
419 >       depends="configure-compiler">
420 >
421 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
422      <available property="junit.available"
423 <               classname="junit.framework.TestCase"/>
424 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
423 >               classname="junit.framework.Protectable"/>
424 >
425 >    <!-- Xalan -->
426 >    <available property="xalan.available"
427 >               classname="org.apache.xalan.Version"/>
428 >
429 >
430 >    <!-- Ant 1.6beta and later don't need or want this check -->
431 >    <!--
432 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
433 >          unless="junit.available"/>
434 >
435 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
436 >          unless="xalan.available"/>
437 >    -->
438 >
439 >  </target>
440 >
441 >
442 >  <!-- Various demos and test programs -->
443 >
444 >
445 >  <target name="loops" depends="init, configure-compiler"
446 >          description="Benchmark from Doug Lea's AQS paper">
447 >
448 >    <mkdir dir="${build.loops.dir}"/>
449 >
450 >    <javac srcdir="${loops.src.dir}"
451 >          destdir="${build.loops.dir}"
452 >            debug="${build.debug}"
453 >       debuglevel="${build.debuglevel}"
454 >      deprecation="${build.deprecation}"
455 >           source="${build.sourcelevel}"
456 >             fork="true">
457 >
458 >      <compilerarg line="${build.args}"/>
459 >      <classpath refid="loops.classpath"/>
460 >      <compilerarg value="-XDignore.symbol.file=true"/>
461 >
462 >    </javac>
463 >
464 >    <java classname="ALoops" fork="true">
465 >      <classpath refid="loops.classpath"/>
466 >    </java>
467 >
468    </target>
469  
470  
471 +  <!-- jsr166x -->
472 +
473 +
474 +  <target name="jsr166xcompile"
475 +          depends="init, configure-compiler"
476 +          description="Compiles jsr166x sources">
477 +
478 +    <mkdir dir="${build.jsr166x.dir}"/>
479 +
480 +    <javac srcdir="${jsr166xsrc.dir}"
481 +          destdir="${build.jsr166x.dir}"
482 +            debug="${build.debug}"
483 +       debuglevel="${build.debuglevel}"
484 +      deprecation="${build.deprecation}"
485 +           source="${build.sourcelevel}"
486 +             fork="true">
487 +
488 +      <include name="**/*.java"/>
489 +      <compilerarg line="${build.args}"/>
490 +      <compilerarg value="-XDignore.symbol.file=true"/>
491 +
492 +    </javac>
493 +
494 +  </target>
495 +
496 +
497 +
498 +  <target name="jsr166xjar"
499 +          depends="jsr166xcompile"
500 +          description="Builds library jar from compiled sources">
501 +
502 +    <mkdir dir="${build.jsr166xlib.dir}"/>
503 +
504 +    <jar destfile="${jsr166xproduct.jar}">
505 +      <fileset dir="${build.jsr166x.dir}"/>
506 +    </jar>
507 +
508 +  </target>
509 +
510 +
511 +
512 +  <target name="jsr166xdocs"
513 +          description="Builds javadocs with custom tags to build folder">
514 +
515 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
516 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
517 +
518 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
519 +             packagenames="jsr166x"
520 +             link="http://download.oracle.com/javase/6/docs/api/"
521 +             source="${build.sourcelevel}"
522 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
523 +
524 +  </target>
525 +
526 +
527 +  <target name="jsr166xdist"
528 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529 +          description="Puts all distributable products in single hierarchy"/>
530 +
531 +
532 +
533 +  <target name="jsr166xclean"
534 +          description="Removes all build products">
535 +
536 +    <delete dir="${build.jsr166x.dir}"/>
537 +    <delete dir="${build.jsr166xlib.dir}"/>
538 +
539 +  </target>
540 +
541 +
542 +
543 +  <target name="jsr166xdist-clean"
544 +          description="Removes all build and distribution products">
545 +
546 +  </target>
547 +
548 +
549 +
550 +  <target name="jsr166xdist-docs"
551 +          description="Builds javadocs without custom tags to dist folder">
552 +
553 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
554 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555 +
556 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
557 +             packagenames="jsr166x"
558 +             link="http://download.oracle.com/javase/6/docs/api/"
559 +             source="${build.sourcelevel}"
560 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
561 +
562 +  </target>
563 +
564 +  <target name="jsr166xdist-jar"
565 +          depends="jsr166xclean, jsr166xjar">
566 +
567 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
568 +
569 +  </target>
570 +
571 +  <!-- jsr166y -->
572 +
573 +
574 +  <target name="jsr166ycompile"
575 +          depends="init, configure-compiler"
576 +          description="Compiles jsr166y sources">
577 +
578 +    <mkdir dir="${build.jsr166y.dir}"/>
579 +
580 +    <javac srcdir="${jsr166ysrc.dir}"
581 +          destdir="${build.jsr166y.dir}"
582 +            debug="${build.debug}"
583 +       debuglevel="${build.debuglevel}"
584 +      deprecation="${build.deprecation}"
585 +           source="${build.sourcelevel}"
586 +             fork="true">
587 +
588 +      <include name="**/*.java"/>
589 +      <compilerarg line="${build.args}"/>
590 +      <compilerarg value="-XDignore.symbol.file=true"/>
591 +      <compilerarg value="${bootclasspath.args}"/>
592 +
593 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
594 +
595 +    </javac>
596 +
597 +  </target>
598 +
599 +
600 +
601 +  <target name="jsr166yjar"
602 +          depends="jsr166ycompile"
603 +          description="Builds library jar from compiled sources">
604 +
605 +    <mkdir dir="${build.jsr166ylib.dir}"/>
606 +
607 +    <jar destfile="${jsr166yproduct.jar}" index="true">
608 +      <fileset dir="${build.jsr166y.dir}"/>
609 +    </jar>
610 +
611 +  </target>
612 +
613 +
614 +
615 +  <target name="jsr166ydocs"
616 +          description="Builds javadocs with custom tags to build folder">
617 +
618 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
619 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
620 +
621 +    <javadoc destdir="${build.jsr166yjavadocs.dir}"
622 +             packagenames="jsr166y"
623 +             link="http://download.oracle.com/javase/6/docs/api/"
624 +             source="${build.sourcelevel}"
625 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
626 +
627 +  </target>
628 +
629 +
630 +  <target name="jsr166ydist"
631 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
632 +          description="Puts all distributable products in single hierarchy"/>
633 +
634 +
635 +
636 +  <target name="jsr166yclean"
637 +          description="Removes all build products">
638 +
639 +    <delete dir="${build.jsr166y.dir}"/>
640 +    <delete dir="${build.jsr166ylib.dir}"/>
641 +
642 +  </target>
643 +
644 +
645 +
646 +  <target name="jsr166ydist-clean"
647 +          description="Removes all build and distribution products">
648 +
649 +  </target>
650 +
651 +  <target name="jsr166ydist-docs"
652 +          description="Builds javadocs without custom tags to dist folder">
653 +
654 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
655 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
656 +
657 +    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
658 +             packagenames="jsr166y"
659 +             link="http://download.oracle.com/javase/6/docs/api/"
660 +             source="${build.sourcelevel}"
661 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
662 +
663 +  </target>
664 +
665 +  <target name="jsr166ydist-jar"
666 +          depends="jsr166yclean, jsr166yjar">
667 +
668 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
669 +
670 +  </target>
671 +
672 +  <!-- extra166y -->
673 +
674 +
675 +  <target name="extra166ycompile"
676 +          depends="init, configure-compiler, jsr166ycompile"
677 +          description="Compiles extra166y sources">
678 +
679 +    <mkdir dir="${build.extra166y.dir}"/>
680 +
681 +    <javac srcdir="${extra166ysrc.dir}"
682 +          destdir="${build.extra166y.dir}"
683 +            debug="${build.debug}"
684 +            classpath="${jsr166yproduct.jar}"
685 +       debuglevel="${build.debuglevel}"
686 +      deprecation="${build.deprecation}"
687 +           source="${build.sourcelevel}"
688 +             fork="true">
689 +
690 +      <include name="**/*.java"/>
691 +      <compilerarg line="${build.args}"/>
692 +      <compilerarg value="-XDignore.symbol.file=true"/>
693 +      <compilerarg value="${bootclasspath.args}"/>
694 +
695 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
696 +
697 +    </javac>
698 +
699 +  </target>
700 +
701 +
702 +
703 +  <target name="extra166yjar"
704 +          depends="extra166ycompile"
705 +          description="Builds library jar from compiled sources">
706 +
707 +    <mkdir dir="${build.extra166ylib.dir}"/>
708 +
709 +    <jar destfile="${extra166yproduct.jar}" index="true">
710 +      <fileset dir="${build.extra166y.dir}"/>
711 +    </jar>
712 +
713 +  </target>
714 +
715 +
716 +
717 +  <target name="extra166ydocs"
718 +          description="Builds javadocs with custom tags to build folder">
719 +
720 +    <delete dir="${build.extra166yjavadocs.dir}"/>
721 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
722 +
723 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
724 +             packagenames="extra166y"
725 +             link="http://download.oracle.com/javase/6/docs/api/"
726 +             source="${build.sourcelevel}"
727 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
728 +
729 +  </target>
730 +
731 +
732 +  <target name="extra166ydist"
733 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
734 +          description="Puts all distributable products in single hierarchy"/>
735 +
736 +
737 +
738 +  <target name="extra166yclean"
739 +          description="Removes all build products">
740 +
741 +    <delete dir="${build.extra166y.dir}"/>
742 +    <delete dir="${build.extra166ylib.dir}"/>
743 +
744 +  </target>
745 +
746 +
747 +
748 +  <target name="extra166ydist-clean"
749 +          description="Removes all build and distribution products">
750 +
751 +  </target>
752 +
753 +  <target name="extra166ydist-docs"
754 +          description="Builds javadocs without custom tags to dist folder">
755 +
756 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
757 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
758 +
759 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
760 +             packagenames="extra166y"
761 +             link="http://download.oracle.com/javase/6/docs/api/"
762 +             source="${build.sourcelevel}"
763 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
764 +
765 +  </target>
766 +
767 +  <target name="extra166ydist-jar"
768 +          depends="extra166yclean, extra166yjar">
769 +
770 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
771 +
772 +  </target>
773 +
774   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines