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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines