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.17 by tim, Fri Dec 13 07:09:11 2002 UTC vs.
Revision 1.23 by tim, Sat May 17 21:20:50 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 +  <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.debug"          value="true"/>
# Line 33 | Line 52
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 78 | Line 97
97        <bootclasspath refid="javac.bootclasspath"/>
98        <compilerarg line="${javac.args} ${build.warnings.option}"/>
99  
81      <!-- need this because srcdir is basedir! -->
82      <include name="java/**/*.java"/>
83
100      </javac>
101    </target>
102  
# Line 94 | Line 110
110    </target>
111  
112  
113 <  <target name="test" depends="init, report-tests"
114 <          description="Runs all tests"/>
113 >  <target name="test" depends="init, check-junit, report-tests"
114 >          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
115  
116  
117    <target name="checkstyle" depends="filter-src"
118 <          description="Reports on style errors in Java source">
118 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
119      <taskdef resource="checkstyletask.properties"
120              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
121  
# Line 111 | Line 127
127  
128  
129    <target name="doccheck" depends="filter-src"
130 <          description="Reports on javadoc style errors">
130 >          description="Reports on javadoc style errors (not working yet)">
131      <delete dir="${build.doccheck.dir}"/>
132      <mkdir dir="${build.doccheck.dir}"/>
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}">
121 <        <include name="java/**"/>
122 <      </packageset>
136 >      <packageset dir="${build.filter.src.dir}"/>
137      </javadoc>
138    </target>
139  
# Line 137 | Line 151
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}">
141 <        <include name="java/**"/>
142 <      </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 158 | Line 175
175        <bootclasspath refid="javac.bootclasspath"/>
176        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
177  
161      <!-- need this because srcdir is basedir! -->
162      <include name="java/**/*.java"/>
163
178      </javac>
179    </target>
180  
# Line 186 | Line 200
200    <!-- Anthill targets -->
201  
202    <!-- Should really run the tests instead of just the jar target -->
203 <  <target name="anthill-build" depends="jar, docs, dist-docs"
190 <          description="Build the jar and both the external and internal docs"/>
203 >  <target name="anthill-build" depends="jar, docs, dist-docs"/>
204  
205    <target name="anthill-publish">
206      <copy todir="${deployDir}/docs/private">
# Line 198 | Line 211
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 234 | Line 250
250              overview="${src.dir}/intro.html"
251                source="${build.sourcelevel}">
252  
253 <      <packageset dir="${build.filter.src.dir}">
238 <        <include name="java/**"/>
239 <      </packageset>
253 >      <packageset dir="${build.filter.src.dir}"/>
254  
255      </javadoc>
256    </target>
# Line 255 | Line 269
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 305 | Line 319
319        <bootclasspath refid="javac.bootclasspath"/>
320        <compilerarg line="${javac.args} ${build.warnings.option}"/>
321        <classpath refid="test.classpath"/>
308      <include name="**/*Test.java"/>
322  
323      </javac>
324    </target>
# Line 320 | Line 333
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}"/>
328 <      </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 362 | Line 374
374    </target>
375  
376  
377 +  <target name="check-junit">
378 +    <!-- FIXME: this test isn't specific enough -->
379 +    <available property="junit.available"
380 +               classname="junit.framework.TestCase"/>
381 +    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
382 +  </target>
383 +
384 +
385   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines