[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.38, Fri May 30 21:27:52 2003 UTC revision 1.48, Fri Aug 1 19:41:06 2003 UTC
# Line 39  Line 39 
39    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
40    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <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 -->    <!-- Source locations -->
45    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 59  Line 60 
60    
61    
62    
63    <!-- Files excluded from emulation and dist-docs -->    <!-- Files excluded from dist-docs and emulation jar -->
64    <patternset id="emulation.excludes">    <patternset id="unsafe.exclusion">
65      <exclude name="java/util/Random.*"/>      <exclude name="java/util/Random.*"/>
66      <exclude name="sun/misc/Unsafe.*"/>      <exclude name="sun/misc/Unsafe.*"/>
67    </patternset>    </patternset>
68    
69      <!-- Files excludes from emulation jar -->
70      <patternset id="atomic.exclusion">
71        <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
72        <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
73        <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
74        <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
75      </patternset>
76    
77    
78    
79    <!-- Main targets -->    <!-- Main targets -->
# Line 124  Line 133 
133    
134    
135    <target name="doccheck"    <target name="doccheck"
136            depends="filter-src"            depends="filter-doccheck"
137            description="Reports on javadoc style errors (not working yet)">            description="Reports on javadoc style errors">
138    
139      <delete dir="${build.doccheck.dir}"/>      <delete dir="${build.doccheck.dir}"/>
140      <mkdir dir="${build.doccheck.dir}"/>      <mkdir dir="${build.doccheck.dir}"/>
# Line 133  Line 142 
142      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
143           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
144              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
145        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.filter.doccheck.dir}"/>
146      </javadoc>      </javadoc>
147    
148        <echo>DocCheck output is in ${build.doccheck.dir}</echo>
149    
150    </target>    </target>
151    
152    
# Line 194  Line 205 
205            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
206            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
207    
208      <target name="release"
209              depends="dist"
210              description="Puts entire CVS tree, plus distribution productions, in a jar">
211    
212    <!--
213        #keep build dir? - dl
214        <delete dir="${build.dir}"/>
215    -->
216        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217    
218        <jar basedir="${basedir}" destfile="${release.jar}">
219          <exclude name="${release.jar}"/>
220          <exclude name="user.properties"/>
221          <exclude name="etc/notes/**"/>
222          <exclude name="lib/gjc/2.1/**"/>
223          <exclude name="**/SyntaxTest.java"/>
224        </jar>
225    
226      </target>
227    
228    <target name="clean"    <target name="clean"
229            description="Removes all build products">            description="Removes all build products">
# Line 292  Line 322 
322    
323      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
324        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
325          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
326            <patternset refid="unsafe.exclusion"/>
327        </fileset>        </fileset>
328        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
329      </jar>      </jar>
# Line 332  Line 363 
363        </fileset>        </fileset>
364      </copy>      </copy>
365    
     <!-- Not needed now, used for doccheck filtering:  
     <property name="generic.declarations"  
              value="public interface E {} public interface T {} public interface K {} public interface V {}"  
     />  
     -->  
   
366      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
367        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
368          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
369          <patternset refid="emulation.excludes"/>          <patternset refid="unsafe.exclusion"/>
370        </fileset>        </fileset>
371        <filterchain>        <filterchain>
372    
# Line 377  Line 402 
402            <param name="pattern"     value="^//@"/>            <param name="pattern"     value="^//@"/>
403            <param name="replacement" value=""/>            <param name="replacement" value=""/>
404          </filterreader>          </filterreader>
405          </filterchain>
406        </copy>
407    
408      </target>
409    
410    
411    
412    
413      <target name="filter-doccheck"
414              depends="filter-src">
415    
416        <mkdir dir="${build.filter.doccheck.dir}"/>
417    
418        <copy todir="${build.filter.doccheck.dir}">
419          <fileset dir="${build.filter.src.dir}">
420            <include name="**/*.html"/>
421          </fileset>
422        </copy>
423    
424        <property name="generic.declarations"
425                 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 {}"
426        />
427    
428        <copy todir="${build.filter.doccheck.dir}">
429          <fileset dir="${build.filter.src.dir}">
430            <exclude name="**/*.html"/>
431          </fileset>
432          <filterchain>
433          <!--          <!--
434           # The next two filters try to make the source look like           # These two filters try to make the source look like
435           # something that doccheck can process. The first removes           # something that doccheck can process. The first removes
436           # -source 1.4 assertions and the second adds in a bunch           # -source 1.4 assertions and the second adds in a bunch
437           # of single letter public nested marker interfaces so that           # of single letter public nested marker interfaces so that
438           # the generic type parameters are recognized.           # the generic type parameters are recognized.
          #  
          # Currently commented out because doccheck doesn't work. :-(  
439           -->           -->
440    
         <!--  
441          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
442                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
443            <param name="matching"    value="^\s*assert[\s ].*$"/>            <param name="matching"    value="^\s*assert[\s ].*$"/>
# Line 399  Line 447 
447    
448          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
449                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
450            <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>            <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
451            <param name="pattern"     value="$"/>            <param name="pattern"     value="$"/>
452            <param name="replacement" value=" ${generic.declarations}"/>            <param name="replacement" value=" ${generic.declarations}"/>
453          </filterreader>          </filterreader>
         -->  
454    
455        </filterchain>        </filterchain>
456      </copy>      </copy>
# Line 498  Line 545 
545    <target name="configure-compiler">    <target name="configure-compiler">
546    
547      <property name="gjc.version"      <property name="gjc.version"
548               value="2.0"/>               value="2.2"/>
549    
550      <condition property="novariance.arg" value="-novariance">      <condition property="novariance.arg" value="-novariance">
551        <and>        <and>
# Line 543  Line 590 
590      </path>      </path>
591    
592      <path id="compile.bootclasspath">      <path id="compile.bootclasspath">
593          <pathelement location="${build.classes.dir}"/>
594        <pathelement location="${collect.jar}"/>        <pathelement location="${collect.jar}"/>
595        <pathelement location="${rt.jar}"/>        <pathelement location="${rt.jar}"/>
596      </path>      </path>
# Line 658  Line 706 
706    </target>    </target>
707    
708    
709      <target name="ng" depends="test">
710        <java classname="SuperfluousAbstract" fork="true">
711    
712          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
713    
714        </java>
715      </target>
716    
717    
718  </project>  </project>

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.48

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8