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.16 by tim, Fri Dec 13 06:34:04 2002 UTC vs.
Revision 1.22 by tim, Wed May 14 21:30:37 2003 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="jar">
1 > <project name="jsr166" default="usage">
2  
3    <description>
4
4      Build file for JSR-166
5  
6 <    Note that junit.jar must be in ${ant.home}/lib for the
8 <    test target to work. [FIXME: This should be automatically
9 <    enforced by this build file by failing with a message if
10 <    junit.jar is not in the right place.]
11 <
6 >    JUnit 1.8 must be in ${ant.home}/lib for the test target to work.
7    </description>
8  
9 +
10 +  <target name="usage" description="Prints this message">
11 +    <echo>
12 + ant [target], where target is one of:
13 +
14 + usage       (default) Prints this message
15 + compile     Compiles all sources to build folder
16 + jar         Builds library jar from compiled sources
17 + test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18 + docs        Builds javadocs with custom tags to build folder
19 + dist-docs   Builds javadocs without custom tags to dist folder
20 + dist        Puts all distributable products in single hierarchy
21 +
22 + clean       Removes all build products
23 + dist-clean  Removes all build and distribution products
24 +
25 + checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26 + doccheck    Reports on javadoc style errors (not working yet)
27 +    </echo>
28 +  </target>
29 +
30 +
31    <!-- Compilation options -->
32    <property name="build.sourcelevel"    value="1.5"/>
33    <property name="build.debug"          value="true"/>
# Line 33 | Line 50
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 78 | Line 95
95        <bootclasspath refid="javac.bootclasspath"/>
96        <compilerarg line="${javac.args} ${build.warnings.option}"/>
97  
81      <!-- need this because srcdir is basedir! -->
82      <include name="java/**/*.java"/>
83
98      </javac>
99    </target>
100  
# Line 94 | Line 108
108    </target>
109  
110  
111 <  <target name="test" depends="init, report-tests"
112 <          description="Runs all tests"/>
111 >  <target name="test" depends="init, check-junit, report-tests"
112 >          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
113  
114  
115    <target name="checkstyle" depends="filter-src"
116 <          description="Reports on style errors in Java source">
116 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
117      <taskdef resource="checkstyletask.properties"
118              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
119  
# Line 111 | Line 125
125  
126  
127    <target name="doccheck" depends="filter-src"
128 <          description="Reports on javadoc style errors">
128 >          description="Reports on javadoc style errors (not working yet)">
129      <delete dir="${build.doccheck.dir}"/>
130      <mkdir dir="${build.doccheck.dir}"/>
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}">
121 <        <include name="java/**"/>
122 <      </packageset>
134 >      <packageset dir="${build.filter.src.dir}"/>
135      </javadoc>
136    </target>
137  
# Line 137 | Line 149
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}">
141 <        <include name="java/**"/>
142 <      </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 158 | Line 173
173        <bootclasspath refid="javac.bootclasspath"/>
174        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
175  
161      <!-- need this because srcdir is basedir! -->
162      <include name="java/**/*.java"/>
163
176      </javac>
177    </target>
178  
# Line 186 | Line 198
198    <!-- Anthill targets -->
199  
200    <!-- Should really run the tests instead of just the jar target -->
201 <  <target name="anthill-build" depends="jar, docs, dist-docs"
190 <          description="Build the jar and both the external and internal docs"/>
201 >  <target name="anthill-build" depends="jar, docs, dist-docs"/>
202  
203    <target name="anthill-publish">
204      <copy todir="${deployDir}/docs/private">
# Line 196 | Line 207
207      <copy todir="${deployDir}/docs/public">
208        <fileset dir="${dist.javadocs.dir}"/>
209      </copy>
210 +    <copy tofile="${deployDir}/index.html"
211 +          file="${basedir}/etc/anthill-index.html"/>
212 +    <copy todir="${deployDir}/notes">
213 +      <fileset dir="${basedir}/etc/notes"/>
214 +    </copy>
215    </target>
216  
217  
# Line 232 | Line 248
248              overview="${src.dir}/intro.html"
249                source="${build.sourcelevel}">
250  
251 <      <packageset dir="${build.filter.src.dir}">
236 <        <include name="java/**"/>
237 <      </packageset>
251 >      <packageset dir="${build.filter.src.dir}"/>
252  
253      </javadoc>
254    </target>
# Line 253 | Line 267
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 303 | Line 317
317        <bootclasspath refid="javac.bootclasspath"/>
318        <compilerarg line="${javac.args} ${build.warnings.option}"/>
319        <classpath refid="test.classpath"/>
306      <include name="**/*Test.java"/>
320  
321      </javac>
322    </target>
# Line 318 | Line 331
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}"/>
326 <      </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 360 | Line 372
372    </target>
373  
374  
375 +  <target name="check-junit">
376 +    <!-- FIXME: this test isn't specific enough -->
377 +    <available property="junit.available"
378 +               classname="junit.framework.TestCase"/>
379 +    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
380 +  </target>
381 +
382 +
383   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines