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.46 by tim, Sat Jul 26 13:17:51 2003 UTC vs.
Revision 1.47 by tim, Fri Aug 1 19:34:05 2003 UTC

# 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 132 | Line 133
133  
134  
135    <target name="doccheck"
136 <          depends="filter-src"
137 <          description="Reports on javadoc style errors (not working yet)">
136 >          depends="filter-doccheck"
137 >          description="Reports on javadoc style errors">
138  
139      <delete dir="${build.doccheck.dir}"/>
140      <mkdir dir="${build.doccheck.dir}"/>
# Line 141 | Line 142
142      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
143           docletpath="${lib.dir}/doccheck.jar"
144              destdir="${build.doccheck.dir}">
145 <      <packageset dir="${build.filter.src.dir}"/>
145 >      <packageset dir="${build.filter.doccheck.dir}"/>
146      </javadoc>
147  
148    </target>
# Line 360 | Line 361
361        </fileset>
362      </copy>
363  
363    <!-- Not needed now, used for doccheck filtering:
364    <property name="generic.declarations"
365             value="public interface E {} public interface T {} public interface K {} public interface V {}"
366    />
367    -->
368
364      <copy todir="${build.filter.src.dir}">
365        <fileset dir="${src.dir}">
366          <exclude name="**/*.html"/>
# Line 405 | Line 400
400            <param name="pattern"     value="^//@"/>
401            <param name="replacement" value=""/>
402          </filterreader>
403 +      </filterchain>
404 +    </copy>
405 +
406 +  </target>
407 +
408 +
409 +
410 +
411 +  <target name="filter-doccheck"
412 +          depends="filter-src">
413  
414 +    <mkdir dir="${build.filter.doccheck.dir}"/>
415  
416 +    <copy todir="${build.filter.doccheck.dir}">
417 +      <fileset dir="${build.filter.src.dir}">
418 +        <include name="**/*.html"/>
419 +      </fileset>
420 +    </copy>
421 +
422 +    <property name="generic.declarations"
423 +             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 {}"
424 +    />
425 +
426 +    <copy todir="${build.filter.doccheck.dir}">
427 +      <fileset dir="${build.filter.src.dir}">
428 +        <exclude name="**/*.html"/>
429 +      </fileset>
430 +      <filterchain>
431          <!--
432 <         # The next two filters try to make the source look like
432 >         # These two filters try to make the source look like
433           # something that doccheck can process. The first removes
434           # -source 1.4 assertions and the second adds in a bunch
435           # of single letter public nested marker interfaces so that
436           # the generic type parameters are recognized.
416         #
417         # Currently commented out because doccheck doesn't work. :-(
437           -->
438  
420        <!--
439          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
440                        classpath="${build.ant.dir}">
441            <param name="matching"    value="^\s*assert[\s ].*$"/>
# Line 427 | Line 445
445  
446          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
447                        classpath="${build.ant.dir}">
448 <          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
448 >          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
449            <param name="pattern"     value="$"/>
450            <param name="replacement" value=" ${generic.declarations}"/>
451          </filterreader>
434        -->
452  
453        </filterchain>
454      </copy>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines