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.31 by tim, Wed May 28 21:15:50 2003 UTC vs.
Revision 1.58 by tim, Mon Sep 15 15:13:35 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 26 | Line 26
26    <property name="build.debug"          value="true"/>
27    <property name="build.debuglevel"     value="source,lines,vars"/>
28    <property name="build.deprecation"    value="false"/>
29  <property name="build.novariance.arg" value=""/>
29  
30    <!-- Build locations -->
31    <property name="build.dir"            location="build"/>
32    <property name="build.classes.dir"    location="${build.dir}/classes"/>
34  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
33    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>
35    <property name="build.ant.dir"        location="${build.dir}/ant"/>
36    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37 +  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
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.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43 +  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
44  
45    <!-- Source locations -->
46    <property name="src.dir"              location="${basedir}/src/main"/>
46  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
47    <property name="test.src.dir"         location="${basedir}/src/test"/>
48    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
49    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
# Line 55 | Line 55
55  
56    <!-- Jar locations -->
57    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
58  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
59  <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 <  <!--
66 <   ! Bootclasspath munging for source compilation.
67 <   -->
68 <
69 <  <path id="javac.bootclasspath.prefix">
70 <    <!-- <pathelement location="${src.dir}"/> -->
71 <    <pathelement location="${javac.jar}"/>
72 <  </path>
73 <
74 <  <path id="javac.bootclasspath">
75 <    <!-- <pathelement location="${src.dir}"/> -->
76 <    <pathelement location="${collect.jar}"/>
77 <    <pathelement location="${rt.jar}"/>
78 <  </path>
79 <
80 <  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
81 <  <property name="javac.bootclasspath.prefix"
82 <           refid="javac.bootclasspath.prefix"/>
83 <
84 <  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
85 <  <property name="build.bootclasspath.arg"
86 <           value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
87 <
88 <
89 <  <!--
90 <   ! Bootclasspath munging for testing, so JUnit can test our local
91 <   ! modifications to java.*.
92 <   -->
93 <
94 <  <path id="test.classpath">
95 <    <pathelement location="${product.jar}"/>
96 <    <pathelement location="${build.testcases.dir}"/>
97 <    <pathelement location="${junit.jar}"/>
98 <  </path>
99 <
100 <  <!-- Flatten test classpath into a platform-appropriate string -->
101 <  <property name="test.classpath" refid="test.classpath"/>
102 <
103 <  <!-- Turn the flattened test classpath into a javac argument -->
104 <  <property name="test.bootclasspath.arg"
105 <           value='-Xbootclasspath/p:${test.classpath}'/>
106 <
107 <
108 <
109 <  <!-- Files excluded from emulation and dist-docs -->
110 <  <patternset id="emulation.excludes">
63 >  <!-- Files excluded from dist-docs -->
64 >  <patternset id="docs.exclusion">
65      <exclude name="java/util/Random.*"/>
66      <exclude name="sun/misc/Unsafe.*"/>
67    </patternset>
# Line 117 | Line 71
71    <!-- Main targets -->
72  
73    <target name="compile"
74 <          depends="init"
74 >          depends="init, configure-compiler, prepare-src"
75            description="Compiles main sources to build folder">
76  
77 +    <property name="prepare.src.dir" value="${src.dir}"/>
78 +
79      <mkdir dir="${build.classes.dir}"/>
80  
81 <    <javac srcdir="${src.dir}"
81 >    <javac srcdir="${prepare.src.dir}"
82            destdir="${build.classes.dir}"
83              debug="${build.debug}"
84         debuglevel="${build.debuglevel}"
# Line 130 | Line 86
86             source="${build.sourcelevel}"
87               fork="true">
88  
89 <      <bootclasspath refid="javac.bootclasspath"/>
134 <      <compilerarg line="${build.javac.args}"/>
89 >      <compilerarg line="${build.args}"/>
90  
91      </javac>
92  
# Line 139 | Line 94
94  
95  
96    <target name="jar"
97 <          depends="check-emulation, init-jar, native-jar, emulation-jar"
97 >          depends="init-jar, native-jar"
98            description="Builds library jar from compiled sources"/>
99  
100  
101    <target name="test"
102 <          depends="init, check-junit, report-tests"
102 >          depends="init, configure-tests, report-tests"
103            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104  
105  
# Line 153 | Line 108
108            description="Reports on style errors in Java source (verbose, mostly chaff)">
109  
110      <taskdef resource="checkstyletask.properties"
111 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
111 >            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
112  
113 <    <checkstyle>
114 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
113 >    <mkdir dir="${build.checkstyle.dir}"/>
114 >    
115 >    <checkstyle config="etc/checkstyle/sun_checks.xml"
116 >       failOnViolation="false">
117 >      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
118        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119      </checkstyle>
120 +    
121 +    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
122 +          out="${build.checkstyle.dir}/checkstyle-report.html"
123 +        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
124  
125    </target>
126  
127  
128    <target name="doccheck"
129 <          depends="filter-src"
130 <          description="Reports on javadoc style errors (not working yet)">
129 >          depends="filter-doccheck"
130 >          description="Reports on javadoc style errors">
131  
132      <delete dir="${build.doccheck.dir}"/>
133      <mkdir dir="${build.doccheck.dir}"/>
# Line 173 | Line 135
135      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
136           docletpath="${lib.dir}/doccheck.jar"
137              destdir="${build.doccheck.dir}">
138 <      <packageset dir="${build.filter.src.dir}"/>
138 >      <packageset dir="${build.dc-filter.dir}"/>
139      </javadoc>
140  
141 +    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
142 +
143    </target>
144  
145  
# Line 193 | Line 157
157  
158        <tag name="revised" description="Last revised:"/>
159        <tag name="spec"    description="Specified by:"/>
196      <tag name="editor"  description="Last edited by:"/>
197      <tag name="fixme"   description="FIX ME:"/>
160  
161        <packageset dir="${build.filter.src.dir}"/>
162  
# Line 203 | Line 165
165    </target>
166  
167  
168 <  <target name="strip"
169 <          depends="init"
170 <          description="Strip generics from java source (not working yet)">
168 >  <target name="sinjdocs"
169 >          depends="configure-tests"
170 >          description="Builds javadocs with custom tags to build folder">
171  
172 <    <mkdir dir="${build.stripped.dir}"/>
172 >    <delete dir="${build.sinjdocs.dir}"/>
173 >    <mkdir dir="${build.sinjdocs.dir}"/>
174  
175 <    <!--
213 <     # javac -s doesn't reliably generate compilable code. It generates
214 <     # bridge methods (marked as "synthetic") that can have identical
215 <     # signatures to existing methods except for the return value.
216 <     -->
217 <    <javac srcdir="${src.dir}"
218 <          destdir="${build.stripped.dir}"
219 <            debug="${build.debug}"
220 <       debuglevel="${build.debuglevel}"
221 <      deprecation="${build.deprecation}"
222 <           source="${build.sourcelevel}"
223 <             fork="true">
175 >    <java classname="net.cscott.sinjdoc.Main" fork="true">
176  
177 <      <bootclasspath refid="javac.bootclasspath"/>
226 <      <compilerarg line="${build.javac.args} -s"/>
177 >      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
178  
179 <    </javac>
179 >      <classpath>
180 >        <pathelement location="${sinjdoc.jar}"/>
181 >        <pathelement location="${lib.dir}/jutil.jar"/>
182 >        <pathelement location="${lib.dir}/cup.jar"/>
183 >        <path refid="test.classpath"/>
184 >      </classpath>
185 >
186 >      <!-- <arg value="-help"/> -->
187 >      <!-- <arg value="-verbose"/> -->
188 >      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
189 >      
190 >      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
191 >      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
192 >      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
193 >      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
194 >      
195 >      <arg value="java.lang"/>
196 >      <arg value="java.util"/>
197 >      <arg value="java.util.concurrent"/>
198 >      <arg value="java.util.concurrent.atomic"/>
199 >      <arg value="java.util.concurrent.locks"/>
200 >
201 >
202 >    </java>
203  
204    </target>
205  
# Line 235 | Line 209
209            description="Puts all distributable products in single hierarchy"/>
210  
211  
212 +  <target name="release"
213 +          depends="dist"
214 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
215 +
216 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217 +
218 +    <jar basedir="${basedir}" destfile="${release.jar}">
219 +      <!-- <exclude name="build/**"/> -->
220 +      <exclude name="${release.jar}"/>
221 +      <exclude name="user.properties"/>
222 +      <exclude name="etc/notes/**"/>
223 +      <exclude name="src/emulation/**"/>
224 +      <exclude name="**/SyntaxTest.java"/>
225 +      <exclude name="**/SuperfluousAbstract.java"/>
226 +    </jar>
227 +
228 +  </target>
229 +
230    <target name="clean"
231            description="Removes all build products">
232  
# Line 275 | Line 267
267  
268    <!-- Internal targets -->
269  
278  <target name="set-warnings-if" if="build.warnings">
279
280    <property name="build.warnings.arg" value="-warnunchecked"/>
281
282  </target>
283
284
285  <target name="set-warnings-unless" unless="build.warnings">
286
287    <property name="build.warnings.arg" value=""/>
288
289  </target>
290
270  
271 <  <target name="init"
293 <          depends="set-warnings-if, set-warnings-unless">
271 >  <target name="init">
272  
273      <!-- Version is kept in a separate file -->
274      <loadfile property="version" srcFile="version.properties"/>
275      <echo>Building JSR-166 version ${version}</echo>
276 <
299 <    <!-- Common options in javac invocations -->
300 <    <property name="build.javac.args"
301 <             value="${build.bootclasspath.arg} ${build.warnings.arg} ${build.novariance.arg}"/>
276 >    <echo>java.home is ${java.home}</echo>
277  
278    </target>
279  
# Line 311 | Line 286
286  
287  
288    <target name="native-jar"
289 <          depends="compile"
315 <          unless="build.emulation.true">
289 >          depends="compile">
290  
291      <jar destfile="${product.jar}">
292        <fileset dir="${build.classes.dir}"/>
# Line 321 | Line 295
295    </target>
296  
297  
324  <target name="compile-emulation"
325          depends="init"
326          if="build.emulation.true">
327
328    <mkdir dir="${build.emulation.dir}"/>
329
330    <javac srcdir="${emulation.src.dir}"
331          destdir="${build.emulation.dir}"
332            debug="${build.debug}"
333       debuglevel="${build.debuglevel}"
334      deprecation="${build.deprecation}"
335           source="${build.sourcelevel}"
336             fork="true">
337
338      <bootclasspath refid="javac.bootclasspath"/>
339      <compilerarg line="${build.javac.args}"/>
340
341    </javac>
342
343  </target>
344
345
346  <target name="emulation-jar"
347          depends="compile-emulation"
348          if="build.emulation.true">
349
350
351    <jar destfile="${product.jar}" duplicate="add">
352      <fileset dir="${build.classes.dir}">
353        <patternset refid="emulation.excludes"/>
354      </fileset>
355      <fileset dir="${build.emulation.dir}"/>
356    </jar>
357
358  </target>
359
360
298    <target name="dist-jar"
299            depends="clean, jar">
300  
# Line 393 | Line 330
330      <copy todir="${build.filter.src.dir}">
331        <fileset dir="${src.dir}">
332          <exclude name="**/*.html"/>
333 <        <patternset refid="emulation.excludes"/>
333 >        <patternset refid="docs.exclusion"/>
334        </fileset>
335        <filterchain>
336 +
337 +        <!--
338 +         # This filter gets rid of angle-bracketed type parameters
339 +         # so that javadoc can run on the result. The following
340 +         # heuristic seems to work:
341 +         #
342 +         # For all lines not starting with space(s)-asterisk-space(s),
343 +         #   replace <something> with a space, where there may be more
344 +         #   than one right angle bracket at the end, and "something"
345 +         #   must not contain parens or pipes. (This may need some
346 +         #   tweaking.)
347 +         -->
348 +
349          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
350                        classpath="${build.ant.dir}">
401          <!--
402           # These arguments are to get rid of angle-bracketed type
403           # parameters so that javadoc can run on the result. The
404           # following heuristic that seems to work:
405           #
406           # For all lines not starting with space(s)-asterisk-space(s),
407           #   replace <something> with a space, where there may be more
408           #   than one right angle bracket at the end, and "something"
409           #   must not contain parens or pipes. (This may need some
410           #   tweaking.)
411           -->
351            <param name="notmatching" value="^\s+\*\s.*$"/>
352 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
352 >          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
353            <param name="replacement" value=" "/>
354          </filterreader>
355 +
356 +      </filterchain>
357 +    </copy>
358 +
359 +  </target>
360 +
361 +
362 +  <target name="filter-doccheck"
363 +          depends="filter-src">
364 +
365 +    <mkdir dir="${build.dc-filter.dir}"/>
366 +
367 +    <copy todir="${build.dc-filter.dir}">
368 +      <fileset dir="${build.filter.src.dir}">
369 +        <include name="**/*.html"/>
370 +      </fileset>
371 +    </copy>
372 +
373 +    <property name="generic.declarations"
374 +             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 {}"
375 +    />
376 +
377 +    <copy todir="${build.dc-filter.dir}">
378 +      <fileset dir="${build.filter.src.dir}">
379 +        <exclude name="**/*.html"/>
380 +      </fileset>
381 +      <filterchain>
382 +        <!--
383 +         # These two filters try to make the source look like
384 +         # something that doccheck can process. The first removes
385 +         # -source 1.4 assertions and the second adds in a bunch
386 +         # of single letter public nested marker interfaces so that
387 +         # the generic type parameters are recognized.
388 +         -->
389 +
390          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
391                        classpath="${build.ant.dir}">
392 <          <!--
393 <           # These arguments are to uncomment lines beginning with
394 <           # "//@" so that javadoc can see imports that are needed
421 <           # to resolve links but that shouldn't be in the compiled
422 <           # code.
423 <           -->
424 <          <param name="matching" value="^//@.*$"/>
425 <          <param name="pattern" value="^//@"/>
426 <          <param name="replacement" value=""/>
392 >          <param name="matching"    value="^\s*assert[\s ].*$"/>
393 >          <param name="pattern"     value="assert"/>
394 >          <param name="replacement" value="//assert"/>
395          </filterreader>
396 +
397 +        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
398 +                      classpath="${build.ant.dir}">
399 +          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
400 +          <param name="pattern"     value="$"/>
401 +          <param name="replacement" value=" ${generic.declarations}"/>
402 +        </filterreader>
403 +
404        </filterchain>
405      </copy>
406  
# Line 444 | Line 420
420             source="${build.sourcelevel}"
421               fork="true">
422  
423 +      <compilerarg line="${build.args}"/>
424        <classpath refid="test.classpath"/>
425 <      <bootclasspath refid="javac.bootclasspath"/>
426 <      <compilerarg line="${build.javac.args}"/>
425 >      
426 >      <include name="java/**"/>
427 >      <include name="jsr166/**"/>
428  
429      </javac>
430  
# Line 468 | Line 446
446                      dir="${build.reports.dir}"
447                     fork="true">
448  
449 <      <jvmarg value="${test.bootclasspath.arg}"/>
449 >      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
450  
451        <formatter type="xml"/>
452  
453        <batchtest todir="${build.reports.dir}">
454          <fileset dir="${test.src.dir}">
455 <          <include name="**/${testcase}Test.java"/>
455 >          <include name="java/**/${testcase}Test.java"/>
456 >          <include name="jsr166/**/${testcase}Test.java"/>
457          </fileset>
458        </batchtest>
459  
# Line 486 | Line 465
465    <target name="report-tests"
466            depends="run-tests">
467  
468 <    <!-- Sets junit.report.format to frames if Xalan is present,
468 >    <!-- Sets junit.report.format to frames if redirection is present,
469           otherwise sets it to noframes. -->
470      <available property="junit.report.format"
471                    value="frames"
# Line 509 | Line 488
488    </target>
489  
490  
491 <  <target name="check-junit">
491 >  <target name="configure-compiler">
492 >
493 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
494 >
495 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
496 >      <istrue value="${build.warnunchecked}"/>
497 >    </condition>
498 >
499 >    <property name="warnunchecked.arg" value=""/>
500 >    
501 >    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
502 >      <istrue value="${build.nothreads}"/>
503 >    </condition>
504 >
505 >
506 >    <!-- Common options in javac invocations -->
507 >    <property name="build.args" value="${warnunchecked.arg}"/>
508 >
509 >  </target>
510 >
511 >
512 >  <target name="prepare-src"
513 >          depends="configure-compiler"
514 >          if="prepare.src.dir">
515 >
516 >    <mkdir dir="${prepare.src.dir}"/>
517 >    <copy todir="${prepare.src.dir}">
518 >      <fileset dir="${src.dir}">
519 >        <exclude name="java/lang/**"/>
520 >      </fileset>
521 >    </copy>
522 >
523 >  </target>
524 >
525 >
526 >  <target name="configure-tests"
527 >       depends="configure-compiler">
528  
529      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
530      <available property="junit.available"
# Line 518 | Line 533
533      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
534            unless="junit.available"/>
535  
536 <  </target>
536 >    <!-- Xalan -->
537 >    <available property="xalan.available"
538 >               classname="org.apache.xalan.Version"/>
539  
540 +    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
541 +          unless="xalan.available"/>
542 +
543 +
544 +    <!--
545 +     ! Bootclasspath munging for testing, so JUnit can test our local
546 +     ! modifications to java.*.
547 +     -->
548 +
549 +    <path id="test.classpath">
550 +      <pathelement location="${product.jar}"/>
551 +      <pathelement location="${rt.jar}"/>
552 +      <pathelement location="${junit.jar}"/>
553 +      <pathelement location="${build.testcases.dir}"/>
554 +    </path>
555 +
556 +    <path id="test.bootclasspath">
557 +      <path refid="test.classpath"/>
558 +    </path>
559 +
560 +    <!-- Flatten test classpaths into platform-appropriate strings -->
561 +    <property name="test.classpath"         refid="test.classpath"/>
562 +    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
563  
524  <target name="check-emulation">
525    <condition property="build.emulation.true">
526      <or>
527        <isset property="build.emulation"/>
528        <os family="windows"/>
529      </or>
530    </condition>
564    </target>
565  
566  
567  
568    <!-- Anthill targets -->
569  
570 <  <target name="anthill-build"
570 >  <target name="anthill-build">
571 >  
572 >    <!-- Override this in user.properties -->
573 >    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
574 >    
575 >    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
576 >      <arg value="-Xmx256000000"/>
577 >      <!-- classpath of new JVM -->
578 >      <arg value="-classpath"/> <arg path="${java.class.path}"/>
579 >      <!-- location of Ant home directory -->
580 >      <arg value="-Dant.home=${ant.home}"/>
581 >      <!-- the Ant main class -->
582 >      <arg value="org.apache.tools.ant.Main"/>
583 >      <!-- The build file -->
584 >      <arg value="-buildfile"/>  <arg value="build.xml"/>
585 >      <!-- the target to build on the new Ant instance -->
586 >      <arg value="-DJAVA_HOME=${tiger.home}"/>
587 >      <arg value="do-anthill-build"/>
588 >    </exec>
589 >  </target>
590 >  
591 >  <target name="do-anthill-build"
592            depends="jar, test, docs, dist-docs"/>
593  
594    <target name="anthill-publish">
# Line 557 | Line 611
611    </target>
612  
613  
614 +  <target name="ng" depends="test">
615 +    <java classname="SuperfluousAbstract" fork="true">
616 +
617 +      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
618 +
619 +    </java>
620 +  </target>
621 +
622 +
623   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines