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.33 by tim, Thu May 29 12:54:10 2003 UTC vs.
Revision 1.62 by tim, Wed Dec 10 01:51:11 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines