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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines