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.20 by tim, Mon Jan 20 18:25:51 2003 UTC vs.
Revision 1.57 by tim, Mon Sep 15 14:07:36 2003 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.docsourcelevel" value="1.4"/>
26    <property name="build.debug"          value="true"/>
27    <property name="build.debuglevel"     value="source,lines,vars"/>
28    <property name="build.deprecation"    value="false"/>
36  <!--
37  <property name="build.warnings"       value="true"/>
38  -->
29  
30    <!-- Build locations -->
31    <property name="build.dir"            location="build"/>
# Line 44 | Line 34 | ant [target], where target is one of:
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>
35    <property name="build.ant.dir"        location="${build.dir}/ant"/>
36    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37 +  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
39    <property name="build.reports.dir"    location="${build.dir}/reports"/>
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.filter.doccheck.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="ant.src.dir"          location="${basedir}/etc/ant"/>
48    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
49    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 62 | Line 54 | ant [target], where target is one of:
54  
55    <!-- Jar locations -->
56    <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"/>
57    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59 +  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
60  
70  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
61  
62 <  <path id="javac.bootclasspath">
63 <    <pathelement location="${collect.jar}"/>
64 <    <pathelement location="${rt.jar}"/>
65 <  </path>
66 <
67 <  <path id="test.classpath">
78 <    <pathelement location="${product.jar}"/>
79 <  </path>
62 >  <!-- Files excluded from dist-docs -->
63 >  <patternset id="docs.exclusion">
64 >    <exclude name="java/util/Random.*"/>
65 >    <exclude name="sun/misc/Unsafe.*"/>
66 >  </patternset>
67 >
68  
69  
70    <!-- Main targets -->
71  
72 <  <target name="compile" depends="init"
73 <          description="Compiles all sources to build folder">
72 >  <target name="compile"
73 >          depends="init, configure-compiler, prepare-src"
74 >          description="Compiles main sources to build folder">
75 >
76 >    <property name="prepare.src.dir" value="${src.dir}"/>
77 >
78      <mkdir dir="${build.classes.dir}"/>
79 <    <javac srcdir="${src.dir}"
79 >
80 > <!--
81 >    <echo>javac ${build.args}</echo>
82 > -->
83 >
84 >    <javac srcdir="${prepare.src.dir}"
85            destdir="${build.classes.dir}"
86              debug="${build.debug}"
87         debuglevel="${build.debuglevel}"
# Line 92 | Line 89 | ant [target], where target is one of:
89             source="${build.sourcelevel}"
90               fork="true">
91  
92 <      <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"/>
92 >      <compilerarg    line="${build.args}"/>
93  
94      </javac>
95 +
96    </target>
97  
98  
99 <  <target name="jar" depends="compile"
100 <          description="Builds library jar from compiled sources">
101 <    <mkdir dir="${build.lib.dir}"/>
108 <    <jar basedir="${build.classes.dir}"
109 <        destfile="${product.jar}"
110 <    />
111 <  </target>
99 >  <target name="jar"
100 >          depends="init-jar, native-jar"
101 >          description="Builds library jar from compiled sources"/>
102  
103  
104 <  <target name="test" depends="init, check-junit, report-tests"
105 <          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
104 >  <target name="test"
105 >          depends="init, configure-tests, report-tests"
106 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
107  
108  
109 <  <target name="checkstyle" depends="filter-src"
109 >  <target name="checkstyle"
110 >          depends="filter-src"
111            description="Reports on style errors in Java source (verbose, mostly chaff)">
112 +
113      <taskdef resource="checkstyletask.properties"
114              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
115  
# Line 124 | Line 117 | ant [target], where target is one of:
117        <formatter type="plain"/>  <!-- also available: type="xml" -->
118        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119      </checkstyle>
120 +
121    </target>
122  
123  
124 <  <target name="doccheck" depends="filter-src"
125 <          description="Reports on javadoc style errors (not working yet)">
124 >  <target name="doccheck"
125 >          depends="filter-doccheck"
126 >          description="Reports on javadoc style errors">
127 >
128      <delete dir="${build.doccheck.dir}"/>
129      <mkdir dir="${build.doccheck.dir}"/>
130 +
131      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132           docletpath="${lib.dir}/doccheck.jar"
133              destdir="${build.doccheck.dir}">
134 <      <packageset dir="${build.filter.src.dir}">
138 <        <include name="java/**"/>
139 <      </packageset>
134 >      <packageset dir="${build.filter.doccheck.dir}"/>
135      </javadoc>
136 +
137 +    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
138 +
139    </target>
140  
141  
142 <  <target name="docs" depends="filter-src"
142 >  <target name="docs"
143 >          depends="filter-src"
144            description="Builds javadocs with custom tags to build folder">
145 +
146      <delete dir="${build.javadocs.dir}"/>
147      <mkdir dir="${build.javadocs.dir}"/>
148 +
149      <javadoc destdir="${build.javadocs.dir}"
150                  link="http://java.sun.com/j2se/1.4.1/docs/api"
151              overview="${src.dir}/intro.html"
152 <              source="${build.sourcelevel}">
152 >              source="${build.docsourcelevel}">
153  
154        <tag name="revised" description="Last revised:"/>
155 <      <tag name="spec" description="Specified by:"/>
156 <      <tag name="editor" description="Last edited by:"/>
157 <      <tag name="fixme" description="FIX ME:"/>
158 <      <packageset dir="${build.filter.src.dir}">
159 <        <include name="java/**"/>
159 <      </packageset>
155 >      <tag name="spec"    description="Specified by:"/>
156 >      <tag name="editor"  description="Last edited by:"/>
157 >      <tag name="fixme"   description="FIX ME:"/>
158 >
159 >      <packageset dir="${build.filter.src.dir}"/>
160  
161      </javadoc>
162 +
163    </target>
164  
165  
166 <  <target name="strip" depends="init">
166 >  <target name="sinjdocs"
167 >          depends="configure-tests"
168 >          description="Builds javadocs with custom tags to build folder">
169 >
170 >    <delete dir="${build.sinjdocs.dir}"/>
171 >    <mkdir dir="${build.sinjdocs.dir}"/>
172 >
173 >    <java classname="net.cscott.sinjdoc.Main" fork="true">
174 >
175 >      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176 >
177 >      <classpath>
178 >        <pathelement location="${sinjdoc.jar}"/>
179 >        <pathelement location="${lib.dir}/jutil.jar"/>
180 >        <pathelement location="${lib.dir}/cup.jar"/>
181 >        <path refid="test.classpath"/>
182 >      </classpath>
183 >
184 >      <!-- <arg value="-help"/> -->
185 >      <!-- <arg value="-verbose"/> -->
186 >      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187 >      
188 >      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189 >      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
190 >      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191 >      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192 >      
193 >      <arg value="java.lang"/>
194 >      <arg value="java.util"/>
195 >      <arg value="java.util.concurrent"/>
196 >      <arg value="java.util.concurrent.atomic"/>
197 >      <arg value="java.util.concurrent.locks"/>
198 >
199 >
200 >    </java>
201 >
202 >  </target>
203 >
204 >
205 >  <target name="strip"
206 >          depends="init, configure-compiler"
207 >          description="Strip generics from java source (not working yet)">
208 >
209      <mkdir dir="${build.stripped.dir}"/>
210 +
211 +    <!--
212 +     # javac -s doesn't reliably generate compilable code. It generates
213 +     # bridge methods (marked as "synthetic") that can have identical
214 +     # signatures to existing methods except for the return value.
215 +     -->
216      <javac srcdir="${src.dir}"
217            destdir="${build.stripped.dir}"
218              debug="${build.debug}"
# Line 172 | Line 221 | ant [target], where target is one of:
221             source="${build.sourcelevel}"
222               fork="true">
223  
224 <      <bootclasspath refid="javac.bootclasspath"/>
176 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
177 <
178 <      <!-- need this because srcdir is basedir! -->
179 <      <include name="java/**/*.java"/>
224 >      <compilerarg    line="${build.args} -s"/>
225  
226      </javac>
227 +
228    </target>
229  
230  
231 <  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
231 >  <target name="dist"
232 >          depends="init, dist-clean, dist-jar, dist-docs"
233            description="Puts all distributable products in single hierarchy"/>
234  
235 +  <target name="release"
236 +          depends="dist"
237 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
238 +
239 + <!--
240 +    #keep build dir? - dl
241 +    <delete dir="${build.dir}"/>
242 + -->
243 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
244 +
245 +    <jar basedir="${basedir}" destfile="${release.jar}">
246 +      <exclude name="${release.jar}"/>
247 +      <exclude name="user.properties"/>
248 +      <exclude name="etc/notes/**"/>
249 +      <exclude name="**/SyntaxTest.java"/>
250 +    </jar>
251 +
252 +  </target>
253  
254    <target name="clean"
255            description="Removes all build products">
256 +
257      <delete dir="${build.dir}"/>
258      <delete dir="${build.classes.dir}"/>
259      <delete dir="${build.lib.dir}"/>
260 +
261    </target>
262  
263  
264    <target name="dist-clean"
265            description="Removes all build and distribution products">
266 +
267      <delete dir="${dist.dir}"/>
268 +
269    </target>
270  
271  
272 <  <!-- Anthill targets -->
272 >  <target name="dist-docs"
273 >          depends="filter-src"
274 >          description="Builds javadocs without custom tags to dist folder">
275  
276 <  <!-- Should really run the tests instead of just the jar target -->
277 <  <target name="anthill-build" depends="jar, docs, dist-docs"/>
276 >    <delete dir="${dist.javadocs.dir}"/>
277 >    <mkdir dir="${dist.javadocs.dir}"/>
278  
279 <  <target name="anthill-publish">
280 <    <copy todir="${deployDir}/docs/private">
281 <      <fileset dir="${build.javadocs.dir}"/>
282 <    </copy>
212 <    <copy todir="${deployDir}/docs/public">
213 <      <fileset dir="${dist.javadocs.dir}"/>
214 <    </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>
279 >    <javadoc destdir="${dist.javadocs.dir}"
280 >                link="http://java.sun.com/j2se/1.4.1/docs/api"
281 >            overview="${src.dir}/intro.html"
282 >              source="${build.docsourcelevel}">
283  
284 +      <packageset dir="${build.filter.src.dir}"/>
285  
286 <  <!-- Internal targets -->
286 >    </javadoc>
287  
225  <target name="set-warnings-if" if="build.warnings">
226    <property name="build.warnings.option" value="-warnunchecked"/>
288    </target>
289  
290  
230  <target name="set-warnings-unless" unless="build.warnings">
231    <property name="build.warnings.option" value=""/>
232  </target>
291  
292 +  <!-- Internal targets -->
293 +
294 +
295 +  <target name="init">
296  
235  <target name="init" depends="set-warnings-if, set-warnings-unless">
297      <!-- Version is kept in a separate file -->
298      <loadfile property="version" srcFile="version.properties"/>
299      <echo>Building JSR-166 version ${version}</echo>
300 +    <echo>java.home is ${java.home}</echo>
301 +
302    </target>
303  
304  
305 <  <target name="dist-jar" depends="clean, jar">
306 <    <copy file="${product.jar}" todir="${dist.dir}"/>
305 >  <target name="init-jar">
306 >
307 >    <mkdir dir="${build.lib.dir}"/>
308 >
309    </target>
310  
311  
312 <  <target name="dist-docs" depends="filter-src"
313 <          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}">
312 >  <target name="native-jar"
313 >          depends="compile">
314  
315 <      <packageset dir="${build.filter.src.dir}">
316 <        <include name="java/**"/>
317 <      </packageset>
315 >    <jar destfile="${product.jar}">
316 >      <fileset dir="${build.classes.dir}"/>
317 >    </jar>
318 >
319 >  </target>
320 >
321 >
322 >  <target name="dist-jar"
323 >          depends="clean, jar">
324 >
325 >    <copy file="${product.jar}" todir="${dist.dir}"/>
326  
260    </javadoc>
327    </target>
328  
329  
330 <  <target name="compile-ant-filter" depends="init">
330 >  <target name="compile-ant-filter"
331 >          depends="init">
332 >
333      <mkdir dir="${build.ant.dir}"/>
334 +
335      <javac srcdir="${ant.src.dir}"
336            destdir="${build.ant.dir}"
337             source="1.4"
338      />
339 +
340    </target>
341  
342  
343 <  <target name="filter-src" depends="compile-ant-filter">
343 >  <target name="filter-src"
344 >          depends="compile-ant-filter">
345 >
346      <mkdir dir="${build.filter.src.dir}"/>
347 +
348 +    <copy todir="${build.filter.src.dir}">
349 +      <fileset dir="${src.dir}">
350 +        <include name="**/*.html"/>
351 +      </fileset>
352 +    </copy>
353 +
354      <copy todir="${build.filter.src.dir}">
355        <fileset dir="${src.dir}">
356 <        <include name="java/**/*.java"/>
356 >        <exclude name="**/*.html"/>
357 >        <patternset refid="docs.exclusion"/>
358        </fileset>
359        <filterchain>
360 +
361 +        <!--
362 +         # This filter gets rid of angle-bracketed type parameters
363 +         # so that javadoc can run on the result. The following
364 +         # heuristic seems to work:
365 +         #
366 +         # For all lines not starting with space(s)-asterisk-space(s),
367 +         #   replace <something> with a space, where there may be more
368 +         #   than one right angle bracket at the end, and "something"
369 +         #   must not contain parens or pipes. (This may need some
370 +         #   tweaking.)
371 +         -->
372 +
373          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
374                        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           -->
375            <param name="notmatching" value="^\s+\*\s.*$"/>
376 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
376 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
377            <param name="replacement" value=" "/>
378          </filterreader>
379 +
380 +      </filterchain>
381 +    </copy>
382 +
383 +  </target>
384 +
385 +
386 +
387 +
388 +  <target name="filter-doccheck"
389 +          depends="filter-src">
390 +
391 +    <mkdir dir="${build.filter.doccheck.dir}"/>
392 +
393 +    <copy todir="${build.filter.doccheck.dir}">
394 +      <fileset dir="${build.filter.src.dir}">
395 +        <include name="**/*.html"/>
396 +      </fileset>
397 +    </copy>
398 +
399 +    <property name="generic.declarations"
400 +             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 {}"
401 +    />
402 +
403 +    <copy todir="${build.filter.doccheck.dir}">
404 +      <fileset dir="${build.filter.src.dir}">
405 +        <exclude name="**/*.html"/>
406 +      </fileset>
407 +      <filterchain>
408 +        <!--
409 +         # These two filters try to make the source look like
410 +         # something that doccheck can process. The first removes
411 +         # -source 1.4 assertions and the second adds in a bunch
412 +         # of single letter public nested marker interfaces so that
413 +         # the generic type parameters are recognized.
414 +         -->
415 +
416 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
417 +                      classpath="${build.ant.dir}">
418 +          <param name="matching"    value="^\s*assert[\s ].*$"/>
419 +          <param name="pattern"     value="assert"/>
420 +          <param name="replacement" value="//assert"/>
421 +        </filterreader>
422 +
423          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
424                        classpath="${build.ant.dir}">
425 <          <!--
426 <           # These arguments are to uncomment lines beginning with
427 <           # "//@" 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=""/>
425 >          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426 >          <param name="pattern"     value="$"/>
427 >          <param name="replacement" value=" ${generic.declarations}"/>
428          </filterreader>
429 +
430        </filterchain>
431      </copy>
432 +
433    </target>
434  
435  
436 <  <target name="compile-tests" depends="jar">
436 >  <target name="compile-tests"
437 >          depends="jar">
438 >
439      <mkdir dir="${build.testcases.dir}"/>
440 +
441 + <!--
442 +    <echo>javac ${build.args}</echo>
443 +    <echo>classpath="${test.classpath}"</echo>
444 + -->
445 +
446      <javac srcdir="${test.src.dir}"
447            destdir="${build.testcases.dir}"
448              debug="${build.debug}"
# Line 321 | Line 451 | ant [target], where target is one of:
451             source="${build.sourcelevel}"
452               fork="true">
453  
454 <      <bootclasspath refid="javac.bootclasspath"/>
325 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
454 >      <compilerarg line="${build.args}"/>
455        <classpath refid="test.classpath"/>
456 <      <include name="**/*Test.java"/>
456 >      
457 >      <include name="java/**"/>
458 >      <include name="jsr166/**"/>
459  
460      </javac>
461 +
462    </target>
463  
464  
465 <  <target name="run-tests" depends="compile-tests">
465 >  <target name="run-tests"
466 >          depends="compile-tests">
467 >
468 >    <!-- May be overridden by user.properties -->
469 >    <property name="testcase" value="*"/>
470 >
471      <mkdir dir="${build.reports.dir}"/>
472 +
473      <junit printsummary="true"
474               showoutput="true"
475            errorProperty="junit.failed"
# Line 339 | Line 477 | ant [target], where target is one of:
477                      dir="${build.reports.dir}"
478                     fork="true">
479  
480 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
343 <
344 <      <classpath>
345 <        <!-- <path refid="test.classpath"/> -->
346 <        <pathelement location="${build.testcases.dir}"/>
347 <      </classpath>
480 >      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
481  
482        <formatter type="xml"/>
483  
484        <batchtest todir="${build.reports.dir}">
485          <fileset dir="${test.src.dir}">
486 <          <include name="**/*Test.java"/>
486 >          <include name="java/**/${testcase}Test.java"/>
487 >          <include name="jsr166/**/${testcase}Test.java"/>
488          </fileset>
489        </batchtest>
490  
491      </junit>
492 +
493    </target>
494  
495  
496 <  <target name="report-tests" depends="run-tests">
497 <    <!-- Sets junit.report.format to frames if Xalan is present,
496 >  <target name="report-tests"
497 >          depends="run-tests">
498 >
499 >    <!-- Sets junit.report.format to frames if redirection is present,
500           otherwise sets it to noframes. -->
501      <available property="junit.report.format"
502                    value="frames"
# Line 378 | Line 515 | ant [target], where target is one of:
515      </junitreport>
516  
517      <fail message="Test Cases Failed" if="junit.failed"/>
518 +
519    </target>
520  
521  
522 <  <target name="check-junit">
523 <    <!-- FIXME: this test isn't specific enough -->
522 >  <target name="configure-compiler">
523 >
524 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
525 >
526 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
527 >      <istrue value="${build.warnunchecked}"/>
528 >    </condition>
529 >
530 >    <property name="warnunchecked.arg" value=""/>
531 >    
532 >    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533 >      <istrue value="${build.nothreads}"/>
534 >    </condition>
535 >
536 >
537 >    <!-- Common options in javac invocations -->
538 >    <property name="build.args" value="${warnunchecked.arg}"/>
539 >
540 >  </target>
541 >
542 >
543 >  <target name="prepare-src"
544 >          depends="configure-compiler"
545 >          if="prepare.src.dir">
546 >
547 >    <mkdir dir="${prepare.src.dir}"/>
548 >    <copy todir="${prepare.src.dir}">
549 >      <fileset dir="${src.dir}">
550 >        <exclude name="java/lang/**"/>
551 >      </fileset>
552 >    </copy>
553 >
554 >  </target>
555 >
556 >
557 >  <target name="configure-tests"
558 >       depends="configure-compiler">
559 >
560 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
561      <available property="junit.available"
562 <               classname="junit.framework.TestCase"/>
563 <    <fail message="Need JUnit 1.8 to run tests" unless="junit.available"/>
562 >               classname="junit.framework.Protectable"/>
563 >
564 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565 >          unless="junit.available"/>
566 >
567 >    <!-- Xalan -->
568 >    <available property="xalan.available"
569 >               classname="org.apache.xalan.Version"/>
570 >
571 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
572 >          unless="xalan.available"/>
573 >
574 >
575 >    <!--
576 >     ! Bootclasspath munging for testing, so JUnit can test our local
577 >     ! modifications to java.*.
578 >     -->
579 >
580 >    <path id="test.classpath">
581 >      <pathelement location="${product.jar}"/>
582 >      <pathelement location="${rt.jar}"/>
583 >      <pathelement location="${junit.jar}"/>
584 >      <pathelement location="${build.testcases.dir}"/>
585 >    </path>
586 >
587 >    <path id="test.bootclasspath">
588 >      <path refid="test.classpath"/>
589 >    </path>
590 >
591 >    <!-- Flatten test classpaths into platform-appropriate strings -->
592 >    <property name="test.classpath"         refid="test.classpath"/>
593 >    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
594 >
595 >  </target>
596 >
597 >
598 >
599 >  <!-- Anthill targets -->
600 >
601 >  <target name="anthill-build">
602 >  
603 >    <!-- Override this in user.properties -->
604 >    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
605 >    
606 >    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607 >      <arg value="-Xmx256000000"/>
608 >      <!-- classpath of new JVM -->
609 >      <arg value="-classpath"/> <arg path="${java.class.path}"/>
610 >      <!-- location of Ant home directory -->
611 >      <arg value="-Dant.home=${ant.home}"/>
612 >      <!-- the Ant main class -->
613 >      <arg value="org.apache.tools.ant.Main"/>
614 >      <!-- The build file -->
615 >      <arg value="-buildfile"/>  <arg value="build.xml"/>
616 >      <!-- the target to build on the new Ant instance -->
617 >      <arg value="-DJAVA_HOME=${tiger.home}"/>
618 >      <arg value="do-anthill-build"/>
619 >    </exec>
620 >  </target>
621 >  
622 >  <target name="do-anthill-build"
623 >          depends="jar, test, docs, dist-docs"/>
624 >
625 >  <target name="anthill-publish">
626 >
627 >    <copy todir="${deployDir}/docs/private">
628 >      <fileset dir="${build.javadocs.dir}"/>
629 >    </copy>
630 >
631 >    <copy todir="${deployDir}/docs/public">
632 >      <fileset dir="${dist.javadocs.dir}"/>
633 >    </copy>
634 >
635 >    <copy tofile="${deployDir}/index.html"
636 >          file="${basedir}/etc/anthill-index.html"/>
637 >
638 >    <copy todir="${deployDir}/notes">
639 >      <fileset dir="${basedir}/etc/notes"/>
640 >    </copy>
641 >
642 >  </target>
643 >
644 >
645 >  <target name="ng" depends="test">
646 >    <java classname="SuperfluousAbstract" fork="true">
647 >
648 >      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
649 >
650 >    </java>
651    </target>
652  
653  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines