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

Diff of /jsr166/build.xml

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

revision 1.37 by tim, Fri May 30 03:24:18 2003 UTC 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"/>    <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    </target>    </target>
# Line 194  Line 203 
203            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
204            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
205    
206      <target name="release"
207              depends="dist"
208              description="Puts entire CVS tree, plus distribution productions, in a jar">
209    
210    <!--
211        #keep build dir? - dl
212        <delete dir="${build.dir}"/>
213    -->
214        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
215    
216        <jar basedir="${basedir}" destfile="${release.jar}">
217          <exclude name="${release.jar}"/>
218          <exclude name="user.properties"/>
219          <exclude name="etc/notes/**"/>
220          <exclude name="lib/gjc/2.1/**"/>
221          <exclude name="**/SyntaxTest.java"/>
222        </jar>
223    
224      </target>
225    
226    <target name="clean"    <target name="clean"
227            description="Removes all build products">            description="Removes all build products">
# Line 292  Line 320 
320    
321      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
322        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
323          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
324            <patternset refid="unsafe.exclusion"/>
325        </fileset>        </fileset>
326        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
327      </jar>      </jar>
# Line 332  Line 361 
361        </fileset>        </fileset>
362      </copy>      </copy>
363    
     <!-- Not needed now, used for doccheck filtering:  
     <property name="generic.declarations"  
              value="public interface E {} public interface T {} public interface K {} public interface V {}"  
     />  
     -->  
   
364      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
365        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
366          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
367          <patternset refid="emulation.excludes"/>          <patternset refid="unsafe.exclusion"/>
368        </fileset>        </fileset>
369        <filterchain>        <filterchain>
370    
# Line 377  Line 400 
400            <param name="pattern"     value="^//@"/>            <param name="pattern"     value="^//@"/>
401            <param name="replacement" value=""/>            <param name="replacement" value=""/>
402          </filterreader>          </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           # These two filters try to make the source look like
433           # something that doccheck can process. The first removes           # something that doccheck can process. The first removes
434           # -source 1.4 assertions and the second adds in a bunch           # -source 1.4 assertions and the second adds in a bunch
435           # of single letter public nested marker interfaces so that           # of single letter public nested marker interfaces so that
436           # the generic type parameters are recognized.           # the generic type parameters are recognized.
          #  
          # Currently commented out because doccheck doesn't work. :-(  
437           -->           -->
438    
         <!--  
439          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
440                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
441            <param name="matching"    value="^\s*assert[\s ].*$"/>            <param name="matching"    value="^\s*assert[\s ].*$"/>
# Line 399  Line 445 
445    
446          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
447                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
448            <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>            <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
449            <param name="pattern"     value="$"/>            <param name="pattern"     value="$"/>
450            <param name="replacement" value=" ${generic.declarations}"/>            <param name="replacement" value=" ${generic.declarations}"/>
451          </filterreader>          </filterreader>
         -->  
452    
453        </filterchain>        </filterchain>
454      </copy>      </copy>
# Line 498  Line 543 
543    <target name="configure-compiler">    <target name="configure-compiler">
544    
545      <property name="gjc.version"      <property name="gjc.version"
546               value="2.0"/>               value="2.2"/>
547    
548      <condition property="novariance.arg" value="-novariance">      <condition property="novariance.arg" value="-novariance">
549        <and>        <and>
# Line 539  Line 584 
584       -->       -->
585    
586      <path id="pre.bootclasspath">      <path id="pre.bootclasspath">
       <!-- <pathelement location="${src.dir}"/> -->  
587        <pathelement location="${javac.jar}"/>        <pathelement location="${javac.jar}"/>
588      </path>      </path>
589    
590      <path id="compile.bootclasspath">      <path id="compile.bootclasspath">
591        <!-- <pathelement location="${src.dir}"/> -->        <pathelement location="${build.classes.dir}"/>
592        <pathelement location="${collect.jar}"/>        <pathelement location="${collect.jar}"/>
593        <pathelement location="${rt.jar}"/>        <pathelement location="${rt.jar}"/>
594      </path>      </path>
# Line 660  Line 704 
704    </target>    </target>
705    
706    
707      <target name="ng" depends="test">
708        <java classname="SuperfluousAbstract" fork="true">
709    
710          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
711    
712        </java>
713      </target>
714    
715    
716  </project>  </project>

Legend:
Removed from v.1.37  
changed lines
  Added in v.1.47

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27