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.50 by tim, Tue Aug 5 04:03:38 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 +  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
61  
62  
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 <   -->
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 +    <exclude name="java/util/concurrent/locks/LockSupport*"/>
76 +    <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
77 +  </patternset>
78 +
79  
80  
81    <!-- Main targets -->
82  
83    <target name="compile"
84 <          depends="init"
84 >          depends="init, configure-compiler, prepare-src"
85            description="Compiles main sources to build folder">
86  
87 +    <property name="prepare.src.dir" value="${src.dir}"/>
88 +
89      <mkdir dir="${build.classes.dir}"/>
90  
91 <    <javac srcdir="${src.dir}"
91 > <!--
92 >    <echo>javac ${gjc.args}</echo>
93 >    <echo>bootclasspath=${compile.bootclasspath}</echo>
94 > -->
95 >
96 >    <javac srcdir="${prepare.src.dir}"
97            destdir="${build.classes.dir}"
98              debug="${build.debug}"
99         debuglevel="${build.debuglevel}"
# Line 127 | Line 101
101             source="${build.sourcelevel}"
102               fork="true">
103  
104 <      <bootclasspath refid="javac.bootclasspath"/>
105 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
104 >      <compilerarg    line="${gjc.args}"/>
105 >      <bootclasspath refid="compile.bootclasspath"/>
106  
107      </javac>
108  
# Line 136 | Line 110
110  
111  
112    <target name="jar"
113 <          depends="check-emulation, init-jar, native-jar, emulation-jar"
113 >          depends="configure-emulation, init-jar, native-jar, emulation-jar"
114            description="Builds library jar from compiled sources"/>
115  
116  
117    <target name="test"
118 <          depends="init, check-junit, report-tests"
118 >          depends="init, configure-tests, report-tests"
119            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
120  
121  
# Line 161 | Line 135
135  
136  
137    <target name="doccheck"
138 <          depends="filter-src"
139 <          description="Reports on javadoc style errors (not working yet)">
138 >          depends="filter-doccheck"
139 >          description="Reports on javadoc style errors">
140  
141      <delete dir="${build.doccheck.dir}"/>
142      <mkdir dir="${build.doccheck.dir}"/>
# Line 170 | Line 144
144      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
145           docletpath="${lib.dir}/doccheck.jar"
146              destdir="${build.doccheck.dir}">
147 <      <packageset dir="${build.filter.src.dir}"/>
147 >      <packageset dir="${build.filter.doccheck.dir}"/>
148      </javadoc>
149  
150 +    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
151 +
152    </target>
153  
154  
# Line 200 | Line 176
176    </target>
177  
178  
179 <  <!--
180 <   # javac -s doesn't reliably generate compilable code. It generates
181 <   # bridge methods (marked as "synthetic") that can have identical
182 <   # signatures to existing methods except for the return value.
183 <   -->
179 >  <target name="sinjdocs"
180 >          depends="configure-tests"
181 >          description="Builds javadocs with custom tags to build folder">
182 >
183 >    <delete dir="${build.javadocs.dir}"/>
184 >    <mkdir dir="${build.javadocs.dir}"/>
185 >
186 >    <java classname="net.cscott.sinjdoc.Main" fork="true">
187 >
188 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
189 >
190 >      <classpath>
191 >        <pathelement location="${sinjdoc.jar}"/>
192 >        <path refid="test.classpath"/>
193 >      </classpath>
194 >
195 >      <!-- <arg value="-link"/>       <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
196 >
197 >      <arg value="-d"/>          <arg value="${build.javadocs.dir}"/>
198 >      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
199 >      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
200 >      <arg value="-source"/>     <arg value="1.5"/>
201 >      <arg value="-verbose"/>
202 >      <arg value="java.util"/>
203 >
204 >      <!--
205 >      <arg value="-help"/>
206 >      -->
207 >
208 >    </java>
209 >
210 >  </target>
211 >
212 >
213    <target name="strip"
214 <          depends="init">
214 >          depends="init, configure-compiler"
215 >          description="Strip generics from java source (not working yet)">
216  
217      <mkdir dir="${build.stripped.dir}"/>
218  
219 +    <!--
220 +     # javac -s doesn't reliably generate compilable code. It generates
221 +     # bridge methods (marked as "synthetic") that can have identical
222 +     # signatures to existing methods except for the return value.
223 +     -->
224      <javac srcdir="${src.dir}"
225            destdir="${build.stripped.dir}"
226              debug="${build.debug}"
# Line 218 | Line 229
229             source="${build.sourcelevel}"
230               fork="true">
231  
232 <      <bootclasspath refid="javac.bootclasspath"/>
233 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
232 >      <compilerarg    line="${gjc.args} -s"/>
233 >      <bootclasspath refid="compile.bootclasspath"/>
234  
235      </javac>
236  
# Line 230 | Line 241
241            depends="init, dist-clean, dist-jar, dist-docs"
242            description="Puts all distributable products in single hierarchy"/>
243  
244 +  <target name="release"
245 +          depends="dist"
246 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
247 +
248 + <!--
249 +    #keep build dir? - dl
250 +    <delete dir="${build.dir}"/>
251 + -->
252 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
253 +
254 +    <jar basedir="${basedir}" destfile="${release.jar}">
255 +      <exclude name="${release.jar}"/>
256 +      <exclude name="user.properties"/>
257 +      <exclude name="etc/notes/**"/>
258 +      <exclude name="lib/gjc/2.1/**"/>
259 +      <exclude name="**/SyntaxTest.java"/>
260 +    </jar>
261 +
262 +  </target>
263  
264    <target name="clean"
265            description="Removes all build products">
# Line 271 | Line 301
301  
302    <!-- Internal targets -->
303  
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">
282
283    <property name="build.warnings.option" value=""/>
284
285  </target>
286
304  
305 <  <target name="init"
289 <          depends="set-warnings-if, set-warnings-unless">
305 >  <target name="init">
306  
307      <!-- Version is kept in a separate file -->
308      <loadfile property="version" srcFile="version.properties"/>
# Line 314 | Line 330
330  
331  
332    <target name="compile-emulation"
333 <          depends="init"
333 >          depends="init, configure-compiler"
334            if="build.emulation.true">
335  
336      <mkdir dir="${build.emulation.dir}"/>
# Line 327 | Line 343
343             source="${build.sourcelevel}"
344               fork="true">
345  
346 <      <bootclasspath refid="javac.bootclasspath"/>
347 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
346 >      <compilerarg    line="${gjc.args}"/>
347 >      <bootclasspath refid="compile.bootclasspath"/>
348  
349      </javac>
350  
# Line 342 | Line 358
358  
359      <jar destfile="${product.jar}" duplicate="add">
360        <fileset dir="${build.classes.dir}">
361 <        <patternset refid="emulation.excludes"/>
361 >        <patternset refid="atomic.exclusion"/>
362 >        <patternset refid="unsafe.exclusion"/>
363        </fileset>
364        <fileset dir="${build.emulation.dir}"/>
365      </jar>
# Line 378 | Line 395
395  
396      <copy todir="${build.filter.src.dir}">
397        <fileset dir="${src.dir}">
398 <        <patternset refid="emulation.excludes"/>
398 >        <include name="**/*.html"/>
399 >      </fileset>
400 >    </copy>
401 >
402 >    <copy todir="${build.filter.src.dir}">
403 >      <fileset dir="${src.dir}">
404 >        <exclude name="**/*.html"/>
405 >        <patternset refid="unsafe.exclusion"/>
406        </fileset>
407        <filterchain>
408 +
409 +        <!--
410 +         # This filter gets rid of angle-bracketed type parameters
411 +         # so that javadoc can run on the result. The following
412 +         # heuristic seems to work:
413 +         #
414 +         # For all lines not starting with space(s)-asterisk-space(s),
415 +         #   replace <something> with a space, where there may be more
416 +         #   than one right angle bracket at the end, and "something"
417 +         #   must not contain parens or pipes. (This may need some
418 +         #   tweaking.)
419 +         -->
420 +
421          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
422                        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           -->
423            <param name="notmatching" value="^\s+\*\s.*$"/>
424 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
424 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
425            <param name="replacement" value=" "/>
426          </filterreader>
427 +
428 +
429 +        <!--
430 +         # This filter uncomments lines beginning with "//@" so that
431 +         # javadoc can see imports that are needed to resolve links
432 +         # but that shouldn't be in the compiled code.
433 +         -->
434 +
435          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
436                        classpath="${build.ant.dir}">
437 <          <!--
438 <           # 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="^//@"/>
437 >          <param name="matching"    value="^//@.*$"/>
438 >          <param name="pattern"     value="^//@"/>
439            <param name="replacement" value=""/>
440          </filterreader>
441        </filterchain>
# Line 416 | Line 444
444    </target>
445  
446  
447 +
448 +
449 +  <target name="filter-doccheck"
450 +          depends="filter-src">
451 +
452 +    <mkdir dir="${build.filter.doccheck.dir}"/>
453 +
454 +    <copy todir="${build.filter.doccheck.dir}">
455 +      <fileset dir="${build.filter.src.dir}">
456 +        <include name="**/*.html"/>
457 +      </fileset>
458 +    </copy>
459 +
460 +    <property name="generic.declarations"
461 +             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 {}"
462 +    />
463 +
464 +    <copy todir="${build.filter.doccheck.dir}">
465 +      <fileset dir="${build.filter.src.dir}">
466 +        <exclude name="**/*.html"/>
467 +      </fileset>
468 +      <filterchain>
469 +        <!--
470 +         # These two filters try to make the source look like
471 +         # something that doccheck can process. The first removes
472 +         # -source 1.4 assertions and the second adds in a bunch
473 +         # of single letter public nested marker interfaces so that
474 +         # the generic type parameters are recognized.
475 +         -->
476 +
477 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
478 +                      classpath="${build.ant.dir}">
479 +          <param name="matching"    value="^\s*assert[\s ].*$"/>
480 +          <param name="pattern"     value="assert"/>
481 +          <param name="replacement" value="//assert"/>
482 +        </filterreader>
483 +
484 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
485 +                      classpath="${build.ant.dir}">
486 +          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
487 +          <param name="pattern"     value="$"/>
488 +          <param name="replacement" value=" ${generic.declarations}"/>
489 +        </filterreader>
490 +
491 +      </filterchain>
492 +    </copy>
493 +
494 +  </target>
495 +
496 +
497    <target name="compile-tests"
498            depends="jar">
499  
500      <mkdir dir="${build.testcases.dir}"/>
501  
502 + <!--
503 +    <echo>javac ${gjc.args}</echo>
504 +    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
505 +    <echo>classpath="${test.classpath}"</echo>
506 + -->
507 +
508      <javac srcdir="${test.src.dir}"
509            destdir="${build.testcases.dir}"
510              debug="${build.debug}"
# Line 429 | Line 513
513             source="${build.sourcelevel}"
514               fork="true">
515  
516 <      <bootclasspath refid="javac.bootclasspath"/>
517 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
518 <      <classpath refid="test.classpath"/>
516 >      <compilerarg    line="${gjc.args}"/>
517 >      <bootclasspath refid="test.compile.bootclasspath"/>
518 >      <classpath     refid="test.classpath"/>
519  
520      </javac>
521  
# Line 453 | Line 537
537                      dir="${build.reports.dir}"
538                     fork="true">
539  
540 <      <jvmarg value="${test.javac.args}"/>
540 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
541  
542        <formatter type="xml"/>
543  
# Line 494 | Line 578
578    </target>
579  
580  
581 <  <target name="check-junit">
581 >  <target name="configure-compiler">
582  
583 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
584 <    <available property="junit.available"
501 <               classname="junit.framework.Protectable"/>
583 >    <property name="gjc.version"
584 >             value="2.2"/>
585  
586 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
587 <          unless="junit.available"/>
586 >    <condition property="novariance.arg" value="-novariance">
587 >      <and>
588 >        <equals arg1="${gjc.version}" arg2="2.0"/>
589 >        <or>
590 >          <not><isset property="gjc.novariance"/></not>
591 >          <istrue value="${gjc.novariance}"/>
592 >        </or>
593 >      </and>
594 >    </condition>
595 >
596 >    <property name="novariance.arg"
597 >             value=""/>
598 >
599 >    <property name="gjc.dir"
600 >             value="${lib.dir}/gjc"/>
601 >
602 >    <property name="javac.jar"
603 >          location="${gjc.dir}/${gjc.version}/javac.jar"/>
604 >
605 >    <property name="collect.jar"
606 >          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
607 >
608 >
609 >    <condition property="warnunchecked.arg" value="-warnunchecked">
610 >      <istrue value="${gjc.warnunchecked}"/>
611 >    </condition>
612 >
613 >    <property name="warnunchecked.arg" value=""/>
614 >
615 >    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
616 >      <istrue value="${build.nothreads}"/>
617 >    </condition>
618 >
619 >
620 >    <!--
621 >     ! Bootclasspath munging for source compilation.
622 >     -->
623 >
624 >    <path id="pre.bootclasspath">
625 >      <pathelement location="${javac.jar}"/>
626 >    </path>
627 >
628 >    <path id="compile.bootclasspath">
629 >      <pathelement location="${build.classes.dir}"/>
630 >      <pathelement location="${collect.jar}"/>
631 >      <pathelement location="${rt.jar}"/>
632 >    </path>
633 >
634 >    <!-- Flatten paths into platform-appropriate strings -->
635 >    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
636 >    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
637 >
638 >
639 >    <!-- Common options in javac invocations -->
640 >    <property name="gjc.args"
641 >             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
642 >    />
643  
644    </target>
645  
646  
647 <  <target name="check-emulation">
647 >  <target name="prepare-src"
648 >          depends="configure-compiler"
649 >          if="prepare.src.dir">
650 >
651 >    <mkdir dir="${prepare.src.dir}"/>
652 >    <copy todir="${prepare.src.dir}">
653 >      <fileset dir="${src.dir}">
654 >        <exclude name="java/lang/**"/>
655 >      </fileset>
656 >    </copy>
657 >
658 >  </target>
659 >
660 >
661 >  <target name="configure-emulation">
662 >
663      <condition property="build.emulation.true">
664        <or>
665 <        <isset property="build.emulation"/>
666 <        <os family="windows"/>
665 >        <and>
666 >          <os family="windows"/>
667 >          <not>
668 >            <isset property="build.emulation"/>
669 >          </not>
670 >        </and>
671 >        <istrue value="${build.emulation}"/>
672        </or>
673      </condition>
674 +
675 +  </target>
676 +
677 +
678 +  <target name="configure-tests"
679 +       depends="configure-compiler">
680 +
681 +    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
682 +    <available property="junit.available"
683 +               classname="junit.framework.Protectable"/>
684 +
685 +    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
686 +          unless="junit.available"/>
687 +
688 +
689 +    <!--
690 +     ! Bootclasspath munging for testing, so JUnit can test our local
691 +     ! modifications to java.*.
692 +     -->
693 +
694 +    <path id="test.classpath">
695 +      <pathelement location="${product.jar}"/>
696 +      <pathelement location="${build.testcases.dir}"/>
697 +      <pathelement location="${junit.jar}"/>
698 +    </path>
699 +
700 +    <path id="test.compile.bootclasspath">
701 +      <pathelement location="${javac.jar}"/>
702 +      <pathelement location="${collect.jar}"/>
703 +      <pathelement location="${rt.jar}"/>
704 +    </path>
705 +
706 +    <path id="test.run.bootclasspath">
707 +      <pathelement location="${javac.jar}"/>
708 +      <path refid="test.classpath"/>
709 +    </path>
710 +
711 +    <!-- Flatten test classpaths into platform-appropriate strings -->
712 +    <property name="test.classpath"             refid="test.classpath"/>
713 +    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
714 +    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
715 +
716    </target>
717  
718  
# Line 542 | Line 742
742    </target>
743  
744  
745 +  <target name="ng" depends="test">
746 +    <java classname="SuperfluousAbstract" fork="true">
747 +
748 +      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
749 +
750 +    </java>
751 +  </target>
752 +
753 +
754   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines