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

Diff of /jsr166/build.xml

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

revision 1.41 by tim, Fri Jun 6 20:48:55 2003 UTC revision 1.53 by dl, Tue Aug 26 19:59:14 2003 UTC
# Line 35  Line 35 
35    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"        location="${build.dir}/lib"/>
36    <property name="build.ant.dir"        location="${build.dir}/ant"/>    <property name="build.ant.dir"        location="${build.dir}/ant"/>
37    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38      <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
39    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
40    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
41    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
42    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
43      <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
44    
45    <!-- Source locations -->    <!-- Source locations -->
46    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 56  Line 58 
58    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
59    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61      <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
62    
63    
64    <!-- Files excluded from dist-docs and emulation jar -->    <!-- Files excluded from dist-docs and emulation jar -->
# Line 71  Line 73 
73      <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>      <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
74      <exclude name="java/util/concurrent/atomic/AtomicLong*"/>      <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
75      <exclude name="java/util/concurrent/atomic/AtomicReference*"/>      <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
76        <exclude name="java/util/concurrent/locks/LockSupport*"/>
77        <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
78    </patternset>    </patternset>
79    
80    
# Line 98  Line 102 
102             source="${build.sourcelevel}"             source="${build.sourcelevel}"
103               fork="true">               fork="true">
104    
105    <!--
106        <compilerarg    line="${gjc.args}"/>        <compilerarg    line="${gjc.args}"/>
107        <bootclasspath refid="compile.bootclasspath"/>        <bootclasspath refid="compile.bootclasspath"/>
108    -->
109    
110      </javac>      </javac>
111    
# Line 132  Line 138 
138    
139    
140    <target name="doccheck"    <target name="doccheck"
141            depends="filter-src"            depends="filter-doccheck"
142            description="Reports on javadoc style errors (not working yet)">            description="Reports on javadoc style errors">
143    
144      <delete dir="${build.doccheck.dir}"/>      <delete dir="${build.doccheck.dir}"/>
145      <mkdir dir="${build.doccheck.dir}"/>      <mkdir dir="${build.doccheck.dir}"/>
# Line 141  Line 147 
147      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
148           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
149              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
150        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.filter.doccheck.dir}"/>
151      </javadoc>      </javadoc>
152    
153        <echo>DocCheck output is in ${build.doccheck.dir}</echo>
154    
155    </target>    </target>
156    
157    
# Line 171  Line 179 
179    </target>    </target>
180    
181    
182      <target name="sinjdocs"
183              depends="configure-tests"
184              description="Builds javadocs with custom tags to build folder">
185    
186        <delete dir="${build.sinjdocs.dir}"/>
187        <mkdir dir="${build.sinjdocs.dir}"/>
188    
189        <java classname="net.cscott.sinjdoc.Main" fork="true">
190    
191          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
192    
193          <classpath>
194            <pathelement location="${sinjdoc.jar}"/>
195            <pathelement location="${lib.dir}/jutil.jar"/>
196            <pathelement location="${lib.dir}/cup.jar"/>
197            <path refid="test.classpath"/>
198          </classpath>
199    
200    
201          <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
202          <arg value="-sourcepath"/> <arg value="${src.dir}"/>
203          <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
204          <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
205          <!-- <arg value="-verbose"/> -->
206          <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
207          <arg value="java.lang"/>
208          <arg value="java.util"/>
209          <arg value="java.util.concurrent"/>
210          <arg value="java.util.concurrent.atomic"/>
211          <arg value="java.util.concurrent.locks"/>
212    
213          <!--
214          <arg value="-help"/>
215          -->
216    
217        </java>
218    
219      </target>
220    
221    
222    <target name="strip"    <target name="strip"
223            depends="init, configure-compiler"            depends="init, configure-compiler"
224            description="Strip generics from java source (not working yet)">            description="Strip generics from java source (not working yet)">
# Line 190  Line 238 
238             source="${build.sourcelevel}"             source="${build.sourcelevel}"
239               fork="true">               fork="true">
240    
241        <!--
242        <compilerarg    line="${gjc.args} -s"/>        <compilerarg    line="${gjc.args} -s"/>
243        <bootclasspath refid="compile.bootclasspath"/>        <bootclasspath refid="compile.bootclasspath"/>
244         -->
245    
246      </javac>      </javac>
247    
# Line 202  Line 252 
252            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
253            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
254    
255      <target name="release"
256              depends="dist"
257              description="Puts entire CVS tree, plus distribution productions, in a jar">
258    
259    <!--
260        #keep build dir? - dl
261        <delete dir="${build.dir}"/>
262    -->
263        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
264    
265        <jar basedir="${basedir}" destfile="${release.jar}">
266          <exclude name="${release.jar}"/>
267          <exclude name="user.properties"/>
268          <exclude name="etc/notes/**"/>
269          <exclude name="lib/gjc/2.1/**"/>
270          <exclude name="**/SyntaxTest.java"/>
271        </jar>
272    
273      </target>
274    
275    <target name="clean"    <target name="clean"
276            description="Removes all build products">            description="Removes all build products">
# Line 341  Line 410 
410        </fileset>        </fileset>
411      </copy>      </copy>
412    
     <!-- Not needed now, used for doccheck filtering:  
     <property name="generic.declarations"  
              value="public interface E {} public interface T {} public interface K {} public interface V {}"  
     />  
     -->  
   
