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.25 by tim, Mon May 19 11:33:20 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"/>
35 +  <property name="build.docsourcelevel" value="1.4"/>
36    <property name="build.debug"          value="true"/>
37    <property name="build.debuglevel"     value="source,lines,vars"/>
38    <property name="build.deprecation"    value="false"/>
# Line 50 | Line 53 | ant [target], where target is one of:
53    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
54  
55    <!-- Source locations -->
56 <  <property name="src.dir"              location="${basedir}"/>
57 <  <property name="test.src.dir"         location="${basedir}/etc/testcases"/>
56 >  <property name="src.dir"              location="${basedir}/src/main"/>
57 >  <property name="test.src.dir"         location="${basedir}/src/test"/>
58    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
59    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
60    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 95 | Line 98 | ant [target], where target is one of:
98        <bootclasspath refid="javac.bootclasspath"/>
99        <compilerarg line="${javac.args} ${build.warnings.option}"/>
100  
98      <!-- need this because srcdir is basedir! -->
99      <include name="java/**/*.java"/>
100
101      </javac>
102    </target>
103  
# Line 134 | Line 134 | ant [target], where target is one of:
134      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
135           docletpath="${lib.dir}/doccheck.jar"
136              destdir="${build.doccheck.dir}">
137 <      <packageset dir="${build.filter.src.dir}">
138 <        <include name="java/**"/>
139 <      </packageset>
137 >      <packageset dir="${build.filter.src.dir}"/>
138      </javadoc>
139    </target>
140  
# Line 148 | Line 146 | ant [target], where target is one of:
146      <javadoc destdir="${build.javadocs.dir}"
147                  link="http://java.sun.com/j2se/1.4.1/docs/api"
148              overview="${src.dir}/intro.html"
149 <              source="${build.sourcelevel}">
149 >              source="${build.docsourcelevel}">
150  
151        <tag name="revised" description="Last revised:"/>
152        <tag name="spec" description="Specified by:"/>
153        <tag name="editor" description="Last edited by:"/>
154        <tag name="fixme" description="FIX ME:"/>
155 <      <packageset dir="${build.filter.src.dir}">
158 <        <include name="java/**"/>
159 <      </packageset>
155 >      <packageset dir="${build.filter.src.dir}"/>
156  
157      </javadoc>
158    </target>
159  
160  
161 +  <!--
162 +   # javac -s doesn't reliably generate compilable code. It generates
163 +   # bridge methods (marked as "synthetic") that can have identical
164 +   # signatures to existing methods except for the return value.
165 +   -->
166    <target name="strip" depends="init">
167      <mkdir dir="${build.stripped.dir}"/>
168      <javac srcdir="${src.dir}"
# Line 175 | Line 176 | ant [target], where target is one of:
176        <bootclasspath refid="javac.bootclasspath"/>
177        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
178  
178      <!-- need this because srcdir is basedir! -->
179      <include name="java/**/*.java"/>
180
179      </javac>
180    </target>
181  
# Line 251 | Line 249 | ant [target], where target is one of:
249      <javadoc destdir="${dist.javadocs.dir}"
250                  link="http://java.sun.com/j2se/1.4.1/docs/api"
251              overview="${src.dir}/intro.html"
252 <              source="${build.sourcelevel}">
252 >              source="${build.docsourcelevel}">
253  
254 <      <packageset dir="${build.filter.src.dir}">
257 <        <include name="java/**"/>
258 <      </packageset>
254 >      <packageset dir="${build.filter.src.dir}"/>
255  
256      </javadoc>
257    </target>
# Line 274 | Line 270 | ant [target], where target is one of:
270      <mkdir dir="${build.filter.src.dir}"/>
271      <copy todir="${build.filter.src.dir}">
272        <fileset dir="${src.dir}">
273 <        <include name="java/**/*.java"/>
273 >        <include name="**/*.java"/>
274        </fileset>
275        <filterchain>
276          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 348 | Line 344 | ant [target], where target is one of:
344  
345        <batchtest todir="${build.reports.dir}">
346          <fileset dir="${test.src.dir}">
347 <          <include name="**/*Test.java"/>
347 >          <include name="**/${testcase}Test.java"/>
348          </fileset>
349        </batchtest>
350  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines