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.22 by tim, Wed May 14 21:30:37 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 1.8 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 +
22 +
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
25 +  <property name="build.docsourcelevel" value="1.4"/>
26    <property name="build.debug"          value="true"/>
27    <property name="build.debuglevel"     value="source,lines,vars"/>
28    <property name="build.deprecation"    value="false"/>
29 <  <!--
37 <  <property name="build.warnings"       value="true"/>
38 <  -->
29 >  <property name="build.novariance.arg" value=""/>
30  
31    <!-- Build locations -->
32    <property name="build.dir"            location="build"/>
33    <property name="build.classes.dir"    location="${build.dir}/classes"/>
34 +  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
35    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
36    <property name="build.lib.dir"        location="${build.dir}/lib"/>
37    <property name="build.ant.dir"        location="${build.dir}/ant"/>
# Line 51 | Line 43 | ant [target], where target is one of:
43  
44    <!-- Source locations -->
45    <property name="src.dir"              location="${basedir}/src/main"/>
46 +  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
47    <property name="test.src.dir"         location="${basedir}/src/test"/>
48    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
49    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
# Line 67 | Line 60 | ant [target], where target is one of:
60    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
61    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
62  
63 <  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
63 >
64 >
65 >  <!--
66 >   ! Bootclasspath munging for source compilation.
67 >   -->
68 >
69 >  <path id="javac.bootclasspath.prefix">
70 >    <!-- <pathelement location="${src.dir}"/> -->
71 >    <pathelement location="${javac.jar}"/>
72 >  </path>
73  
74    <path id="javac.bootclasspath">
75 +    <!-- <pathelement location="${src.dir}"/> -->
76      <pathelement location="${collect.jar}"/>
77      <pathelement location="${rt.jar}"/>
78    </path>
79  
80 +  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
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="build.bootclasspath.arg"
86 +           value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
87 +
88 +
89 +  <!--
90 +   ! Bootclasspath munging for testing, so JUnit can test our local
91 +   ! modifications to java.*.
92 +   -->
93 +
94    <path id="test.classpath">
95      <pathelement location="${product.jar}"/>
96 +    <pathelement location="${build.testcases.dir}"/>
97 +    <pathelement location="${junit.jar}"/>
98    </path>
99  
100 +  <!-- Flatten test classpath into a platform-appropriate string -->
101 +  <property name="test.classpath" refid="test.classpath"/>
102 +
103 +  <!-- Turn the flattened test classpath into a javac argument -->
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"
120 <          description="Compiles all sources to build folder">
119 >  <target name="compile"
120 >          depends="init"
121 >          description="Compiles main sources to build folder">
122 >
123      <mkdir dir="${build.classes.dir}"/>
124 +
125      <javac srcdir="${src.dir}"
126            destdir="${build.classes.dir}"
127              debug="${build.debug}"
# Line 93 | 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="compile"
142 <          description="Builds library jar from compiled sources">
143 <    <mkdir dir="${build.lib.dir}"/>
105 <    <jar basedir="${build.classes.dir}"
106 <        destfile="${product.jar}"
107 <    />
108 <  </target>
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 1.8 in ${ant.home}/lib)"/>
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"
156              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
157  
# Line 121 | Line 159 | ant [target], where target is one of:
159        <formatter type="plain"/>  <!-- also available: type="xml" -->
160        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
161      </checkstyle>
162 +
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}"/>
171      <mkdir dir="${build.doccheck.dir}"/>
172 +
173      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
174           docletpath="${lib.dir}/doccheck.jar"
175              destdir="${build.doccheck.dir}">
176        <packageset dir="${build.filter.src.dir}"/>
177      </javadoc>
178 +
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}"/>
187      <mkdir dir="${build.javadocs.dir}"/>
188 +
189      <javadoc destdir="${build.javadocs.dir}"
190                  link="http://java.sun.com/j2se/1.4.1/docs/api"
191              overview="${src.dir}/intro.html"
192 <              source="${build.sourcelevel}">
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>
202 +
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
209 <   # signatures to existing methods except for the return value.
162 <   -->
163 <  <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 171 | 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  
238    <target name="clean"
239            description="Removes all build products">
240 +
241      <delete dir="${build.dir}"/>
242      <delete dir="${build.classes.dir}"/>
243      <delete dir="${build.lib.dir}"/>
244 +
245    </target>
246  
247  
248    <target name="dist-clean"
249            description="Removes all build and distribution products">
250 +
251      <delete dir="${dist.dir}"/>
252 +
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, 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  
203  <target name="anthill-publish">
204    <copy todir="${deployDir}/docs/private">
205      <fileset dir="${build.javadocs.dir}"/>
206    </copy>
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>
272    </target>
273  
274  
275 +
276    <!-- Internal targets -->
277  
278    <target name="set-warnings-if" if="build.warnings">
279 <    <property name="build.warnings.option" value="-warnunchecked"/>
279 >
280 >    <property name="build.warnings.arg" value="-warnunchecked"/>
281 >
282    </target>
283  
284  
285    <target name="set-warnings-unless" unless="build.warnings">
286 <    <property name="build.warnings.option" value=""/>
286 >
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="dist-jar" depends="clean, jar">
307 <    <copy file="${product.jar}" todir="${dist.dir}"/>
306 >  <target name="init-jar">
307 >
308 >    <mkdir dir="${build.lib.dir}"/>
309 >
310    </target>
311  
312  
313 <  <target name="dist-docs" depends="filter-src"
314 <          description="Builds javadocs without custom tags to dist folder">
315 <    <delete dir="${dist.javadocs.dir}"/>
245 <    <mkdir dir="${dist.javadocs.dir}"/>
246 <    <javadoc destdir="${dist.javadocs.dir}"
247 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
248 <            overview="${src.dir}/intro.html"
249 <              source="${build.sourcelevel}">
313 >  <target name="native-jar"
314 >          depends="compile"
315 >          unless="build.emulation.true">
316  
317 <      <packageset dir="${build.filter.src.dir}"/>
317 >    <jar destfile="${product.jar}">
318 >      <fileset dir="${build.classes.dir}"/>
319 >    </jar>
320 >
321 >  </target>
322 >
323 >
324 >  <target name="compile-emulation"
325 >          depends="init"
326 >          if="build.emulation.true">
327 >
328 >    <mkdir dir="${build.emulation.dir}"/>
329 >
330 >    <javac srcdir="${emulation.src.dir}"
331 >          destdir="${build.emulation.dir}"
332 >            debug="${build.debug}"
333 >       debuglevel="${build.debuglevel}"
334 >      deprecation="${build.deprecation}"
335 >           source="${build.sourcelevel}"
336 >             fork="true">
337 >
338 >      <bootclasspath refid="javac.bootclasspath"/>
339 >      <compilerarg line="${build.javac.args}"/>
340 >
341 >    </javac>
342  
253    </javadoc>
343    </target>
344  
345  
346 <  <target name="compile-ant-filter" depends="init">
346 >  <target name="emulation-jar"
347 >          depends="compile-emulation"
348 >          if="build.emulation.true">
349 >
350 >
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"
362 >          depends="clean, jar">
363 >
364 >    <copy file="${product.jar}" todir="${dist.dir}"/>
365 >
366 >  </target>
367 >
368 >
369 >  <target name="compile-ant-filter"
370 >          depends="init">
371 >
372      <mkdir dir="${build.ant.dir}"/>
373 +
374      <javac srcdir="${ant.src.dir}"
375            destdir="${build.ant.dir}"
376             source="1.4"
377      />
378 +
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="**/*.html"/>
390 +      </fileset>
391 +    </copy>
392 +
393      <copy todir="${build.filter.src.dir}">
394        <fileset dir="${src.dir}">
395 <        <include name="**/*.java"/>
395 >        <exclude name="**/*.html"/>
396 >        <patternset refid="emulation.excludes"/>
397        </fileset>
398        <filterchain>
399          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 301 | Line 427 | ant [target], where target is one of:
427          </filterreader>
428        </filterchain>
429      </copy>
430 +
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 +
439      <javac srcdir="${test.src.dir}"
440            destdir="${build.testcases.dir}"
441              debug="${build.debug}"
# Line 314 | Line 444 | ant [target], where target is one of:
444             source="${build.sourcelevel}"
445               fork="true">
446  
317      <bootclasspath refid="javac.bootclasspath"/>
318      <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="*"/>
461 >
462      <mkdir dir="${build.reports.dir}"/>
463 +
464      <junit printsummary="true"
465               showoutput="true"
466            errorProperty="junit.failed"
# Line 331 | Line 468 | ant [target], where target is one of:
468                      dir="${build.reports.dir}"
469                     fork="true">
470  
471 <      <!--
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}"/>
471 >      <jvmarg value="${test.bootclasspath.arg}"/>
472  
473        <formatter type="xml"/>
474  
475        <batchtest todir="${build.reports.dir}">
476          <fileset dir="${test.src.dir}">
477 <          <include name="**/*Test.java"/>
477 >          <include name="**/${testcase}Test.java"/>
478          </fileset>
479        </batchtest>
480  
481      </junit>
482 +
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 369 | 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