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.27 by tim, Wed May 28 00:33:17 2003 UTC vs.
Revision 1.31 by tim, Wed May 28 21:15:50 2003 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage">
2  
3    <description>
4 <    Build file for JSR-166
4 > ------------------------------------------------------------------------------
5 >  Build file for JSR-166
6  
7 <    JUnit 3.8 or better must be in ${ant.home}/lib for the test target to work.
7 <  </description>
7 >  Usage: ant [target]
8  
9 +  User-specific settings are read from user.properties.
10 +  See user.properties.sample for examples.
11 + ------------------------------------------------------------------------------
12 +  </description>
13  
14 <  <target name="usage" description="Prints this message">
15 <    <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>
14 >  <target name="usage" description="Advises user to run with -projecthelp">
15 >    <echo>Run "ant -projecthelp" for full usage information.</echo>
16    </target>
17  
18 +
19    <!-- User-specific settings -->
20    <property file="user.properties"/>
21  
33  <!-- Set build.warnings in user.properties to turn on -warnunchecked -->
34  <!-- <property name="build.warnings" value=""/> -->
35
22  
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
# Line 40 | Line 26 | ant [target], where target is one of:
26    <property name="build.debug"          value="true"/>
27    <property name="build.debuglevel"     value="source,lines,vars"/>
28    <property name="build.deprecation"    value="false"/>
29 +  <property name="build.novariance.arg" value=""/>
30  
31    <!-- Build locations -->
32    <property name="build.dir"            location="build"/>
# Line 74 | Line 61 | ant [target], where target is one of:
61    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
62  
63  
64 +
65    <!--
66     ! Bootclasspath munging for source compilation.
67     -->
68  
69 <  <path id="javac.bootclasspath.prepend">
69 >  <path id="javac.bootclasspath.prefix">
70      <!-- <pathelement location="${src.dir}"/> -->
71      <pathelement location="${javac.jar}"/>
72    </path>
# Line 90 | Line 78 | ant [target], where target is one of:
78    </path>
79  
80    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
81 <  <property name="javac.bootclasspath.prepend" refid="javac.bootclasspath.prepend"/>
81 >  <property name="javac.bootclasspath.prefix"
82 >           refid="javac.bootclasspath.prefix"/>
83  
84    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
85 <  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prepend}'/>
85 >  <property name="build.bootclasspath.arg"
86 >           value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
87  
88  
89    <!--
# Line 111 | Line 101 | ant [target], where target is one of:
101    <property name="test.classpath" refid="test.classpath"/>
102  
103    <!-- Turn the flattened test classpath into a javac argument -->
104 <  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
104 >  <property name="test.bootclasspath.arg"
105 >           value='-Xbootclasspath/p:${test.classpath}'/>
106 >
107 >
108 >
109 >  <!-- Files excluded from emulation and dist-docs -->
110 >  <patternset id="emulation.excludes">
111 >    <exclude name="java/util/Random.*"/>
112 >    <exclude name="sun/misc/Unsafe.*"/>
113 >  </patternset>
114  
115  
116  
117    <!-- Main targets -->
118  
119 <  <target name="compile" depends="init"
119 >  <target name="compile"
120 >          depends="init"
121            description="Compiles main sources to build folder">
122  
123      <mkdir dir="${build.classes.dir}"/>
# Line 131 | Line 131 | ant [target], where target is one of:
131               fork="true">
132  
133        <bootclasspath refid="javac.bootclasspath"/>
134 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
134 >      <compilerarg line="${build.javac.args}"/>
135  
136      </javac>
137  
138    </target>
139  
140  
141 <  <target name="jar" depends="native-jar, emulation-jar"/>
141 >  <target name="jar"
142 >          depends="check-emulation, init-jar, native-jar, emulation-jar"
143 >          description="Builds library jar from compiled sources"/>
144  
145  
146 <  <target name="test" depends="init, check-junit, report-tests"
147 <          description="Runs all tests (requires JUnit 3.8+ in ${ant.home}/lib)"
148 <  />
146 >  <target name="test"
147 >          depends="init, check-junit, report-tests"
148 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
149  
150  
151 <  <target name="checkstyle" depends="filter-src"
151 >  <target name="checkstyle"
152 >          depends="filter-src"
153            description="Reports on style errors in Java source (verbose, mostly chaff)">
154  
155      <taskdef resource="checkstyletask.properties"
# Line 160 | Line 163 | ant [target], where target is one of:
163    </target>
164  
165  
166 <  <target name="doccheck" depends="filter-src"
166 >  <target name="doccheck"
167 >          depends="filter-src"
168            description="Reports on javadoc style errors (not working yet)">
169  
170      <delete dir="${build.doccheck.dir}"/>
# Line 175 | Line 179 | ant [target], where target is one of:
179    </target>
180  
181  
182 <  <target name="docs" depends="filter-src"
182 >  <target name="docs"
183 >          depends="filter-src"
184            description="Builds javadocs with custom tags to build folder">
185  
186      <delete dir="${build.javadocs.dir}"/>
# Line 187 | Line 192 | ant [target], where target is one of:
192                source="${build.docsourcelevel}">
193  
194        <tag name="revised" description="Last revised:"/>
195 <      <tag name="spec" description="Specified by:"/>
196 <      <tag name="editor" description="Last edited by:"/>
197 <      <tag name="fixme" description="FIX ME:"/>
195 >      <tag name="spec"    description="Specified by:"/>
196 >      <tag name="editor"  description="Last edited by:"/>
197 >      <tag name="fixme"   description="FIX ME:"/>
198 >
199        <packageset dir="${build.filter.src.dir}"/>
200  
201      </javadoc>
# Line 197 | Line 203 | ant [target], where target is one of:
203    </target>
204  
205  
206 <  <!--
207 <   # javac -s doesn't reliably generate compilable code. It generates
208 <   # bridge methods (marked as "synthetic") that can have identical
203 <   # signatures to existing methods except for the return value.
204 <   -->
205 <  <target name="strip" depends="init">
206 >  <target name="strip"
207 >          depends="init"
208 >          description="Strip generics from java source (not working yet)">
209  
210      <mkdir dir="${build.stripped.dir}"/>
211  
212 +    <!--
213 +     # javac -s doesn't reliably generate compilable code. It generates
214 +     # bridge methods (marked as "synthetic") that can have identical
215 +     # signatures to existing methods except for the return value.
216 +     -->
217      <javac srcdir="${src.dir}"
218            destdir="${build.stripped.dir}"
219              debug="${build.debug}"
# Line 215 | Line 223 | ant [target], where target is one of:
223               fork="true">
224  
225        <bootclasspath refid="javac.bootclasspath"/>
226 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
226 >      <compilerarg line="${build.javac.args} -s"/>
227  
228      </javac>
229  
230    </target>
231  
232  
233 <  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
233 >  <target name="dist"
234 >          depends="init, dist-clean, dist-jar, dist-docs"
235            description="Puts all distributable products in single hierarchy"/>
236  
237  
# Line 244 | Line 253 | ant [target], where target is one of:
253    </target>
254  
255  
256 <  <!-- Anthill targets -->
256 >  <target name="dist-docs"
257 >          depends="filter-src"
258 >          description="Builds javadocs without custom tags to dist folder">
259  
260 <  <!-- Should really run the tests instead of just the jar target -->
261 <  <target name="anthill-build" depends="jar, test, docs, dist-docs"/>
260 >    <delete dir="${dist.javadocs.dir}"/>
261 >    <mkdir dir="${dist.javadocs.dir}"/>
262 >
263 >    <javadoc destdir="${dist.javadocs.dir}"
264 >                link="http://java.sun.com/j2se/1.4.1/docs/api"
265 >            overview="${src.dir}/intro.html"
266 >              source="${build.docsourcelevel}">
267 >
268 >      <packageset dir="${build.filter.src.dir}"/>
269 >
270 >    </javadoc>
271  
252  <target name="anthill-publish">
253    <copy todir="${deployDir}/docs/private">
254      <fileset dir="${build.javadocs.dir}"/>
255    </copy>
256    <copy todir="${deployDir}/docs/public">
257      <fileset dir="${dist.javadocs.dir}"/>
258    </copy>
259    <copy tofile="${deployDir}/index.html"
260          file="${basedir}/etc/anthill-index.html"/>
261    <copy todir="${deployDir}/notes">
262      <fileset dir="${basedir}/etc/notes"/>
263    </copy>
272    </target>
273  
274  
275 +
276    <!-- Internal targets -->
277  
278    <target name="set-warnings-if" if="build.warnings">
279  
280 <    <property name="build.warnings.option" value="-warnunchecked"/>
280 >    <property name="build.warnings.arg" value="-warnunchecked"/>
281  
282    </target>
283  
284  
285    <target name="set-warnings-unless" unless="build.warnings">
286  
287 <    <property name="build.warnings.option" value=""/>
287 >    <property name="build.warnings.arg" value=""/>
288  
289    </target>
290  
291  
292 <  <target name="init" depends="set-warnings-if, set-warnings-unless">
292 >  <target name="init"
293 >          depends="set-warnings-if, set-warnings-unless">
294  
295      <!-- Version is kept in a separate file -->
296      <loadfile property="version" srcFile="version.properties"/>
297      <echo>Building JSR-166 version ${version}</echo>
298  
299 +    <!-- Common options in javac invocations -->
300 +    <property name="build.javac.args"
301 +             value="${build.bootclasspath.arg} ${build.warnings.arg} ${build.novariance.arg}"/>
302 +
303    </target>
304  
305  
306 <  <target name="native-jar" depends="compile"
293 <          description="Builds library jar from compiled sources">
306 >  <target name="init-jar">
307  
308      <mkdir dir="${build.lib.dir}"/>
309  
310 +  </target>
311 +
312 +
313 +  <target name="native-jar"
314 +          depends="compile"
315 +          unless="build.emulation.true">
316 +
317      <jar destfile="${product.jar}">
318        <fileset dir="${build.classes.dir}"/>
319      </jar>
# Line 301 | Line 321 | ant [target], where target is one of:
321    </target>
322  
323  
324 <  <target name="compile-emulation" depends="init"
325 <          if="build.emulation"
326 <          description="Compiles emulation sources to build folder">
324 >  <target name="compile-emulation"
325 >          depends="init"
326 >          if="build.emulation.true">
327  
328      <mkdir dir="${build.emulation.dir}"/>
329  
# Line 316 | Line 336 | ant [target], where target is one of:
336               fork="true">
337  
338        <bootclasspath refid="javac.bootclasspath"/>
339 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
339 >      <compilerarg line="${build.javac.args}"/>
340  
341      </javac>
342  
343    </target>
344  
345  
346 <  <target name="emulation-jar" depends="native-jar, compile-emulation"
347 <          if="build.emulation">
346 >  <target name="emulation-jar"
347 >          depends="compile-emulation"
348 >          if="build.emulation.true">
349 >
350  
351 <    <jar destfile="${product.jar}" update="true" duplicate="add">
351 >    <jar destfile="${product.jar}" duplicate="add">
352 >      <fileset dir="${build.classes.dir}">
353 >        <patternset refid="emulation.excludes"/>
354 >      </fileset>
355        <fileset dir="${build.emulation.dir}"/>
356      </jar>
357  
358    </target>
359  
360  
361 <  <target name="dist-jar" depends="clean, jar">
361 >  <target name="dist-jar"
362 >          depends="clean, jar">
363  
364      <copy file="${product.jar}" todir="${dist.dir}"/>
365  
366    </target>
367  
368  
369 <  <target name="dist-docs" depends="filter-src"
370 <          description="Builds javadocs without custom tags to dist folder">
345 <
346 <    <delete dir="${dist.javadocs.dir}"/>
347 <    <mkdir dir="${dist.javadocs.dir}"/>
348 <
349 <    <javadoc destdir="${dist.javadocs.dir}"
350 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
351 <            overview="${src.dir}/intro.html"
352 <              source="${build.docsourcelevel}">
353 <
354 <      <packageset dir="${build.filter.src.dir}"/>
355 <
356 <    </javadoc>
357 <
358 <  </target>
359 <
360 <
361 <  <target name="compile-ant-filter" depends="init">
369 >  <target name="compile-ant-filter"
370 >          depends="init">
371  
372      <mkdir dir="${build.ant.dir}"/>
373  
# Line 370 | Line 379 | ant [target], where target is one of:
379    </target>
380  
381  
382 <  <target name="filter-src" depends="compile-ant-filter">
382 >  <target name="filter-src"
383 >          depends="compile-ant-filter">
384  
385      <mkdir dir="${build.filter.src.dir}"/>
386  
387      <copy todir="${build.filter.src.dir}">
388        <fileset dir="${src.dir}">
389 <        <include name="**/*.java"/>
390 <        <exclude name="**/Random.java"/>
391 <        <exclude name="**/Unsafe.java"/>
389 >        <include name="**/*.html"/>
390 >      </fileset>
391 >    </copy>
392 >
393 >    <copy todir="${build.filter.src.dir}">
394 >      <fileset dir="${src.dir}">
395 >        <exclude name="**/*.html"/>
396 >        <patternset refid="emulation.excludes"/>
397        </fileset>
398        <filterchain>
399          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 416 | Line 431 | ant [target], where target is one of:
431    </target>
432  
433  
434 <  <target name="compile-tests" depends="jar">
434 >  <target name="compile-tests"
435 >          depends="jar">
436  
437      <mkdir dir="${build.testcases.dir}"/>
438  
# Line 428 | Line 444 | ant [target], where target is one of:
444             source="${build.sourcelevel}"
445               fork="true">
446  
431      <bootclasspath refid="javac.bootclasspath"/>
432      <compilerarg line="${javac.args} ${build.warnings.option}"/>
447        <classpath refid="test.classpath"/>
448 +      <bootclasspath refid="javac.bootclasspath"/>
449 +      <compilerarg line="${build.javac.args}"/>
450  
451      </javac>
452  
453    </target>
454  
455  
456 <  <target name="run-tests" depends="compile-tests">
456 >  <target name="run-tests"
457 >          depends="compile-tests">
458  
459      <!-- May be overridden by user.properties -->
460      <property name="testcase" value="*"/>
# Line 451 | Line 468 | ant [target], where target is one of:
468                      dir="${build.reports.dir}"
469                     fork="true">
470  
471 <      <jvmarg value="${test.javac.args}"/>
471 >      <jvmarg value="${test.bootclasspath.arg}"/>
472  
473        <formatter type="xml"/>
474  
# Line 466 | Line 483 | ant [target], where target is one of:
483    </target>
484  
485  
486 <  <target name="report-tests" depends="run-tests">
486 >  <target name="report-tests"
487 >          depends="run-tests">
488 >
489      <!-- Sets junit.report.format to frames if Xalan is present,
490           otherwise sets it to noframes. -->
491      <available property="junit.report.format"
# Line 486 | Line 505 | ant [target], where target is one of:
505      </junitreport>
506  
507      <fail message="Test Cases Failed" if="junit.failed"/>
508 +
509    </target>
510  
511  
512    <target name="check-junit">
513 <    <!-- FIXME: this test isn't specific enough -->
513 >
514 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
515      <available property="junit.available"
516 <               classname="junit.framework.TestCase"/>
517 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
516 >               classname="junit.framework.Protectable"/>
517 >
518 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
519 >          unless="junit.available"/>
520 >
521 >  </target>
522 >
523 >
524 >  <target name="check-emulation">
525 >    <condition property="build.emulation.true">
526 >      <or>
527 >        <isset property="build.emulation"/>
528 >        <os family="windows"/>
529 >      </or>
530 >    </condition>
531 >  </target>
532 >
533 >
534 >
535 >  <!-- Anthill targets -->
536 >
537 >  <target name="anthill-build"
538 >          depends="jar, test, docs, dist-docs"/>
539 >
540 >  <target name="anthill-publish">
541 >
542 >    <copy todir="${deployDir}/docs/private">
543 >      <fileset dir="${build.javadocs.dir}"/>
544 >    </copy>
545 >
546 >    <copy todir="${deployDir}/docs/public">
547 >      <fileset dir="${dist.javadocs.dir}"/>
548 >    </copy>
549 >
550 >    <copy tofile="${deployDir}/index.html"
551 >          file="${basedir}/etc/anthill-index.html"/>
552 >
553 >    <copy todir="${deployDir}/notes">
554 >      <fileset dir="${basedir}/etc/notes"/>
555 >    </copy>
556 >
557    </target>
558  
559  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines