[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.59, Sun Dec 7 20:49:10 2003 UTC revision 1.60, Mon Dec 8 03:10:54 2003 UTC
# Line 42  Line 42 
42    <!-- Source locations -->    <!-- Source locations -->
43    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
44    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
45      <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
46    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
47    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
48    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 69  Line 70 
70    
71    
72    <target name="compile"    <target name="compile"
73            depends="init, configure-compiler, prepare-src"            depends="init, configure-compiler"
74            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
75    
76      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
77    
78      <javac srcdir="${prepare.src.dir}"      <javac srcdir="${src.dir}"
79            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
80              debug="${build.debug}"              debug="${build.debug}"
81         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 132  Line 133 
133    
134    
135    
136      <target name="doccheck"
137              depends="filter-doccheck"
138              description="Reports on javadoc style errors">
139    
140        <delete dir="${build.doccheck.dir}"/>
141        <mkdir dir="${build.doccheck.dir}"/>
142    
143        <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
144             docletpath="${lib.dir}/doccheck.jar"
145                destdir="${build.doccheck.dir}">
146          <packageset dir="${build.dc-filter.dir}"/>
147        </javadoc>
148    
149        <echo>DocCheck output is in ${build.doccheck.dir}</echo>
150    
151      </target>
152    
153    
154    
155    <target name="checkstyle"    <target name="checkstyle"
156            depends="filter-src"            depends="filter-src"
157            description="Reports on style errors in Java source (verbose, mostly chaff)">            description="Reports on style errors in Java source (verbose, mostly chaff)">
# Line 155  Line 175 
175    
176    
177    
   <target name="doccheck"  
           depends="filter-doccheck"  
           description="Reports on javadoc style errors">  
   
     <delete dir="${build.doccheck.dir}"/>  
     <mkdir dir="${build.doccheck.dir}"/>  
   
     <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"  
          docletpath="${lib.dir}/doccheck.jar"  
             destdir="${build.doccheck.dir}">  
       <packageset dir="${build.dc-filter.dir}"/>  
     </javadoc>  
   
     <echo>DocCheck output is in ${build.doccheck.dir}</echo>  
   
   </target>  
   
   
   
178    <target name="dist"    <target name="dist"
179            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
180            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 377  Line 378 
378    
379      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
380    
381      <javac srcdir="${test.src.dir}/tck"      <javac srcdir="${tck.src.dir}"
382            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
383              debug="${build.debug}"              debug="${build.debug}"
384         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 392  Line 393 
393    
394      </javac>      </javac>
395    
396        <javac srcdir="${test.src.dir}"
397              destdir="${build.testcases.dir}"
398                debug="${build.debug}"
399           debuglevel="${build.debuglevel}"
400          deprecation="${build.deprecation}"
401               source="${build.sourcelevel}"
402                 fork="true">
403    
404          <include name="jsr166/test/**"/>
405    
406          <compilerarg value="${bootclasspath.args}"/>
407          <compilerarg line="${build.args}"/>
408    
409          <classpath refid="test.classpath"/>
410    
411        </javac>
412    
413    </target>    </target>
414    
415    
# Line 417  Line 435 
435        <formatter type="xml"/>        <formatter type="xml"/>
436    
437        <batchtest todir="${build.reports.dir}">        <batchtest todir="${build.reports.dir}">
438          <fileset dir="${test.src.dir}/tck">          <fileset dir="${tck.src.dir}">
439            <include name="${testcase}Test.java"/>            <include name="**/${testcase}Test.java"/>
440            </fileset>
441            <fileset dir="${test.src.dir}">
442              <include name="jsr166/test/**/${testcase}Test.java"/>
443          </fileset>          </fileset>
444        </batchtest>        </batchtest>
445    
# Line 463  Line 484 
484    
485      <property name="warnunchecked.arg" value=""/>      <property name="warnunchecked.arg" value=""/>
486    
     <condition property="prepare.src.dir" value="${build.dir}/prepare-src">  
       <istrue value="${build.nothreads}"/>  
     </condition>  
   
     <property name="prepare.src.dir" value="${src.dir}"/>  
   
487    
488      <!-- Common options in javac invocations -->      <!-- Common options in javac invocations -->
489      <property name="build.args" value="${warnunchecked.arg}"/>      <property name="build.args" value="${warnunchecked.arg}"/>
# Line 476  Line 491 
491    </target>    </target>
492    
493    
   <target name="prepare-src"  
           depends="configure-compiler"  
           if="prepare.src.dir">  
   
     <mkdir dir="${prepare.src.dir}"/>  
     <copy todir="${prepare.src.dir}">  
       <fileset dir="${src.dir}">  
         <exclude name="java/lang/**"/>  
       </fileset>  
     </copy>  
   
   </target>  
   
   
494    <target name="configure-tests"    <target name="configure-tests"
495         depends="configure-compiler">         depends="configure-compiler">
496    
# Line 562  Line 563 
563    
564    
565    
566    <!-- Backward compatibility, work in progress -->    <!-- Backward compatibility, work in progress (some files not checked in) -->
567    
568    
569    <target name="compat" depends="jar">    <target name="compat" depends="jar">
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.60
Doug Lea
 ViewVC Help
Powered by ViewVC 1.0.8