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.48 by tim, Fri Aug 1 19:41:06 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 39 | Line 39
39    <property name="build.reports.dir"    location="${build.dir}/reports"/>
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"/>
43  
44    <!-- Source locations -->
45    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 54 | Line 55
55  
56    <!-- Jar locations -->
57    <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"/>
58    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
59    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
60  
61  
62  
63 <  <!--
64 <   ! 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 <   -->
91 <
92 <  <path id="test.classpath">
93 <    <pathelement location="${product.jar}"/>
94 <    <pathelement location="${build.testcases.dir}"/>
95 <    <pathelement location="${junit.jar}"/>
96 <  </path>
97 <
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">
63 >  <!-- Files excluded from dist-docs and emulation jar -->
64 >  <patternset id="unsafe.exclusion">
65      <exclude name="java/util/Random.*"/>
66      <exclude name="sun/misc/Unsafe.*"/>
67    </patternset>
68  
69 +  <!-- Files excludes from emulation jar -->
70 +  <patternset id="atomic.exclusion">
71 +    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
72 +    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
73 +    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
74 +    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
75 +  </patternset>
76 +
77  
78  
79    <!-- Main targets -->
80  
81    <target name="compile"
82 <          depends="init"
82 >          depends="init, configure-compiler, prepare-src"
83            description="Compiles main sources to build folder">
84  
85 +    <property name="prepare.src.dir" value="${src.dir}"/>
86 +
87      <mkdir dir="${build.classes.dir}"/>
88  
89 <    <javac srcdir="${src.dir}"
89 > <!--
90 >    <echo>javac ${gjc.args}</echo>
91 >    <echo>bootclasspath=${compile.bootclasspath}</echo>
92 > -->
93 >
94 >    <javac srcdir="${prepare.src.dir}"
95            destdir="${build.classes.dir}"
96              debug="${build.debug}"
97         debuglevel="${build.debuglevel}"
# Line 127 | Line 99
99             source="${build.sourcelevel}"
100               fork="true">
101  
102 <      <bootclasspath refid="javac.bootclasspath"/>
103 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
102 >      <compilerarg    line="${gjc.args}"/>
103 >      <bootclasspath refid="compile.bootclasspath"/>
104  
105      </javac>
106  
# Line 136 | Line 108
108  
109  
110    <target name="jar"
111 <          depends="check-emulation, init-jar, native-jar, emulation-jar"
111 >          depends="configure-emulation, init-jar, native-jar, emulation-jar"
112            description="Builds library jar from compiled sources"/>
113  
114  
115    <target name="test"
116 <          depends="init, check-junit, report-tests"
116 >          depends="init, configure-tests, report-tests"
117            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
118  
119  
# Line 161 | Line 133
133  
134  
135    <target name="doccheck"
136 <          depends="filter-src"
137 <          description="Reports on javadoc style errors (not working yet)">
136 >          depends="filter-doccheck"
137 >          description="Reports on javadoc style errors">
138  
139      <delete dir="${build.doccheck.dir}"/>
140      <mkdir dir="${build.doccheck.dir}"/>
# Line 170 | Line 142
142      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
143           docletpath="${lib.dir}/doccheck.jar"
144              destdir="${build.doccheck.dir}">
145 <      <packageset dir="${build.filter.src.dir}"/>
145 >      <packageset dir="${build.filter.doccheck.dir}"/>
146      </javadoc>
147  
148 +    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
149 +
150    </target>
151  
152  
# Line 200 | Line 174
174    </target>
175  
176  
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   -->
177    <target name="strip"
178 <          depends="init">
178 >          depends="init, configure-compiler"
179 >          description="Strip generics from java source (not working yet)">
180  
181      <mkdir dir="${build.stripped.dir}"/>
182  
183 +    <!--
184 +     # javac -s doesn't reliably generate compilable code. It generates
185 +     # bridge methods (marked as "synthetic") that can have identical
186 +     # signatures to existing methods except for the return value.
187 +     -->
188      <javac srcdir="${src.dir}"
189            destdir="${build.stripped.dir}"
190              debug="${build.debug}"
# Line 218 | Line 193
193             source="${build.sourcelevel}"
194               fork="true">
195  
196 <      <bootclasspath refid="javac.bootclasspath"/>
197 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
196 >      <compilerarg    line="${gjc.args} -s"/>
197 >      <bootclasspath refid="compile.bootclasspath"/>
198  
199      </javac>
200  
# Line 230 | Line 205
205            depends="init, dist-clean, dist-jar, dist-docs"
206            description="Puts all distributable products in single hierarchy"/>
207  
208 +  <target name="release"
209 +          depends="dist"
210 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
211 +
212 + <!--
213 +    #keep build dir? - dl
214 +    <delete dir="${build.dir}"/>
215 + -->
216 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217 +
218 +    <jar basedir="${basedir}" destfile="${release.jar}">
219 +      <exclude name="${release.jar}"/>
220 +      <exclude name="user.properties"/>
221 +      <exclude name="etc/notes/**"/>
222 +      <exclude name="lib/gjc/2.1/**"/>
223 +      <exclude name="**/SyntaxTest.java"/>
224 +    </jar>
225 +
226 +  </target>
227  
228    <target name="clean"
229            description="Removes all build products">
# Line 271 | Line 265
265  
266    <!-- Internal targets -->
267  
274  <target name="set-warnings-if" if="build.warnings">
275
276    <property name="build.warnings.option" value="-warnunchecked"/>
277
278  </target>
268  
269 <
281 <  <target name="set-warnings-unless" unless="build.warnings">
282 <
283 <    <property name="build.warnings.option" value=""/>
284 <
285 <  </target>
286 <
287 <
288 <  <target name="init"
289 <          depends="set-warnings-if, set-warnings-unless">
269 >  <target name="init">
270  
271      <!-- Version is kept in a separate file -->
272      <loadfile property="version" srcFile="version.properties"/>
# Line 314 | Line 294
294  
295  
296    <target name="compile-emulation"
297 <          depends="init"
297 >          depends="init, configure-compiler"
298            if="build.emulation.true">
299  
300      <mkdir dir="${build.emulation.dir}"/>
# Line 327 | Line 307
307             source="${build.sourcelevel}"
308               fork="true">
309  
310 <      <bootclasspath refid="javac.bootclasspath"/>
311 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
310 >      <compilerarg    line="${gjc.args}"/>
311 >      <bootclasspath refid="compile.bootclasspath"/>
312  
313      </javac>
314  
# Line 342 | Line 322
322  
323      <jar destfile="${product.jar}" duplicate="add">
324        <fileset dir="${build.classes.dir}">
325 <        <patternset refid="emulation.excludes"/>
325 >        <patternset refid="atomic.exclusion"/>
326 >        <patternset refid="unsafe.exclusion"/>
327        </fileset>
328        <fileset dir="${build.emulation.dir}"/>
329      </jar>
# Line 378 | Line 359
359  
360      <copy todir="${build.filter.src.dir}">
361        <fileset dir="${src.dir}">
362 <        <patternset refid="emulation.excludes"/>
362 >        <include name="**/*.html"/>
363 >      </fileset>
364 >    </copy>
365 >
366 >    <copy todir="${build.filter.src.dir}">
367 >      <fileset dir="${src.dir}">
368 >        <exclude name="**/*.html"/>
369 >        <patternset refid="unsafe.exclusion"/>
370        </fileset>
371        <filterchain>
372 +
373 +        <!--
374 +         # This filter gets rid of angle-bracketed type parameters
375 +         # so that javadoc can run on the result. The following
376 +         # heuristic seems to work:
377 +         #
378 +         # For all lines not starting with space(s)-asterisk-space(s),
379 +         #   replace <something> with a space, where there may be more
380 +         #   than one right angle bracket at the end, and "something"
381 +         #   must not contain parens or pipes. (This may need some
382 +         #   tweaking.)
383 +         -->
384 +
385          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
386                        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           -->
387            <param name="notmatching" value="^\s+\*\s.*$"/>
388 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
388 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
389            <param name="replacement" value=" "/>
390          </filterreader>
391 +
392 +
393 +        <!--
394 +         # This filter uncomments lines beginning with "//@" so that
395 +         # javadoc can see imports that are needed to resolve links
396 +         # but that shouldn't be in the compiled code.
397 +         -->
398 +
399          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
400                        classpath="${build.ant.dir}">
401 <          <!--
402 <           # These arguments are to uncomment lines beginning with
405 <           # "//@" 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="^//@"/>
401 >          <param name="matching"    value="^//@.*$"/>
402 >          <param name="pattern"     value="^//@"/>
403            <param name="replacement" value=""/>
404          </filterreader>
405        </filterchain>
# Line 416 | Line 408
408    </target>
409  
410  
411 +
412 +
413 +  <target name="filter-doccheck"
414 +          depends="filter-src">
415 +
416 +    <mkdir dir="${build.filter.doccheck.dir}"/>
417 +
418 +    <copy todir="${build.filter.doccheck.dir}">
419 +      <fileset dir="${build.filter.src.dir}">
420 +        <include name="**/*.html"/>
421 +      </fileset>
422 +    </copy>
423 +
424 +    <property name="generic.declarations"
425 +             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 {}"
426 +    />
427 +
428 +    <copy todir="${build.filter.doccheck.dir}">
429 +      <fileset dir="${build.filter.src.dir}">
430 +        <exclude name="**/*.html"/>
431 +      </fileset>
432 +      <filterchain>
433 +        <!--
434 +         # These two filters try to make the source look like
435 +         # something that doccheck can process. The first removes
436 +         # -source 1.4 assertions and the second adds in a bunch
437 +         # of single letter public nested marker interfaces so that
438 +         # the generic type parameters are recognized.
439 +         -->
440 +
441 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
442 +                      classpath="${build.ant.dir}">
443 +          <param name="matching"    value="^\s*assert[\s ].*$"/>
444 +          <param name="pattern"     value="assert"/>
445 +          <param name="replacement" value="//assert"/>
446 +        </filterreader>
447 +
448 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
449 +                      classpath="${build.ant.dir}">
450 +          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
451 +          <param name="pattern"     value="$"/>
452 +          <param name="replacement" value=" ${generic.declarations}"/>
453 +        </filterreader>
454 +
455 +      </filterchain>
456 +    </copy>
457 +
458 +  </target>
459 +
460 +
461    <target name="compile-tests"
462            depends="jar">
463  
464      <mkdir dir="${build.testcases.dir}"/>
465  
466 + <!--
467 +    <echo>javac ${gjc.args}</echo>
468 +    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
469 +    <echo>classpath="${test.classpath}"</echo>
470 + -->
471 +
472      <javac srcdir="${test.src.dir}"
473            destdir="${build.testcases.dir}"
474              debug="${build.debug}"
# Line 429 | Line 477
477             source="${build.sourcelevel}"
478               fork="true">
479  
480 <      <bootclasspath refid="javac.bootclasspath"/>
481 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
482 <      <classpath refid="test.classpath"/>
480 >      <compilerarg    line="${gjc.args}"/>
481 >      <bootclasspath refid="test.compile.bootclasspath"/>
482 >      <classpath     refid="test.classpath"/>
483  
484      </javac>
485  
# Line 453 | Line 501
501                      dir="${build.reports.dir}"
502                     fork="true">
503  
504 <      <jvmarg value="${test.javac.args}"/>
504 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
505  
506        <formatter type="xml"/>
507  
# Line 494 | Line 542
542    </target>
543  
544  
545 <  <target name="check-junit">
545 >  <target name="configure-compiler">
546  
547 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
548 <    <available property="junit.available"
549 <               classname="junit.framework.Protectable"/>
547 >    <property name="gjc.version"
548 >             value="2.2"/>
549 >
550 >    <condition property="novariance.arg" value="-novariance">
551 >      <and>
552 >        <equals arg1="${gjc.version}" arg2="2.0"/>
553 >        <or>
554 >          <not><isset property="gjc.novariance"/></not>
555 >          <istrue value="${gjc.novariance}"/>
556 >        </or>
557 >      </and>
558 >    </condition>
559 >
560 >    <property name="novariance.arg"
561 >             value=""/>
562 >
563 >    <property name="gjc.dir"
564 >             value="${lib.dir}/gjc"/>
565 >
566 >    <property name="javac.jar"
567 >          location="${gjc.dir}/${gjc.version}/javac.jar"/>
568 >
569 >    <property name="collect.jar"
570 >          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
571 >
572 >
573 >    <condition property="warnunchecked.arg" value="-warnunchecked">
574 >      <istrue value="${gjc.warnunchecked}"/>
575 >    </condition>
576 >
577 >    <property name="warnunchecked.arg" value=""/>
578 >
579 >    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
580 >      <istrue value="${build.nothreads}"/>
581 >    </condition>
582  
583 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
584 <          unless="junit.available"/>
583 >
584 >    <!--
585 >     ! Bootclasspath munging for source compilation.
586 >     -->
587 >
588 >    <path id="pre.bootclasspath">
589 >      <pathelement location="${javac.jar}"/>
590 >    </path>
591 >
592 >    <path id="compile.bootclasspath">
593 >      <pathelement location="${build.classes.dir}"/>
594 >      <pathelement location="${collect.jar}"/>
595 >      <pathelement location="${rt.jar}"/>
596 >    </path>
597 >
598 >    <!-- Flatten paths into platform-appropriate strings -->
599 >    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
600 >    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
601 >
602 >
603 >    <!-- Common options in javac invocations -->
604 >    <property name="gjc.args"
605 >             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
606 >    />
607  
608    </target>
609  
610  
611 <  <target name="check-emulation">
611 >  <target name="prepare-src"
612 >          depends="configure-compiler"
613 >          if="prepare.src.dir">
614 >
615 >    <mkdir dir="${prepare.src.dir}"/>
616 >    <copy todir="${prepare.src.dir}">
617 >      <fileset dir="${src.dir}">
618 >        <exclude name="java/lang/**"/>
619 >      </fileset>
620 >    </copy>
621 >
622 >  </target>
623 >
624 >
625 >  <target name="configure-emulation">
626 >
627      <condition property="build.emulation.true">
628        <or>
629 <        <isset property="build.emulation"/>
630 <        <os family="windows"/>
629 >        <and>
630 >          <os family="windows"/>
631 >          <not>
632 >            <isset property="build.emulation"/>
633 >          </not>
634 >        </and>
635 >        <istrue value="${build.emulation}"/>
636        </or>
637      </condition>
638 +
639 +  </target>
640 +
641 +
642 +  <target name="configure-tests"
643 +       depends="configure-compiler">
644 +
645 +    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
646 +    <available property="junit.available"
647 +               classname="junit.framework.Protectable"/>
648 +
649 +    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
650 +          unless="junit.available"/>
651 +
652 +
653 +    <!--
654 +     ! Bootclasspath munging for testing, so JUnit can test our local
655 +     ! modifications to java.*.
656 +     -->
657 +
658 +    <path id="test.classpath">
659 +      <pathelement location="${product.jar}"/>
660 +      <pathelement location="${build.testcases.dir}"/>
661 +      <pathelement location="${junit.jar}"/>
662 +    </path>
663 +
664 +    <path id="test.compile.bootclasspath">
665 +      <pathelement location="${javac.jar}"/>
666 +      <pathelement location="${collect.jar}"/>
667 +      <pathelement location="${rt.jar}"/>
668 +    </path>
669 +
670 +    <path id="test.run.bootclasspath">
671 +      <pathelement location="${javac.jar}"/>
672 +      <path refid="test.classpath"/>
673 +    </path>
674 +
675 +    <!-- Flatten test classpaths into platform-appropriate strings -->
676 +    <property name="test.classpath"             refid="test.classpath"/>
677 +    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
678 +    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
679 +
680    </target>
681  
682  
# Line 542 | Line 706
706    </target>
707  
708  
709 +  <target name="ng" depends="test">
710 +    <java classname="SuperfluousAbstract" fork="true">
711 +
712 +      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
713 +
714 +    </java>
715 +  </target>
716 +
717 +
718   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines