ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.21 by tim, Fri Mar 14 04:14:07 2003 UTC vs.
Revision 1.23 by tim, Sat May 17 21:20:50 2003 UTC

# Line 27 | Line 27 | ant [target], where target is one of:
27      </echo>
28    </target>
29  
30 +  <property file="user.properties"/>
31 +  <property name="testcase" value="*"/>
32  
33    <!-- Compilation options -->
34    <property name="build.sourcelevel"    value="1.5"/>
# Line 50 | Line 52 | ant [target], where target is one of:
52    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
53  
54    <!-- Source locations -->
55 <  <property name="src.dir"              location="${basedir}"/>
56 <  <property name="test.src.dir"         location="${basedir}/etc/testcases"/>
55 >  <property name="src.dir"              location="${basedir}/src/main"/>
56 >  <property name="test.src.dir"         location="${basedir}/src/test"/>
57    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
58    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
59    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 95 | Line 97 | ant [target], where target is one of:
97        <bootclasspath refid="javac.bootclasspath"/>
98        <compilerarg line="${javac.args} ${build.warnings.option}"/>
99  
98      <!-- need this because srcdir is basedir! -->
99      <include name="java/**/*.java"/>
100
100      </javac>
101    </target>
102  
# Line 134 | Line 133 | ant [target], where target is one of:
133      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
134           docletpath="${lib.dir}/doccheck.jar"
135              destdir="${build.doccheck.dir}">
136 <      <packageset dir="${build.filter.src.dir}">
138 <        <include name="java/**"/>
139 <      </packageset>
136 >      <packageset dir="${build.filter.src.dir}"/>
137      </javadoc>
138    </target>
139  
# Line 154 | Line 151 | ant [target], where target is one of:
151        <tag name="spec" description="Specified by:"/>
152        <tag name="editor" description="Last edited by:"/>
153        <tag name="fixme" description="FIX ME:"/>
154 <      <packageset dir="${build.filter.src.dir}">
158 <        <include name="java/**"/>
159 <      </packageset>
154 >      <packageset dir="${build.filter.src.dir}"/>
155  
156      </javadoc>
157    </target>
158  
159  
160 +  <!--
161 +   # javac -s doesn't reliably generate compilable code. It generates
162 +   # bridge methods (marked as "synthetic") that can have identical
163 +   # signatures to existing methods except for the return value.
164 +   -->
165    <target name="strip" depends="init">
166      <mkdir dir="${build.stripped.dir}"/>
167      <javac srcdir="${src.dir}"
# Line 175 | Line 175 | ant [target], where target is one of:
175        <bootclasspath refid="javac.bootclasspath"/>
176        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
177  
178      <!-- need this because srcdir is basedir! -->
179      <include name="java/**/*.java"/>
180
178      </javac>
179    </target>
180  
# Line 253 | Line 250 | ant [target], where target is one of:
250              overview="${src.dir}/intro.html"
251                source="${build.sourcelevel}">
252  
253 <      <packageset dir="${build.filter.src.dir}">
257 <        <include name="java/**"/>
258 <      </packageset>
253 >      <packageset dir="${build.filter.src.dir}"/>
254  
255      </javadoc>
256    </target>
# Line 274 | Line 269 | ant [target], where target is one of:
269      <mkdir dir="${build.filter.src.dir}"/>
270      <copy todir="${build.filter.src.dir}">
271        <fileset dir="${src.dir}">
272 <        <include name="java/**/*.java"/>
272 >        <include name="**/*.java"/>
273        </fileset>
274        <filterchain>
275          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 348 | Line 343 | ant [target], where target is one of:
343  
344        <batchtest todir="${build.reports.dir}">
345          <fileset dir="${test.src.dir}">
346 <          <include name="**/*Test.java"/>
346 >          <include name="**/${testcase}Test.java"/>
347          </fileset>
348        </batchtest>
349  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines