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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines