[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.20, Mon Jan 20 18:25:51 2003 UTC revision 1.22, Wed May 14 21:30:37 2003 UTC
# Line 50  Line 50 
50    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
51    
52    <!-- Source locations -->    <!-- Source locations -->
53    <property name="src.dir"              location="${basedir}"/>    <property name="src.dir"              location="${basedir}/src/main"/>
54    <property name="test.src.dir"         location="${basedir}/etc/testcases"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
55    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
56    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
57    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 95  Line 95 
95        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
96        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <compilerarg line="${javac.args} ${build.warnings.option}"/>
97    
       <!-- need this because srcdir is basedir! -->  
       <include name="java/**/*.java"/>  
   
98      </javac>      </javac>
99    </target>    </target>
100    
# Line 134  Line 131 
131      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
133              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
134        <packageset dir="${build.filter.src.dir}">        <packageset dir="${build.filter.src.dir}"/>
         <include name="java/**"/>  
       </packageset>  
135      </javadoc>      </javadoc>
136    </target>    </target>
137    
# Line 154  Line 149 
149        <tag name="spec" description="Specified by:"/>        <tag name="spec" description="Specified by:"/>
150        <tag name="editor" description="Last edited by:"/>        <tag name="editor" description="Last edited by:"/>
151        <tag name="fixme" description="FIX ME:"/>        <tag name="fixme" description="FIX ME:"/>
152        <packageset dir="${build.filter.src.dir}">        <packageset dir="${build.filter.src.dir}"/>
         <include name="java/**"/>  
       </packageset>  
153    
154      </javadoc>      </javadoc>
155    </target>    </target>
156    
157    
158      <!--
159       # javac -s doesn't reliably generate compilable code. It generates
160       # bridge methods (marked as "synthetic") that can have identical
161       # signatures to existing methods except for the return value.
162       -->
163    <target name="strip" depends="init">    <target name="strip" depends="init">
164      <mkdir dir="${build.stripped.dir}"/>      <mkdir dir="${build.stripped.dir}"/>
165      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
# Line 175  Line 173 
173        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
174        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
175    
       <!-- need this because srcdir is basedir! -->  
       <include name="java/**/*.java"/>  
   
176      </javac>      </javac>
177    </target>    </target>
178    
# Line 253  Line 248 
248              overview="${src.dir}/intro.html"              overview="${src.dir}/intro.html"
249                source="${build.sourcelevel}">                source="${build.sourcelevel}">
250    
251        <packageset dir="${build.filter.src.dir}">        <packageset dir="${build.filter.src.dir}"/>
         <include name="java/**"/>  
       </packageset>  
252    
253      </javadoc>      </javadoc>
254    </target>    </target>
# Line 274  Line 267 
267      <mkdir dir="${build.filter.src.dir}"/>      <mkdir dir="${build.filter.src.dir}"/>
268      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
269        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
270          <include name="java/**/*.java"/>          <include name="**/*.java"/>
271        </fileset>        </fileset>
272        <filterchain>        <filterchain>
273          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 324  Line 317 
317        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
318        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <compilerarg line="${javac.args} ${build.warnings.option}"/>
319        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
       <include name="**/*Test.java"/>  
320    
321      </javac>      </javac>
322    </target>    </target>
# Line 339  Line 331 
331                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
332                     fork="true">                     fork="true">
333    
334        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>        <!--
335           ! This nastiness is so JUnit can test classes we are inserting
336        <classpath>         ! into the java.* packages.
337          <!-- <path refid="test.classpath"/> -->         -->
338          <pathelement location="${build.testcases.dir}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
       </classpath>  
339    
340        <formatter type="xml"/>        <formatter type="xml"/>
341    
# Line 385  Line 376 
376      <!-- FIXME: this test isn't specific enough -->      <!-- FIXME: this test isn't specific enough -->
377      <available property="junit.available"      <available property="junit.available"
378                 classname="junit.framework.TestCase"/>                 classname="junit.framework.TestCase"/>
379      <fail message="Need JUnit 1.8 to run tests" unless="junit.available"/>      <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
380    </target>    </target>
381    
382    

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.22

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8