ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines