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.20 by tim, Mon Jan 20 18:25:51 2003 UTC vs.
Revision 1.22 by tim, Wed May 14 21:30:37 2003 UTC

# Line 50 | Line 50 | ant [target], where target is one of:
50    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
51  
52    <!-- Source locations -->
53 <  <property name="src.dir"              location="${basedir}"/>
54 <  <property name="test.src.dir"         location="${basedir}/etc/testcases"/>
53 >  <property name="src.dir"              location="${basedir}/src/main"/>
54 >  <property name="test.src.dir"         location="${basedir}/src/test"/>
55    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
56    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
57    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 95 | Line 95 | ant [target], where target is one of:
95        <bootclasspath refid="javac.bootclasspath"/>
96        <compilerarg line="${javac.args} ${build.warnings.option}"/>
97  
98      <!-- need this because srcdir is basedir! -->
99      <include name="java/**/*.java"/>
100
98      </javac>
99    </target>
100  
# Line 134 | Line 131 | ant [target], where target is one of:
131      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132           docletpath="${lib.dir}/doccheck.jar"
133              destdir="${build.doccheck.dir}">
134 <      <packageset dir="${build.filter.src.dir}">
138 <        <include name="java/**"/>
139 <      </packageset>
134 >      <packageset dir="${build.filter.src.dir}"/>
135      </javadoc>
136    </target>
137  
# Line 154 | Line 149 | ant [target], where target is one of:
149        <tag name="spec" description="Specified by:"/>
150        <tag name="editor" description="Last edited by:"/>
151        <tag name="fixme" description="FIX ME:"/>
152 <      <packageset dir="${build.filter.src.dir}">
158 <        <include name="java/**"/>
159 <      </packageset>
152 >      <packageset dir="${build.filter.src.dir}"/>
153  
154      </javadoc>
155    </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">
164      <mkdir dir="${build.stripped.dir}"/>
165      <javac srcdir="${src.dir}"
# Line 175 | Line 173 | ant [target], where target is one of:
173        <bootclasspath refid="javac.bootclasspath"/>
174        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
175  
178      <!-- need this because srcdir is basedir! -->
179      <include name="java/**/*.java"/>
180
176      </javac>
177    </target>
178  
# Line 253 | Line 248 | ant [target], where target is one of:
248              overview="${src.dir}/intro.html"
249                source="${build.sourcelevel}">
250  
251 <      <packageset dir="${build.filter.src.dir}">
257 <        <include name="java/**"/>
258 <      </packageset>
251 >      <packageset dir="${build.filter.src.dir}"/>
252  
253      </javadoc>
254    </target>
# Line 274 | Line 267 | ant [target], where target is one of:
267      <mkdir dir="${build.filter.src.dir}"/>
268      <copy todir="${build.filter.src.dir}">
269        <fileset dir="${src.dir}">
270 <        <include name="java/**/*.java"/>
270 >        <include name="**/*.java"/>
271        </fileset>
272        <filterchain>
273          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 324 | Line 317 | ant [target], where target is one of:
317        <bootclasspath refid="javac.bootclasspath"/>
318        <compilerarg line="${javac.args} ${build.warnings.option}"/>
319        <classpath refid="test.classpath"/>
327      <include name="**/*Test.java"/>
320  
321      </javac>
322    </target>
# Line 339 | Line 331 | ant [target], where target is one of:
331                      dir="${build.reports.dir}"
332                     fork="true">
333  
334 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
335 <
336 <      <classpath>
337 <        <!-- <path refid="test.classpath"/> -->
338 <        <pathelement location="${build.testcases.dir}"/>
347 <      </classpath>
334 >      <!--
335 >       ! This nastiness is so JUnit can test classes we are inserting
336 >       ! into the java.* packages.
337 >       -->
338 >      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
339  
340        <formatter type="xml"/>
341  
# Line 385 | Line 376 | ant [target], where target is one of:
376      <!-- FIXME: this test isn't specific enough -->
377      <available property="junit.available"
378                 classname="junit.framework.TestCase"/>
379 <    <fail message="Need JUnit 1.8 to run tests" unless="junit.available"/>
379 >    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
380    </target>
381  
382  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines