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.28 by tim, Wed May 28 13:37:59 2003 UTC vs.
Revision 1.36 by tim, Thu May 29 17:29:08 2003 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage">
2  
3    <description>
4 <    Build file for JSR-166
4 > ------------------------------------------------------------------------------
5 >  Build file for JSR-166
6  
7 <    JUnit 3.8 or better must be in ${ant.home}/lib for the test target to work.
7 <  </description>
7 >  Usage: ant [target]
8  
9 +  User-specific settings are read from user.properties.
10 +  See user.properties.sample for an explanation of some useful settings.
11 + ------------------------------------------------------------------------------
12 +  </description>
13  
14 <  <target name="usage" description="Prints this message">
15 <    <echo>
12 < ant [target], where target is one of:
13 <
14 < usage       (default) Prints this message
15 < compile     Compiles all sources to build folder
16 < jar         Builds library jar from compiled sources
17 < test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18 < docs        Builds javadocs with custom tags to build folder
19 < dist-docs   Builds javadocs without custom tags to dist folder
20 < dist        Puts all distributable products in single hierarchy
21 <
22 < clean       Removes all build products
23 < dist-clean  Removes all build and distribution products
24 <
25 < checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26 < doccheck    Reports on javadoc style errors (not working yet)
27 <    </echo>
14 >  <target name="usage" description="Advises user to run with -projecthelp">
15 >    <echo>Run "ant -projecthelp" for full usage information.</echo>
16    </target>
17  
18 +
19    <!-- User-specific settings -->
20    <property file="user.properties"/>
21  
33  <!-- Set build.warnings in user.properties to turn on -warnunchecked -->
34  <!-- <property name="build.warnings" value=""/> -->
35
22  
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
# Line 68 | Line 54 | ant [target], where target is one of:
54  
55    <!-- Jar locations -->
56    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
71  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
72  <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  
78  <!--
79   ! Bootclasspath munging for source compilation.
80   -->
81
82  <path id="javac.bootclasspath.prefix">
83    <!-- <pathelement location="${src.dir}"/> -->
84    <pathelement location="${javac.jar}"/>
85  </path>
86
87  <path id="javac.bootclasspath">
88    <!-- <pathelement location="${src.dir}"/> -->
89    <pathelement location="${collect.jar}"/>
90    <pathelement location="${rt.jar}"/>
91  </path>
92
93  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
94  <property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>
95
96  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
97  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
98
99
100
101  <!--
102   ! Bootclasspath munging for testing, so JUnit can test our local
103   ! modifications to java.*.
104   -->
105
106  <path id="test.classpath">
107    <pathelement location="${product.jar}"/>
108    <pathelement location="${build.testcases.dir}"/>
109    <pathelement location="${junit.jar}"/>
110  </path>
111
112  <!-- Flatten test classpath into a platform-appropriate string -->
113  <property name="test.classpath" refid="test.classpath"/>
114
115  <!-- Turn the flattened test classpath into a javac argument -->
116  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
117
118
119
62    <!-- Files excluded from emulation and dist-docs -->
63    <patternset id="emulation.excludes">
64      <exclude name="java/util/Random.*"/>
# Line 128 | Line 70 | ant [target], where target is one of:
70    <!-- Main targets -->
71  
72    <target name="compile"
73 <          depends="init"
73 >          depends="init, configure-compiler, prepare-src"
74            description="Compiles main sources to build folder">
75  
76 +    <property name="prepare.src.dir" value="${src.dir}"/>
77 +
78      <mkdir dir="${build.classes.dir}"/>
79  
80 <    <javac srcdir="${src.dir}"
80 >    <javac srcdir="${prepare.src.dir}"
81            destdir="${build.classes.dir}"
82              debug="${build.debug}"
83         debuglevel="${build.debuglevel}"
# Line 142 | Line 86 | ant [target], where target is one of:
86               fork="true">
87  
88        <bootclasspath refid="javac.bootclasspath"/>
89 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
89 >      <compilerarg line="${build.javac.args}"/>
90  
91      </javac>
92  
# Line 150 | Line 94 | ant [target], where target is one of:
94  
95  
96    <target name="jar"
97 <          depends="native-jar, emulation-jar"
97 >          depends="configure-emulation, init-jar, native-jar, emulation-jar"
98            description="Builds library jar from compiled sources"/>
99  
100  
101    <target name="test"
102 <          depends="init, check-junit, report-tests"
103 <          description="Runs all tests (requires JUnit 3.8+ in ${ant.home}/lib)" />
102 >          depends="init, configure-tests, report-tests"
103 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104  
105  
106    <target name="checkstyle"
# Line 203 | Line 147 | ant [target], where target is one of:
147                source="${build.docsourcelevel}">
148  
149        <tag name="revised" description="Last revised:"/>
150 <      <tag name="spec" description="Specified by:"/>
151 <      <tag name="editor" description="Last edited by:"/>
152 <      <tag name="fixme" description="FIX ME:"/>
150 >      <tag name="spec"    description="Specified by:"/>
151 >      <tag name="editor"  description="Last edited by:"/>
152 >      <tag name="fixme"   description="FIX ME:"/>
153 >
154        <packageset dir="${build.filter.src.dir}"/>
155  
156      </javadoc>
# Line 213 | Line 158 | ant [target], where target is one of:
158    </target>
159  
160  
216  <!--
217   # javac -s doesn't reliably generate compilable code. It generates
218   # bridge methods (marked as "synthetic") that can have identical
219   # signatures to existing methods except for the return value.
220   -->
161    <target name="strip"
162 <          depends="init">
162 >          depends="init, configure-compiler"
163 >          description="Strip generics from java source (not working yet)">
164  
165      <mkdir dir="${build.stripped.dir}"/>
166  
167 +    <!--
168 +     # javac -s doesn't reliably generate compilable code. It generates
169 +     # bridge methods (marked as "synthetic") that can have identical
170 +     # signatures to existing methods except for the return value.
171 +     -->
172      <javac srcdir="${src.dir}"
173            destdir="${build.stripped.dir}"
174              debug="${build.debug}"
# Line 232 | Line 178 | ant [target], where target is one of:
178               fork="true">
179  
180        <bootclasspath refid="javac.bootclasspath"/>
181 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
181 >      <compilerarg line="${build.javac.args} -s"/>
182  
183      </javac>
184  
# Line 284 | Line 230 | ant [target], where target is one of:
230  
231    <!-- Internal targets -->
232  
287  <target name="set-warnings-if" if="build.warnings">
288
289    <property name="build.warnings.option" value="-warnunchecked"/>
290
291  </target>
292
293
294  <target name="set-warnings-unless" unless="build.warnings">
295
296    <property name="build.warnings.option" value=""/>
297
298  </target>
233  
234 <
301 <  <target name="init"
302 <          depends="set-warnings-if, set-warnings-unless">
234 >  <target name="init">
235  
236      <!-- Version is kept in a separate file -->
237      <loadfile property="version" srcFile="version.properties"/>
# Line 316 | Line 248 | ant [target], where target is one of:
248  
249  
250    <target name="native-jar"
251 <          depends="compile, init-jar"
252 <          unless="build.emulation">
251 >          depends="compile"
252 >          unless="build.emulation.true">
253  
254      <jar destfile="${product.jar}">
255        <fileset dir="${build.classes.dir}"/>
# Line 326 | Line 258 | ant [target], where target is one of:
258    </target>
259  
260  
329  <target name="base-jar"
330          depends="compile, init-jar">
331
332    <jar destfile="${product.jar}">
333      <fileset dir="${build.classes.dir}">
334        <patternset refid="emulation.excludes"/>
335      </fileset>
336    </jar>
337
338  </target>
339
340
261    <target name="compile-emulation"
262 <          depends="init"
263 <          if="build.emulation">
262 >          depends="init, configure-compiler"
263 >          if="build.emulation.true">
264  
265      <mkdir dir="${build.emulation.dir}"/>
266  
# Line 353 | Line 273 | ant [target], where target is one of:
273               fork="true">
274  
275        <bootclasspath refid="javac.bootclasspath"/>
276 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
276 >      <compilerarg line="${build.javac.args}"/>
277  
278      </javac>
279  
# Line 361 | Line 281 | ant [target], where target is one of:
281  
282  
283    <target name="emulation-jar"
284 <          depends="base-jar, compile-emulation"
285 <          if="build.emulation">
284 >          depends="compile-emulation"
285 >          if="build.emulation.true">
286 >
287  
288 <    <jar destfile="${product.jar}" update="true" duplicate="add">
288 >    <jar destfile="${product.jar}" duplicate="add">
289 >      <fileset dir="${build.classes.dir}">
290 >        <patternset refid="emulation.excludes"/>
291 >      </fileset>
292        <fileset dir="${build.emulation.dir}"/>
293      </jar>
294  
# Line 399 | Line 323 | ant [target], where target is one of:
323  
324      <copy todir="${build.filter.src.dir}">
325        <fileset dir="${src.dir}">
326 +        <include name="**/*.html"/>
327 +      </fileset>
328 +    </copy>
329 +
330 +    <!-- Not needed now, used for doccheck filtering:
331 +    <property name="generic.declarations"
332 +             value="public interface E {} public interface T {} public interface K {} public interface V {}"
333 +    />
334 +    -->
335 +
336 +    <copy todir="${build.filter.src.dir}">
337 +      <fileset dir="${src.dir}">
338 +        <exclude name="**/*.html"/>
339          <patternset refid="emulation.excludes"/>
340        </fileset>
341        <filterchain>
342 +
343 +        <!--
344 +         # This filter gets rid of angle-bracketed type parameters
345 +         # so that javadoc can run on the result. The following
346 +         # heuristic seems to work:
347 +         #
348 +         # For all lines not starting with space(s)-asterisk-space(s),
349 +         #   replace <something> with a space, where there may be more
350 +         #   than one right angle bracket at the end, and "something"
351 +         #   must not contain parens or pipes. (This may need some
352 +         #   tweaking.)
353 +         -->
354 +
355          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
356                        classpath="${build.ant.dir}">
407          <!--
408           # These arguments are to get rid of angle-bracketed type
409           # parameters so that javadoc can run on the result. The
410           # following heuristic that seems to work:
411           #
412           # For all lines not starting with space(s)-asterisk-space(s),
413           #   replace <something> with a space, where there may be more
414           #   than one right angle bracket at the end, and "something"
415           #   must not contain parens or pipes. (This may need some
416           #   tweaking.)
417           -->
357            <param name="notmatching" value="^\s+\*\s.*$"/>
358 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
358 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
359            <param name="replacement" value=" "/>
360          </filterreader>
361 +
362 +
363 +        <!--
364 +         # This filter uncomments lines beginning with "//@" so that
365 +         # javadoc can see imports that are needed to resolve links
366 +         # but that shouldn't be in the compiled code.
367 +         -->
368 +
369          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                        classpath="${build.ant.dir}">
371 <          <!--
372 <           # These arguments are to uncomment lines beginning with
426 <           # "//@" so that javadoc can see imports that are needed
427 <           # to resolve links but that shouldn't be in the compiled
428 <           # code.
429 <           -->
430 <          <param name="matching" value="^//@.*$"/>
431 <          <param name="pattern" value="^//@"/>
371 >          <param name="matching"    value="^//@.*$"/>
372 >          <param name="pattern"     value="^//@"/>
373            <param name="replacement" value=""/>
374          </filterreader>
375 +
376 +
377 +        <!--
378 +         # The next two filters try to make the source look like
379 +         # something that doccheck can process. The first removes
380 +         # -source 1.4 assertions and the second adds in a bunch
381 +         # of single letter public nested marker interfaces so that
382 +         # the generic type parameters are recognized.
383 +         #
384 +         # Currently commented out because doccheck doesn't work. :-(
385 +         -->
386 +
387 +        <!--
388 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389 +                      classpath="${build.ant.dir}">
390 +          <param name="matching"    value="^\s*assert[\s ].*$"/>
391 +          <param name="pattern"     value="assert"/>
392 +          <param name="replacement" value="//assert"/>
393 +        </filterreader>
394 +
395 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
396 +                      classpath="${build.ant.dir}">
397 +          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
398 +          <param name="pattern"     value="$"/>
399 +          <param name="replacement" value=" ${generic.declarations}"/>
400 +        </filterreader>
401 +        -->
402 +
403        </filterchain>
404      </copy>
405  
# Line 450 | Line 419 | ant [target], where target is one of:
419             source="${build.sourcelevel}"
420               fork="true">
421  
453      <bootclasspath refid="javac.bootclasspath"/>
454      <compilerarg line="${javac.args} ${build.warnings.option}"/>
422        <classpath refid="test.classpath"/>
423 +      <bootclasspath refid="javac.bootclasspath"/>
424 +      <compilerarg line="${build.javac.args}"/>
425  
426      </javac>
427  
# Line 474 | Line 443 | ant [target], where target is one of:
443                      dir="${build.reports.dir}"
444                     fork="true">
445  
446 <      <jvmarg value="${test.javac.args}"/>
446 >      <jvmarg value="${test.bootclasspath.arg}"/>
447  
448        <formatter type="xml"/>
449  
# Line 515 | Line 484 | ant [target], where target is one of:
484    </target>
485  
486  
487 <  <target name="check-junit">
487 >  <target name="configure-compiler">
488 >
489 >    <property name="gjc.version"
490 >             value="2.0"/>
491 >
492 >    <condition property="build.novariance" value="-novariance">
493 >      <and>
494 >        <equals arg1="${gjc.version}" arg2="2.0"/>
495 >        <or>
496 >          <not><isset property="gjc.novariance"/></not>
497 >          <istrue value="${gjc.novariance}"/>
498 >        </or>
499 >      </and>
500 >    </condition>
501 >
502 >    <property name="build.novariance"
503 >             value=""/>
504 >
505 >    <property name="gjc.dir"
506 >             value="${lib.dir}/gjc"/>
507 >
508 >    <property name="javac.jar"
509 >          location="${gjc.dir}/${gjc.version}/javac.jar"/>
510 >
511 >    <property name="collect.jar"
512 >          location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
513 >
514 >
515 >    <condition property="build.warnunchecked" value="-warnunchecked">
516 >      <istrue value="${gjc.warnunchecked}"/>
517 >    </condition>
518 >
519 >    <property name="build.warnunchecked" value=""/>
520 >
521 >    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
522 >      <istrue value="${build.nothreads}"/>
523 >    </condition>
524 >
525 >
526 >    <!--
527 >     ! Bootclasspath munging for source compilation.
528 >     -->
529 >
530 >    <path id="javac.bootclasspath.prefix">
531 >      <!-- <pathelement location="${src.dir}"/> -->
532 >      <pathelement location="${javac.jar}"/>
533 >    </path>
534 >
535 >    <path id="javac.bootclasspath">
536 >      <!-- <pathelement location="${src.dir}"/> -->
537 >      <pathelement location="${collect.jar}"/>
538 >      <pathelement location="${rt.jar}"/>
539 >    </path>
540 >
541 >    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
542 >    <property name="javac.bootclasspath.prefix"
543 >             refid="javac.bootclasspath.prefix"/>
544 >
545 >    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
546 >    <property name="build.bootclasspath.arg"
547 >             value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
548 >
549 >    <!-- Flatten bootclasspath for trace message -->
550 >    <property name="javac.bootclasspath"
551 >             refid="javac.bootclasspath"/>
552 >
553 >    <!-- Common options in javac invocations -->
554 >    <property name="build.javac.args"
555 >             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
556 >
557 >    <echo>javac ${build.javac.args}</echo>
558 >    <echo>bootclasspath=${javac.bootclasspath}</echo>
559 >
560 >  </target>
561 >
562 >
563 >  <target name="prepare-src"
564 >          depends="configure-compiler"
565 >          if="prepare.src.dir">
566 >
567 >    <mkdir dir="${prepare.src.dir}"/>
568 >    <copy todir="${prepare.src.dir}">
569 >      <fileset dir="${src.dir}">
570 >        <exclude name="java/lang/**"/>
571 >      </fileset>
572 >    </copy>
573 >
574 >  </target>
575 >
576 >
577 >  <target name="configure-emulation">
578 >
579 >    <condition property="build.emulation.true">
580 >      <or>
581 >        <and>
582 >          <os family="windows"/>
583 >          <not>
584 >            <isset property="build.emulation"/>
585 >          </not>
586 >        </and>
587 >        <istrue value="${build.emulation}"/>
588 >      </or>
589 >    </condition>
590 >
591 >  </target>
592 >
593 >
594 >  <target name="configure-tests">
595  
596      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
597      <available property="junit.available"
# Line 524 | Line 600 | ant [target], where target is one of:
600      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
601            unless="junit.available"/>
602  
603 +
604 +    <!--
605 +     ! Bootclasspath munging for testing, so JUnit can test our local
606 +     ! modifications to java.*.
607 +     -->
608 +
609 +    <path id="test.classpath">
610 +      <pathelement location="${product.jar}"/>
611 +      <pathelement location="${build.testcases.dir}"/>
612 +      <pathelement location="${junit.jar}"/>
613 +    </path>
614 +
615 +    <!-- Flatten test classpath into a platform-appropriate string -->
616 +    <property name="test.classpath" refid="test.classpath"/>
617 +
618 +    <!-- Turn the flattened test classpath into a javac argument -->
619 +    <property name="test.bootclasspath.arg"
620 +             value='-Xbootclasspath/p:${test.classpath}'/>
621 +
622    </target>
623  
624  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines