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.61 by tim, Tue Dec 9 18:38:28 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="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 54 | Line 53
53  
54    <!-- Jar locations -->
55    <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"/>
56    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
57 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
58 <
59 <
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 <   -->
57 >  
58 >  <!-- Bootclasspath argument -->
59 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
60  
61 +  <!-- Test classpath -->
62    <path id="test.classpath">
93    <pathelement location="${product.jar}"/>
63      <pathelement location="${build.testcases.dir}"/>
64      <pathelement location="${junit.jar}"/>
65    </path>
66  
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
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 127 | Line 83
83             source="${build.sourcelevel}"
84               fork="true">
85  
86 <      <bootclasspath refid="javac.bootclasspath"/>
131 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
86 >      <compilerarg line="${build.args}"/>
87  
88      </javac>
89  
90    </target>
91  
92  
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)" />
146
93  
94 <  <target name="checkstyle"
95 <          depends="filter-src"
96 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
94 >  <target name="jar"
95 >          depends="compile"
96 >          description="Builds library jar from compiled sources">
97  
98 <    <taskdef resource="checkstyletask.properties"
153 <            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"/>
158 <    </checkstyle>
100 >    <jar destfile="${product.jar}">
101 >      <fileset dir="${build.classes.dir}"/>
102 >    </jar>
103  
104    </target>
105  
106  
163  <target name="doccheck"
164          depends="filter-src"
165          description="Reports on javadoc style errors (not working yet)">
166
167    <delete dir="${build.doccheck.dir}"/>
168    <mkdir dir="${build.doccheck.dir}"/>
107  
108 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
109 <         docletpath="${lib.dir}/doccheck.jar"
110 <            destdir="${build.doccheck.dir}">
173 <      <packageset dir="${build.filter.src.dir}"/>
174 <    </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  
176  </target>
112  
113  
114    <target name="docs"
180          depends="filter-src"
115            description="Builds javadocs with custom tags to build folder">
116  
117      <delete dir="${build.javadocs.dir}"/>
# Line 186 | Line 120
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:"/>
193      <tag name="editor"  description="Last edited by:"/>
194      <tag name="fixme"   description="FIX ME:"/>
127  
128 <      <packageset dir="${build.filter.src.dir}"/>
128 >      <packageset dir="${src.dir}"/>
129  
130      </javadoc>
131  
132    </target>
133  
134  
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">
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}"
215 <            debug="${build.debug}"
216 <       debuglevel="${build.debuglevel}"
217 <      deprecation="${build.deprecation}"
218 <           source="${build.sourcelevel}"
219 <             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 241 | Line 211
211    </target>
212  
213  
214 +
215    <target name="dist-clean"
216            description="Removes all build and distribution products">
217  
# Line 249 | Line 220
220    </target>
221  
222  
223 +
224    <target name="dist-docs"
253          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 271 | Line 242
242  
243    <!-- Internal targets -->
244  
274  <target name="set-warnings-if" if="build.warnings">
275
276    <property name="build.warnings.option" value="-warnunchecked"/>
277
278  </target>
279
280
281  <target name="set-warnings-unless" unless="build.warnings">
245  
246 <    <property name="build.warnings.option" value=""/>
284 <
285 <  </target>
286 <
287 <
288 <  <target name="init"
289 <          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 +    <echo>java.home is ${java.home}</echo>
252  
253    </target>
254 <
255 <
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>
349 <
350 <  </target>
351 <
352 <
254 >  
255 >  
256    <target name="dist-jar"
257            depends="clean, jar">
258  
# Line 378 | Line 281
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}">
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           -->
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
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=""/>
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 421 | Line 378
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 429 | Line 401
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 453 | Line 428
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 471 | Line 451
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 494 | Line 474
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 <  </target>
512 <
511 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
512 >          unless="xalan.available"/>
513 >    -->
514  
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>
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 542 | Line 562
562    </target>
563  
564  
565 +  <!-- Standalone sample program -->
566 +  
567 +  <target name="sample" depends="jar">
568 +  
569 +    <mkdir dir="${build.testcases.dir}"/>
570 +    
571 +    <javac srcdir="${test.src.dir}"
572 +          destdir="${build.testcases.dir}"
573 +            debug="${build.debug}"
574 +       debuglevel="${build.debuglevel}"
575 +      deprecation="${build.deprecation}"
576 +           source="${build.sourcelevel}"
577 +             fork="true">
578 +            
579 +      <compilerarg value="${bootclasspath.args}"/>
580 +      <compilerarg line="${build.args}"/>
581 +      
582 +      <classpath refid="test.classpath"/>
583 +      
584 +      <include name="jsr166/test/Sample.java"/>
585 +      
586 +    </javac>
587 +    
588 +            
589 +    <java classname="jsr166.test.Sample" fork="true">
590 +      <jvmarg value="${bootclasspath.args}"/>
591 +      <classpath refid="test.classpath"/>
592 +    </java>
593 +  </target>
594 +
595 +
596 +
597 +  <!-- Backward compatibility, work in progress (some files not checked in) -->
598 +
599 +
600 +
601 +  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
602 +  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
603 +  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
604 +  <property name="pretiger.sourcelevel" value="1.4"/>
605 +  
606 +  <target name="defang"
607 +       depends="init"
608 +   description="Generates pre-Tiger compatible source">
609 +  
610 +    <delete dir="${pretiger.src.dir}"/>
611 +    <mkdir dir="${pretiger.src.dir}"/>
612 +  
613 +    <exec executable="perl">
614 +      <arg file="etc/defang.pl"/>
615 +      <!-- <arg value="-v"/> -->
616 +      <arg value="-s"/> <arg file="${src.dir}"/>
617 +      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
618 +    </exec>
619 +    
620 +  </target>
621 +
622 +  <target name="compile-pretiger"
623 +          depends="init, configure-compiler, defang"
624 +          description="Compiles pre-Tiger sources to build folder">
625 +
626 +    <mkdir dir="${build.pretiger.dir}"/>
627 +
628 +    <javac srcdir="${pretiger.src.dir}"
629 +          destdir="${build.pretiger.dir}"
630 +            debug="${build.debug}"
631 +       debuglevel="${build.debuglevel}"
632 +      deprecation="${build.deprecation}"
633 +           source="${pretiger.sourcelevel}"
634 +             fork="true">
635 +
636 +      <compilerarg line="${build.args}"/>
637 +      <exclude name="**/Thread.java"/>
638 +
639 +    </javac>
640 +
641 +  </target>
642 +  
643 +  <target name="pretiger" depends="compile-pretiger">
644 +
645 +    <mkdir dir="${build.lib.dir}"/>
646 +    
647 +    <jar destfile="${pretiger.jar}">
648 +      <fileset dir="${build.pretiger.dir}">
649 +      </fileset>
650 +    </jar>
651 +    
652 +  </target>
653 +
654   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines