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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines