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.27 by tim, Wed May 28 00:33:17 2003 UTC vs.
Revision 1.49 by tim, Sat Aug 2 02:38:24 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 3.8 or better 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  
33  <!-- Set build.warnings in user.properties to turn on -warnunchecked -->
34  <!-- <property name="build.warnings" value=""/> -->
35
22  
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
# Line 53 | Line 39 | ant [target], where target is one of:
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}/src/main"/>
# Line 68 | Line 55 | ant [target], where target is one of:
55  
56    <!-- Jar locations -->
57    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
71  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
72  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
58    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
59    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
60 +  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
61  
62  
63 <  <!--
64 <   ! Bootclasspath munging for source compilation.
65 <   -->
66 <
67 <  <path id="javac.bootclasspath.prepend">
68 <    <!-- <pathelement location="${src.dir}"/> -->
69 <    <pathelement location="${javac.jar}"/>
70 <  </path>
71 <
72 <  <path id="javac.bootclasspath">
73 <    <!-- <pathelement location="${src.dir}"/> -->
74 <    <pathelement location="${collect.jar}"/>
75 <    <pathelement location="${rt.jar}"/>
90 <  </path>
91 <
92 <  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
93 <  <property name="javac.bootclasspath.prepend" refid="javac.bootclasspath.prepend"/>
94 <
95 <  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
96 <  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prepend}'/>
97 <
98 <
99 <  <!--
100 <   ! Bootclasspath munging for testing, so JUnit can test our local
101 <   ! modifications to java.*.
102 <   -->
103 <
104 <  <path id="test.classpath">
105 <    <pathelement location="${product.jar}"/>
106 <    <pathelement location="${build.testcases.dir}"/>
107 <    <pathelement location="${junit.jar}"/>
108 <  </path>
109 <
110 <  <!-- Flatten test classpath into a platform-appropriate string -->
111 <  <property name="test.classpath" refid="test.classpath"/>
112 <
113 <  <!-- Turn the flattened test classpath into a javac argument -->
114 <  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
63 >  <!-- Files excluded from dist-docs and emulation jar -->
64 >  <patternset id="unsafe.exclusion">
65 >    <exclude name="java/util/Random.*"/>
66 >    <exclude name="sun/misc/Unsafe.*"/>
67 >  </patternset>
68 >
69 >  <!-- Files excludes from emulation jar -->
70 >  <patternset id="atomic.exclusion">
71 >    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
72 >    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
73 >    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
74 >    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
75 >  </patternset>
76  
77  
78  
79    <!-- Main targets -->
80  
81 <  <target name="compile" depends="init"
81 >  <target name="compile"
82 >          depends="init, configure-compiler, prepare-src"
83            description="Compiles main sources to build folder">
84  
85 +    <property name="prepare.src.dir" value="${src.dir}"/>
86 +
87      <mkdir dir="${build.classes.dir}"/>
88  
89 <    <javac srcdir="${src.dir}"
89 > <!--
90 >    <echo>javac ${gjc.args}</echo>
91 >    <echo>bootclasspath=${compile.bootclasspath}</echo>
92 > -->
93 >
94 >    <javac srcdir="${prepare.src.dir}"
95            destdir="${build.classes.dir}"
96              debug="${build.debug}"
97         debuglevel="${build.debuglevel}"
# Line 130 | Line 99 | ant [target], where target is one of:
99             source="${build.sourcelevel}"
100               fork="true">
101  
102 <      <bootclasspath refid="javac.bootclasspath"/>
103 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
102 >      <compilerarg    line="${gjc.args}"/>
103 >      <bootclasspath refid="compile.bootclasspath"/>
104  
105      </javac>
106  
107    </target>
108  
109  
110 <  <target name="jar" depends="native-jar, emulation-jar"/>
110 >  <target name="jar"
111 >          depends="configure-emulation, init-jar, native-jar, emulation-jar"
112 >          description="Builds library jar from compiled sources"/>
113  
114  
115 <  <target name="test" depends="init, check-junit, report-tests"
116 <          description="Runs all tests (requires JUnit 3.8+ in ${ant.home}/lib)"
117 <  />
115 >  <target name="test"
116 >          depends="init, configure-tests, report-tests"
117 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
118  
119  
120 <  <target name="checkstyle" depends="filter-src"
120 >  <target name="checkstyle"
121 >          depends="filter-src"
122            description="Reports on style errors in Java source (verbose, mostly chaff)">
123  
124      <taskdef resource="checkstyletask.properties"
# Line 160 | Line 132 | ant [target], where target is one of:
132    </target>
133  
134  
135 <  <target name="doccheck" depends="filter-src"
136 <          description="Reports on javadoc style errors (not working yet)">
135 >  <target name="doccheck"
136 >          depends="filter-doccheck"
137 >          description="Reports on javadoc style errors">
138  
139      <delete dir="${build.doccheck.dir}"/>
140      <mkdir dir="${build.doccheck.dir}"/>
# Line 169 | Line 142 | ant [target], where target is one of:
142      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
143           docletpath="${lib.dir}/doccheck.jar"
144              destdir="${build.doccheck.dir}">
145 <      <packageset dir="${build.filter.src.dir}"/>
145 >      <packageset dir="${build.filter.doccheck.dir}"/>
146      </javadoc>
147  
148 +    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
149 +
150    </target>
151  
152  
153 <  <target name="docs" depends="filter-src"
153 >  <target name="docs"
154 >          depends="filter-src"
155            description="Builds javadocs with custom tags to build folder">
156  
157      <delete dir="${build.javadocs.dir}"/>
# Line 187 | Line 163 | ant [target], where target is one of:
163                source="${build.docsourcelevel}">
164  
165        <tag name="revised" description="Last revised:"/>
166 <      <tag name="spec" description="Specified by:"/>
167 <      <tag name="editor" description="Last edited by:"/>
168 <      <tag name="fixme" description="FIX ME:"/>
166 >      <tag name="spec"    description="Specified by:"/>
167 >      <tag name="editor"  description="Last edited by:"/>
168 >      <tag name="fixme"   description="FIX ME:"/>
169 >
170        <packageset dir="${build.filter.src.dir}"/>
171  
172      </javadoc>
# Line 197 | Line 174 | ant [target], where target is one of:
174    </target>
175  
176  
177 <  <!--
178 <   # javac -s doesn't reliably generate compilable code. It generates
179 <   # bridge methods (marked as "synthetic") that can have identical
180 <   # signatures to existing methods except for the return value.
181 <   -->
182 <  <target name="strip" depends="init">
177 >  <target name="sinjdocs"
178 >          depends="configure-tests"
179 >          description="Builds javadocs with custom tags to build folder">
180 >
181 >    <delete dir="${build.javadocs.dir}"/>
182 >    <mkdir dir="${build.javadocs.dir}"/>
183 >
184 >    <java classname="net.cscott.sinjdoc.Main" fork="true">
185 >
186 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
187 >
188 >      <classpath>
189 >        <pathelement location="${sinjdoc.jar}"/>
190 >        <path refid="test.classpath"/>
191 >      </classpath>
192 >
193 >      <!-- <arg value="-link"/>       <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
194 >
195 >      <arg value="-d"/>          <arg value="${build.javadocs.dir}"/>
196 >      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
197 >      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
198 >      <arg value="-source"/>     <arg value="1.5"/>
199 >      <arg value="-verbose"/>
200 >      <arg value="java.util"/>
201 >
202 >      <!--
203 >      <arg value="-help"/>
204 >      -->
205 >
206 >    </java>
207 >
208 >  </target>
209 >
210 >
211 >  <target name="strip"
212 >          depends="init, configure-compiler"
213 >          description="Strip generics from java source (not working yet)">
214  
215      <mkdir dir="${build.stripped.dir}"/>
216  
217 +    <!--
218 +     # javac -s doesn't reliably generate compilable code. It generates
219 +     # bridge methods (marked as "synthetic") that can have identical
220 +     # signatures to existing methods except for the return value.
221 +     -->
222      <javac srcdir="${src.dir}"
223            destdir="${build.stripped.dir}"
224              debug="${build.debug}"
# Line 214 | Line 227 | ant [target], where target is one of:
227             source="${build.sourcelevel}"
228               fork="true">
229  
230 <      <bootclasspath refid="javac.bootclasspath"/>
231 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
230 >      <compilerarg    line="${gjc.args} -s"/>
231 >      <bootclasspath refid="compile.bootclasspath"/>
232  
233      </javac>
234  
235    </target>
236  
237  
238 <  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
238 >  <target name="dist"
239 >          depends="init, dist-clean, dist-jar, dist-docs"
240            description="Puts all distributable products in single hierarchy"/>
241  
242 +  <target name="release"
243 +          depends="dist"
244 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
245 +
246 + <!--
247 +    #keep build dir? - dl
248 +    <delete dir="${build.dir}"/>
249 + -->
250 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
251 +
252 +    <jar basedir="${basedir}" destfile="${release.jar}">
253 +      <exclude name="${release.jar}"/>
254 +      <exclude name="user.properties"/>
255 +      <exclude name="etc/notes/**"/>
256 +      <exclude name="lib/gjc/2.1/**"/>
257 +      <exclude name="**/SyntaxTest.java"/>
258 +    </jar>
259 +
260 +  </target>
261  
262    <target name="clean"
263            description="Removes all build products">
# Line 244 | Line 277 | ant [target], where target is one of:
277    </target>
278  
279  
280 <  <!-- Anthill targets -->
281 <
282 <  <!-- Should really run the tests instead of just the jar target -->
250 <  <target name="anthill-build" depends="jar, test, docs, dist-docs"/>
251 <
252 <  <target name="anthill-publish">
253 <    <copy todir="${deployDir}/docs/private">
254 <      <fileset dir="${build.javadocs.dir}"/>
255 <    </copy>
256 <    <copy todir="${deployDir}/docs/public">
257 <      <fileset dir="${dist.javadocs.dir}"/>
258 <    </copy>
259 <    <copy tofile="${deployDir}/index.html"
260 <          file="${basedir}/etc/anthill-index.html"/>
261 <    <copy todir="${deployDir}/notes">
262 <      <fileset dir="${basedir}/etc/notes"/>
263 <    </copy>
264 <  </target>
280 >  <target name="dist-docs"
281 >          depends="filter-src"
282 >          description="Builds javadocs without custom tags to dist folder">
283  
284 +    <delete dir="${dist.javadocs.dir}"/>
285 +    <mkdir dir="${dist.javadocs.dir}"/>
286  
287 <  <!-- Internal targets -->
287 >    <javadoc destdir="${dist.javadocs.dir}"
288 >                link="http://java.sun.com/j2se/1.4.1/docs/api"
289 >            overview="${src.dir}/intro.html"
290 >              source="${build.docsourcelevel}">
291  
292 <  <target name="set-warnings-if" if="build.warnings">
292 >      <packageset dir="${build.filter.src.dir}"/>
293  
294 <    <property name="build.warnings.option" value="-warnunchecked"/>
294 >    </javadoc>
295  
296    </target>
297  
298  
276  <target name="set-warnings-unless" unless="build.warnings">
277
278    <property name="build.warnings.option" value=""/>
299  
300 <  </target>
300 >  <!-- Internal targets -->
301  
302  
303 <  <target name="init" depends="set-warnings-if, set-warnings-unless">
303 >  <target name="init">
304  
305      <!-- Version is kept in a separate file -->
306      <loadfile property="version" srcFile="version.properties"/>
# Line 289 | Line 309 | ant [target], where target is one of:
309    </target>
310  
311  
312 <  <target name="native-jar" depends="compile"
293 <          description="Builds library jar from compiled sources">
312 >  <target name="init-jar">
313  
314      <mkdir dir="${build.lib.dir}"/>
315  
316 +  </target>
317 +
318 +
319 +  <target name="native-jar"
320 +          depends="compile"
321 +          unless="build.emulation.true">
322 +
323      <jar destfile="${product.jar}">
324        <fileset dir="${build.classes.dir}"/>
325      </jar>
# Line 301 | Line 327 | ant [target], where target is one of:
327    </target>
328  
329  
330 <  <target name="compile-emulation" depends="init"
331 <          if="build.emulation"
332 <          description="Compiles emulation sources to build folder">
330 >  <target name="compile-emulation"
331 >          depends="init, configure-compiler"
332 >          if="build.emulation.true">
333  
334      <mkdir dir="${build.emulation.dir}"/>
335  
# Line 315 | Line 341 | ant [target], where target is one of:
341             source="${build.sourcelevel}"
342               fork="true">
343  
344 <      <bootclasspath refid="javac.bootclasspath"/>
345 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
344 >      <compilerarg    line="${gjc.args}"/>
345 >      <bootclasspath refid="compile.bootclasspath"/>
346  
347      </javac>
348  
349    </target>
350  
351  
352 <  <target name="emulation-jar" depends="native-jar, compile-emulation"
353 <          if="build.emulation">
352 >  <target name="emulation-jar"
353 >          depends="compile-emulation"
354 >          if="build.emulation.true">
355 >
356  
357 <    <jar destfile="${product.jar}" update="true" duplicate="add">
357 >    <jar destfile="${product.jar}" duplicate="add">
358 >      <fileset dir="${build.classes.dir}">
359 >        <patternset refid="atomic.exclusion"/>
360 >        <patternset refid="unsafe.exclusion"/>
361 >      </fileset>
362        <fileset dir="${build.emulation.dir}"/>
363      </jar>
364  
365    </target>
366  
367  
368 <  <target name="dist-jar" depends="clean, jar">
368 >  <target name="dist-jar"
369 >          depends="clean, jar">
370  
371      <copy file="${product.jar}" todir="${dist.dir}"/>
372  
373    </target>
374  
375  
376 <  <target name="dist-docs" depends="filter-src"
377 <          description="Builds javadocs without custom tags to dist folder">
345 <
346 <    <delete dir="${dist.javadocs.dir}"/>
347 <    <mkdir dir="${dist.javadocs.dir}"/>
348 <
349 <    <javadoc destdir="${dist.javadocs.dir}"
350 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
351 <            overview="${src.dir}/intro.html"
352 <              source="${build.docsourcelevel}">
353 <
354 <      <packageset dir="${build.filter.src.dir}"/>
355 <
356 <    </javadoc>
357 <
358 <  </target>
359 <
360 <
361 <  <target name="compile-ant-filter" depends="init">
376 >  <target name="compile-ant-filter"
377 >          depends="init">
378  
379      <mkdir dir="${build.ant.dir}"/>
380  
# Line 370 | Line 386 | ant [target], where target is one of:
386    </target>
387  
388  
389 <  <target name="filter-src" depends="compile-ant-filter">
389 >  <target name="filter-src"
390 >          depends="compile-ant-filter">
391  
392      <mkdir dir="${build.filter.src.dir}"/>
393  
394      <copy todir="${build.filter.src.dir}">
395        <fileset dir="${src.dir}">
396 <        <include name="**/*.java"/>
397 <        <exclude name="**/Random.java"/>
398 <        <exclude name="**/Unsafe.java"/>
396 >        <include name="**/*.html"/>
397 >      </fileset>
398 >    </copy>
399 >
400 >    <copy todir="${build.filter.src.dir}">
401 >      <fileset dir="${src.dir}">
402 >        <exclude name="**/*.html"/>
403 >        <patternset refid="unsafe.exclusion"/>
404        </fileset>
405        <filterchain>
406 +
407 +        <!--
408 +         # This filter gets rid of angle-bracketed type parameters
409 +         # so that javadoc can run on the result. The following
410 +         # heuristic seems to work:
411 +         #
412 +         # For all lines not starting with space(s)-asterisk-space(s),
413 +         #   replace <something> with a space, where there may be more
414 +         #   than one right angle bracket at the end, and "something"
415 +         #   must not contain parens or pipes. (This may need some
416 +         #   tweaking.)
417 +         -->
418 +
419          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
420                        classpath="${build.ant.dir}">
386          <!--
387           # These arguments are to get rid of angle-bracketed type
388           # parameters so that javadoc can run on the result. The
389           # following heuristic that seems to work:
390           #
391           # For all lines not starting with space(s)-asterisk-space(s),
392           #   replace <something> with a space, where there may be more
393           #   than one right angle bracket at the end, and "something"
394           #   must not contain parens or pipes. (This may need some
395           #   tweaking.)
396           -->
421            <param name="notmatching" value="^\s+\*\s.*$"/>
422 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
422 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
423            <param name="replacement" value=" "/>
424          </filterreader>
425 +
426 +
427 +        <!--
428 +         # This filter uncomments lines beginning with "//@" so that
429 +         # javadoc can see imports that are needed to resolve links
430 +         # but that shouldn't be in the compiled code.
431 +         -->
432 +
433          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
434                        classpath="${build.ant.dir}">
435 <          <!--
436 <           # These arguments are to uncomment lines beginning with
405 <           # "//@" so that javadoc can see imports that are needed
406 <           # to resolve links but that shouldn't be in the compiled
407 <           # code.
408 <           -->
409 <          <param name="matching" value="^//@.*$"/>
410 <          <param name="pattern" value="^//@"/>
435 >          <param name="matching"    value="^//@.*$"/>
436 >          <param name="pattern"     value="^//@"/>
437            <param name="replacement" value=""/>
438          </filterreader>
439        </filterchain>
# Line 416 | Line 442 | ant [target], where target is one of:
442    </target>
443  
444  
445 <  <target name="compile-tests" depends="jar">
445 >
446 >
447 >  <target name="filter-doccheck"
448 >          depends="filter-src">
449 >
450 >    <mkdir dir="${build.filter.doccheck.dir}"/>
451 >
452 >    <copy todir="${build.filter.doccheck.dir}">
453 >      <fileset dir="${build.filter.src.dir}">
454 >        <include name="**/*.html"/>
455 >      </fileset>
456 >    </copy>
457 >
458 >    <property name="generic.declarations"
459 >             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 {}"
460 >    />
461 >
462 >    <copy todir="${build.filter.doccheck.dir}">
463 >      <fileset dir="${build.filter.src.dir}">
464 >        <exclude name="**/*.html"/>
465 >      </fileset>
466 >      <filterchain>
467 >        <!--
468 >         # These two filters try to make the source look like
469 >         # something that doccheck can process. The first removes
470 >         # -source 1.4 assertions and the second adds in a bunch
471 >         # of single letter public nested marker interfaces so that
472 >         # the generic type parameters are recognized.
473 >         -->
474 >
475 >        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
476 >                      classpath="${build.ant.dir}">
477 >          <param name="matching"    value="^\s*assert[\s ].*$"/>
478 >          <param name="pattern"     value="assert"/>
479 >          <param name="replacement" value="//assert"/>
480 >        </filterreader>
481 >
482 >        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
483 >                      classpath="${build.ant.dir}">
484 >          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
485 >          <param name="pattern"     value="$"/>
486 >          <param name="replacement" value=" ${generic.declarations}"/>
487 >        </filterreader>
488 >
489 >      </filterchain>
490 >    </copy>
491 >
492 >  </target>
493 >
494 >
495 >  <target name="compile-tests"
496 >          depends="jar">
497  
498      <mkdir dir="${build.testcases.dir}"/>
499  
500 + <!--
501 +    <echo>javac ${gjc.args}</echo>
502 +    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
503 +    <echo>classpath="${test.classpath}"</echo>
504 + -->
505 +
506      <javac srcdir="${test.src.dir}"
507            destdir="${build.testcases.dir}"
508              debug="${build.debug}"
# Line 428 | Line 511 | ant [target], where target is one of:
511             source="${build.sourcelevel}"
512               fork="true">
513  
514 <      <bootclasspath refid="javac.bootclasspath"/>
515 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
516 <      <classpath refid="test.classpath"/>
514 >      <compilerarg    line="${gjc.args}"/>
515 >      <bootclasspath refid="test.compile.bootclasspath"/>
516 >      <classpath     refid="test.classpath"/>
517  
518      </javac>
519  
520    </target>
521  
522  
523 <  <target name="run-tests" depends="compile-tests">
523 >  <target name="run-tests"
524 >          depends="compile-tests">
525  
526      <!-- May be overridden by user.properties -->
527      <property name="testcase" value="*"/>
# Line 451 | Line 535 | ant [target], where target is one of:
535                      dir="${build.reports.dir}"
536                     fork="true">
537  
538 <      <jvmarg value="${test.javac.args}"/>
538 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
539  
540        <formatter type="xml"/>
541  
# Line 466 | Line 550 | ant [target], where target is one of:
550    </target>
551  
552  
553 <  <target name="report-tests" depends="run-tests">
553 >  <target name="report-tests"
554 >          depends="run-tests">
555 >
556      <!-- Sets junit.report.format to frames if Xalan is present,
557           otherwise sets it to noframes. -->
558      <available property="junit.report.format"
# Line 486 | Line 572 | ant [target], where target is one of:
572      </junitreport>
573  
574      <fail message="Test Cases Failed" if="junit.failed"/>
575 +
576 +  </target>
577 +
578 +
579 +  <target name="configure-compiler">
580 +
581 +    <property name="gjc.version"
582 +             value="2.2"/>
583 +
584 +    <condition property="novariance.arg" value="-novariance">
585 +      <and>
586 +        <equals arg1="${gjc.version}" arg2="2.0"/>
587 +        <or>
588 +          <not><isset property="gjc.novariance"/></not>
589 +          <istrue value="${gjc.novariance}"/>
590 +        </or>
591 +      </and>
592 +    </condition>
593 +
594 +    <property name="novariance.arg"
595 +             value=""/>
596 +
597 +    <property name="gjc.dir"
598 +             value="${lib.dir}/gjc"/>
599 +
600 +    <property name="javac.jar"
601 +          location="${gjc.dir}/${gjc.version}/javac.jar"/>
602 +
603 +    <property name="collect.jar"
604 +          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
605 +
606 +
607 +    <condition property="warnunchecked.arg" value="-warnunchecked">
608 +      <istrue value="${gjc.warnunchecked}"/>
609 +    </condition>
610 +
611 +    <property name="warnunchecked.arg" value=""/>
612 +
613 +    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
614 +      <istrue value="${build.nothreads}"/>
615 +    </condition>
616 +
617 +
618 +    <!--
619 +     ! Bootclasspath munging for source compilation.
620 +     -->
621 +
622 +    <path id="pre.bootclasspath">
623 +      <pathelement location="${javac.jar}"/>
624 +    </path>
625 +
626 +    <path id="compile.bootclasspath">
627 +      <pathelement location="${build.classes.dir}"/>
628 +      <pathelement location="${collect.jar}"/>
629 +      <pathelement location="${rt.jar}"/>
630 +    </path>
631 +
632 +    <!-- Flatten paths into platform-appropriate strings -->
633 +    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
634 +    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
635 +
636 +
637 +    <!-- Common options in javac invocations -->
638 +    <property name="gjc.args"
639 +             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
640 +    />
641 +
642 +  </target>
643 +
644 +
645 +  <target name="prepare-src"
646 +          depends="configure-compiler"
647 +          if="prepare.src.dir">
648 +
649 +    <mkdir dir="${prepare.src.dir}"/>
650 +    <copy todir="${prepare.src.dir}">
651 +      <fileset dir="${src.dir}">
652 +        <exclude name="java/lang/**"/>
653 +      </fileset>
654 +    </copy>
655 +
656 +  </target>
657 +
658 +
659 +  <target name="configure-emulation">
660 +
661 +    <condition property="build.emulation.true">
662 +      <or>
663 +        <and>
664 +          <os family="windows"/>
665 +          <not>
666 +            <isset property="build.emulation"/>
667 +          </not>
668 +        </and>
669 +        <istrue value="${build.emulation}"/>
670 +      </or>
671 +    </condition>
672 +
673    </target>
674  
675  
676 <  <target name="check-junit">
677 <    <!-- FIXME: this test isn't specific enough -->
676 >  <target name="configure-tests"
677 >       depends="configure-compiler">
678 >
679 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
680      <available property="junit.available"
681 <               classname="junit.framework.TestCase"/>
682 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
681 >               classname="junit.framework.Protectable"/>
682 >
683 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
684 >          unless="junit.available"/>
685 >
686 >
687 >    <!--
688 >     ! Bootclasspath munging for testing, so JUnit can test our local
689 >     ! modifications to java.*.
690 >     -->
691 >
692 >    <path id="test.classpath">
693 >      <pathelement location="${product.jar}"/>
694 >      <pathelement location="${build.testcases.dir}"/>
695 >      <pathelement location="${junit.jar}"/>
696 >    </path>
697 >
698 >    <path id="test.compile.bootclasspath">
699 >      <pathelement location="${javac.jar}"/>
700 >      <pathelement location="${collect.jar}"/>
701 >      <pathelement location="${rt.jar}"/>
702 >    </path>
703 >
704 >    <path id="test.run.bootclasspath">
705 >      <pathelement location="${javac.jar}"/>
706 >      <path refid="test.classpath"/>
707 >    </path>
708 >
709 >    <!-- Flatten test classpaths into platform-appropriate strings -->
710 >    <property name="test.classpath"             refid="test.classpath"/>
711 >    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
712 >    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
713 >
714 >  </target>
715 >
716 >
717 >
718 >  <!-- Anthill targets -->
719 >
720 >  <target name="anthill-build"
721 >          depends="jar, test, docs, dist-docs"/>
722 >
723 >  <target name="anthill-publish">
724 >
725 >    <copy todir="${deployDir}/docs/private">
726 >      <fileset dir="${build.javadocs.dir}"/>
727 >    </copy>
728 >
729 >    <copy todir="${deployDir}/docs/public">
730 >      <fileset dir="${dist.javadocs.dir}"/>
731 >    </copy>
732 >
733 >    <copy tofile="${deployDir}/index.html"
734 >          file="${basedir}/etc/anthill-index.html"/>
735 >
736 >    <copy todir="${deployDir}/notes">
737 >      <fileset dir="${basedir}/etc/notes"/>
738 >    </copy>
739 >
740 >  </target>
741 >
742 >
743 >  <target name="ng" depends="test">
744 >    <java classname="SuperfluousAbstract" fork="true">
745 >
746 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
747 >
748 >    </java>
749    </target>
750  
751  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines