[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.57, Mon Sep 15 14:07:36 2003 UTC revision 1.58, Mon Sep 15 15:13:35 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"/>    <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43      <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
44    
45    <!-- Source locations -->    <!-- Source locations -->
46    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 77  Line 78 
78    
79      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
80    
 <!--  
     <echo>javac ${build.args}</echo>  
 -->  
   
81      <javac srcdir="${prepare.src.dir}"      <javac srcdir="${prepare.src.dir}"
82            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
83              debug="${build.debug}"              debug="${build.debug}"
# Line 111  Line 108 
108            description="Reports on style errors in Java source (verbose, mostly chaff)">            description="Reports on style errors in Java source (verbose, mostly chaff)">
109    
110      <taskdef resource="checkstyletask.properties"      <taskdef resource="checkstyletask.properties"
111              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>              classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
112    
113        <mkdir dir="${build.checkstyle.dir}"/>
114    
115      <checkstyle>      <checkstyle config="etc/checkstyle/sun_checks.xml"
116        <formatter type="plain"/>  <!-- also available: type="xml" -->         failOnViolation="false">
117          <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
118        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119      </checkstyle>      </checkstyle>
120    
121        <style in="${build.checkstyle.dir}/checkstyle-report.xml"
122              out="${build.checkstyle.dir}/checkstyle-report.html"
123            style="${stylesheet.dir}/checkstyle-frames.xsl"/>
124    
125    </target>    </target>
126    
127    
# Line 131  Line 135 
135      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
136           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
137              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
138        <packageset dir="${build.filter.doccheck.dir}"/>        <packageset dir="${build.dc-filter.dir}"/>
139      </javadoc>      </javadoc>
140    
141      <echo>DocCheck output is in ${build.doccheck.dir}</echo>      <echo>DocCheck output is in ${build.doccheck.dir}</echo>
# Line 153  Line 157 
157    
158        <tag name="revised" description="Last revised:"/>        <tag name="revised" description="Last revised:"/>
159        <tag name="spec"    description="Specified by:"/>        <tag name="spec"    description="Specified by:"/>
       <tag name="editor"  description="Last edited by:"/>  
       <tag name="fixme"   description="FIX ME:"/>  
160    
161        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.filter.src.dir}"/>
162    
# Line 202  Line 204 
204    </target>    </target>
205    
206    
   <target name="strip"  
           depends="init, configure-compiler"  
           description="Strip generics from java source (not working yet)">  
   
     <mkdir dir="${build.stripped.dir}"/>  
   
     <!--  
      # javac -s doesn't reliably generate compilable code. It generates  
      # bridge methods (marked as "synthetic") that can have identical  
      # signatures to existing methods except for the return value.  
      -->  
     <javac srcdir="${src.dir}"  
           destdir="${build.stripped.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg    line="${build.args} -s"/>  
   
     </javac>  
   
   </target>  
   
   
207    <target name="dist"    <target name="dist"
208            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
209            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
210    
211    
212    <target name="release"    <target name="release"
213            depends="dist"            depends="dist"
214            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
215    
 <!--  
     #keep build dir? - dl  
     <delete dir="${build.dir}"/>  
 -->  
216      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217    
218      <jar basedir="${basedir}" destfile="${release.jar}">      <jar basedir="${basedir}" destfile="${release.jar}">
219          <!-- <exclude name="build/**"/> -->
220        <exclude name="${release.jar}"/>        <exclude name="${release.jar}"/>
221        <exclude name="user.properties"/>        <exclude name="user.properties"/>
222        <exclude name="etc/notes/**"/>        <exclude name="etc/notes/**"/>
223          <exclude name="src/emulation/**"/>
224        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
225          <exclude name="**/SuperfluousAbstract.java"/>
226      </jar>      </jar>
227    
228    </target>    </target>
# Line 383  Line 359 
359    </target>    </target>
360    
361    
   
   
362    <target name="filter-doccheck"    <target name="filter-doccheck"
363            depends="filter-src">            depends="filter-src">
364    
365      <mkdir dir="${build.filter.doccheck.dir}"/>      <mkdir dir="${build.dc-filter.dir}"/>
366    
367      <copy todir="${build.filter.doccheck.dir}">      <copy todir="${build.dc-filter.dir}">
368        <fileset dir="${build.filter.src.dir}">        <fileset dir="${build.filter.src.dir}">
369          <include name="**/*.html"/>          <include name="**/*.html"/>
370        </fileset>        </fileset>
# Line 400  Line 374 
374               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 {}"               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 {}"
375      />      />
376    
377      <copy todir="${build.filter.doccheck.dir}">      <copy todir="${build.dc-filter.dir}">
378        <fileset dir="${build.filter.src.dir}">        <fileset dir="${build.filter.src.dir}">
379          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
380        </fileset>        </fileset>
# Line 438  Line 412 
412    
413      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
414    
 <!--  
     <echo>javac ${build.args}</echo>  
     <echo>classpath="${test.classpath}"</echo>  
 -->  
   
415      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
416            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
417              debug="${build.debug}"              debug="${build.debug}"

Legend:
Removed from v.1.57  
changed lines
  Added in v.1.58

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8