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.30 by tim, Wed May 28 14:19:25 2003 UTC vs.
Revision 1.59 by tim, Sun Dec 7 20:49:10 2003 UTC

# Line 7 | Line 7
7    Usage: ant [target]
8  
9    User-specific settings are read from user.properties.
10 <  See user.properties.sample for examples.
10 >  See user.properties.sample for an explanation of some useful settings.
11   ------------------------------------------------------------------------------
12    </description>
13  
# Line 22 | Line 22
22  
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
25  <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 30 | Line 29
29    <!-- Build locations -->
30    <property name="build.dir"            location="build"/>
31    <property name="build.classes.dir"    location="${build.dir}/classes"/>
33  <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"/>
38  <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"/>
45  <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 54 | Line 52
52  
53    <!-- Jar locations -->
54    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
57  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
58  <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 <
63 <
64 <  <!--
65 <   ! Bootclasspath munging for source compilation.
66 <   -->
67 <
68 <  <path id="javac.bootclasspath.prefix">
69 <    <!-- <pathelement location="${src.dir}"/> -->
70 <    <pathelement location="${javac.jar}"/>
71 <  </path>
72 <
73 <  <path id="javac.bootclasspath">
74 <    <!-- <pathelement location="${src.dir}"/> -->
75 <    <pathelement location="${collect.jar}"/>
76 <    <pathelement location="${rt.jar}"/>
77 <  </path>
78 <
79 <  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
80 <  <property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>
81 <
82 <  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
83 <  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
84 <
85 <
86 <
87 <  <!--
88 <   ! Bootclasspath munging for testing, so JUnit can test our local
89 <   ! modifications to java.*.
90 <   -->
56 >  
57 >  <!-- Bootclasspath argument -->
58 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
59  
60 +  <!-- Test classpath -->
61    <path id="test.classpath">
93    <pathelement location="${product.jar}"/>
62      <pathelement location="${build.testcases.dir}"/>
63      <pathelement location="${junit.jar}"/>
64    </path>
65  
98  <!-- Flatten test classpath into a platform-appropriate string -->
99  <property name="test.classpath" refid="test.classpath"/>
100
101  <!-- Turn the flattened test classpath into a javac argument -->
102  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
103
104
105
106  <!-- Files excluded from emulation and dist-docs -->
107  <patternset id="emulation.excludes">
108    <exclude name="java/util/Random.*"/>
109    <exclude name="sun/misc/Unsafe.*"/>
110  </patternset>
111
66  
67  
68    <!-- Main targets -->
69  
70 +
71    <target name="compile"
72 <          depends="init"
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 127 | Line 82
82             source="${build.sourcelevel}"
83               fork="true">
84  
85 <      <bootclasspath refid="javac.bootclasspath"/>
131 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
85 >      <compilerarg line="${build.args}"/>
86  
87      </javac>
88  
89    </target>
90  
91  
138  <target name="jar"
139          depends="check-emulation, init-jar, native-jar, emulation-jar"
140          description="Builds library jar from compiled sources"/>
141
142
143  <target name="test"
144          depends="init, check-junit, report-tests"
145          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
92  
93 +  <target name="jar"
94 +          depends="compile"
95 +          description="Builds library jar from compiled sources">
96  
97 <  <target name="checkstyle"
149 <          depends="filter-src"
150 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
151 <
152 <    <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"
164          depends="filter-src"
165          description="Reports on javadoc style errors (not working yet)">
106  
107 <    <delete dir="${build.doccheck.dir}"/>
108 <    <mkdir dir="${build.doccheck.dir}"/>
109 <
170 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
171 <         docletpath="${lib.dir}/doccheck.jar"
172 <            destdir="${build.doccheck.dir}">
173 <      <packageset dir="${build.filter.src.dir}"/>
174 <    </javadoc>
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  
176  </target>
111  
112  
113    <target name="docs"
180          depends="filter-src"
114            description="Builds javadocs with custom tags to build folder">
115  
116      <delete dir="${build.javadocs.dir}"/>
# Line 186 | Line 119
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:"/>
193      <tag name="editor"  description="Last edited by:"/>
194      <tag name="fixme"   description="FIX ME:"/>
126  
127 <      <packageset dir="${build.filter.src.dir}"/>
127 >      <packageset dir="${src.dir}"/>
128  
129      </javadoc>
130  
131    </target>
132  
133  
203  <!--
204   # javac -s doesn't reliably generate compilable code. It generates
205   # bridge methods (marked as "synthetic") that can have identical
206   # signatures to existing methods except for the return value.
207   -->
208  <target name="strip"
209          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}"
215 <            debug="${build.debug}"
216 <       debuglevel="${build.debuglevel}"
217 <      deprecation="${build.deprecation}"
218 <           source="${build.sourcelevel}"
219 <             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"
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 241 | Line 210
210    </target>
211  
212  
213 +
214    <target name="dist-clean"
215            description="Removes all build and distribution products">
216  
# Line 249 | Line 219
219    </target>
220  
221  
222 +
223    <target name="dist-docs"
253          depends="filter-src"
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      <javadoc destdir="${dist.javadocs.dir}"
230 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
230 >                link="http://java.sun.com/j2se/1.4.2/docs/api"
231              overview="${src.dir}/intro.html"
232 <              source="${build.docsourcelevel}">
232 >              source="${build.sourcelevel}">
233  
234 <      <packageset dir="${build.filter.src.dir}"/>
234 >      <packageset dir="${src.dir}"/>
235  
236      </javadoc>
237  
# Line 271 | Line 241
241  
242    <!-- Internal targets -->
243  
274  <target name="set-warnings-if" if="build.warnings">
275
276    <property name="build.warnings.option" value="-warnunchecked"/>
277
278  </target>
279
244  
245 <  <target name="set-warnings-unless" unless="build.warnings">
282 <
283 <    <property name="build.warnings.option" value=""/>
284 <
285 <  </target>
286 <
287 <
288 <  <target name="init"
289 <          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 <
295 <  </target>
296 <
297 <
298 <  <target name="init-jar">
299 <
300 <    <mkdir dir="${build.lib.dir}"/>
301 <
302 <  </target>
303 <
304 <
305 <  <target name="native-jar"
306 <          depends="compile"
307 <          unless="build.emulation.true">
308 <
309 <    <jar destfile="${product.jar}">
310 <      <fileset dir="${build.classes.dir}"/>
311 <    </jar>
312 <
313 <  </target>
314 <
315 <
316 <  <target name="compile-emulation"
317 <          depends="init"
318 <          if="build.emulation.true">
319 <
320 <    <mkdir dir="${build.emulation.dir}"/>
321 <
322 <    <javac srcdir="${emulation.src.dir}"
323 <          destdir="${build.emulation.dir}"
324 <            debug="${build.debug}"
325 <       debuglevel="${build.debuglevel}"
326 <      deprecation="${build.deprecation}"
327 <           source="${build.sourcelevel}"
328 <             fork="true">
329 <
330 <      <bootclasspath refid="javac.bootclasspath"/>
331 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
332 <
333 <    </javac>
334 <
335 <  </target>
336 <
337 <
338 <  <target name="emulation-jar"
339 <          depends="compile-emulation"
340 <          if="build.emulation.true">
341 <
342 <
343 <    <jar destfile="${product.jar}" duplicate="add">
344 <      <fileset dir="${build.classes.dir}">
345 <        <patternset refid="emulation.excludes"/>
346 <      </fileset>
347 <      <fileset dir="${build.emulation.dir}"/>
348 <    </jar>
250 >    <echo>java.home is ${java.home}</echo>
251  
252    </target>
253  
# Line 378 | Line 280
280  
281      <copy todir="${build.filter.src.dir}">
282        <fileset dir="${src.dir}">
283 <        <patternset refid="emulation.excludes"/>
283 >        <include name="**/*.html"/>
284        </fileset>
285 +    </copy>
286 +
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 +        <!--
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 +        <!--
311          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
312                        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           -->
313            <param name="notmatching" value="^\s+\*\s.*$"/>
314 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
314 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
315            <param name="replacement" value=" "/>
316          </filterreader>
317 +        -->
318 +
319 +      <!--
320 +      </filterchain>
321 +      -->
322 +    </copy>
323 +
324 +  </target>
325 +
326 +
327 +  <target name="filter-doccheck"
328 +          depends="filter-src">
329 +
330 +    <mkdir dir="${build.dc-filter.dir}"/>
331 +
332 +    <copy todir="${build.dc-filter.dir}">
333 +      <fileset dir="${build.filter.src.dir}">
334 +        <include name="**/*.html"/>
335 +      </fileset>
336 +    </copy>
337 +
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.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 +          <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  
# Line 421 | Line 377
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 429 | Line 385
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 453 | Line 410
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 471 | Line 430
430    <target name="report-tests"
431            depends="run-tests">
432  
433 <    <!-- Sets junit.report.format to frames if Xalan is present,
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 494 | Line 453
453    </target>
454  
455  
456 <  <target name="check-junit">
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="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.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 <  </target>
511 <
510 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
511 >          unless="xalan.available"/>
512 >    -->
513  
509  <target name="check-emulation">
510    <condition property="build.emulation.true">
511      <or>
512        <isset property="build.emulation"/>
513        <os family="windows"/>
514      </or>
515    </condition>
514    </target>
515  
516  
517  
518    <!-- Anthill targets -->
519  
520 <  <target name="anthill-build"
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">
# Line 542 | Line 561
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