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.54 by tim, Mon Sep 1 04:09:57 2003 UTC vs.
Revision 1.65 by jsr166, Fri Apr 9 20:10:29 2004 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.j1.dir"         location="${build.dir}/j1"/>
34 +  <property name="build.loops.dir"      location="${build.dir}/loops"/>
35    <property name="build.lib.dir"        location="${build.dir}/lib"/>
36    <property name="build.ant.dir"        location="${build.dir}/ant"/>
37    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
39  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
38    <property name="build.reports.dir"    location="${build.dir}/reports"/>
39 +  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
40    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42 <  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
42 >  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43  
44    <!-- Source locations -->
45    <property name="src.dir"              location="${basedir}/src/main"/>
47  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
46    <property name="test.src.dir"         location="${basedir}/src/test"/>
47 +  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
48 +  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
49 +  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
50 +  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
51    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
52    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
53    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 57 | Line 59
59    <!-- Jar locations -->
60    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
61    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
62  
63 +  <!-- Bootclasspath argument -->
64 +  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
65  
66 <  <!-- Files excluded from dist-docs and emulation jar -->
67 <  <patternset id="unsafe.exclusion">
68 <    <exclude name="java/util/Random.*"/>
69 <    <exclude name="sun/misc/Unsafe.*"/>
70 <  </patternset>
71 <
72 <  <!-- Files excludes from emulation jar -->
73 <  <patternset id="atomic.exclusion">
74 <    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
75 <    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
76 <    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
77 <    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
78 <    <exclude name="java/util/concurrent/locks/LockSupport*"/>
79 <    <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
80 <  </patternset>
81 <
66 >  <!-- Test classpath -->
67 >  <path id="test.classpath">
68 >    <pathelement location="${build.testcases.dir}"/>
69 >    <pathelement location="${junit.jar}"/>
70 >  </path>
71 >
72 >  <!-- ALoops classpath -->
73 >  <path id="loops.classpath">
74 >    <pathelement location="${build.loops.dir}"/>
75 >  </path>
76 >
77 >  <!-- J1 classpath -->
78 >  <path id="j1.classpath">
79 >    <pathelement location="${build.j1.dir}"/>
80 >    <pathelement location="${junit.jar}"/>
81 >  </path>
82  
83  
84    <!-- Main targets -->
85  
86 +
87    <target name="compile"
88 <          depends="init, configure-compiler, prepare-src"
88 >          depends="init, configure-compiler"
89            description="Compiles main sources to build folder">
90  
88    <property name="prepare.src.dir" value="${src.dir}"/>
89
91      <mkdir dir="${build.classes.dir}"/>
92  
93 < <!--
93 <    <echo>javac ${gjc.args}</echo>
94 <    <echo>bootclasspath=${compile.bootclasspath}</echo>
95 < -->
96 <
97 <    <javac srcdir="${prepare.src.dir}"
93 >    <javac srcdir="${src.dir}"
94            destdir="${build.classes.dir}"
95              debug="${build.debug}"
96         debuglevel="${build.debuglevel}"
# Line 102 | Line 98
98             source="${build.sourcelevel}"
99               fork="true">
100  
101 <      <compilerarg    line="${gjc.args}"/>
106 < <!--
107 <      <bootclasspath refid="compile.bootclasspath"/>
108 < -->
101 >      <compilerarg line="${build.args}"/>
102  
103      </javac>
104  
105    </target>
106  
107  
115  <target name="jar"
116          depends="configure-emulation, init-jar, native-jar, emulation-jar"
117          description="Builds library jar from compiled sources"/>
118
119
120  <target name="test"
121          depends="init, configure-tests, report-tests"
122          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
123
108  
109 <  <target name="checkstyle"
110 <          depends="filter-src"
111 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
109 >  <target name="jar"
110 >          depends="compile"
111 >          description="Builds library jar from compiled sources">
112  
113 <    <taskdef resource="checkstyletask.properties"
130 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
113 >    <mkdir dir="${build.lib.dir}"/>
114  
115 <    <checkstyle>
116 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
117 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
135 <    </checkstyle>
115 >    <jar destfile="${product.jar}">
116 >      <fileset dir="${build.classes.dir}"/>
117 >    </jar>
118  
119    </target>
120  
121  
140  <target name="doccheck"
141          depends="filter-doccheck"
142          description="Reports on javadoc style errors">
122  
123 <    <delete dir="${build.doccheck.dir}"/>
124 <    <mkdir dir="${build.doccheck.dir}"/>
125 <
147 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
148 <         docletpath="${lib.dir}/doccheck.jar"
149 <            destdir="${build.doccheck.dir}">
150 <      <packageset dir="${build.filter.doccheck.dir}"/>
151 <    </javadoc>
152 <
153 <    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
123 >  <target name="test"
124 >          depends="init, configure-tests, report-tests"
125 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
126  
155  </target>
127  
128  
129    <target name="docs"
159          depends="filter-src"
130            description="Builds javadocs with custom tags to build folder">
131  
132      <delete dir="${build.javadocs.dir}"/>
# Line 165 | Line 135
135      <javadoc destdir="${build.javadocs.dir}"
136                  link="http://java.sun.com/j2se/1.4.1/docs/api"
137              overview="${src.dir}/intro.html"
138 <              source="${build.docsourcelevel}">
138 >              source="${build.sourcelevel}">
139  
140        <tag name="revised" description="Last revised:"/>
141        <tag name="spec"    description="Specified by:"/>
172      <tag name="editor"  description="Last edited by:"/>
173      <tag name="fixme"   description="FIX ME:"/>
142  
143 <      <packageset dir="${build.filter.src.dir}"/>
143 >      <packageset dir="${src.dir}"/>
144  
145      </javadoc>
146  
147    </target>
148  
149  
182  <target name="sinjdocs"
183          depends="configure-tests"
184          description="Builds javadocs with custom tags to build folder">
185
186    <delete dir="${build.sinjdocs.dir}"/>
187    <mkdir dir="${build.sinjdocs.dir}"/>
188
189    <java classname="net.cscott.sinjdoc.Main" fork="true">
150  
151 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
151 >  <target name="doccheck"
152 >          depends="filter-doccheck"
153 >          description="Reports on javadoc style errors">
154  
155 <      <classpath>
156 <        <pathelement location="${sinjdoc.jar}"/>
195 <        <pathelement location="${lib.dir}/jutil.jar"/>
196 <        <pathelement location="${lib.dir}/cup.jar"/>
197 <        <path refid="test.classpath"/>
198 <      </classpath>
199 <
200 <
201 <      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
202 <      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
203 <      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
204 <      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
205 <      <!-- <arg value="-verbose"/> -->
206 <      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
207 <      <arg value="java.lang"/>
208 <      <arg value="java.util"/>
209 <      <arg value="java.util.concurrent"/>
210 <      <arg value="java.util.concurrent.atomic"/>
211 <      <arg value="java.util.concurrent.locks"/>
155 >    <delete dir="${build.doccheck.dir}"/>
156 >    <mkdir dir="${build.doccheck.dir}"/>
157  
158 <      <!--
159 <      <arg value="-help"/>
160 <      -->
158 >    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
159 >         docletpath="${lib.dir}/doccheck.jar"
160 >            destdir="${build.doccheck.dir}">
161 >      <packageset dir="${build.dc-filter.dir}"/>
162 >    </javadoc>
163  
164 <    </java>
164 >    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
165  
166    </target>
167  
168  
222  <target name="strip"
223          depends="init, configure-compiler"
224          description="Strip generics from java source (not working yet)">
169  
170 <    <mkdir dir="${build.stripped.dir}"/>
170 >  <target name="checkstyle"
171 >          depends="filter-src"
172 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
173  
174 <    <!--
175 <     # javac -s doesn't reliably generate compilable code. It generates
230 <     # bridge methods (marked as "synthetic") that can have identical
231 <     # signatures to existing methods except for the return value.
232 <     -->
233 <    <javac srcdir="${src.dir}"
234 <          destdir="${build.stripped.dir}"
235 <            debug="${build.debug}"
236 <       debuglevel="${build.debuglevel}"
237 <      deprecation="${build.deprecation}"
238 <           source="${build.sourcelevel}"
239 <             fork="true">
174 >    <taskdef resource="checkstyletask.properties"
175 >            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
176  
177 <      <compilerarg    line="${gjc.args} -s"/>
242 < <!--
243 <      <bootclasspath refid="compile.bootclasspath"/>
244 < -->
177 >    <mkdir dir="${build.checkstyle.dir}"/>
178  
179 <    </javac>
179 >    <checkstyle config="etc/checkstyle/sun_checks.xml"
180 >       failOnViolation="false">
181 >      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
182 >      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
183 >    </checkstyle>
184 >
185 >    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
186 >          out="${build.checkstyle.dir}/checkstyle-report.html"
187 >        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
188  
189    </target>
190  
191  
192 +
193    <target name="dist"
194            depends="init, dist-clean, dist-jar, dist-docs"
195            description="Puts all distributable products in single hierarchy"/>
196  
197 +
198 +
199    <target name="release"
200            depends="dist"
201            description="Puts entire CVS tree, plus distribution productions, in a jar">
202  
259 <!--
260    #keep build dir? - dl
261    <delete dir="${build.dir}"/>
262 -->
203      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
204  
205      <jar basedir="${basedir}" destfile="${release.jar}">
206 +      <!-- <exclude name="build/**"/> -->
207        <exclude name="${release.jar}"/>
208        <exclude name="user.properties"/>
209        <exclude name="etc/notes/**"/>
210 <      <exclude name="lib/gjc/2.1/**"/>
210 >      <exclude name="src/emulation/**"/>
211        <exclude name="**/SyntaxTest.java"/>
212 +      <exclude name="**/SuperfluousAbstract.java"/>
213      </jar>
214  
215    </target>
216  
217 +
218 +
219    <target name="clean"
220            description="Removes all build products">
221  
# Line 282 | Line 226
226    </target>
227  
228  
229 +
230    <target name="dist-clean"
231            description="Removes all build and distribution products">
232  
# Line 290 | Line 235
235    </target>
236  
237  
238 +
239    <target name="dist-docs"
294          depends="filter-src"
240            description="Builds javadocs without custom tags to dist folder">
241  
242      <delete dir="${dist.javadocs.dir}"/>
243      <mkdir dir="${dist.javadocs.dir}"/>
244  
245      <javadoc destdir="${dist.javadocs.dir}"
246 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
246 >                link="http://java.sun.com/j2se/1.4.2/docs/api"
247              overview="${src.dir}/intro.html"
248 <              source="${build.docsourcelevel}">
248 >              source="${build.sourcelevel}">
249  
250 <      <packageset dir="${build.filter.src.dir}"/>
250 >      <packageset dir="${src.dir}"/>
251  
252      </javadoc>
253  
# Line 323 | Line 268
268    </target>
269  
270  
326  <target name="init-jar">
327
328    <mkdir dir="${build.lib.dir}"/>
329
330  </target>
331
332
333  <target name="native-jar"
334          depends="compile"
335          unless="build.emulation.true">
336
337    <jar destfile="${product.jar}">
338      <fileset dir="${build.classes.dir}"/>
339    </jar>
340
341  </target>
342
343
344  <target name="compile-emulation"
345          depends="init, configure-compiler"
346          if="build.emulation.true">
347
348    <mkdir dir="${build.emulation.dir}"/>
349
350    <javac srcdir="${emulation.src.dir}"
351          destdir="${build.emulation.dir}"
352            debug="${build.debug}"
353       debuglevel="${build.debuglevel}"
354      deprecation="${build.deprecation}"
355           source="${build.sourcelevel}"
356             fork="true">
357
358      <compilerarg    line="${gjc.args}"/>
359 <!--
360      <bootclasspath refid="compile.bootclasspath"/>
361 -->
362
363    </javac>
364
365  </target>
366
367
368  <target name="emulation-jar"
369          depends="compile-emulation"
370          if="build.emulation.true">
371
372
373    <jar destfile="${product.jar}" duplicate="add">
374      <fileset dir="${build.classes.dir}">
375        <patternset refid="atomic.exclusion"/>
376        <patternset refid="unsafe.exclusion"/>
377      </fileset>
378      <fileset dir="${build.emulation.dir}"/>
379    </jar>
380
381  </target>
382
383
271    <target name="dist-jar"
272            depends="clean, jar">
273  
# Line 396 | Line 283
283  
284      <javac srcdir="${ant.src.dir}"
285            destdir="${build.ant.dir}"
286 <           source="1.4"
400 <    />
286 >           source="1.4"/>
287  
288    </target>
289  
# Line 416 | Line 302
302      <copy todir="${build.filter.src.dir}">
303        <fileset dir="${src.dir}">
304          <exclude name="**/*.html"/>
305 <        <patternset refid="unsafe.exclusion"/>
305 >        <!-- Files excluded from dist-docs -->
306 >        <exclude name="java/util/Random.*"/>
307 >        <exclude name="sun/misc/Unsafe.*"/>
308        </fileset>
309 +      <!--
310        <filterchain>
311 +      -->
312  
313          <!--
314           # This filter gets rid of angle-bracketed type parameters
# Line 432 | Line 322
322           #   tweaking.)
323           -->
324  
325 +        <!--
326          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
327                        classpath="${build.ant.dir}">
328            <param name="notmatching" value="^\s+\*\s.*$"/>
329            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
330            <param name="replacement" value=" "/>
331          </filterreader>
332 +        -->
333  
334 <
443 <        <!--
444 <         # This filter uncomments lines beginning with "//@" so that
445 <         # javadoc can see imports that are needed to resolve links
446 <         # but that shouldn't be in the compiled code.
447 <         -->
448 <
449 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
450 <                      classpath="${build.ant.dir}">
451 <          <param name="matching"    value="^//@.*$"/>
452 <          <param name="pattern"     value="^//@"/>
453 <          <param name="replacement" value=""/>
454 <        </filterreader>
334 >      <!--
335        </filterchain>
336 +      -->
337      </copy>
338  
339    </target>
340  
341  
461
462
342    <target name="filter-doccheck"
343            depends="filter-src">
344  
345 <    <mkdir dir="${build.filter.doccheck.dir}"/>
345 >    <mkdir dir="${build.dc-filter.dir}"/>
346  
347 <    <copy todir="${build.filter.doccheck.dir}">
347 >    <copy todir="${build.dc-filter.dir}">
348        <fileset dir="${build.filter.src.dir}">
349          <include name="**/*.html"/>
350        </fileset>
# Line 475 | Line 354
354               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 {}"
355      />
356  
357 <    <copy todir="${build.filter.doccheck.dir}">
357 >    <copy todir="${build.dc-filter.dir}">
358        <fileset dir="${build.filter.src.dir}">
359          <exclude name="**/*.html"/>
360        </fileset>
# Line 513 | Line 392
392  
393      <mkdir dir="${build.testcases.dir}"/>
394  
395 < <!--
396 <    <echo>javac ${gjc.args}</echo>
397 <    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
398 <    <echo>classpath="${test.classpath}"</echo>
399 < -->
395 >    <javac srcdir="${tck.src.dir}"
396 >          destdir="${build.testcases.dir}"
397 >            debug="${build.debug}"
398 >       debuglevel="${build.debuglevel}"
399 >      deprecation="${build.deprecation}"
400 >           source="${build.sourcelevel}"
401 >             fork="true">
402 >
403 >      <compilerarg value="${bootclasspath.args}"/>
404 >      <compilerarg line="${build.args}"/>
405 >
406 >      <classpath refid="test.classpath"/>
407 >
408 >    </javac>
409  
410      <javac srcdir="${test.src.dir}"
411            destdir="${build.testcases.dir}"
# Line 527 | Line 415
415             source="${build.sourcelevel}"
416               fork="true">
417  
418 <      <compilerarg    line="${gjc.args}"/>
419 < <!--      
420 <      <bootclasspath refid="test.compile.bootclasspath"/>
421 < -->      
422 <      <classpath     refid="test.classpath"/>
423 <      
536 <      <include name="java/**"/>
537 <      <include name="jsr166/**"/>
418 >      <include name="jsr166/test/**"/>
419 >
420 >      <compilerarg value="${bootclasspath.args}"/>
421 >      <compilerarg line="${build.args}"/>
422 >
423 >      <classpath refid="test.classpath"/>
424  
425      </javac>
426  
427 + <!--
428 +    <javac srcdir="${jtreg.src.dir}"
429 +          destdir="${build.testcases.dir}"
430 +            debug="${build.debug}"
431 +       debuglevel="${build.debuglevel}"
432 +      deprecation="${build.deprecation}"
433 +           source="${build.sourcelevel}"
434 +             fork="true">
435 +
436 +      <compilerarg value="${bootclasspath.args}"/>
437 +      <compilerarg line="${build.args}"/>
438 +
439 +      <classpath refid="test.classpath"/>
440 +
441 +    </javac>
442 + -->
443 +
444    </target>
445  
446  
# Line 556 | Line 459
459                      dir="${build.reports.dir}"
460                     fork="true">
461  
462 <      <jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/>
462 >      <jvmarg value="${bootclasspath.args}"/>
463 >      <jvmarg value="-server"/>
464 >      <jvmarg value="-showversion"/>
465 >
466 >      <classpath refid="test.classpath"/>
467  
468        <formatter type="xml"/>
469  
470 <      <batchtest todir="${build.reports.dir}">
470 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
471 >        <fileset dir="${tck.src.dir}">
472 >          <include name="**/${testcase}Test.java"/>
473 >        </fileset>
474 >      </batchtest>
475 >
476 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
477          <fileset dir="${test.src.dir}">
478 <          <include name="java/**/${testcase}Test.java"/>
566 <          <include name="jsr166/**/${testcase}Test.java"/>
478 >          <include name="jsr166/test/**/${testcase}Test.java"/>
479          </fileset>
480        </batchtest>
481  
482 + <!--
483 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
484 +        <fileset dir="${jtreg.src.dir}">
485 +          <include name="**/${testcase}Test.java"/>
486 +        </fileset>
487 +      </batchtest>
488 + -->
489 +
490      </junit>
491  
492    </target>
# Line 600 | Line 520
520  
521    <target name="configure-compiler">
522  
603    <property name="gjc.version"
604             value="2.2"/>
605
606    <condition property="novariance.arg" value="-novariance">
607      <and>
608        <equals arg1="${gjc.version}" arg2="2.0"/>
609        <or>
610          <not><isset property="gjc.novariance"/></not>
611          <istrue value="${gjc.novariance}"/>
612        </or>
613      </and>
614    </condition>
615
616    <property name="novariance.arg"
617             value=""/>
618
619    <property name="gjc.dir"
620             value="${lib.dir}/gjc"/>
621
622    <property name="javac.jar"
623          location="${gjc.dir}/${gjc.version}/javac.jar"/>
624
625    <property name="collect.jar"
626          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
627
628 <!--
629    <property name="unchecked.option" value="-warnunchecked"/>
630 -->
631
523      <property name="unchecked.option" value="-Xlint:unchecked"/>
524  
525      <condition property="warnunchecked.arg" value="${unchecked.option}">
526 <      <istrue value="${gjc.warnunchecked}"/>
526 >      <istrue value="${build.warnunchecked}"/>
527      </condition>
528  
529      <property name="warnunchecked.arg" value=""/>
639    
640    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
641      <istrue value="${build.nothreads}"/>
642    </condition>
643
644
645    <!--
646     ! Bootclasspath munging for source compilation.
647     -->
648
649    <path id="pre.bootclasspath">
650 <!--
651      <pathelement location="${javac.jar}"/>
652 -->
653    </path>
654
655    <path id="compile.bootclasspath">
656      <pathelement location="${build.classes.dir}"/>
657 <!--      
658      <pathelement location="${collect.jar}"/>
659 -->
660      <pathelement location="${rt.jar}"/>
661    </path>
662
663    <!-- Flatten paths into platform-appropriate strings -->
664    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
665    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
530  
531  
532      <!-- Common options in javac invocations -->
533 < <!--
670 <    <property name="gjc.args"
671 <             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
672 <    />
673 < -->
674 <    <property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/>
675 <
676 <  </target>
677 <
678 <
679 <  <target name="prepare-src"
680 <          depends="configure-compiler"
681 <          if="prepare.src.dir">
682 <
683 <    <mkdir dir="${prepare.src.dir}"/>
684 <    <copy todir="${prepare.src.dir}">
685 <      <fileset dir="${src.dir}">
686 <        <exclude name="java/lang/**"/>
687 <      </fileset>
688 <    </copy>
689 <
690 <  </target>
691 <
692 <
693 <  <target name="configure-emulation">
694 <
695 <    <condition property="build.emulation.true">
696 <      <or>
697 <        <and>
698 <          <os family="windows"/>
699 <          <not>
700 <            <isset property="build.emulation"/>
701 <          </not>
702 <        </and>
703 <        <istrue value="${build.emulation}"/>
704 <      </or>
705 <    </condition>
533 >    <property name="build.args" value="${warnunchecked.arg}"/>
534  
535    </target>
536  
# Line 714 | Line 542
542      <available property="junit.available"
543                 classname="junit.framework.Protectable"/>
544  
717    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
718          unless="junit.available"/>
719
545      <!-- Xalan -->
546      <available property="xalan.available"
547                 classname="org.apache.xalan.Version"/>
548  
724    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
725          unless="xalan.available"/>
726
549  
550 +    <!-- Ant 1.6beta and later don't need or want this check -->
551      <!--
552 <     ! Bootclasspath munging for testing, so JUnit can test our local
553 <     ! modifications to java.*.
731 <     -->
732 <
733 <    <path id="test.classpath">
734 <      <pathelement location="${product.jar}"/>
735 <      <pathelement location="${rt.jar}"/>
736 <      <pathelement location="${build.testcases.dir}"/>
737 <      <pathelement location="${junit.jar}"/>
738 <    </path>
739 <
740 <    <path id="test.compile.bootclasspath">
741 <      <pathelement location="${javac.jar}"/>
742 <      <pathelement location="${collect.jar}"/>
743 <      <pathelement location="${rt.jar}"/>
744 <    </path>
745 <
746 <    <path id="test.run.bootclasspath">
747 < <!--    
748 <      <pathelement location="${javac.jar}"/>
749 < -->      
750 <      <path refid="test.classpath"/>
751 <    </path>
552 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
553 >          unless="junit.available"/>
554  
555 <    <!-- Flatten test classpaths into platform-appropriate strings -->
556 <    <property name="test.classpath"             refid="test.classpath"/>
557 <    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
756 <    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
555 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
556 >          unless="xalan.available"/>
557 >    -->
558  
559    </target>
560  
# Line 762 | Line 563
563    <!-- Anthill targets -->
564  
565    <target name="anthill-build">
566 +
567 +    <!-- Override this in user.properties -->
568 +    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
569 +
570      <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
571        <arg value="-Xmx256000000"/>
572        <!-- classpath of new JVM -->
# Line 777 | Line 582
582        <arg value="do-anthill-build"/>
583      </exec>
584    </target>
585 <  
585 >
586    <target name="do-anthill-build"
587            depends="jar, test, docs, dist-docs"/>
588  
# Line 801 | Line 606
606    </target>
607  
608  
804  <target name="ng" depends="test">
805    <java classname="SuperfluousAbstract" fork="true">
609  
610 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
610 >  <!-- Various demos and test programs -->
611 >
612 >
613 >  <target name="sample" depends="init, configure-compiler"
614 >          description="Standalone demo program">
615 >
616 >    <mkdir dir="${build.testcases.dir}"/>
617 >
618 >    <javac srcdir="${test.src.dir}"
619 >          destdir="${build.testcases.dir}"
620 >            debug="${build.debug}"
621 >       debuglevel="${build.debuglevel}"
622 >      deprecation="${build.deprecation}"
623 >           source="${build.sourcelevel}"
624 >             fork="true">
625 >
626 >      <include name="jsr166/test/Sample.java"/>
627 >
628 >    </javac>
629 >
630 >    <copy todir="${build.testcases.dir}">
631 >      <fileset dir="${test.src.dir}">
632 >        <include name="**/*.properties"/>
633 >      </fileset>
634 >    </copy>
635 >
636 >
637 >    <java classname="jsr166.test.Sample" fork="true">
638 >      <classpath refid="test.classpath"/>
639 >      <!-- <jvmarg value="-ea"/> -->
640 >      <!-- <jvmarg value="-server"/> -->
641 >      <!-- <arg value="1000"/> -->
642 >    </java>
643 >  </target>
644 >
645 >
646 >  <target name="loops" depends="init, configure-compiler"
647 >          description="Benchmark from Doug Lea's AQS paper">
648 >
649 >    <mkdir dir="${build.loops.dir}"/>
650 >
651 >    <javac srcdir="${loops.src.dir}"
652 >          destdir="${build.loops.dir}"
653 >            debug="${build.debug}"
654 >       debuglevel="${build.debuglevel}"
655 >      deprecation="${build.deprecation}"
656 >           source="${build.sourcelevel}"
657 >             fork="true">
658 >
659 >      <compilerarg line="${build.args}"/>
660 >      <classpath refid="loops.classpath"/>
661 >
662 >    </javac>
663 >
664 >    <java classname="ALoops" fork="true">
665 >      <classpath refid="loops.classpath"/>
666 >    </java>
667 >
668 >  </target>
669 >
670 >
671 >  <target name="compile-j1" depends="init, configure-compiler">
672 >
673 >    <mkdir dir="${build.j1.dir}"/>
674 >
675 >    <javac srcdir="${j1.src.dir}"
676 >          destdir="${build.j1.dir}"
677 >            debug="${build.debug}"
678 >       debuglevel="${build.debuglevel}"
679 >      deprecation="${build.deprecation}"
680 >           source="${build.sourcelevel}"
681 >             fork="true">
682 >
683 >      <compilerarg line="${build.args}"/>
684 >      <classpath refid="j1.classpath"/>
685 >
686 >    </javac>
687 >
688 >  </target>
689 >
690 >
691 >  <target name="sw" depends="compile-j1"
692 >          description="Runs the SwingWorker demo">
693 >
694 >    <!--
695 >    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
696 >      <classpath refid="j1.classpath"/>
697 >    </java>
698 >    -->
699 >
700 >    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
701 >
702 >    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
703 >      <arg value="${build.j1.dir}/SwingWorker.html"/>
704 >    </exec>
705 >
706 >  </target>
707 >
708 >  <target name="j1" depends="compile-j1"
709 >          description="Runs a standalone JavaOne program">
710 >
711 >    <java classname="jsr166.misc.SortedEnumSet" fork="true">
712 >      <classpath refid="j1.classpath"/>
713 >    </java>
714 >
715 >  </target>
716 >
717 >
718 >  <target name="test-j1" depends="compile-j1"
719 >          description="Runs testcases from the JavaOne source directories">
720 >
721 >    <junit printsummary="true"
722 >             showoutput="true"
723 >          errorProperty="junit.failed"
724 >        failureProperty="junit.failed"
725 >                    dir="${build.j1.dir}"
726 >                   fork="true">
727 >
728 >      <!-- <jvmarg value="-server"/> -->
729 >      <classpath refid="j1.classpath"/>
730 >      <formatter type="xml"/>
731 >
732 >      <batchtest todir="${build.j1.dir}">
733 >        <fileset dir="${j1.src.dir}">
734 >          <include name="**/*Test.java"/>
735 >        </fileset>
736 >      </batchtest>
737 >
738 >    </junit>
739 >
740 >    <available property="junit.report.format"
741 >                  value="frames"
742 >              classname="org.apache.xalan.lib.Redirect"/>
743 >    <property name="junit.report.format" value="noframes"/>
744 >
745 >    <junitreport todir="${build.j1.dir}">
746 >      <fileset dir="${build.j1.dir}">
747 >        <include name="TEST-*.xml"/>
748 >      </fileset>
749 >      <report styledir="${stylesheet.dir}"
750 >                format="${junit.report.format}"
751 >                 todir="${build.j1.dir}"
752 >      />
753 >    </junitreport>
754 >
755 >    <fail message="Test Cases Failed" if="junit.failed"/>
756 >
757 >  </target>
758 >
759 >
760 >
761 >  <!-- C++ and JNI definitions and demos -->
762 >
763 >  <target name="configure-cpp">
764 >
765 >    <!-- Define tasks and types -->
766 >
767 >    <path id="cpptasks.path">
768 >      <pathelement location="${lib.dir}/cpptasks.jar"/>
769 >    </path>
770 >    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
771 >    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
772 >
773 >    <!-- Set platform property for JNI includes -->
774 >
775 >    <condition property="platform" value="linux">
776 >      <os name="Linux"/>
777 >    </condition>
778 >    <condition property="platform" value="win32">
779 >      <os family="windows"/>
780 >    </condition>
781 >    <condition property="platform" value="solaris">
782 >      <os name="SunOS"/>
783 >    </condition>
784 >
785 >  </target>
786 >
787 >
788 >  <target name="cppdemo" depends="configure-cpp">
789 >
790 >    <mkdir dir="${build.dir}"/>
791  
792 +    <cc multithreaded="true"
793 +                 name="g++"
794 +               objdir="${build.dir}"
795 +              outfile="${build.dir}/CppDemo">
796 +      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
797 +      <libset libs="stdc++"/>
798 +    </cc>
799 +
800 +    <exec executable="${build.dir}/CppDemo">
801 +      <arg line="count in word frequency of word in command line count"/>
802 +    </exec>
803 +
804 +  </target>
805 +
806 +
807 +  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
808 +
809 +    <mkdir dir="${build.testcases.dir}"/>
810 +
811 +    <javac srcdir="${test.src.dir}"
812 +          destdir="${build.testcases.dir}"
813 +            debug="${build.debug}"
814 +       debuglevel="${build.debuglevel}"
815 +      deprecation="${build.deprecation}"
816 +           source="${build.sourcelevel}"
817 +             fork="true">
818 +      <compilerarg value="${bootclasspath.args}"/>
819 +      <compilerarg line="${build.args}"/>
820 +      <classpath refid="test.classpath"/>
821 +      <include name="JniDemo.java"/>
822 +    </javac>
823 +
824 +    <javah destdir="${build.testcases.dir}"
825 +      classpathref="test.classpath">
826 +      <class name="JniDemo"/>
827 +    </javah>
828 +
829 +    <cc multithreaded="true"
830 +                 name="g++"
831 +               objdir="${build.dir}"
832 +              outfile="${build.dir}/JniDemo"
833 +              outtype="shared">
834 +
835 +      <compiler>
836 +        <defineset>
837 +          <define name="__int64" value="long long"/>
838 +        </defineset>
839 +        <includepath location="${java.home}/../include"/>
840 +        <includepath location="${java.home}/../include/${platform}"/>
841 +        <compilerarg value="-mno-cygwin"/>
842 +      </compiler>
843 +
844 +      <linker>
845 +        <linkerarg value="--add-stdcall-alias"/>
846 +      </linker>
847 +
848 +      <includepath location="${build.testcases.dir}"/>
849 +
850 +      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
851 +
852 +      <libset libs="stdc++"/>
853 +
854 +    </cc>
855 +
856 +    <!-- Necessary if windows, harmless if not -->
857 +    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
858 +
859 +    <java classname="JniDemo" fork="true">
860 +      <!-- Watch out: path separator hardwired to semicolon here! -->
861 +      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
862 +      <classpath refid="test.classpath"/>
863 +      <arg line="count in word frequency of word in command line count"/>
864      </java>
865 +
866 +  </target>
867 +
868 +
869 +
870 +  <!-- Backward compatibility, work in progress (some files not checked in) -->
871 +
872 +
873 +
874 +  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
875 +  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
876 +  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
877 +  <property name="pretiger.sourcelevel" value="1.4"/>
878 +
879 +  <target name="defang"
880 +       depends="init"
881 +   description="Generates pre-Tiger compatible source">
882 +
883 +    <delete dir="${pretiger.src.dir}"/>
884 +    <mkdir dir="${pretiger.src.dir}"/>
885 +
886 +    <exec executable="perl">
887 +      <arg file="etc/defang.pl"/>
888 +      <!-- <arg value="-v"/> -->
889 +      <arg value="-s"/> <arg file="${src.dir}"/>
890 +      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
891 +    </exec>
892 +
893    </target>
894  
895 +  <target name="compile-pretiger"
896 +          depends="init, configure-compiler, defang"
897 +          description="Compiles pre-Tiger sources to build folder">
898 +
899 +    <mkdir dir="${build.pretiger.dir}"/>
900 +
901 +    <javac srcdir="${pretiger.src.dir}"
902 +          destdir="${build.pretiger.dir}"
903 +            debug="${build.debug}"
904 +       debuglevel="${build.debuglevel}"
905 +      deprecation="${build.deprecation}"
906 +           source="${pretiger.sourcelevel}"
907 +             fork="true">
908 +
909 +      <compilerarg line="${build.args}"/>
910 +      <exclude name="**/Thread.java"/>
911 +
912 +    </javac>
913 +
914 +  </target>
915 +
916 +  <target name="pretiger" depends="compile-pretiger">
917 +
918 +    <mkdir dir="${build.lib.dir}"/>
919 +
920 +    <jar destfile="${pretiger.jar}">
921 +      <fileset dir="${build.pretiger.dir}">
922 +      </fileset>
923 +    </jar>
924 +
925 +  </target>
926  
927   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines