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.21 by tim, Fri Mar 14 04:14:07 2003 UTC vs.
Revision 1.67 by jsr166, Sun Apr 11 22:00:40 2004 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"/>
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.j1.dir"         location="${build.dir}/j1"/>
34 +  <property name="build.loops.dir"      location="${build.dir}/loops"/>
35    <property name="build.lib.dir"        location="${build.dir}/lib"/>
36    <property name="build.ant.dir"        location="${build.dir}/ant"/>
37    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
47  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
38    <property name="build.reports.dir"    location="${build.dir}/reports"/>
39 +  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
40    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42 +  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43  
44    <!-- Source locations -->
45 <  <property name="src.dir"              location="${basedir}"/>
46 <  <property name="test.src.dir"         location="${basedir}/etc/testcases"/>
45 >  <property name="src.dir"              location="${basedir}/src/main"/>
46 >  <property name="test.src.dir"         location="${basedir}/src/test"/>
47 >  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
48 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
49 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
50 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
51    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
52    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
53    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 62 | Line 58 | ant [target], where target is one of:
58  
59    <!-- Jar locations -->
60    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
65  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
66  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
61    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
62 >  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
63  
64 <  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
64 >  <!-- Bootclasspath argument -->
65 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
66  
67 <  <path id="javac.bootclasspath">
68 <    <pathelement location="${collect.jar}"/>
69 <    <pathelement location="${rt.jar}"/>
67 >  <!-- Test classpath -->
68 >  <path id="test.classpath">
69 >    <pathelement location="${build.testcases.dir}"/>
70 >    <pathelement location="${junit.jar}"/>
71    </path>
72  
73 <  <path id="test.classpath">
74 <    <pathelement location="${product.jar}"/>
73 >  <!-- ALoops classpath -->
74 >  <path id="loops.classpath">
75 >    <pathelement location="${build.loops.dir}"/>
76 >  </path>
77 >
78 >  <!-- J1 classpath -->
79 >  <path id="j1.classpath">
80 >    <pathelement location="${build.j1.dir}"/>
81 >    <pathelement location="${junit.jar}"/>
82 >    <pathelement location="${concurrent.jar}"/>
83    </path>
84  
85  
86    <!-- Main targets -->
87  
88 <  <target name="compile" depends="init"
89 <          description="Compiles all sources to build folder">
88 >
89 >  <target name="compile"
90 >          depends="init, configure-compiler"
91 >          description="Compiles main sources to build folder">
92 >
93      <mkdir dir="${build.classes.dir}"/>
94 +
95      <javac srcdir="${src.dir}"
96            destdir="${build.classes.dir}"
97              debug="${build.debug}"
# Line 92 | Line 100 | ant [target], where target is one of:
100             source="${build.sourcelevel}"
101               fork="true">
102  
103 <      <bootclasspath refid="javac.bootclasspath"/>
96 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
97 <
98 <      <!-- need this because srcdir is basedir! -->
99 <      <include name="java/**/*.java"/>
103 >      <compilerarg line="${build.args}"/>
104  
105      </javac>
106 +
107    </target>
108  
109  
110 <  <target name="jar" depends="compile"
110 >
111 >  <target name="jar"
112 >          depends="compile"
113            description="Builds library jar from compiled sources">
107    <mkdir dir="${build.lib.dir}"/>
108    <jar basedir="${build.classes.dir}"
109        destfile="${product.jar}"
110    />
111  </target>
114  
115 +    <mkdir dir="${build.lib.dir}"/>
116  
117 <  <target name="test" depends="init, check-junit, report-tests"
118 <          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
117 >    <jar destfile="${product.jar}">
118 >      <fileset dir="${build.classes.dir}"/>
119 >    </jar>
120  
121 +  </target>
122  
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"/>
123  
123    <checkstyle>
124      <formatter type="plain"/>  <!-- also available: type="xml" -->
125      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
126    </checkstyle>
127  </target>
124  
125 +  <target name="test"
126 +          depends="init, configure-tests, report-tests"
127 +          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
128  
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        <include name="java/**"/>
139      </packageset>
140    </javadoc>
141  </target>
129  
130  
131 <  <target name="docs" depends="filter-src"
131 >  <target name="docs"
132            description="Builds javadocs with custom tags to build folder">
133 +
134      <delete dir="${build.javadocs.dir}"/>
135      <mkdir dir="${build.javadocs.dir}"/>
136 +
137      <javadoc destdir="${build.javadocs.dir}"
138                  link="http://java.sun.com/j2se/1.4.1/docs/api"
139              overview="${src.dir}/intro.html"
140                source="${build.sourcelevel}">
141  
142        <tag name="revised" description="Last revised:"/>
143 <      <tag name="spec" description="Specified by:"/>
144 <      <tag name="editor" description="Last edited by:"/>
145 <      <tag name="fixme" description="FIX ME:"/>
157 <      <packageset dir="${build.filter.src.dir}">
158 <        <include name="java/**"/>
159 <      </packageset>
143 >      <tag name="spec"    description="Specified by:"/>
144 >
145 >      <packageset dir="${src.dir}"/>
146  
147      </javadoc>
148 +
149    </target>
150  
151  
165  <target name="strip" depends="init">
166    <mkdir dir="${build.stripped.dir}"/>
167    <javac srcdir="${src.dir}"
168          destdir="${build.stripped.dir}"
169            debug="${build.debug}"
170       debuglevel="${build.debuglevel}"
171      deprecation="${build.deprecation}"
172           source="${build.sourcelevel}"
173             fork="true">
152  
153 <      <bootclasspath refid="javac.bootclasspath"/>
154 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
153 >  <target name="doccheck"
154 >          depends="filter-doccheck"
155 >          description="Reports on javadoc style errors">
156  
157 <      <!-- need this because srcdir is basedir! -->
158 <      <include name="java/**/*.java"/>
157 >    <delete dir="${build.doccheck.dir}"/>
158 >    <mkdir dir="${build.doccheck.dir}"/>
159 >
160 >    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
161 >         docletpath="${lib.dir}/doccheck.jar"
162 >            destdir="${build.doccheck.dir}">
163 >      <packageset dir="${build.dc-filter.dir}"/>
164 >    </javadoc>
165 >
166 >    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
167  
181    </javac>
168    </target>
169  
170  
171 <  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
171 >
172 >  <target name="checkstyle"
173 >          depends="filter-src"
174 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
175 >
176 >    <taskdef resource="checkstyletask.properties"
177 >            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
178 >
179 >    <mkdir dir="${build.checkstyle.dir}"/>
180 >
181 >    <checkstyle config="etc/checkstyle/sun_checks.xml"
182 >       failOnViolation="false">
183 >      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
184 >      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
185 >    </checkstyle>
186 >
187 >    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
188 >          out="${build.checkstyle.dir}/checkstyle-report.html"
189 >        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
190 >
191 >  </target>
192 >
193 >
194 >
195 >  <target name="dist"
196 >          depends="init, dist-clean, dist-jar, dist-docs"
197            description="Puts all distributable products in single hierarchy"/>
198  
199  
200 +
201 +  <target name="release"
202 +          depends="dist"
203 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
204 +
205 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
206 +
207 +    <jar basedir="${basedir}" destfile="${release.jar}">
208 +      <!-- <exclude name="build/**"/> -->
209 +      <exclude name="${release.jar}"/>
210 +      <exclude name="user.properties"/>
211 +      <exclude name="etc/notes/**"/>
212 +      <exclude name="src/emulation/**"/>
213 +      <exclude name="**/SyntaxTest.java"/>
214 +      <exclude name="**/SuperfluousAbstract.java"/>
215 +    </jar>
216 +
217 +  </target>
218 +
219 +
220 +
221    <target name="clean"
222            description="Removes all build products">
223 +
224      <delete dir="${build.dir}"/>
225      <delete dir="${build.classes.dir}"/>
226      <delete dir="${build.lib.dir}"/>
227 +
228    </target>
229  
230  
231 +
232    <target name="dist-clean"
233            description="Removes all build and distribution products">
234 +
235      <delete dir="${dist.dir}"/>
236 +
237    </target>
238  
239  
203  <!-- Anthill targets -->
240  
241 <  <!-- Should really run the tests instead of just the jar target -->
242 <  <target name="anthill-build" depends="jar, docs, dist-docs"/>
241 >  <target name="dist-docs"
242 >          description="Builds javadocs without custom tags to dist folder">
243  
244 <  <target name="anthill-publish">
245 <    <copy todir="${deployDir}/docs/private">
246 <      <fileset dir="${build.javadocs.dir}"/>
247 <    </copy>
248 <    <copy todir="${deployDir}/docs/public">
249 <      <fileset dir="${dist.javadocs.dir}"/>
250 <    </copy>
215 <    <copy tofile="${deployDir}/index.html"
216 <          file="${basedir}/etc/anthill-index.html"/>
217 <    <copy todir="${deployDir}/notes">
218 <      <fileset dir="${basedir}/etc/notes"/>
219 <    </copy>
220 <  </target>
244 >    <delete dir="${dist.javadocs.dir}"/>
245 >    <mkdir dir="${dist.javadocs.dir}"/>
246 >
247 >    <javadoc destdir="${dist.javadocs.dir}"
248 >                link="http://java.sun.com/j2se/1.4.2/docs/api"
249 >            overview="${src.dir}/intro.html"
250 >              source="${build.sourcelevel}">
251  
252 +      <packageset dir="${src.dir}"/>
253  
254 <  <!-- Internal targets -->
254 >    </javadoc>
255  
225  <target name="set-warnings-if" if="build.warnings">
226    <property name="build.warnings.option" value="-warnunchecked"/>
256    </target>
257  
258  
230  <target name="set-warnings-unless" unless="build.warnings">
231    <property name="build.warnings.option" value=""/>
232  </target>
259  
260 +  <!-- Internal targets -->
261 +
262 +
263 +  <target name="init">
264  
235  <target name="init" depends="set-warnings-if, set-warnings-unless">
265      <!-- Version is kept in a separate file -->
266      <loadfile property="version" srcFile="version.properties"/>
267      <echo>Building JSR-166 version ${version}</echo>
268 <  </target>
240 <
268 >    <echo>java.home is ${java.home}</echo>
269  
242  <target name="dist-jar" depends="clean, jar">
243    <copy file="${product.jar}" todir="${dist.dir}"/>
270    </target>
271  
272  
273 <  <target name="dist-docs" depends="filter-src"
274 <          description="Builds javadocs without custom tags to dist folder">
249 <    <delete dir="${dist.javadocs.dir}"/>
250 <    <mkdir dir="${dist.javadocs.dir}"/>
251 <    <javadoc destdir="${dist.javadocs.dir}"
252 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
253 <            overview="${src.dir}/intro.html"
254 <              source="${build.sourcelevel}">
273 >  <target name="dist-jar"
274 >          depends="clean, jar">
275  
276 <      <packageset dir="${build.filter.src.dir}">
257 <        <include name="java/**"/>
258 <      </packageset>
276 >    <copy file="${product.jar}" todir="${dist.dir}"/>
277  
260    </javadoc>
278    </target>
279  
280  
281 <  <target name="compile-ant-filter" depends="init">
281 >  <target name="compile-ant-filter"
282 >          depends="init">
283 >
284      <mkdir dir="${build.ant.dir}"/>
285 +
286      <javac srcdir="${ant.src.dir}"
287            destdir="${build.ant.dir}"
288 <           source="1.4"
289 <    />
288 >           source="1.4"/>
289 >
290    </target>
291  
292  
293 <  <target name="filter-src" depends="compile-ant-filter">
293 >  <target name="filter-src"
294 >          depends="compile-ant-filter">
295 >
296      <mkdir dir="${build.filter.src.dir}"/>
297 +
298 +    <copy todir="${build.filter.src.dir}">
299 +      <fileset dir="${src.dir}">
300 +        <include name="**/*.html"/>
301 +      </fileset>
302 +    </copy>
303 +
304      <copy todir="${build.filter.src.dir}">
305        <fileset dir="${src.dir}">
306 <        <include name="java/**/*.java"/>
306 >        <exclude name="**/*.html"/>
307 >        <!-- Files excluded from dist-docs -->
308 >        <exclude name="java/util/Random.*"/>
309 >        <exclude name="sun/misc/Unsafe.*"/>
310        </fileset>
311 +      <!--
312        <filterchain>
313 +      -->
314 +
315 +        <!--
316 +         # This filter gets rid of angle-bracketed type parameters
317 +         # so that javadoc can run on the result. The following
318 +         # heuristic seems to work:
319 +         #
320 +         # For all lines not starting with space(s)-asterisk-space(s),
321 +         #   replace <something> with a space, where there may be more
322 +         #   than one right angle bracket at the end, and "something"
323 +         #   must not contain parens or pipes. (This may need some
324 +         #   tweaking.)
325 +         -->
326 +
327 +        <!--
328          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
329                        classpath="${build.ant.dir}">
282          <!--
283           # These arguments are to get rid of angle-bracketed type
284           # parameters so that javadoc can run on the result. The
285           # following heuristic that seems to work:
286           #
287           # For all lines not starting with space(s)-asterisk-space(s),
288           #   replace <something> with a space, where there may be more
289           #   than one right angle bracket at the end, and "something"
290           #   must not contain parens or pipes. (This may need some
291           #   tweaking.)
292           -->
330            <param name="notmatching" value="^\s+\*\s.*$"/>
331 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
331 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
332            <param name="replacement" value=" "/>
333          </filterreader>
334 +        -->
335 +
336 +      <!--
337 +      </filterchain>
338 +      -->
339 +    </copy>
340 +
341 +  </target>
342 +
343 +
344 +  <target name="filter-doccheck"
345 +          depends="filter-src">
346 +
347 +    <mkdir dir="${build.dc-filter.dir}"/>
348 +
349 +    <copy todir="${build.dc-filter.dir}">
350 +      <fileset dir="${build.filter.src.dir}">
351 +        <include name="**/*.html"/>
352 +      </fileset>
353 +    </copy>
354 +
355 +    <property name="generic.declarations"
356 +             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
357 +    />
358 +
359 +    <copy todir="${build.dc-filter.dir}">
360 +      <fileset dir="${build.filter.src.dir}">
361 +        <exclude name="**/*.html"/>
362 +      </fileset>
363 +      <filterchain>
364 +        <!--
365 +         # These two filters try to make the source look like
366 +         # something that doccheck can process. The first removes
367 +         # -source 1.4 assertions and the second adds in a bunch
368 +         # of single letter public nested marker interfaces so that
369 +         # the generic type parameters are recognized.
370 +         -->
371 +
372 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
373 +                      classpath="${build.ant.dir}">
374 +          <param name="matching"    value="^\s*assert[\s ].*$"/>
375 +          <param name="pattern"     value="assert"/>
376 +          <param name="replacement" value="//assert"/>
377 +        </filterreader>
378 +
379          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
380                        classpath="${build.ant.dir}">
381 <          <!--
382 <           # These arguments are to uncomment lines beginning with
383 <           # "//@" so that javadoc can see imports that are needed
302 <           # to resolve links but that shouldn't be in the compiled
303 <           # code.
304 <           -->
305 <          <param name="matching" value="^//@.*$"/>
306 <          <param name="pattern" value="^//@"/>
307 <          <param name="replacement" value=""/>
381 >          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
382 >          <param name="pattern"     value="$"/>
383 >          <param name="replacement" value=" ${generic.declarations}"/>
384          </filterreader>
385 +
386        </filterchain>
387      </copy>
388 +
389    </target>
390  
391  
392 <  <target name="compile-tests" depends="jar">
392 >  <target name="compile-tests"
393 >          depends="jar">
394 >
395      <mkdir dir="${build.testcases.dir}"/>
396 +
397 +    <javac srcdir="${tck.src.dir}"
398 +          destdir="${build.testcases.dir}"
399 +            debug="${build.debug}"
400 +       debuglevel="${build.debuglevel}"
401 +      deprecation="${build.deprecation}"
402 +           source="${build.sourcelevel}"
403 +             fork="true">
404 +
405 +      <compilerarg value="${bootclasspath.args}"/>
406 +      <compilerarg line="${build.args}"/>
407 +
408 +      <classpath refid="test.classpath"/>
409 +
410 +    </javac>
411 +
412      <javac srcdir="${test.src.dir}"
413            destdir="${build.testcases.dir}"
414              debug="${build.debug}"
# Line 321 | Line 417 | ant [target], where target is one of:
417             source="${build.sourcelevel}"
418               fork="true">
419  
420 <      <bootclasspath refid="javac.bootclasspath"/>
421 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
420 >      <include name="jsr166/test/**"/>
421 >
422 >      <compilerarg value="${bootclasspath.args}"/>
423 >      <compilerarg line="${build.args}"/>
424 >
425 >      <classpath refid="test.classpath"/>
426 >
427 >    </javac>
428 >
429 > <!--
430 >    <javac srcdir="${jtreg.src.dir}"
431 >          destdir="${build.testcases.dir}"
432 >            debug="${build.debug}"
433 >       debuglevel="${build.debuglevel}"
434 >      deprecation="${build.deprecation}"
435 >           source="${build.sourcelevel}"
436 >             fork="true">
437 >
438 >      <compilerarg value="${bootclasspath.args}"/>
439 >      <compilerarg line="${build.args}"/>
440 >
441        <classpath refid="test.classpath"/>
442  
443      </javac>
444 + -->
445 +
446    </target>
447  
448  
449 <  <target name="run-tests" depends="compile-tests">
449 >  <target name="run-tests"
450 >          depends="compile-tests">
451 >
452 >    <!-- May be overridden by user.properties -->
453 >    <property name="testcase" value="*"/>
454 >
455      <mkdir dir="${build.reports.dir}"/>
456 +
457      <junit printsummary="true"
458               showoutput="true"
459            errorProperty="junit.failed"
# Line 338 | Line 461 | ant [target], where target is one of:
461                      dir="${build.reports.dir}"
462                     fork="true">
463  
464 <      <!--
465 <       ! This nastiness is so JUnit can test classes we are inserting
466 <       ! into the java.* packages.
467 <       -->
468 <      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
464 >      <jvmarg value="${bootclasspath.args}"/>
465 >      <jvmarg value="-server"/>
466 >      <jvmarg value="-showversion"/>
467 >
468 >      <classpath refid="test.classpath"/>
469  
470        <formatter type="xml"/>
471  
472 <      <batchtest todir="${build.reports.dir}">
472 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
473 >        <fileset dir="${tck.src.dir}">
474 >          <include name="**/${testcase}Test.java"/>
475 >        </fileset>
476 >      </batchtest>
477 >
478 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
479          <fileset dir="${test.src.dir}">
480 <          <include name="**/*Test.java"/>
480 >          <include name="jsr166/test/**/${testcase}Test.java"/>
481 >        </fileset>
482 >      </batchtest>
483 >
484 > <!--
485 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
486 >        <fileset dir="${jtreg.src.dir}">
487 >          <include name="**/${testcase}Test.java"/>
488          </fileset>
489        </batchtest>
490 + -->
491  
492      </junit>
493 +
494    </target>
495  
496  
497 <  <target name="report-tests" depends="run-tests">
498 <    <!-- Sets junit.report.format to frames if Xalan is present,
497 >  <target name="report-tests"
498 >          depends="run-tests">
499 >
500 >    <!-- Sets junit.report.format to frames if redirection is present,
501           otherwise sets it to noframes. -->
502      <available property="junit.report.format"
503                    value="frames"
# Line 376 | Line 516 | ant [target], where target is one of:
516      </junitreport>
517  
518      <fail message="Test Cases Failed" if="junit.failed"/>
519 +
520    </target>
521  
522  
523 <  <target name="check-junit">
524 <    <!-- FIXME: this test isn't specific enough -->
523 >  <target name="configure-compiler">
524 >
525 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
526 >
527 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
528 >      <istrue value="${build.warnunchecked}"/>
529 >    </condition>
530 >
531 >    <property name="warnunchecked.arg" value=""/>
532 >
533 >
534 >    <!-- Common options in javac invocations -->
535 >    <property name="build.args" value="${warnunchecked.arg}"/>
536 >
537 >  </target>
538 >
539 >
540 >  <target name="configure-tests"
541 >       depends="configure-compiler">
542 >
543 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
544      <available property="junit.available"
545 <               classname="junit.framework.TestCase"/>
546 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
545 >               classname="junit.framework.Protectable"/>
546 >
547 >    <!-- Xalan -->
548 >    <available property="xalan.available"
549 >               classname="org.apache.xalan.Version"/>
550 >
551 >
552 >    <!-- Ant 1.6beta and later don't need or want this check -->
553 >    <!--
554 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
555 >          unless="junit.available"/>
556 >
557 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
558 >          unless="xalan.available"/>
559 >    -->
560 >
561 >  </target>
562 >
563 >
564 >
565 >  <!-- Anthill targets -->
566 >
567 >  <target name="anthill-build">
568 >
569 >    <!-- Override this in user.properties -->
570 >    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
571 >
572 >    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
573 >      <arg value="-Xmx256000000"/>
574 >      <!-- classpath of new JVM -->
575 >      <arg value="-classpath"/> <arg path="${java.class.path}"/>
576 >      <!-- location of Ant home directory -->
577 >      <arg value="-Dant.home=${ant.home}"/>
578 >      <!-- the Ant main class -->
579 >      <arg value="org.apache.tools.ant.Main"/>
580 >      <!-- The build file -->
581 >      <arg value="-buildfile"/>  <arg value="build.xml"/>
582 >      <!-- the target to build on the new Ant instance -->
583 >      <arg value="-DJAVA_HOME=${tiger.home}"/>
584 >      <arg value="do-anthill-build"/>
585 >    </exec>
586 >  </target>
587 >
588 >  <target name="do-anthill-build"
589 >          depends="jar, test, docs, dist-docs"/>
590 >
591 >  <target name="anthill-publish">
592 >
593 >    <copy todir="${deployDir}/docs/private">
594 >      <fileset dir="${build.javadocs.dir}"/>
595 >    </copy>
596 >
597 >    <copy todir="${deployDir}/docs/public">
598 >      <fileset dir="${dist.javadocs.dir}"/>
599 >    </copy>
600 >
601 >    <copy tofile="${deployDir}/index.html"
602 >          file="${basedir}/etc/anthill-index.html"/>
603 >
604 >    <copy todir="${deployDir}/notes">
605 >      <fileset dir="${basedir}/etc/notes"/>
606 >    </copy>
607 >
608 >  </target>
609 >
610 >
611 >
612 >  <!-- Various demos and test programs -->
613 >
614 >
615 >  <target name="sample" depends="init, configure-compiler"
616 >          description="Standalone demo program">
617 >
618 >    <mkdir dir="${build.testcases.dir}"/>
619 >
620 >    <javac srcdir="${test.src.dir}"
621 >          destdir="${build.testcases.dir}"
622 >            debug="${build.debug}"
623 >       debuglevel="${build.debuglevel}"
624 >      deprecation="${build.deprecation}"
625 >           source="${build.sourcelevel}"
626 >             fork="true">
627 >
628 >      <include name="jsr166/test/Sample.java"/>
629 >
630 >    </javac>
631 >
632 >    <copy todir="${build.testcases.dir}">
633 >      <fileset dir="${test.src.dir}">
634 >        <include name="**/*.properties"/>
635 >      </fileset>
636 >    </copy>
637 >
638 >
639 >    <java classname="jsr166.test.Sample" fork="true">
640 >      <classpath refid="test.classpath"/>
641 >      <!-- <jvmarg value="-ea"/> -->
642 >      <!-- <jvmarg value="-server"/> -->
643 >      <!-- <arg value="1000"/> -->
644 >    </java>
645 >  </target>
646 >
647 >
648 >  <target name="loops" depends="init, configure-compiler"
649 >          description="Benchmark from Doug Lea's AQS paper">
650 >
651 >    <mkdir dir="${build.loops.dir}"/>
652 >
653 >    <javac srcdir="${loops.src.dir}"
654 >          destdir="${build.loops.dir}"
655 >            debug="${build.debug}"
656 >       debuglevel="${build.debuglevel}"
657 >      deprecation="${build.deprecation}"
658 >           source="${build.sourcelevel}"
659 >             fork="true">
660 >
661 >      <compilerarg line="${build.args}"/>
662 >      <classpath refid="loops.classpath"/>
663 >
664 >    </javac>
665 >
666 >    <java classname="ALoops" fork="true">
667 >      <classpath refid="loops.classpath"/>
668 >    </java>
669 >
670 >  </target>
671 >
672 >
673 >  <target name="compile-j1" depends="init, configure-compiler">
674 >
675 >    <mkdir dir="${build.j1.dir}"/>
676 >
677 >    <javac srcdir="${j1.src.dir}"
678 >          destdir="${build.j1.dir}"
679 >            debug="${build.debug}"
680 >       debuglevel="${build.debuglevel}"
681 >      deprecation="${build.deprecation}"
682 >           source="${build.sourcelevel}" >
683 >
684 >      <include name="**/*.java"/>
685 >      <exclude name="**/dijkstra/**"/>
686 >
687 >      <compilerarg line="${build.args}"/>
688 >      <classpath refid="j1.classpath"/>
689 >
690 >    </javac>
691 >
692 >  </target>
693 >
694 >
695 >  <target name="sw" depends="compile-j1"
696 >          description="Runs the SwingWorker demo">
697 >
698 >    <!--
699 >    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
700 >      <classpath refid="j1.classpath"/>
701 >    </java>
702 >    -->
703 >
704 >    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
705 >
706 >    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
707 >      <arg value="${build.j1.dir}/SwingWorker.html"/>
708 >    </exec>
709 >
710    </target>
711  
712 +  <target name="j1" depends="compile-j1"
713 +          description="Runs a standalone JavaOne program">
714 +
715 +    <java classname="jsr166.random.TestRandom" fork="true">
716 +      <classpath refid="j1.classpath"/>
717 +      <jvmarg value="-client"/>
718 +    </java>
719 +
720 +  </target>
721 +
722 +
723 +  <target name="test-j1" depends="compile-j1"
724 +          description="Runs testcases from the JavaOne source directories">
725 +
726 +    <junit printsummary="true"
727 +             showoutput="true"
728 +          errorProperty="junit.failed"
729 +        failureProperty="junit.failed"
730 +                    dir="${build.j1.dir}"
731 +                   fork="true">
732 +
733 +      <!-- <jvmarg value="-server"/> -->
734 +      <classpath refid="j1.classpath"/>
735 +      <formatter type="xml"/>
736 +
737 +      <batchtest todir="${build.j1.dir}">
738 +        <fileset dir="${j1.src.dir}">
739 +          <include name="**/*Test.java"/>
740 +        </fileset>
741 +      </batchtest>
742 +
743 +    </junit>
744 +
745 +    <available property="junit.report.format"
746 +                  value="frames"
747 +              classname="org.apache.xalan.lib.Redirect"/>
748 +    <property name="junit.report.format" value="noframes"/>
749 +
750 +    <junitreport todir="${build.j1.dir}">
751 +      <fileset dir="${build.j1.dir}">
752 +        <include name="TEST-*.xml"/>
753 +      </fileset>
754 +      <report styledir="${stylesheet.dir}"
755 +                format="${junit.report.format}"
756 +                 todir="${build.j1.dir}"
757 +      />
758 +    </junitreport>
759 +
760 +    <fail message="Test Cases Failed" if="junit.failed"/>
761 +
762 +  </target>
763 +
764 +
765 +
766 +  <!-- C++ and JNI definitions and demos -->
767 +
768 +  <target name="configure-cpp">
769 +
770 +    <!-- Define tasks and types -->
771 +
772 +    <path id="cpptasks.path">
773 +      <pathelement location="${lib.dir}/cpptasks.jar"/>
774 +    </path>
775 +    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
776 +    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
777 +
778 +    <!-- Set platform property for JNI includes -->
779 +
780 +    <condition property="platform" value="linux">
781 +      <os name="Linux"/>
782 +    </condition>
783 +    <condition property="platform" value="win32">
784 +      <os family="windows"/>
785 +    </condition>
786 +    <condition property="platform" value="solaris">
787 +      <os name="SunOS"/>
788 +    </condition>
789 +
790 +  </target>
791 +
792 +
793 +  <target name="cppdemo" depends="configure-cpp">
794 +
795 +    <mkdir dir="${build.dir}"/>
796 +
797 +    <cc multithreaded="true"
798 +                 name="g++"
799 +               objdir="${build.dir}"
800 +              outfile="${build.dir}/CppDemo">
801 +      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
802 +      <libset libs="stdc++"/>
803 +    </cc>
804 +
805 +    <exec executable="${build.dir}/CppDemo">
806 +      <arg line="count in word frequency of word in command line count"/>
807 +    </exec>
808 +
809 +  </target>
810 +
811 +
812 +  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
813 +
814 +    <mkdir dir="${build.testcases.dir}"/>
815 +
816 +    <javac srcdir="${test.src.dir}"
817 +          destdir="${build.testcases.dir}"
818 +            debug="${build.debug}"
819 +       debuglevel="${build.debuglevel}"
820 +      deprecation="${build.deprecation}"
821 +           source="${build.sourcelevel}"
822 +             fork="true">
823 +      <compilerarg value="${bootclasspath.args}"/>
824 +      <compilerarg line="${build.args}"/>
825 +      <classpath refid="test.classpath"/>
826 +      <include name="JniDemo.java"/>
827 +    </javac>
828 +
829 +    <javah destdir="${build.testcases.dir}"
830 +      classpathref="test.classpath">
831 +      <class name="JniDemo"/>
832 +    </javah>
833 +
834 +    <cc multithreaded="true"
835 +                 name="g++"
836 +               objdir="${build.dir}"
837 +              outfile="${build.dir}/JniDemo"
838 +              outtype="shared">
839 +
840 +      <compiler>
841 +        <defineset>
842 +          <define name="__int64" value="long long"/>
843 +        </defineset>
844 +        <includepath location="${java.home}/../include"/>
845 +        <includepath location="${java.home}/../include/${platform}"/>
846 +        <compilerarg value="-mno-cygwin"/>
847 +      </compiler>
848 +
849 +      <linker>
850 +        <linkerarg value="--add-stdcall-alias"/>
851 +      </linker>
852 +
853 +      <includepath location="${build.testcases.dir}"/>
854 +
855 +      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
856 +
857 +      <libset libs="stdc++"/>
858 +
859 +    </cc>
860 +
861 +    <!-- Necessary if windows, harmless if not -->
862 +    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
863 +
864 +    <java classname="JniDemo" fork="true">
865 +      <!-- Watch out: path separator hardwired to semicolon here! -->
866 +      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
867 +      <classpath refid="test.classpath"/>
868 +      <arg line="count in word frequency of word in command line count"/>
869 +    </java>
870 +
871 +  </target>
872 +
873 +
874 +
875 +  <!-- Backward compatibility, work in progress (some files not checked in) -->
876 +
877 +
878 +
879 +  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
880 +  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
881 +  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
882 +  <property name="pretiger.sourcelevel" value="1.4"/>
883 +
884 +  <target name="defang"
885 +       depends="init"
886 +   description="Generates pre-Tiger compatible source">
887 +
888 +    <delete dir="${pretiger.src.dir}"/>
889 +    <mkdir dir="${pretiger.src.dir}"/>
890 +
891 +    <exec executable="perl">
892 +      <arg file="etc/defang.pl"/>
893 +      <!-- <arg value="-v"/> -->
894 +      <arg value="-s"/> <arg file="${src.dir}"/>
895 +      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
896 +    </exec>
897 +
898 +  </target>
899 +
900 +  <target name="compile-pretiger"
901 +          depends="init, configure-compiler, defang"
902 +          description="Compiles pre-Tiger sources to build folder">
903 +
904 +    <mkdir dir="${build.pretiger.dir}"/>
905 +
906 +    <javac srcdir="${pretiger.src.dir}"
907 +          destdir="${build.pretiger.dir}"
908 +            debug="${build.debug}"
909 +       debuglevel="${build.debuglevel}"
910 +      deprecation="${build.deprecation}"
911 +           source="${pretiger.sourcelevel}"
912 +             fork="true">
913 +
914 +      <compilerarg line="${build.args}"/>
915 +      <exclude name="**/Thread.java"/>
916 +
917 +    </javac>
918 +
919 +  </target>
920 +
921 +  <target name="pretiger" depends="compile-pretiger">
922 +
923 +    <mkdir dir="${build.lib.dir}"/>
924 +
925 +    <jar destfile="${pretiger.jar}">
926 +      <fileset dir="${build.pretiger.dir}">
927 +      </fileset>
928 +    </jar>
929 +
930 +  </target>
931  
932   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines