[cvs] / jsr166 / build.xml Repository:
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.34, Thu May 29 14:56:37 2003 UTC revision 1.36, Thu May 29 17:29:08 2003 UTC
# Line 327  Line 327 
327        </fileset>        </fileset>
328      </copy>      </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}">      <copy todir="${build.filter.src.dir}">
337        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
338          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
339          <patternset refid="emulation.excludes"/>          <patternset refid="emulation.excludes"/>
340        </fileset>        </fileset>
341        <filterchain>        <filterchain>
342          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
343            <!--            <!--
344             # These arguments are to get rid of angle-bracketed type           # This filter gets rid of angle-bracketed type parameters
345             # parameters so that javadoc can run on the result. The           # so that javadoc can run on the result. The following
346             # following heuristic that seems to work:           # heuristic seems to work:
347             #             #
348             # For all lines not starting with space(s)-asterisk-space(s),             # For all lines not starting with space(s)-asterisk-space(s),
349             #   replace <something> with a space, where there may be more             #   replace <something> with a space, where there may be more
# Line 346  Line 351 
351             #   must not contain parens or pipes. (This may need some             #   must not contain parens or pipes. (This may need some
352             #   tweaking.)             #   tweaking.)
353             -->             -->
354    
355            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
356                          classpath="${build.ant.dir}">
357            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
358            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern" value="&lt;[^|>()]+?>+"/>
359            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
360          </filterreader>          </filterreader>
361          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
362                        classpath="${build.ant.dir}">  
363            <!--            <!--
364             # These arguments are to uncomment lines beginning with           # This filter uncomments lines beginning with "//@" so that
365             # "//@" so that javadoc can see imports that are needed           # javadoc can see imports that are needed to resolve links
366             # to resolve links but that shouldn't be in the compiled           # but that shouldn't be in the compiled code.
            # code.  
367             -->             -->
368    
369            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                          classpath="${build.ant.dir}">
371            <param name="matching" value="^//@.*$"/>            <param name="matching" value="^//@.*$"/>
372            <param name="pattern" value="^//@"/>            <param name="pattern" value="^//@"/>
373            <param name="replacement" value=""/>            <param name="replacement" value=""/>
374          </filterreader>          </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>        </filterchain>
404      </copy>      </copy>
405    
# Line 481  Line 519 
519      <property name="build.warnunchecked" value=""/>      <property name="build.warnunchecked" value=""/>
520    
521      <condition property="prepare.src.dir" value="${build.dir}/prepare-src">      <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
       <or>  
         <and>  
           <not><isset property="build.nothreads"/></not>  
           <equals arg1="${gjc.version}" arg2="2.0"/>  
         </and>  
522          <istrue value="${build.nothreads}"/>          <istrue value="${build.nothreads}"/>
       </or>  
523      </condition>      </condition>
524    
525    
Legend:
Removed from v.1.34  
changed lines
  Added in v.1.36
Doug Lea
 ViewVC Help
Powered by ViewVC 1.0.8