413      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
414        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
415          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
# Line 386  Line 449 
449            <param name="pattern"     value="^//@"/>            <param name="pattern"     value="^//@"/>
450            <param name="replacement" value=""/>            <param name="replacement" value=""/>
451          </filterreader>          </filterreader>
452          </filterchain>
453        </copy>
454    
455      </target>
456    
457    
458    
459    
460      <target name="filter-doccheck"
461              depends="filter-src">
462    
463        <mkdir dir="${build.filter.doccheck.dir}"/>
464    
465        <copy todir="${build.filter.doccheck.dir}">
466          <fileset dir="${build.filter.src.dir}">
467            <include name="**/*.html"/>
468          </fileset>
469        </copy>
470    
471        <property name="generic.declarations"
472                 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 {}"
473        />
474    
475        <copy todir="${build.filter.doccheck.dir}">
476          <fileset dir="${build.filter.src.dir}">
477            <exclude name="**/*.html"/>
478          </fileset>
479          <filterchain>
480          <!--          <!--
481           # The next two filters try to make the source look like           # These two filters try to make the source look like
482           # something that doccheck can process. The first removes           # something that doccheck can process. The first removes
483           # -source 1.4 assertions and the second adds in a bunch           # -source 1.4 assertions and the second adds in a bunch
484           # of single letter public nested marker interfaces so that           # of single letter public nested marker interfaces so that
485           # the generic type parameters are recognized.           # the generic type parameters are recognized.
          #  
          # Currently commented out because doccheck doesn't work. :-(  
486           -->           -->
487    
         <!--  
488          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
489                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
490            <param name="matching"    value="^\s*assert[\s ].*$"/>            <param name="matching"    value="^\s*assert[\s ].*$"/>
# Line 408  Line 494 
494    
495          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
496                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
497            <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>            <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
498            <param name="pattern"     value="$"/>            <param name="pattern"     value="$"/>
499            <param name="replacement" value=" ${generic.declarations}"/>            <param name="replacement" value=" ${generic.declarations}"/>
500          </filterreader>          </filterreader>
         -->  
501    
502        </filterchain>        </filterchain>
503      </copy>      </copy>
# Line 439  Line 524 
524             source="${build.sourcelevel}"             source="${build.sourcelevel}"
525               fork="true">               fork="true">
526    
527    <!--
528        <compilerarg    line="${gjc.args}"/>        <compilerarg    line="${gjc.args}"/>
529    -->
530        <bootclasspath refid="test.compile.bootclasspath"/>        <bootclasspath refid="test.compile.bootclasspath"/>
531        <classpath     refid="test.classpath"/>        <classpath     refid="test.classpath"/>
532    
# Line 505  Line 592 
592    
593    
594    <target name="configure-compiler">    <target name="configure-compiler">
595    <!--
596      <property name="gjc.version"      <property name="gjc.version"
597               value="2.0"/>               value="2.2"/>
598    
599      <condition property="novariance.arg" value="-novariance">      <condition property="novariance.arg" value="-novariance">
600        <and>        <and>
# Line 531  Line 618 
618      <property name="collect.jar"      <property name="collect.jar"
619            location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>            location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
620    
621    -->
622      <condition property="warnunchecked.arg" value="-warnunchecked">      <condition property="warnunchecked.arg" value="-warnunchecked">
623        <istrue value="${gjc.warnunchecked}"/>        <istrue value="${gjc.warnunchecked}"/>
624      </condition>      </condition>
# Line 563  Line 650 
650    
651    
652      <!-- Common options in javac invocations -->      <!-- Common options in javac invocations -->
653    <!--
654      <property name="gjc.args"      <property name="gjc.args"
655               value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"               value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
656      />      />
657    -->
658    
659    </target>    </target>
660    
# Line 668  Line 757 
757    </target>    </target>
758    
759    
760      <target name="ng" depends="test">
761        <java classname="SuperfluousAbstract" fork="true">
762    
763          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
764    
765        </java>
766      </target>
767    
768    
769  </project>  </project>

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.53

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