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.39 by tim, Sat May 31 17:24:03 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}"/>
79 <  </path>
61 >
62 >  <!-- Files excluded from emulation and dist-docs -->
63 >  <patternset id="emulation.excludes">
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 ${gjc.args}</echo>
82 >    <echo>bootclasspath=${compile.bootclasspath}</echo>
83 > -->
84 >
85 >    <javac srcdir="${prepare.src.dir}"
86            destdir="${build.classes.dir}"
87              debug="${build.debug}"
88         debuglevel="${build.debuglevel}"
# Line 92 | Line 90 | ant [target], where target is one of:
90             source="${build.sourcelevel}"
91               fork="true">
92  
93 <      <bootclasspath refid="javac.bootclasspath"/>
94 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
97 <
98 <      <!-- need this because srcdir is basedir! -->
99 <      <include name="java/**/*.java"/>
93 >      <compilerarg    line="${gjc.args}"/>
94 >      <bootclasspath refid="compile.bootclasspath"/>
95  
96      </javac>
97 +
98    </target>
99  
100  
101 <  <target name="jar" depends="compile"
102 <          description="Builds library jar from compiled sources">
103 <    <mkdir dir="${build.lib.dir}"/>
108 <    <jar basedir="${build.classes.dir}"
109 <        destfile="${product.jar}"
110 <    />
111 <  </target>
101 >  <target name="jar"
102 >          depends="configure-emulation, init-jar, native-jar, emulation-jar"
103 >          description="Builds library jar from compiled sources"/>
104  
105  
106 <  <target name="test" depends="init, check-junit, report-tests"
107 <          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
106 >  <target name="test"
107 >          depends="init, configure-tests, report-tests"
108 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
109  
110  
111 <  <target name="checkstyle" depends="filter-src"
111 >  <target name="checkstyle"
112 >          depends="filter-src"
113            description="Reports on style errors in Java source (verbose, mostly chaff)">
114 +
115      <taskdef resource="checkstyletask.properties"
116              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
117  
# Line 124 | Line 119 | ant [target], where target is one of:
119        <formatter type="plain"/>  <!-- also available: type="xml" -->
120        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
121      </checkstyle>
122 +
123    </target>
124  
125  
126 <  <target name="doccheck" depends="filter-src"
126 >  <target name="doccheck"
127 >          depends="filter-src"
128            description="Reports on javadoc style errors (not working yet)">
129 +
130      <delete dir="${build.doccheck.dir}"/>
131      <mkdir dir="${build.doccheck.dir}"/>
132 +
133      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
134           docletpath="${lib.dir}/doccheck.jar"
135              destdir="${build.doccheck.dir}">
136 <      <packageset dir="${build.filter.src.dir}">
138 <        <include name="java/**"/>
139 <      </packageset>
136 >      <packageset dir="${build.filter.src.dir}"/>
137      </javadoc>
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="strip"
167 >          depends="init, configure-compiler"
168 >          description="Strip generics from java source (not working yet)">
169 >
170      <mkdir dir="${build.stripped.dir}"/>
171 +
172 +    <!--
173 +     # javac -s doesn't reliably generate compilable code. It generates
174 +     # bridge methods (marked as "synthetic") that can have identical
175 +     # signatures to existing methods except for the return value.
176 +     -->
177      <javac srcdir="${src.dir}"
178            destdir="${build.stripped.dir}"
179              debug="${build.debug}"
# Line 172 | Line 182 | ant [target], where target is one of:
182             source="${build.sourcelevel}"
183               fork="true">
184  
185 <      <bootclasspath refid="javac.bootclasspath"/>
186 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
177 <
178 <      <!-- need this because srcdir is basedir! -->
179 <      <include name="java/**/*.java"/>
185 >      <compilerarg    line="${gjc.args} -s"/>
186 >      <bootclasspath refid="compile.bootclasspath"/>
187  
188      </javac>
189 +
190    </target>
191  
192  
193 <  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
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    <target name="clean"
199            description="Removes all build products">
200 +
201      <delete dir="${build.dir}"/>
202      <delete dir="${build.classes.dir}"/>
203      <delete dir="${build.lib.dir}"/>
204 +
205    </target>
206  
207  
208    <target name="dist-clean"
209            description="Removes all build and distribution products">
210 +
211      <delete dir="${dist.dir}"/>
212 +
213    </target>
214  
215  
216 <  <!-- Anthill targets -->
216 >  <target name="dist-docs"
217 >          depends="filter-src"
218 >          description="Builds javadocs without custom tags to dist folder">
219  
220 <  <!-- Should really run the tests instead of just the jar target -->
221 <  <target name="anthill-build" depends="jar, docs, dist-docs"/>
220 >    <delete dir="${dist.javadocs.dir}"/>
221 >    <mkdir dir="${dist.javadocs.dir}"/>
222  
223 <  <target name="anthill-publish">
224 <    <copy todir="${deployDir}/docs/private">
225 <      <fileset dir="${build.javadocs.dir}"/>
226 <    </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>
223 >    <javadoc destdir="${dist.javadocs.dir}"
224 >                link="http://java.sun.com/j2se/1.4.1/docs/api"
225 >            overview="${src.dir}/intro.html"
226 >              source="${build.docsourcelevel}">
227  
228 +      <packageset dir="${build.filter.src.dir}"/>
229  
230 <  <!-- Internal targets -->
230 >    </javadoc>
231  
225  <target name="set-warnings-if" if="build.warnings">
226    <property name="build.warnings.option" value="-warnunchecked"/>
232    </target>
233  
234  
235 <  <target name="set-warnings-unless" unless="build.warnings">
236 <    <property name="build.warnings.option" value=""/>
232 <  </target>
235 >
236 >  <!-- Internal targets -->
237  
238  
239 <  <target name="init" depends="set-warnings-if, set-warnings-unless">
239 >  <target name="init">
240 >
241      <!-- Version is kept in a separate file -->
242      <loadfile property="version" srcFile="version.properties"/>
243      <echo>Building JSR-166 version ${version}</echo>
244 +
245    </target>
246  
247  
248 <  <target name="dist-jar" depends="clean, jar">
249 <    <copy file="${product.jar}" todir="${dist.dir}"/>
248 >  <target name="init-jar">
249 >
250 >    <mkdir dir="${build.lib.dir}"/>
251 >
252    </target>
253  
254  
255 <  <target name="dist-docs" depends="filter-src"
256 <          description="Builds javadocs without custom tags to dist folder">
257 <    <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}">
255 >  <target name="native-jar"
256 >          depends="compile"
257 >          unless="build.emulation.true">
258  
259 <      <packageset dir="${build.filter.src.dir}">
260 <        <include name="java/**"/>
261 <      </packageset>
259 >    <jar destfile="${product.jar}">
260 >      <fileset dir="${build.classes.dir}"/>
261 >    </jar>
262 >
263 >  </target>
264 >
265 >
266 >  <target name="compile-emulation"
267 >          depends="init, configure-compiler"
268 >          if="build.emulation.true">
269 >
270 >    <mkdir dir="${build.emulation.dir}"/>
271 >
272 >    <javac srcdir="${emulation.src.dir}"
273 >          destdir="${build.emulation.dir}"
274 >            debug="${build.debug}"
275 >       debuglevel="${build.debuglevel}"
276 >      deprecation="${build.deprecation}"
277 >           source="${build.sourcelevel}"
278 >             fork="true">
279 >
280 >      <compilerarg    line="${gjc.args}"/>
281 >      <bootclasspath refid="compile.bootclasspath"/>
282 >
283 >    </javac>
284  
260    </javadoc>
285    </target>
286  
287  
288 <  <target name="compile-ant-filter" depends="init">
288 >  <target name="emulation-jar"
289 >          depends="compile-emulation"
290 >          if="build.emulation.true">
291 >
292 >
293 >    <jar destfile="${product.jar}" duplicate="add">
294 >      <fileset dir="${build.classes.dir}">
295 >        <patternset refid="emulation.excludes"/>
296 >      </fileset>
297 >      <fileset dir="${build.emulation.dir}"/>
298 >    </jar>
299 >
300 >  </target>
301 >
302 >
303 >  <target name="dist-jar"
304 >          depends="clean, jar">
305 >
306 >    <copy file="${product.jar}" todir="${dist.dir}"/>
307 >
308 >  </target>
309 >
310 >
311 >  <target name="compile-ant-filter"
312 >          depends="init">
313 >
314      <mkdir dir="${build.ant.dir}"/>
315 +
316      <javac srcdir="${ant.src.dir}"
317            destdir="${build.ant.dir}"
318             source="1.4"
319      />
320 +
321    </target>
322  
323  
324 <  <target name="filter-src" depends="compile-ant-filter">
324 >  <target name="filter-src"
325 >          depends="compile-ant-filter">
326 >
327      <mkdir dir="${build.filter.src.dir}"/>
328 +
329      <copy todir="${build.filter.src.dir}">
330        <fileset dir="${src.dir}">
331 <        <include name="java/**/*.java"/>
331 >        <include name="**/*.html"/>
332 >      </fileset>
333 >    </copy>
334 >
335 >    <!-- Not needed now, used for doccheck filtering:
336 >    <property name="generic.declarations"
337 >             value="public interface E {} public interface T {} public interface K {} public interface V {}"
338 >    />
339 >    -->
340 >
341 >    <copy todir="${build.filter.src.dir}">
342 >      <fileset dir="${src.dir}">
343 >        <exclude name="**/*.html"/>
344 >        <patternset refid="emulation.excludes"/>
345        </fileset>
346        <filterchain>
347 +
348 +        <!--
349 +         # This filter gets rid of angle-bracketed type parameters
350 +         # so that javadoc can run on the result. The following
351 +         # heuristic seems to work:
352 +         #
353 +         # For all lines not starting with space(s)-asterisk-space(s),
354 +         #   replace <something> with a space, where there may be more
355 +         #   than one right angle bracket at the end, and "something"
356 +         #   must not contain parens or pipes. (This may need some
357 +         #   tweaking.)
358 +         -->
359 +
360          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
361                        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           -->
362            <param name="notmatching" value="^\s+\*\s.*$"/>
363 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
363 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
364            <param name="replacement" value=" "/>
365          </filterreader>
366 +
367 +
368 +        <!--
369 +         # This filter uncomments lines beginning with "//@" so that
370 +         # javadoc can see imports that are needed to resolve links
371 +         # but that shouldn't be in the compiled code.
372 +         -->
373 +
374          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
375                        classpath="${build.ant.dir}">
376 <          <!--
377 <           # 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="^//@"/>
376 >          <param name="matching"    value="^//@.*$"/>
377 >          <param name="pattern"     value="^//@"/>
378            <param name="replacement" value=""/>
379          </filterreader>
380 +
381 +
382 +        <!--
383 +         # The next two filters try to make the source look like
384 +         # something that doccheck can process. The first removes
385 +         # -source 1.4 assertions and the second adds in a bunch
386 +         # of single letter public nested marker interfaces so that
387 +         # the generic type parameters are recognized.
388 +         #
389 +         # Currently commented out because doccheck doesn't work. :-(
390 +         -->
391 +
392 +        <!--
393 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
394 +                      classpath="${build.ant.dir}">
395 +          <param name="matching"    value="^\s*assert[\s ].*$"/>
396 +          <param name="pattern"     value="assert"/>
397 +          <param name="replacement" value="//assert"/>
398 +        </filterreader>
399 +
400 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
401 +                      classpath="${build.ant.dir}">
402 +          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
403 +          <param name="pattern"     value="$"/>
404 +          <param name="replacement" value=" ${generic.declarations}"/>
405 +        </filterreader>
406 +        -->
407 +
408        </filterchain>
409      </copy>
410 +
411    </target>
412  
413  
414 <  <target name="compile-tests" depends="jar">
414 >  <target name="compile-tests"
415 >          depends="jar">
416 >
417      <mkdir dir="${build.testcases.dir}"/>
418 +
419 + <!--
420 +    <echo>javac ${gjc.args}</echo>
421 +    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
422 +    <echo>classpath="${test.classpath}"</echo>
423 + -->
424 +
425      <javac srcdir="${test.src.dir}"
426            destdir="${build.testcases.dir}"
427              debug="${build.debug}"
# Line 321 | Line 430 | ant [target], where target is one of:
430             source="${build.sourcelevel}"
431               fork="true">
432  
433 <      <bootclasspath refid="javac.bootclasspath"/>
434 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
435 <      <classpath refid="test.classpath"/>
433 >      <compilerarg    line="${gjc.args}"/>
434 >      <bootclasspath refid="test.compile.bootclasspath"/>
435 >      <classpath     refid="test.classpath"/>
436  
437      </javac>
438 +
439    </target>
440  
441  
442 <  <target name="run-tests" depends="compile-tests">
442 >  <target name="run-tests"
443 >          depends="compile-tests">
444 >
445 >    <!-- May be overridden by user.properties -->
446 >    <property name="testcase" value="*"/>
447 >
448      <mkdir dir="${build.reports.dir}"/>
449 +
450      <junit printsummary="true"
451               showoutput="true"
452            errorProperty="junit.failed"
# Line 338 | Line 454 | ant [target], where target is one of:
454                      dir="${build.reports.dir}"
455                     fork="true">
456  
457 <      <!--
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}"/>
457 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
458  
459        <formatter type="xml"/>
460  
461        <batchtest todir="${build.reports.dir}">
462          <fileset dir="${test.src.dir}">
463 <          <include name="**/*Test.java"/>
463 >          <include name="**/${testcase}Test.java"/>
464          </fileset>
465        </batchtest>
466  
467      </junit>
468 +
469    </target>
470  
471  
472 <  <target name="report-tests" depends="run-tests">
472 >  <target name="report-tests"
473 >          depends="run-tests">
474 >
475      <!-- Sets junit.report.format to frames if Xalan is present,
476           otherwise sets it to noframes. -->
477      <available property="junit.report.format"
# Line 376 | Line 491 | ant [target], where target is one of:
491      </junitreport>
492  
493      <fail message="Test Cases Failed" if="junit.failed"/>
494 +
495 +  </target>
496 +
497 +
498 +  <target name="configure-compiler">
499 +
500 +    <property name="gjc.version"
501 +             value="2.0"/>
502 +
503 +    <condition property="novariance.arg" value="-novariance">
504 +      <and>
505 +        <equals arg1="${gjc.version}" arg2="2.0"/>
506 +        <or>
507 +          <not><isset property="gjc.novariance"/></not>
508 +          <istrue value="${gjc.novariance}"/>
509 +        </or>
510 +      </and>
511 +    </condition>
512 +
513 +    <property name="novariance.arg"
514 +             value=""/>
515 +
516 +    <property name="gjc.dir"
517 +             value="${lib.dir}/gjc"/>
518 +
519 +    <property name="javac.jar"
520 +          location="${gjc.dir}/${gjc.version}/javac.jar"/>
521 +
522 +    <property name="collect.jar"
523 +          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
524 +
525 +
526 +    <condition property="warnunchecked.arg" value="-warnunchecked">
527 +      <istrue value="${gjc.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 +    <!--
538 +     ! Bootclasspath munging for source compilation.
539 +     -->
540 +
541 +    <path id="pre.bootclasspath">
542 +      <pathelement location="${javac.jar}"/>
543 +    </path>
544 +
545 +    <path id="compile.bootclasspath">
546 +      <pathelement location="${build.classes.dir}"/>
547 +      <pathelement location="${collect.jar}"/>
548 +      <pathelement location="${rt.jar}"/>
549 +    </path>
550 +
551 +    <!-- Flatten paths into platform-appropriate strings -->
552 +    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
553 +    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
554 +
555 +
556 +    <!-- Common options in javac invocations -->
557 +    <property name="gjc.args"
558 +             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
559 +    />
560 +
561    </target>
562  
563  
564 <  <target name="check-junit">
565 <    <!-- FIXME: this test isn't specific enough -->
564 >  <target name="prepare-src"
565 >          depends="configure-compiler"
566 >          if="prepare.src.dir">
567 >
568 >    <mkdir dir="${prepare.src.dir}"/>
569 >    <copy todir="${prepare.src.dir}">
570 >      <fileset dir="${src.dir}">
571 >        <exclude name="java/lang/**"/>
572 >      </fileset>
573 >    </copy>
574 >
575 >  </target>
576 >
577 >
578 >  <target name="configure-emulation">
579 >
580 >    <condition property="build.emulation.true">
581 >      <or>
582 >        <and>
583 >          <os family="windows"/>
584 >          <not>
585 >            <isset property="build.emulation"/>
586 >          </not>
587 >        </and>
588 >        <istrue value="${build.emulation}"/>
589 >      </or>
590 >    </condition>
591 >
592 >  </target>
593 >
594 >
595 >  <target name="configure-tests"
596 >       depends="configure-compiler">
597 >
598 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
599      <available property="junit.available"
600 <               classname="junit.framework.TestCase"/>
601 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
600 >               classname="junit.framework.Protectable"/>
601 >
602 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
603 >          unless="junit.available"/>
604 >
605 >
606 >    <!--
607 >     ! Bootclasspath munging for testing, so JUnit can test our local
608 >     ! modifications to java.*.
609 >     -->
610 >
611 >    <path id="test.classpath">
612 >      <pathelement location="${product.jar}"/>
613 >      <pathelement location="${build.testcases.dir}"/>
614 >      <pathelement location="${junit.jar}"/>
615 >    </path>
616 >
617 >    <path id="test.compile.bootclasspath">
618 >      <pathelement location="${javac.jar}"/>
619 >      <pathelement location="${collect.jar}"/>
620 >      <pathelement location="${rt.jar}"/>
621 >    </path>
622 >
623 >    <path id="test.run.bootclasspath">
624 >      <pathelement location="${javac.jar}"/>
625 >      <path refid="test.classpath"/>
626 >    </path>
627 >
628 >    <!-- Flatten test classpaths into platform-appropriate strings -->
629 >    <property name="test.classpath"             refid="test.classpath"/>
630 >    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
631 >    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
632 >
633 >  </target>
634 >
635 >
636 >
637 >  <!-- Anthill targets -->
638 >
639 >  <target name="anthill-build"
640 >          depends="jar, test, docs, dist-docs"/>
641 >
642 >  <target name="anthill-publish">
643 >
644 >    <copy todir="${deployDir}/docs/private">
645 >      <fileset dir="${build.javadocs.dir}"/>
646 >    </copy>
647 >
648 >    <copy todir="${deployDir}/docs/public">
649 >      <fileset dir="${dist.javadocs.dir}"/>
650 >    </copy>
651 >
652 >    <copy tofile="${deployDir}/index.html"
653 >          file="${basedir}/etc/anthill-index.html"/>
654 >
655 >    <copy todir="${deployDir}/notes">
656 >      <fileset dir="${basedir}/etc/notes"/>
657 >    </copy>
658 >
659    </target>
660  
661  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines