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.25 by tim, Mon May 19 11:33:20 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.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 33 | Line 53
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 78 | Line 98
98        <bootclasspath refid="javac.bootclasspath"/>
99        <compilerarg line="${javac.args} ${build.warnings.option}"/>
100  
81      <!-- need this because srcdir is basedir! -->
82      <include name="java/**/*.java"/>
83
101      </javac>
102    </target>
103  
# Line 94 | Line 111
111    </target>
112  
113  
114 <  <target name="test" depends="init, report-tests"
115 <          description="Runs all tests"/>
114 >  <target name="test" depends="init, check-junit, report-tests"
115 >          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
116  
117  
118    <target name="checkstyle" depends="filter-src"
119 <          description="Reports on style errors in Java source">
119 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
120      <taskdef resource="checkstyletask.properties"
121              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
122  
# Line 111 | Line 128
128  
129  
130    <target name="doccheck" depends="filter-src"
131 <          description="Reports on javadoc style errors">
131 >          description="Reports on javadoc style errors (not working yet)">
132      <delete dir="${build.doccheck.dir}"/>
133      <mkdir dir="${build.doccheck.dir}"/>
134      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
135           docletpath="${lib.dir}/doccheck.jar"
136              destdir="${build.doccheck.dir}">
137 <      <packageset dir="${build.filter.src.dir}">
121 <        <include name="java/**"/>
122 <      </packageset>
137 >      <packageset dir="${build.filter.src.dir}"/>
138      </javadoc>
139    </target>
140  
# Line 131 | Line 146
146      <javadoc destdir="${build.javadocs.dir}"
147                  link="http://java.sun.com/j2se/1.4.1/docs/api"
148              overview="${src.dir}/intro.html"
149 <              source="${build.sourcelevel}">
149 >              source="${build.docsourcelevel}">
150  
151        <tag name="revised" description="Last revised:"/>
152        <tag name="spec" description="Specified by:"/>
153        <tag name="editor" description="Last edited by:"/>
154        <tag name="fixme" description="FIX ME:"/>
155 <      <packageset dir="${build.filter.src.dir}">
141 <        <include name="java/**"/>
142 <      </packageset>
155 >      <packageset dir="${build.filter.src.dir}"/>
156  
157      </javadoc>
158    </target>
159  
160  
161 +  <!--
162 +   # javac -s doesn't reliably generate compilable code. It generates
163 +   # bridge methods (marked as "synthetic") that can have identical
164 +   # signatures to existing methods except for the return value.
165 +   -->
166    <target name="strip" depends="init">
167      <mkdir dir="${build.stripped.dir}"/>
168      <javac srcdir="${src.dir}"
# Line 158 | Line 176
176        <bootclasspath refid="javac.bootclasspath"/>
177        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
178  
161      <!-- need this because srcdir is basedir! -->
162      <include name="java/**/*.java"/>
163
179      </javac>
180    </target>
181  
# Line 186 | Line 201
201    <!-- Anthill targets -->
202  
203    <!-- Should really run the tests instead of just the jar target -->
204 <  <target name="anthill-build" depends="jar, docs, dist-docs"
190 <          description="Build the jar and both the external and internal docs"/>
204 >  <target name="anthill-build" depends="jar, docs, dist-docs"/>
205  
206    <target name="anthill-publish">
207      <copy todir="${deployDir}/docs/private">
# Line 198 | Line 212
212      </copy>
213      <copy tofile="${deployDir}/index.html"
214            file="${basedir}/etc/anthill-index.html"/>
215 +    <copy todir="${deployDir}/notes">
216 +      <fileset dir="${basedir}/etc/notes"/>
217 +    </copy>
218    </target>
219  
220  
# Line 232 | Line 249
249      <javadoc destdir="${dist.javadocs.dir}"
250                  link="http://java.sun.com/j2se/1.4.1/docs/api"
251              overview="${src.dir}/intro.html"
252 <              source="${build.sourcelevel}">
252 >              source="${build.docsourcelevel}">
253  
254 <      <packageset dir="${build.filter.src.dir}">
238 <        <include name="java/**"/>
239 <      </packageset>
254 >      <packageset dir="${build.filter.src.dir}"/>
255  
256      </javadoc>
257    </target>
# Line 255 | Line 270
270      <mkdir dir="${build.filter.src.dir}"/>
271      <copy todir="${build.filter.src.dir}">
272        <fileset dir="${src.dir}">
273 <        <include name="java/**/*.java"/>
273 >        <include name="**/*.java"/>
274        </fileset>
275        <filterchain>
276          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 305 | Line 320
320        <bootclasspath refid="javac.bootclasspath"/>
321        <compilerarg line="${javac.args} ${build.warnings.option}"/>
322        <classpath refid="test.classpath"/>
308      <include name="**/*Test.java"/>
323  
324      </javac>
325    </target>
# Line 320 | Line 334
334                      dir="${build.reports.dir}"
335                     fork="true">
336  
337 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
338 <
339 <      <classpath>
340 <        <!-- <path refid="test.classpath"/> -->
341 <        <pathelement location="${build.testcases.dir}"/>
328 <      </classpath>
337 >      <!--
338 >       ! This nastiness is so JUnit can test classes we are inserting
339 >       ! into the java.* packages.
340 >       -->
341 >      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
342  
343        <formatter type="xml"/>
344  
345        <batchtest todir="${build.reports.dir}">
346          <fileset dir="${test.src.dir}">
347 <          <include name="**/*Test.java"/>
347 >          <include name="**/${testcase}Test.java"/>
348          </fileset>
349        </batchtest>
350  
# Line 362 | Line 375
375    </target>
376  
377  
378 +  <target name="check-junit">
379 +    <!-- FIXME: this test isn't specific enough -->
380 +    <available property="junit.available"
381 +               classname="junit.framework.TestCase"/>
382 +    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
383 +  </target>
384 +
385 +
386   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines