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.41 by tim, Fri Jun 6 20:48:55 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 54 | Line 54
54  
55    <!-- Jar locations -->
56    <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"/>
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 <  <!--
63 <   ! 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">
62 >  <!-- Files excluded from dist-docs and emulation jar -->
63 >  <patternset id="unsafe.exclusion">
64      <exclude name="java/util/Random.*"/>
65      <exclude name="sun/misc/Unsafe.*"/>
66    </patternset>
67  
68 +  <!-- Files excludes from emulation jar -->
69 +  <patternset id="atomic.exclusion">
70 +    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
71 +    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
72 +    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
73 +    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
74 +  </patternset>
75 +
76  
77  
78    <!-- Main targets -->
79  
80    <target name="compile"
81 <          depends="init"
81 >          depends="init, configure-compiler, prepare-src"
82            description="Compiles main sources to build folder">
83  
84 +    <property name="prepare.src.dir" value="${src.dir}"/>
85 +
86      <mkdir dir="${build.classes.dir}"/>
87  
88 <    <javac srcdir="${src.dir}"
88 > <!--
89 >    <echo>javac ${gjc.args}</echo>
90 >    <echo>bootclasspath=${compile.bootclasspath}</echo>
91 > -->
92 >
93 >    <javac srcdir="${prepare.src.dir}"
94            destdir="${build.classes.dir}"
95              debug="${build.debug}"
96         debuglevel="${build.debuglevel}"
# Line 127 | Line 98
98             source="${build.sourcelevel}"
99               fork="true">
100  
101 <      <bootclasspath refid="javac.bootclasspath"/>
102 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
101 >      <compilerarg    line="${gjc.args}"/>
102 >      <bootclasspath refid="compile.bootclasspath"/>
103  
104      </javac>
105  
# Line 136 | Line 107
107  
108  
109    <target name="jar"
110 <          depends="check-emulation, init-jar, native-jar, emulation-jar"
110 >          depends="configure-emulation, init-jar, native-jar, emulation-jar"
111            description="Builds library jar from compiled sources"/>
112  
113  
114    <target name="test"
115 <          depends="init, check-junit, report-tests"
115 >          depends="init, configure-tests, report-tests"
116            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
117  
118  
# Line 200 | Line 171
171    </target>
172  
173  
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   -->
174    <target name="strip"
175 <          depends="init">
175 >          depends="init, configure-compiler"
176 >          description="Strip generics from java source (not working yet)">
177  
178      <mkdir dir="${build.stripped.dir}"/>
179  
180 +    <!--
181 +     # javac -s doesn't reliably generate compilable code. It generates
182 +     # bridge methods (marked as "synthetic") that can have identical
183 +     # signatures to existing methods except for the return value.
184 +     -->
185      <javac srcdir="${src.dir}"
186            destdir="${build.stripped.dir}"
187              debug="${build.debug}"
# Line 218 | Line 190
190             source="${build.sourcelevel}"
191               fork="true">
192  
193 <      <bootclasspath refid="javac.bootclasspath"/>
194 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
193 >      <compilerarg    line="${gjc.args} -s"/>
194 >      <bootclasspath refid="compile.bootclasspath"/>
195  
196      </javac>
197  
# Line 271 | Line 243
243  
244    <!-- Internal targets -->
245  
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">
246  
247 <    <property name="build.warnings.option" value=""/>
284 <
285 <  </target>
286 <
287 <
288 <  <target name="init"
289 <          depends="set-warnings-if, set-warnings-unless">
247 >  <target name="init">
248  
249      <!-- Version is kept in a separate file -->
250      <loadfile property="version" srcFile="version.properties"/>
# Line 314 | Line 272
272  
273  
274    <target name="compile-emulation"
275 <          depends="init"
275 >          depends="init, configure-compiler"
276            if="build.emulation.true">
277  
278      <mkdir dir="${build.emulation.dir}"/>
# Line 327 | Line 285
285             source="${build.sourcelevel}"
286               fork="true">
287  
288 <      <bootclasspath refid="javac.bootclasspath"/>
289 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
288 >      <compilerarg    line="${gjc.args}"/>
289 >      <bootclasspath refid="compile.bootclasspath"/>
290  
291      </javac>
292  
# Line 342 | Line 300
300  
301      <jar destfile="${product.jar}" duplicate="add">
302        <fileset dir="${build.classes.dir}">
303 <        <patternset refid="emulation.excludes"/>
303 >        <patternset refid="atomic.exclusion"/>
304 >        <patternset refid="unsafe.exclusion"/>
305        </fileset>
306        <fileset dir="${build.emulation.dir}"/>
307      </jar>
# Line 378 | Line 337
337  
338      <copy todir="${build.filter.src.dir}">
339        <fileset dir="${src.dir}">
340 <        <patternset refid="emulation.excludes"/>
340 >        <include name="**/*.html"/>
341 >      </fileset>
342 >    </copy>
343 >
344 >    <!-- Not needed now, used for doccheck filtering:
345 >    <property name="generic.declarations"
346 >             value="public interface E {} public interface T {} public interface K {} public interface V {}"
347 >    />
348 >    -->
349 >
350 >    <copy todir="${build.filter.src.dir}">
351 >      <fileset dir="${src.dir}">
352 >        <exclude name="**/*.html"/>
353 >        <patternset refid="unsafe.exclusion"/>
354        </fileset>
355        <filterchain>
356 +
357 +        <!--
358 +         # This filter gets rid of angle-bracketed type parameters
359 +         # so that javadoc can run on the result. The following
360 +         # heuristic seems to work:
361 +         #
362 +         # For all lines not starting with space(s)-asterisk-space(s),
363 +         #   replace <something> with a space, where there may be more
364 +         #   than one right angle bracket at the end, and "something"
365 +         #   must not contain parens or pipes. (This may need some
366 +         #   tweaking.)
367 +         -->
368 +
369          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                        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           -->
371            <param name="notmatching" value="^\s+\*\s.*$"/>
372 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
372 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
373            <param name="replacement" value=" "/>
374          </filterreader>
375 +
376 +
377 +        <!--
378 +         # This filter uncomments lines beginning with "//@" so that
379 +         # javadoc can see imports that are needed to resolve links
380 +         # but that shouldn't be in the compiled code.
381 +         -->
382 +
383          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
384                        classpath="${build.ant.dir}">
385 <          <!--
386 <           # 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="^//@"/>
385 >          <param name="matching"    value="^//@.*$"/>
386 >          <param name="pattern"     value="^//@"/>
387            <param name="replacement" value=""/>
388          </filterreader>
389 +
390 +
391 +        <!--
392 +         # The next two filters try to make the source look like
393 +         # something that doccheck can process. The first removes
394 +         # -source 1.4 assertions and the second adds in a bunch
395 +         # of single letter public nested marker interfaces so that
396 +         # the generic type parameters are recognized.
397 +         #
398 +         # Currently commented out because doccheck doesn't work. :-(
399 +         -->
400 +
401 +        <!--
402 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
403 +                      classpath="${build.ant.dir}">
404 +          <param name="matching"    value="^\s*assert[\s ].*$"/>
405 +          <param name="pattern"     value="assert"/>
406 +          <param name="replacement" value="//assert"/>
407 +        </filterreader>
408 +
409 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
410 +                      classpath="${build.ant.dir}">
411 +          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
412 +          <param name="pattern"     value="$"/>
413 +          <param name="replacement" value=" ${generic.declarations}"/>
414 +        </filterreader>
415 +        -->
416 +
417        </filterchain>
418      </copy>
419  
# Line 421 | Line 425
425  
426      <mkdir dir="${build.testcases.dir}"/>
427  
428 + <!--
429 +    <echo>javac ${gjc.args}</echo>
430 +    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
431 +    <echo>classpath="${test.classpath}"</echo>
432 + -->
433 +
434      <javac srcdir="${test.src.dir}"
435            destdir="${build.testcases.dir}"
436              debug="${build.debug}"
# Line 429 | Line 439
439             source="${build.sourcelevel}"
440               fork="true">
441  
442 <      <bootclasspath refid="javac.bootclasspath"/>
443 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
444 <      <classpath refid="test.classpath"/>
442 >      <compilerarg    line="${gjc.args}"/>
443 >      <bootclasspath refid="test.compile.bootclasspath"/>
444 >      <classpath     refid="test.classpath"/>
445  
446      </javac>
447  
# Line 453 | Line 463
463                      dir="${build.reports.dir}"
464                     fork="true">
465  
466 <      <jvmarg value="${test.javac.args}"/>
466 >      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
467  
468        <formatter type="xml"/>
469  
# Line 494 | Line 504
504    </target>
505  
506  
507 <  <target name="check-junit">
507 >  <target name="configure-compiler">
508  
509 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
510 <    <available property="junit.available"
501 <               classname="junit.framework.Protectable"/>
509 >    <property name="gjc.version"
510 >             value="2.0"/>
511  
512 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
513 <          unless="junit.available"/>
512 >    <condition property="novariance.arg" value="-novariance">
513 >      <and>
514 >        <equals arg1="${gjc.version}" arg2="2.0"/>
515 >        <or>
516 >          <not><isset property="gjc.novariance"/></not>
517 >          <istrue value="${gjc.novariance}"/>
518 >        </or>
519 >      </and>
520 >    </condition>
521 >
522 >    <property name="novariance.arg"
523 >             value=""/>
524 >
525 >    <property name="gjc.dir"
526 >             value="${lib.dir}/gjc"/>
527 >
528 >    <property name="javac.jar"
529 >          location="${gjc.dir}/${gjc.version}/javac.jar"/>
530 >
531 >    <property name="collect.jar"
532 >          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
533 >
534 >
535 >    <condition property="warnunchecked.arg" value="-warnunchecked">
536 >      <istrue value="${gjc.warnunchecked}"/>
537 >    </condition>
538 >
539 >    <property name="warnunchecked.arg" value=""/>
540 >
541 >    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
542 >      <istrue value="${build.nothreads}"/>
543 >    </condition>
544 >
545 >
546 >    <!--
547 >     ! Bootclasspath munging for source compilation.
548 >     -->
549 >
550 >    <path id="pre.bootclasspath">
551 >      <pathelement location="${javac.jar}"/>
552 >    </path>
553 >
554 >    <path id="compile.bootclasspath">
555 >      <pathelement location="${build.classes.dir}"/>
556 >      <pathelement location="${collect.jar}"/>
557 >      <pathelement location="${rt.jar}"/>
558 >    </path>
559 >
560 >    <!-- Flatten paths into platform-appropriate strings -->
561 >    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
562 >    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
563 >
564 >
565 >    <!-- Common options in javac invocations -->
566 >    <property name="gjc.args"
567 >             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
568 >    />
569  
570    </target>
571  
572  
573 <  <target name="check-emulation">
573 >  <target name="prepare-src"
574 >          depends="configure-compiler"
575 >          if="prepare.src.dir">
576 >
577 >    <mkdir dir="${prepare.src.dir}"/>
578 >    <copy todir="${prepare.src.dir}">
579 >      <fileset dir="${src.dir}">
580 >        <exclude name="java/lang/**"/>
581 >      </fileset>
582 >    </copy>
583 >
584 >  </target>
585 >
586 >
587 >  <target name="configure-emulation">
588 >
589      <condition property="build.emulation.true">
590        <or>
591 <        <isset property="build.emulation"/>
592 <        <os family="windows"/>
591 >        <and>
592 >          <os family="windows"/>
593 >          <not>
594 >            <isset property="build.emulation"/>
595 >          </not>
596 >        </and>
597 >        <istrue value="${build.emulation}"/>
598        </or>
599      </condition>
600 +
601 +  </target>
602 +
603 +
604 +  <target name="configure-tests"
605 +       depends="configure-compiler">
606 +
607 +    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
608 +    <available property="junit.available"
609 +               classname="junit.framework.Protectable"/>
610 +
611 +    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
612 +          unless="junit.available"/>
613 +
614 +
615 +    <!--
616 +     ! Bootclasspath munging for testing, so JUnit can test our local
617 +     ! modifications to java.*.
618 +     -->
619 +
620 +    <path id="test.classpath">
621 +      <pathelement location="${product.jar}"/>
622 +      <pathelement location="${build.testcases.dir}"/>
623 +      <pathelement location="${junit.jar}"/>
624 +    </path>
625 +
626 +    <path id="test.compile.bootclasspath">
627 +      <pathelement location="${javac.jar}"/>
628 +      <pathelement location="${collect.jar}"/>
629 +      <pathelement location="${rt.jar}"/>
630 +    </path>
631 +
632 +    <path id="test.run.bootclasspath">
633 +      <pathelement location="${javac.jar}"/>
634 +      <path refid="test.classpath"/>
635 +    </path>
636 +
637 +    <!-- Flatten test classpaths into platform-appropriate strings -->
638 +    <property name="test.classpath"             refid="test.classpath"/>
639 +    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
640 +    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
641 +
642    </target>
643  
644  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines