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.18 by tim, Mon Dec 16 15:32:55 2002 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 214 | Line 211 | ant [target], where target is one of:
211      </copy>
212      <copy tofile="${deployDir}/index.html"
213            file="${basedir}/etc/anthill-index.html"/>
214 +    <copy todir="${deployDir}/notes">
215 +      <fileset dir="${basedir}/etc/notes"/>
216 +    </copy>
217    </target>
218  
219  
# Line 250 | 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}">
254 <        <include name="java/**"/>
255 <      </packageset>
253 >      <packageset dir="${build.filter.src.dir}"/>
254  
255      </javadoc>
256    </target>
# Line 271 | 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 321 | Line 319 | ant [target], where target is one of:
319        <bootclasspath refid="javac.bootclasspath"/>
320        <compilerarg line="${javac.args} ${build.warnings.option}"/>
321        <classpath refid="test.classpath"/>
324 –      <include name="**/*Test.java"/>
322  
323      </javac>
324    </target>
# Line 336 | Line 333 | ant [target], where target is one of:
333                      dir="${build.reports.dir}"
334                     fork="true">
335  
336 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
337 <
338 <      <classpath>
339 <        <!-- <path refid="test.classpath"/> -->
340 <        <pathelement location="${build.testcases.dir}"/>
344 <      </classpath>
336 >      <!--
337 >       ! This nastiness is so JUnit can test classes we are inserting
338 >       ! into the java.* packages.
339 >       -->
340 >      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
341  
342        <formatter type="xml"/>
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  
# Line 382 | Line 378 | ant [target], where target is one of:
378      <!-- FIXME: this test isn't specific enough -->
379      <available property="junit.available"
380                 classname="junit.framework.TestCase"/>
381 <    <fail message="Need JUnit 1.8 to run tests" unless="junit.available"/>
381 >    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
382    </target>
383  
384  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines