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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines