39 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
40 |
|
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
41 |
|
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
42 |
+ |
<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/> |
43 |
|
|
44 |
|
<!-- Source locations --> |
45 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
133 |
|
|
134 |
|
|
135 |
|
<target name="doccheck" |
136 |
< |
depends="filter-src" |
137 |
< |
description="Reports on javadoc style errors (not working yet)"> |
136 |
> |
depends="filter-doccheck" |
137 |
> |
description="Reports on javadoc style errors"> |
138 |
|
|
139 |
|
<delete dir="${build.doccheck.dir}"/> |
140 |
|
<mkdir dir="${build.doccheck.dir}"/> |
142 |
|
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
143 |
|
docletpath="${lib.dir}/doccheck.jar" |
144 |
|
destdir="${build.doccheck.dir}"> |
145 |
< |
<packageset dir="${build.filter.src.dir}"/> |
145 |
> |
<packageset dir="${build.filter.doccheck.dir}"/> |
146 |
|
</javadoc> |
147 |
|
|
148 |
+ |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
149 |
+ |
|
150 |
|
</target> |
151 |
|
|
152 |
|
|
209 |
|
depends="dist" |
210 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
211 |
|
|
212 |
+ |
<!-- |
213 |
+ |
#keep build dir? - dl |
214 |
|
<delete dir="${build.dir}"/> |
215 |
< |
|
215 |
> |
--> |
216 |
|
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
217 |
|
|
218 |
|
<jar basedir="${basedir}" destfile="${release.jar}"> |
363 |
|
</fileset> |
364 |
|
</copy> |
365 |
|
|
361 |
– |
<!-- Not needed now, used for doccheck filtering: |
362 |
– |
<property name="generic.declarations" |
363 |
– |
value="public interface E {} public interface T {} public interface K {} public interface V {}" |
364 |
– |
/> |
365 |
– |
--> |
366 |
– |
|
366 |
|
<copy todir="${build.filter.src.dir}"> |
367 |
|
<fileset dir="${src.dir}"> |
368 |
|
<exclude name="**/*.html"/> |
402 |
|
<param name="pattern" value="^//@"/> |
403 |
|
<param name="replacement" value=""/> |
404 |
|
</filterreader> |
405 |
+ |
</filterchain> |
406 |
+ |
</copy> |
407 |
+ |
|
408 |
+ |
</target> |
409 |
+ |
|
410 |
+ |
|
411 |
|
|
412 |
|
|
413 |
+ |
<target name="filter-doccheck" |
414 |
+ |
depends="filter-src"> |
415 |
+ |
|
416 |
+ |
<mkdir dir="${build.filter.doccheck.dir}"/> |
417 |
+ |
|
418 |
+ |
<copy todir="${build.filter.doccheck.dir}"> |
419 |
+ |
<fileset dir="${build.filter.src.dir}"> |
420 |
+ |
<include name="**/*.html"/> |
421 |
+ |
</fileset> |
422 |
+ |
</copy> |
423 |
+ |
|
424 |
+ |
<property name="generic.declarations" |
425 |
+ |
value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}" |
426 |
+ |
/> |
427 |
+ |
|
428 |
+ |
<copy todir="${build.filter.doccheck.dir}"> |
429 |
+ |
<fileset dir="${build.filter.src.dir}"> |
430 |
+ |
<exclude name="**/*.html"/> |
431 |
+ |
</fileset> |
432 |
+ |
<filterchain> |
433 |
|
<!-- |
434 |
< |
# The next two filters try to make the source look like |
434 |
> |
# These two filters try to make the source look like |
435 |
|
# something that doccheck can process. The first removes |
436 |
|
# -source 1.4 assertions and the second adds in a bunch |
437 |
|
# of single letter public nested marker interfaces so that |
438 |
|
# the generic type parameters are recognized. |
414 |
– |
# |
415 |
– |
# Currently commented out because doccheck doesn't work. :-( |
439 |
|
--> |
440 |
|
|
418 |
– |
<!-- |
441 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
442 |
|
classpath="${build.ant.dir}"> |
443 |
|
<param name="matching" value="^\s*assert[\s ].*$"/> |
447 |
|
|
448 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
449 |
|
classpath="${build.ant.dir}"> |
450 |
< |
<param name="matching" value="^(.*(class|interface|implements) .*|)\{.*$"/> |
450 |
> |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
451 |
|
<param name="pattern" value="$"/> |
452 |
|
<param name="replacement" value=" ${generic.declarations}"/> |
453 |
|
</filterreader> |
432 |
– |
--> |
454 |
|
|
455 |
|
</filterchain> |
456 |
|
</copy> |
545 |
|
<target name="configure-compiler"> |
546 |
|
|
547 |
|
<property name="gjc.version" |
548 |
< |
value="2.0"/> |
548 |
> |
value="2.2"/> |
549 |
|
|
550 |
|
<condition property="novariance.arg" value="-novariance"> |
551 |
|
<and> |