| 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 |
|
</target> |
| 207 |
|
depends="dist" |
| 208 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
| 209 |
|
|
| 210 |
+ |
<!-- |
| 211 |
+ |
#keep build dir? - dl |
| 212 |
|
<delete dir="${build.dir}"/> |
| 213 |
< |
|
| 213 |
> |
--> |
| 214 |
|
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
| 215 |
|
|
| 216 |
|
<jar basedir="${basedir}" destfile="${release.jar}"> |
| 218 |
|
<exclude name="user.properties"/> |
| 219 |
|
<exclude name="etc/notes/**"/> |
| 220 |
|
<exclude name="lib/gjc/2.1/**"/> |
| 221 |
+ |
<exclude name="**/SyntaxTest.java"/> |
| 222 |
|
</jar> |
| 223 |
|
|
| 224 |
|
</target> |
| 361 |
|
</fileset> |
| 362 |
|
</copy> |
| 363 |
|
|
| 360 |
– |
<!-- Not needed now, used for doccheck filtering: |
| 361 |
– |
<property name="generic.declarations" |
| 362 |
– |
value="public interface E {} public interface T {} public interface K {} public interface V {}" |
| 363 |
– |
/> |
| 364 |
– |
--> |
| 365 |
– |
|
| 364 |
|
<copy todir="${build.filter.src.dir}"> |
| 365 |
|
<fileset dir="${src.dir}"> |
| 366 |
|
<exclude name="**/*.html"/> |
| 400 |
|
<param name="pattern" value="^//@"/> |
| 401 |
|
<param name="replacement" value=""/> |
| 402 |
|
</filterreader> |
| 403 |
+ |
</filterchain> |
| 404 |
+ |
</copy> |
| 405 |
+ |
|
| 406 |
+ |
</target> |
| 407 |
+ |
|
| 408 |
+ |
|
| 409 |
|
|
| 410 |
|
|
| 411 |
+ |
<target name="filter-doccheck" |
| 412 |
+ |
depends="filter-src"> |
| 413 |
+ |
|
| 414 |
+ |
<mkdir dir="${build.filter.doccheck.dir}"/> |
| 415 |
+ |
|
| 416 |
+ |
<copy todir="${build.filter.doccheck.dir}"> |
| 417 |
+ |
<fileset dir="${build.filter.src.dir}"> |
| 418 |
+ |
<include name="**/*.html"/> |
| 419 |
+ |
</fileset> |
| 420 |
+ |
</copy> |
| 421 |
+ |
|
| 422 |
+ |
<property name="generic.declarations" |
| 423 |
+ |
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 {}" |
| 424 |
+ |
/> |
| 425 |
+ |
|
| 426 |
+ |
<copy todir="${build.filter.doccheck.dir}"> |
| 427 |
+ |
<fileset dir="${build.filter.src.dir}"> |
| 428 |
+ |
<exclude name="**/*.html"/> |
| 429 |
+ |
</fileset> |
| 430 |
+ |
<filterchain> |
| 431 |
|
<!-- |
| 432 |
< |
# The next two filters try to make the source look like |
| 432 |
> |
# These two filters try to make the source look like |
| 433 |
|
# something that doccheck can process. The first removes |
| 434 |
|
# -source 1.4 assertions and the second adds in a bunch |
| 435 |
|
# of single letter public nested marker interfaces so that |
| 436 |
|
# the generic type parameters are recognized. |
| 413 |
– |
# |
| 414 |
– |
# Currently commented out because doccheck doesn't work. :-( |
| 437 |
|
--> |
| 438 |
|
|
| 417 |
– |
<!-- |
| 439 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 440 |
|
classpath="${build.ant.dir}"> |
| 441 |
|
<param name="matching" value="^\s*assert[\s ].*$"/> |
| 445 |
|
|
| 446 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 447 |
|
classpath="${build.ant.dir}"> |
| 448 |
< |
<param name="matching" value="^(.*(class|interface|implements) .*|)\{.*$"/> |
| 448 |
> |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
| 449 |
|
<param name="pattern" value="$"/> |
| 450 |
|
<param name="replacement" value=" ${generic.declarations}"/> |
| 451 |
|
</filterreader> |
| 431 |
– |
--> |
| 452 |
|
|
| 453 |
|
</filterchain> |
| 454 |
|
</copy> |
| 543 |
|
<target name="configure-compiler"> |
| 544 |
|
|
| 545 |
|
<property name="gjc.version" |
| 546 |
< |
value="2.0"/> |
| 546 |
> |
value="2.2"/> |
| 547 |
|
|
| 548 |
|
<condition property="novariance.arg" value="-novariance"> |
| 549 |
|
<and> |
