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.26 by dl, Tue May 27 16:21:52 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 67 | Line 70 | ant [target], where target is one of:
70    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
71    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
72  
73 <  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
73 >  <property name="javac.args"           value='-J-Xbootclasspath/p:$[src.dir]:${javac.jar}'/>
74  
75    <path id="javac.bootclasspath">
76 +    <pathelement location="${src.dir}"/>
77      <pathelement location="${collect.jar}"/>
78      <pathelement location="${rt.jar}"/>
79    </path>
# Line 95 | Line 99 | ant [target], where target is one of:
99        <bootclasspath refid="javac.bootclasspath"/>
100        <compilerarg line="${javac.args} ${build.warnings.option}"/>
101  
98      <!-- need this because srcdir is basedir! -->
99      <include name="java/**/*.java"/>
100
102      </javac>
103    </target>
104  
# Line 134 | Line 135 | ant [target], where target is one of:
135      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
136           docletpath="${lib.dir}/doccheck.jar"
137              destdir="${build.doccheck.dir}">
138 <      <packageset dir="${build.filter.src.dir}">
138 <        <include name="java/**"/>
139 <      </packageset>
138 >      <packageset dir="${build.filter.src.dir}"/>
139      </javadoc>
140    </target>
141  
# Line 148 | Line 147 | ant [target], where target is one of:
147      <javadoc destdir="${build.javadocs.dir}"
148                  link="http://java.sun.com/j2se/1.4.1/docs/api"
149              overview="${src.dir}/intro.html"
150 <              source="${build.sourcelevel}">
150 >              source="${build.docsourcelevel}">
151  
152        <tag name="revised" description="Last revised:"/>
153        <tag name="spec" description="Specified by:"/>
154        <tag name="editor" description="Last edited by:"/>
155        <tag name="fixme" description="FIX ME:"/>
156 <      <packageset dir="${build.filter.src.dir}">
158 <        <include name="java/**"/>
159 <      </packageset>
156 >      <packageset dir="${build.filter.src.dir}"/>
157  
158      </javadoc>
159    </target>
160  
161  
162 +  <!--
163 +   # javac -s doesn't reliably generate compilable code. It generates
164 +   # bridge methods (marked as "synthetic") that can have identical
165 +   # signatures to existing methods except for the return value.
166 +   -->
167    <target name="strip" depends="init">
168      <mkdir dir="${build.stripped.dir}"/>
169      <javac srcdir="${src.dir}"
# Line 175 | Line 177 | ant [target], where target is one of:
177        <bootclasspath refid="javac.bootclasspath"/>
178        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
179  
178      <!-- need this because srcdir is basedir! -->
179      <include name="java/**/*.java"/>
180
180      </javac>
181    </target>
182  
# Line 251 | Line 250 | ant [target], where target is one of:
250      <javadoc destdir="${dist.javadocs.dir}"
251                  link="http://java.sun.com/j2se/1.4.1/docs/api"
252              overview="${src.dir}/intro.html"
253 <              source="${build.sourcelevel}">
253 >              source="${build.docsourcelevel}">
254  
255 <      <packageset dir="${build.filter.src.dir}">
257 <        <include name="java/**"/>
258 <      </packageset>
255 >      <packageset dir="${build.filter.src.dir}"/>
256  
257      </javadoc>
258    </target>
# Line 274 | Line 271 | ant [target], where target is one of:
271      <mkdir dir="${build.filter.src.dir}"/>
272      <copy todir="${build.filter.src.dir}">
273        <fileset dir="${src.dir}">
274 <        <include name="java/**/*.java"/>
274 >        <include name="**/*.java"/>
275        </fileset>
276        <filterchain>
277          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 348 | Line 345 | ant [target], where target is one of:
345  
346        <batchtest todir="${build.reports.dir}">
347          <fileset dir="${test.src.dir}">
348 <          <include name="**/*Test.java"/>
348 >          <include name="**/${testcase}Test.java"/>
349          </fileset>
350        </batchtest>
351  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines