| 21 |
|
|
| 22 |
|
|
| 23 |
|
<!-- Compilation options --> |
| 24 |
< |
<property name="build.sourcelevel" value="1.5"/> |
| 24 |
> |
<property name="build.sourcelevel" value="1.6"/> |
| 25 |
|
<property name="build.debug" value="true"/> |
| 26 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
| 27 |
|
<property name="build.deprecation" value="false"/> |
| 28 |
|
|
| 29 |
|
<!-- Build locations --> |
| 30 |
< |
<property name="build.dir" location="build"/> |
| 31 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 32 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
| 33 |
< |
<property name="build.j1.dir" location="${build.dir}/j1"/> |
| 34 |
< |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
| 35 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
| 36 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
| 37 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
| 38 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
| 39 |
< |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
| 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.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
| 43 |
< |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
| 30 |
> |
<property name="build.dir" location="build"/> |
| 31 |
> |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 32 |
> |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
| 33 |
> |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
| 34 |
> |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
| 35 |
> |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
| 36 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
| 37 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
| 38 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
| 39 |
|
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
| 40 |
|
|
| 41 |
+ |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
| 42 |
+ |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
| 43 |
+ |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
| 44 |
+ |
|
| 45 |
+ |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
| 46 |
+ |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
| 47 |
+ |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
| 48 |
+ |
|
| 49 |
|
<!-- Source locations --> |
| 50 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
| 51 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
| 50 |
– |
<property name="j1.src.dir" location="${basedir}/src/javaone"/> |
| 52 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
| 53 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
| 54 |
|
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
| 54 |
– |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
| 55 |
– |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
| 55 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
| 56 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
| 57 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
| 58 |
|
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
| 59 |
< |
|
| 59 |
> |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
| 60 |
> |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
| 61 |
> |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
| 62 |
|
<!-- Distribution locations --> |
| 63 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
| 63 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
| 64 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
| 65 |
+ |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
| 66 |
+ |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
| 67 |
|
|
| 68 |
|
<!-- Jar locations --> |
| 69 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
| 70 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
| 71 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
| 72 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
| 73 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
| 69 |
– |
<property name="concurrent.jar" location="${lib.dir}/concurrent.jar"/> |
| 74 |
|
|
| 75 |
|
<!-- Bootclasspath argument --> |
| 76 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
| 86 |
|
<pathelement location="${build.loops.dir}"/> |
| 87 |
|
</path> |
| 88 |
|
|
| 85 |
– |
<!-- J1 classpath --> |
| 86 |
– |
<path id="j1.classpath"> |
| 87 |
– |
<pathelement location="${build.classes.dir}"/> |
| 88 |
– |
<pathelement location="${build.j1.dir}"/> |
| 89 |
– |
<pathelement location="${junit.jar}"/> |
| 90 |
– |
|
| 91 |
– |
<!-- Include dl.u.c for BoundedBuffer comparison --> |
| 92 |
– |
<pathelement location="${concurrent.jar}"/> |
| 93 |
– |
</path> |
| 94 |
– |
|
| 89 |
|
|
| 90 |
|
<!-- Main targets --> |
| 91 |
|
|
| 92 |
+ |
<target name="dists" |
| 93 |
+ |
depends="dist, jsr166xdist, jsr166ydist, extra166ydist" |
| 94 |
+ |
description="Builds all public jars and docs"/> |
| 95 |
|
|
| 96 |
|
<target name="compile" |
| 97 |
|
depends="init, configure-compiler" |
| 108 |
|
fork="true"> |
| 109 |
|
|
| 110 |
|
<include name="**/*.java"/> |
| 111 |
+ |
<compilerarg value="-XDignore.symbol.file"/> |
| 112 |
+ |
|
| 113 |
+ |
<!-- |
| 114 |
|
<exclude name="java/lang/**"/> |
| 115 |
|
<compilerarg line="${build.args}"/> |
| 116 |
+ |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
| 117 |
+ |
--> |
| 118 |
|
|
| 119 |
|
</javac> |
| 120 |
|
|
| 149 |
|
<mkdir dir="${build.javadocs.dir}"/> |
| 150 |
|
|
| 151 |
|
<javadoc destdir="${build.javadocs.dir}" |
| 152 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
| 152 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 153 |
|
overview="${src.dir}/intro.html" |
| 154 |
< |
source="${build.sourcelevel}"> |
| 155 |
< |
|
| 154 |
< |
<tag name="revised" description="Last revised:"/> |
| 155 |
< |
<tag name="spec" description="Specified by:"/> |
| 154 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
| 155 |
> |
> |
| 156 |
|
|
| 157 |
|
<packageset dir="${src.dir}"/> |
| 158 |
|
|
| 162 |
|
|
| 163 |
|
|
| 164 |
|
|
| 165 |
– |
<target name="doccheck" |
| 166 |
– |
depends="filter-doccheck" |
| 167 |
– |
description="Reports on javadoc style errors"> |
| 168 |
– |
|
| 169 |
– |
<delete dir="${build.doccheck.dir}"/> |
| 170 |
– |
<mkdir dir="${build.doccheck.dir}"/> |
| 171 |
– |
|
| 172 |
– |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
| 173 |
– |
docletpath="${lib.dir}/doccheck.jar" |
| 174 |
– |
destdir="${build.doccheck.dir}"> |
| 175 |
– |
<packageset dir="${build.dc-filter.dir}"/> |
| 176 |
– |
</javadoc> |
| 177 |
– |
|
| 178 |
– |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
| 179 |
– |
|
| 180 |
– |
</target> |
| 181 |
– |
|
| 182 |
– |
|
| 183 |
– |
|
| 184 |
– |
<target name="checkstyle" |
| 185 |
– |
depends="filter-src" |
| 186 |
– |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
| 187 |
– |
|
| 188 |
– |
<taskdef resource="checkstyletask.properties" |
| 189 |
– |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
| 190 |
– |
|
| 191 |
– |
<mkdir dir="${build.checkstyle.dir}"/> |
| 192 |
– |
|
| 193 |
– |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
| 194 |
– |
failOnViolation="false"> |
| 195 |
– |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
| 196 |
– |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
| 197 |
– |
</checkstyle> |
| 198 |
– |
|
| 199 |
– |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
| 200 |
– |
out="${build.checkstyle.dir}/checkstyle-report.html" |
| 201 |
– |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
| 202 |
– |
|
| 203 |
– |
</target> |
| 204 |
– |
|
| 205 |
– |
|
| 206 |
– |
|
| 165 |
|
<target name="dist" |
| 166 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
| 167 |
|
description="Puts all distributable products in single hierarchy"/> |
| 168 |
|
|
| 169 |
|
|
| 212 |
– |
|
| 170 |
|
<target name="release" |
| 171 |
|
depends="dist" |
| 172 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
| 214 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
| 215 |
|
|
| 216 |
|
<javadoc destdir="${dist.javadocs.dir}" |
| 217 |
< |
link="http://java.sun.com/j2se/1.4.2/docs/api" |
| 217 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 218 |
|
overview="${src.dir}/intro.html" |
| 262 |
– |
source="${build.sourcelevel}"> |
| 263 |
– |
|
| 264 |
– |
<packageset dir="${src.dir}"/> |
| 219 |
|
|
| 220 |
+ |
sourcepath="${src.dir}:${jdksrc.dir}" |
| 221 |
+ |
> |
| 222 |
+ |
<!-- |
| 223 |
+ |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
| 224 |
+ |
<include name="java/util/concurrent"/> |
| 225 |
+ |
<include name="java/util/concurrent/atomic"/> |
| 226 |
+ |
<include name="java/util/concurrent/locks"/> |
| 227 |
+ |
</packageset> |
| 228 |
+ |
--> |
| 229 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 230 |
+ |
<include name="main/java/util/concurrent/*.java"/> |
| 231 |
+ |
<include name="main/java/util/concurrent/atomic/*.java"/> |
| 232 |
+ |
<include name="main/java/util/concurrent/locks/*.java"/> |
| 233 |
+ |
<include name="main/java/util/*.java"/> |
| 234 |
+ |
<!-- |
| 235 |
+ |
<include name="main/java/util/concurrent/*.html"/> |
| 236 |
+ |
<include name="main/java/util/concurrent/atomic/*.html"/> |
| 237 |
+ |
<include name="main/java/util/concurrent/locks/*.html"/> |
| 238 |
+ |
<include name="main/java/util/*.html"/> |
| 239 |
+ |
--> |
| 240 |
+ |
<!-- <include name="jsr166x/*.java"/> --> |
| 241 |
+ |
</fileset> |
| 242 |
|
</javadoc> |
| 243 |
|
|
| 244 |
|
</target> |
| 266 |
|
</target> |
| 267 |
|
|
| 268 |
|
|
| 293 |
– |
<target name="compile-ant-filter" |
| 294 |
– |
depends="init"> |
| 295 |
– |
|
| 296 |
– |
<mkdir dir="${build.ant.dir}"/> |
| 297 |
– |
|
| 298 |
– |
<javac srcdir="${ant.src.dir}" |
| 299 |
– |
destdir="${build.ant.dir}" |
| 300 |
– |
source="1.4"/> |
| 301 |
– |
|
| 302 |
– |
</target> |
| 303 |
– |
|
| 304 |
– |
|
| 305 |
– |
<target name="filter-src" |
| 306 |
– |
depends="compile-ant-filter"> |
| 307 |
– |
|
| 308 |
– |
<mkdir dir="${build.filter.src.dir}"/> |
| 309 |
– |
|
| 310 |
– |
<copy todir="${build.filter.src.dir}"> |
| 311 |
– |
<fileset dir="${src.dir}"> |
| 312 |
– |
<include name="**/*.html"/> |
| 313 |
– |
</fileset> |
| 314 |
– |
</copy> |
| 315 |
– |
|
| 316 |
– |
<copy todir="${build.filter.src.dir}"> |
| 317 |
– |
<fileset dir="${src.dir}"> |
| 318 |
– |
<exclude name="**/*.html"/> |
| 319 |
– |
<!-- Files excluded from dist-docs --> |
| 320 |
– |
<exclude name="java/util/Random.*"/> |
| 321 |
– |
<exclude name="sun/misc/Unsafe.*"/> |
| 322 |
– |
</fileset> |
| 323 |
– |
<!-- |
| 324 |
– |
<filterchain> |
| 325 |
– |
--> |
| 326 |
– |
|
| 327 |
– |
<!-- |
| 328 |
– |
# This filter gets rid of angle-bracketed type parameters |
| 329 |
– |
# so that javadoc can run on the result. The following |
| 330 |
– |
# heuristic seems to work: |
| 331 |
– |
# |
| 332 |
– |
# For all lines not starting with space(s)-asterisk-space(s), |
| 333 |
– |
# replace <something> with a space, where there may be more |
| 334 |
– |
# than one right angle bracket at the end, and "something" |
| 335 |
– |
# must not contain parens or pipes. (This may need some |
| 336 |
– |
# tweaking.) |
| 337 |
– |
--> |
| 338 |
– |
|
| 339 |
– |
<!-- |
| 340 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 341 |
– |
classpath="${build.ant.dir}"> |
| 342 |
– |
<param name="notmatching" value="^\s+\*\s.*$"/> |
| 343 |
– |
<param name="pattern" value="<[^|>()]+?>+"/> |
| 344 |
– |
<param name="replacement" value=" "/> |
| 345 |
– |
</filterreader> |
| 346 |
– |
--> |
| 347 |
– |
|
| 348 |
– |
<!-- |
| 349 |
– |
</filterchain> |
| 350 |
– |
--> |
| 351 |
– |
</copy> |
| 352 |
– |
|
| 353 |
– |
</target> |
| 354 |
– |
|
| 355 |
– |
|
| 356 |
– |
<target name="filter-doccheck" |
| 357 |
– |
depends="filter-src"> |
| 358 |
– |
|
| 359 |
– |
<mkdir dir="${build.dc-filter.dir}"/> |
| 360 |
– |
|
| 361 |
– |
<copy todir="${build.dc-filter.dir}"> |
| 362 |
– |
<fileset dir="${build.filter.src.dir}"> |
| 363 |
– |
<include name="**/*.html"/> |
| 364 |
– |
</fileset> |
| 365 |
– |
</copy> |
| 366 |
– |
|
| 367 |
– |
<property name="generic.declarations" |
| 368 |
– |
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 {}" |
| 369 |
– |
/> |
| 370 |
– |
|
| 371 |
– |
<copy todir="${build.dc-filter.dir}"> |
| 372 |
– |
<fileset dir="${build.filter.src.dir}"> |
| 373 |
– |
<exclude name="**/*.html"/> |
| 374 |
– |
</fileset> |
| 375 |
– |
<filterchain> |
| 376 |
– |
<!-- |
| 377 |
– |
# These two filters try to make the source look like |
| 378 |
– |
# something that doccheck can process. The first removes |
| 379 |
– |
# -source 1.4 assertions and the second adds in a bunch |
| 380 |
– |
# of single letter public nested marker interfaces so that |
| 381 |
– |
# the generic type parameters are recognized. |
| 382 |
– |
--> |
| 383 |
– |
|
| 384 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 385 |
– |
classpath="${build.ant.dir}"> |
| 386 |
– |
<param name="matching" value="^\s*assert[\s ].*$"/> |
| 387 |
– |
<param name="pattern" value="assert"/> |
| 388 |
– |
<param name="replacement" value="//assert"/> |
| 389 |
– |
</filterreader> |
| 390 |
– |
|
| 391 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 392 |
– |
classpath="${build.ant.dir}"> |
| 393 |
– |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
| 394 |
– |
<param name="pattern" value="$"/> |
| 395 |
– |
<param name="replacement" value=" ${generic.declarations}"/> |
| 396 |
– |
</filterreader> |
| 397 |
– |
|
| 398 |
– |
</filterchain> |
| 399 |
– |
</copy> |
| 400 |
– |
|
| 401 |
– |
</target> |
| 402 |
– |
|
| 403 |
– |
|
| 269 |
|
<target name="compile-tests" |
| 270 |
|
depends="jar"> |
| 271 |
|
|
| 386 |
|
<fileset dir="${build.reports.dir}"> |
| 387 |
|
<include name="TEST-*.xml"/> |
| 388 |
|
</fileset> |
| 389 |
< |
<report styledir="${stylesheet.dir}" |
| 525 |
< |
format="${junit.report.format}" |
| 526 |
< |
todir="${build.reports.dir}" |
| 389 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
| 390 |
|
/> |
| 391 |
|
</junitreport> |
| 392 |
|
|
| 436 |
|
</target> |
| 437 |
|
|
| 438 |
|
|
| 576 |
– |
|
| 577 |
– |
<!-- Anthill targets --> |
| 578 |
– |
|
| 579 |
– |
<target name="anthill-build"> |
| 580 |
– |
|
| 581 |
– |
<!-- Override this in user.properties --> |
| 582 |
– |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
| 583 |
– |
|
| 584 |
– |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
| 585 |
– |
<arg value="-Xmx256000000"/> |
| 586 |
– |
<!-- classpath of new JVM --> |
| 587 |
– |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
| 588 |
– |
<!-- location of Ant home directory --> |
| 589 |
– |
<arg value="-Dant.home=${ant.home}"/> |
| 590 |
– |
<!-- the Ant main class --> |
| 591 |
– |
<arg value="org.apache.tools.ant.Main"/> |
| 592 |
– |
<!-- The build file --> |
| 593 |
– |
<arg value="-buildfile"/> <arg value="build.xml"/> |
| 594 |
– |
<!-- the target to build on the new Ant instance --> |
| 595 |
– |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
| 596 |
– |
<arg value="do-anthill-build"/> |
| 597 |
– |
</exec> |
| 598 |
– |
</target> |
| 599 |
– |
|
| 600 |
– |
<target name="do-anthill-build" |
| 601 |
– |
depends="jar, test, docs, dist-docs"/> |
| 602 |
– |
|
| 603 |
– |
<target name="anthill-publish"> |
| 604 |
– |
|
| 605 |
– |
<copy todir="${deployDir}/docs/private"> |
| 606 |
– |
<fileset dir="${build.javadocs.dir}"/> |
| 607 |
– |
</copy> |
| 608 |
– |
|
| 609 |
– |
<copy todir="${deployDir}/docs/public"> |
| 610 |
– |
<fileset dir="${dist.javadocs.dir}"/> |
| 611 |
– |
</copy> |
| 612 |
– |
|
| 613 |
– |
<copy tofile="${deployDir}/index.html" |
| 614 |
– |
file="${basedir}/etc/anthill-index.html"/> |
| 615 |
– |
|
| 616 |
– |
<copy todir="${deployDir}/notes"> |
| 617 |
– |
<fileset dir="${basedir}/etc/notes"/> |
| 618 |
– |
</copy> |
| 619 |
– |
|
| 620 |
– |
</target> |
| 621 |
– |
|
| 622 |
– |
|
| 623 |
– |
|
| 439 |
|
<!-- Various demos and test programs --> |
| 440 |
|
|
| 441 |
|
|
| 627 |
– |
<target name="sample" depends="init, configure-compiler" |
| 628 |
– |
description="Standalone demo program"> |
| 629 |
– |
|
| 630 |
– |
<mkdir dir="${build.testcases.dir}"/> |
| 631 |
– |
|
| 632 |
– |
<javac srcdir="${test.src.dir}" |
| 633 |
– |
destdir="${build.testcases.dir}" |
| 634 |
– |
debug="${build.debug}" |
| 635 |
– |
debuglevel="${build.debuglevel}" |
| 636 |
– |
deprecation="${build.deprecation}" |
| 637 |
– |
source="${build.sourcelevel}" |
| 638 |
– |
fork="true"> |
| 639 |
– |
|
| 640 |
– |
<include name="jsr166/test/Sample.java"/> |
| 641 |
– |
|
| 642 |
– |
</javac> |
| 643 |
– |
|
| 644 |
– |
<copy todir="${build.testcases.dir}"> |
| 645 |
– |
<fileset dir="${test.src.dir}"> |
| 646 |
– |
<include name="**/*.properties"/> |
| 647 |
– |
</fileset> |
| 648 |
– |
</copy> |
| 649 |
– |
|
| 650 |
– |
|
| 651 |
– |
<java classname="jsr166.test.Sample" fork="true"> |
| 652 |
– |
<classpath refid="test.classpath"/> |
| 653 |
– |
<!-- <jvmarg value="-ea"/> --> |
| 654 |
– |
<!-- <jvmarg value="-server"/> --> |
| 655 |
– |
<!-- <arg value="1000"/> --> |
| 656 |
– |
</java> |
| 657 |
– |
</target> |
| 658 |
– |
|
| 659 |
– |
|
| 442 |
|
<target name="loops" depends="init, configure-compiler" |
| 443 |
|
description="Benchmark from Doug Lea's AQS paper"> |
| 444 |
|
|
| 464 |
|
</target> |
| 465 |
|
|
| 466 |
|
|
| 467 |
< |
<target name="compile-j1" depends="init, configure-compiler, compile"> |
| 467 |
> |
<!-- jsr166x --> |
| 468 |
> |
|
| 469 |
> |
|
| 470 |
> |
<target name="jsr166xcompile" |
| 471 |
> |
depends="init, configure-compiler" |
| 472 |
> |
description="Compiles jsr166x sources"> |
| 473 |
|
|
| 474 |
< |
<mkdir dir="${build.j1.dir}"/> |
| 474 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
| 475 |
|
|
| 476 |
< |
<javac srcdir="${j1.src.dir}" |
| 477 |
< |
destdir="${build.j1.dir}" |
| 476 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
| 477 |
> |
destdir="${build.jsr166x.dir}" |
| 478 |
|
debug="${build.debug}" |
| 479 |
|
debuglevel="${build.debuglevel}" |
| 480 |
|
deprecation="${build.deprecation}" |
| 481 |
< |
source="${build.sourcelevel}" > |
| 481 |
> |
source="${build.sourcelevel}" |
| 482 |
> |
fork="true"> |
| 483 |
|
|
| 484 |
|
<include name="**/*.java"/> |
| 697 |
– |
<exclude name="**/dijkstra/**"/> |
| 698 |
– |
|
| 485 |
|
<compilerarg line="${build.args}"/> |
| 700 |
– |
<classpath refid="j1.classpath"/> |
| 486 |
|
|
| 487 |
|
</javac> |
| 488 |
|
|
| 489 |
|
</target> |
| 490 |
|
|
| 491 |
|
|
| 707 |
– |
<target name="sw" depends="compile-j1" |
| 708 |
– |
description="Runs the SwingWorker demo"> |
| 492 |
|
|
| 493 |
< |
<!-- |
| 494 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
| 495 |
< |
<classpath refid="j1.classpath"/> |
| 713 |
< |
</java> |
| 714 |
< |
--> |
| 493 |
> |
<target name="jsr166xjar" |
| 494 |
> |
depends="jsr166xcompile" |
| 495 |
> |
description="Builds library jar from compiled sources"> |
| 496 |
|
|
| 497 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
| 497 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
| 498 |
|
|
| 499 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
| 500 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
| 501 |
< |
</exec> |
| 499 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
| 500 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
| 501 |
> |
</jar> |
| 502 |
|
|
| 503 |
|
</target> |
| 504 |
|
|
| 724 |
– |
<target name="j1" depends="compile-j1" |
| 725 |
– |
description="Runs a standalone JavaOne program"> |
| 505 |
|
|
| 727 |
– |
<java classname="${j1.test}" fork="true"> |
| 728 |
– |
<classpath refid="j1.classpath"/> |
| 729 |
– |
<jvmarg value="-client"/> |
| 506 |
|
|
| 507 |
< |
<!-- TestPseudoRandom args --> |
| 508 |
< |
<arg value="2"/> |
| 733 |
< |
<arg value="25"/> |
| 734 |
< |
<arg value="100000"/> |
| 735 |
< |
|
| 736 |
< |
<!-- WebCrawler args --> |
| 737 |
< |
<!-- |
| 738 |
< |
<arg value="jsr166.webcrawler.WebCrawler3"/> |
| 739 |
< |
<arg value="http://www.priorartisans.com"/> |
| 740 |
< |
<arg value="25"/> |
| 741 |
< |
--> |
| 507 |
> |
<target name="jsr166xdocs" |
| 508 |
> |
description="Builds javadocs with custom tags to build folder"> |
| 509 |
|
|
| 510 |
< |
</java> |
| 510 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
| 511 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
| 512 |
|
|
| 513 |
< |
</target> |
| 513 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
| 514 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 515 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 516 |
> |
> |
| 517 |
> |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 518 |
> |
<include name="jsr166x"/> |
| 519 |
> |
</packageset> |
| 520 |
|
|
| 521 |
|
|
| 522 |
< |
<target name="test-j1" depends="compile-j1" |
| 749 |
< |
description="Runs testcases from the JavaOne source directories"> |
| 522 |
> |
</javadoc> |
| 523 |
|
|
| 524 |
< |
<junit printsummary="true" |
| 752 |
< |
showoutput="true" |
| 753 |
< |
errorProperty="junit.failed" |
| 754 |
< |
failureProperty="junit.failed" |
| 755 |
< |
dir="${build.j1.dir}" |
| 756 |
< |
fork="true"> |
| 524 |
> |
</target> |
| 525 |
|
|
| 758 |
– |
<!-- <jvmarg value="-server"/> --> |
| 759 |
– |
<classpath refid="j1.classpath"/> |
| 760 |
– |
<formatter type="xml"/> |
| 526 |
|
|
| 527 |
< |
<batchtest todir="${build.j1.dir}"> |
| 528 |
< |
<fileset dir="${j1.src.dir}"> |
| 529 |
< |
<include name="**/*Test.java"/> |
| 765 |
< |
</fileset> |
| 766 |
< |
</batchtest> |
| 527 |
> |
<target name="jsr166xdist" |
| 528 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
| 529 |
> |
description="Puts all distributable products in single hierarchy"/> |
| 530 |
|
|
| 768 |
– |
</junit> |
| 531 |
|
|
| 770 |
– |
<available property="junit.report.format" |
| 771 |
– |
value="frames" |
| 772 |
– |
classname="org.apache.xalan.lib.Redirect"/> |
| 773 |
– |
<property name="junit.report.format" value="noframes"/> |
| 532 |
|
|
| 533 |
< |
<junitreport todir="${build.j1.dir}"> |
| 534 |
< |
<fileset dir="${build.j1.dir}"> |
| 777 |
< |
<include name="TEST-*.xml"/> |
| 778 |
< |
</fileset> |
| 779 |
< |
<report styledir="${stylesheet.dir}" |
| 780 |
< |
format="${junit.report.format}" |
| 781 |
< |
todir="${build.j1.dir}" |
| 782 |
< |
/> |
| 783 |
< |
</junitreport> |
| 533 |
> |
<target name="jsr166xclean" |
| 534 |
> |
description="Removes all build products"> |
| 535 |
|
|
| 536 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
| 536 |
> |
<delete dir="${build.jsr166x.dir}"/> |
| 537 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
| 538 |
|
|
| 539 |
|
</target> |
| 540 |
|
|
| 541 |
|
|
| 542 |
|
|
| 543 |
< |
<!-- C++ and JNI definitions and demos --> |
| 543 |
> |
<target name="jsr166xdist-clean" |
| 544 |
> |
description="Removes all build and distribution products"> |
| 545 |
|
|
| 546 |
< |
<target name="configure-cpp"> |
| 546 |
> |
</target> |
| 547 |
|
|
| 795 |
– |
<!-- Define tasks and types --> |
| 548 |
|
|
| 797 |
– |
<path id="cpptasks.path"> |
| 798 |
– |
<pathelement location="${lib.dir}/cpptasks.jar"/> |
| 799 |
– |
</path> |
| 800 |
– |
<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/> |
| 801 |
– |
<typedef resource="cpptasks.types" classpathref="cpptasks.path"/> |
| 549 |
|
|
| 550 |
< |
<!-- Set platform property for JNI includes --> |
| 550 |
> |
<target name="jsr166xdist-docs" |
| 551 |
> |
description="Builds javadocs without custom tags to dist folder"> |
| 552 |
|
|
| 553 |
< |
<condition property="platform" value="linux"> |
| 554 |
< |
<os name="Linux"/> |
| 807 |
< |
</condition> |
| 808 |
< |
<condition property="platform" value="win32"> |
| 809 |
< |
<os family="windows"/> |
| 810 |
< |
</condition> |
| 811 |
< |
<condition property="platform" value="solaris"> |
| 812 |
< |
<os name="SunOS"/> |
| 813 |
< |
</condition> |
| 553 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
| 554 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
| 555 |
|
|
| 556 |
< |
</target> |
| 556 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
| 557 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 558 |
> |
source="${build.sourcelevel}"> |
| 559 |
|
|
| 560 |
+ |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 561 |
+ |
<include name="jsr166x"/> |
| 562 |
+ |
</packageset> |
| 563 |
|
|
| 564 |
< |
<target name="cppdemo" depends="configure-cpp"> |
| 564 |
> |
</javadoc> |
| 565 |
|
|
| 566 |
< |
<mkdir dir="${build.dir}"/> |
| 566 |
> |
</target> |
| 567 |
|
|
| 568 |
< |
<cc multithreaded="true" |
| 569 |
< |
name="g++" |
| 824 |
< |
objdir="${build.dir}" |
| 825 |
< |
outfile="${build.dir}/CppDemo"> |
| 826 |
< |
<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/> |
| 827 |
< |
<libset libs="stdc++"/> |
| 828 |
< |
</cc> |
| 568 |
> |
<target name="jsr166xdist-jar" |
| 569 |
> |
depends="jsr166xclean, jsr166xjar"> |
| 570 |
|
|
| 571 |
< |
<exec executable="${build.dir}/CppDemo"> |
| 831 |
< |
<arg line="count in word frequency of word in command line count"/> |
| 832 |
< |
</exec> |
| 571 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
| 572 |
|
|
| 573 |
|
</target> |
| 574 |
|
|
| 575 |
+ |
<!-- jsr166y --> |
| 576 |
|
|
| 837 |
– |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
| 577 |
|
|
| 578 |
< |
<mkdir dir="${build.testcases.dir}"/> |
| 578 |
> |
<target name="jsr166ycompile" |
| 579 |
> |
depends="init, configure-compiler" |
| 580 |
> |
description="Compiles jsr166y sources"> |
| 581 |
|
|
| 582 |
< |
<javac srcdir="${test.src.dir}" |
| 583 |
< |
destdir="${build.testcases.dir}" |
| 582 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
| 583 |
> |
|
| 584 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
| 585 |
> |
destdir="${build.jsr166y.dir}" |
| 586 |
|
debug="${build.debug}" |
| 587 |
|
debuglevel="${build.debuglevel}" |
| 588 |
|
deprecation="${build.deprecation}" |
| 589 |
|
source="${build.sourcelevel}" |
| 590 |
|
fork="true"> |
| 591 |
< |
<compilerarg value="${bootclasspath.args}"/> |
| 591 |
> |
|
| 592 |
> |
<include name="**/*.java"/> |
| 593 |
|
<compilerarg line="${build.args}"/> |
| 594 |
< |
<classpath refid="test.classpath"/> |
| 851 |
< |
<include name="JniDemo.java"/> |
| 852 |
< |
</javac> |
| 594 |
> |
<compilerarg value="${bootclasspath.args}"/> |
| 595 |
|
|
| 596 |
< |
<javah destdir="${build.testcases.dir}" |
| 597 |
< |
classpathref="test.classpath"> |
| 598 |
< |
<class name="JniDemo"/> |
| 857 |
< |
</javah> |
| 858 |
< |
|
| 859 |
< |
<cc multithreaded="true" |
| 860 |
< |
name="g++" |
| 861 |
< |
objdir="${build.dir}" |
| 862 |
< |
outfile="${build.dir}/JniDemo" |
| 863 |
< |
outtype="shared"> |
| 864 |
< |
|
| 865 |
< |
<compiler> |
| 866 |
< |
<defineset> |
| 867 |
< |
<define name="__int64" value="long long"/> |
| 868 |
< |
</defineset> |
| 869 |
< |
<includepath location="${java.home}/../include"/> |
| 870 |
< |
<includepath location="${java.home}/../include/${platform}"/> |
| 871 |
< |
<compilerarg value="-mno-cygwin"/> |
| 872 |
< |
</compiler> |
| 873 |
< |
|
| 874 |
< |
<linker> |
| 875 |
< |
<linkerarg value="--add-stdcall-alias"/> |
| 876 |
< |
</linker> |
| 877 |
< |
|
| 878 |
< |
<includepath location="${build.testcases.dir}"/> |
| 879 |
< |
|
| 880 |
< |
<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/> |
| 881 |
< |
|
| 882 |
< |
<libset libs="stdc++"/> |
| 883 |
< |
|
| 884 |
< |
</cc> |
| 885 |
< |
|
| 886 |
< |
<!-- Necessary if windows, harmless if not --> |
| 887 |
< |
<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/> |
| 888 |
< |
|
| 889 |
< |
<java classname="JniDemo" fork="true"> |
| 890 |
< |
<!-- Watch out: path separator hardwired to semicolon here! --> |
| 891 |
< |
<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/> |
| 892 |
< |
<classpath refid="test.classpath"/> |
| 893 |
< |
<arg line="count in word frequency of word in command line count"/> |
| 894 |
< |
</java> |
| 596 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 597 |
> |
|
| 598 |
> |
</javac> |
| 599 |
|
|
| 600 |
|
</target> |
| 601 |
|
|
| 602 |
|
|
| 603 |
|
|
| 604 |
< |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
| 604 |
> |
<target name="jsr166yjar" |
| 605 |
> |
depends="jsr166ycompile" |
| 606 |
> |
description="Builds library jar from compiled sources"> |
| 607 |
> |
|
| 608 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
| 609 |
> |
|
| 610 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
| 611 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
| 612 |
> |
</jar> |
| 613 |
> |
|
| 614 |
> |
</target> |
| 615 |
> |
|
| 616 |
|
|
| 617 |
|
|
| 618 |
+ |
<target name="jsr166ydocs" |
| 619 |
+ |
description="Builds javadocs with custom tags to build folder"> |
| 620 |
|
|
| 621 |
< |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
| 622 |
< |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
| 906 |
< |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
| 907 |
< |
<property name="pretiger.sourcelevel" value="1.4"/> |
| 621 |
> |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
| 622 |
> |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
| 623 |
|
|
| 624 |
< |
<target name="defang" |
| 625 |
< |
depends="init" |
| 626 |
< |
description="Generates pre-Tiger compatible source"> |
| 624 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
| 625 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 626 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 627 |
> |
> |
| 628 |
> |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
| 629 |
> |
<include name="jsr166y"/> |
| 630 |
> |
</packageset> |
| 631 |
|
|
| 913 |
– |
<delete dir="${pretiger.src.dir}"/> |
| 914 |
– |
<mkdir dir="${pretiger.src.dir}"/> |
| 632 |
|
|
| 633 |
< |
<exec executable="perl"> |
| 917 |
< |
<arg file="etc/defang.pl"/> |
| 918 |
< |
<!-- <arg value="-v"/> --> |
| 919 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
| 920 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
| 921 |
< |
</exec> |
| 633 |
> |
</javadoc> |
| 634 |
|
|
| 635 |
|
</target> |
| 636 |
|
|
| 925 |
– |
<target name="compile-pretiger" |
| 926 |
– |
depends="init, configure-compiler, defang" |
| 927 |
– |
description="Compiles pre-Tiger sources to build folder"> |
| 637 |
|
|
| 638 |
< |
<mkdir dir="${build.pretiger.dir}"/> |
| 638 |
> |
<target name="jsr166ydist" |
| 639 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
| 640 |
> |
description="Puts all distributable products in single hierarchy"/> |
| 641 |
|
|
| 931 |
– |
<javac srcdir="${pretiger.src.dir}" |
| 932 |
– |
destdir="${build.pretiger.dir}" |
| 933 |
– |
debug="${build.debug}" |
| 934 |
– |
debuglevel="${build.debuglevel}" |
| 935 |
– |
deprecation="${build.deprecation}" |
| 936 |
– |
source="${pretiger.sourcelevel}" |
| 937 |
– |
fork="true"> |
| 642 |
|
|
| 939 |
– |
<compilerarg line="${build.args}"/> |
| 940 |
– |
<exclude name="**/Thread.java"/> |
| 643 |
|
|
| 644 |
< |
</javac> |
| 644 |
> |
<target name="jsr166yclean" |
| 645 |
> |
description="Removes all build products"> |
| 646 |
> |
|
| 647 |
> |
<delete dir="${build.jsr166y.dir}"/> |
| 648 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
| 649 |
|
|
| 650 |
|
</target> |
| 651 |
|
|
| 946 |
– |
<target name="pretiger" depends="compile-pretiger"> |
| 652 |
|
|
| 948 |
– |
<mkdir dir="${build.lib.dir}"/> |
| 653 |
|
|
| 654 |
< |
<jar destfile="${pretiger.jar}"> |
| 655 |
< |
<fileset dir="${build.pretiger.dir}"> |
| 952 |
< |
</fileset> |
| 953 |
< |
</jar> |
| 654 |
> |
<target name="jsr166ydist-clean" |
| 655 |
> |
description="Removes all build and distribution products"> |
| 656 |
|
|
| 657 |
|
</target> |
| 658 |
|
|
| 659 |
< |
<!-- jsr166x --> |
| 659 |
> |
<target name="jsr166ydist-docs" |
| 660 |
> |
description="Builds javadocs without custom tags to dist folder"> |
| 661 |
|
|
| 662 |
+ |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
| 663 |
+ |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
| 664 |
|
|
| 665 |
< |
<target name="jsr166xcompile" |
| 666 |
< |
depends="init, configure-compiler" |
| 667 |
< |
description="Compiles jsr166x sources"> |
| 665 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
| 666 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 667 |
> |
source="${build.sourcelevel}" |
| 668 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 669 |
> |
> |
| 670 |
> |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 671 |
> |
<include name="jsr166y/*.java"/> |
| 672 |
> |
</fileset> |
| 673 |
> |
</javadoc> |
| 674 |
|
|
| 675 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
| 675 |
> |
</target> |
| 676 |
|
|
| 677 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
| 678 |
< |
destdir="${build.jsr166x.dir}" |
| 677 |
> |
<target name="jsr166ydist-jar" |
| 678 |
> |
depends="jsr166yclean, jsr166yjar"> |
| 679 |
> |
|
| 680 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
| 681 |
> |
|
| 682 |
> |
</target> |
| 683 |
> |
|
| 684 |
> |
<!-- extra166y --> |
| 685 |
> |
|
| 686 |
> |
|
| 687 |
> |
<target name="extra166ycompile" |
| 688 |
> |
depends="init, configure-compiler, jsr166ycompile" |
| 689 |
> |
description="Compiles extra166y sources"> |
| 690 |
> |
|
| 691 |
> |
<mkdir dir="${build.extra166y.dir}"/> |
| 692 |
> |
|
| 693 |
> |
<javac srcdir="${extra166ysrc.dir}" |
| 694 |
> |
destdir="${build.extra166y.dir}" |
| 695 |
|
debug="${build.debug}" |
| 696 |
+ |
classpath="${jsr166yproduct.jar}" |
| 697 |
|
debuglevel="${build.debuglevel}" |
| 698 |
|
deprecation="${build.deprecation}" |
| 699 |
|
source="${build.sourcelevel}" |
| 701 |
|
|
| 702 |
|
<include name="**/*.java"/> |
| 703 |
|
<compilerarg line="${build.args}"/> |
| 704 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
| 705 |
+ |
|
| 706 |
+ |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 707 |
|
|
| 708 |
|
</javac> |
| 709 |
|
|
| 711 |
|
|
| 712 |
|
|
| 713 |
|
|
| 714 |
< |
<target name="jsr166xjar" |
| 715 |
< |
depends="jsr166xcompile" |
| 714 |
> |
<target name="extra166yjar" |
| 715 |
> |
depends="extra166ycompile" |
| 716 |
|
description="Builds library jar from compiled sources"> |
| 717 |
|
|
| 718 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
| 718 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
| 719 |
|
|
| 720 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
| 721 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
| 720 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
| 721 |
> |
<fileset dir="${build.extra166y.dir}"/> |
| 722 |
|
</jar> |
| 723 |
|
|
| 724 |
|
</target> |
| 725 |
|
|
| 726 |
|
|
| 727 |
|
|
| 728 |
< |
<target name="jsr166xdocs" |
| 728 |
> |
<target name="extra166ydocs" |
| 729 |
|
description="Builds javadocs with custom tags to build folder"> |
| 730 |
|
|
| 731 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
| 732 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
| 731 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
| 732 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
| 733 |
|
|
| 734 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
| 735 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
| 734 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
| 735 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 736 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 737 |
|
> |
| 738 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 739 |
< |
<include name="jsr166x"/> |
| 738 |
> |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
| 739 |
> |
<include name="extra166y"/> |
| 740 |
|
</packageset> |
| 741 |
|
|
| 742 |
|
|
| 745 |
|
</target> |
| 746 |
|
|
| 747 |
|
|
| 748 |
< |
<target name="jsr166xdist" |
| 749 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
| 748 |
> |
<target name="extra166ydist" |
| 749 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
| 750 |
|
description="Puts all distributable products in single hierarchy"/> |
| 751 |
|
|
| 752 |
|
|
| 753 |
|
|
| 754 |
< |
<target name="jsr166xclean" |
| 754 |
> |
<target name="extra166yclean" |
| 755 |
|
description="Removes all build products"> |
| 756 |
|
|
| 757 |
< |
<delete dir="${build.jsr166x.dir}"/> |
| 758 |
< |
<delete dir="${build.jsr166xlib.dir}"/> |
| 757 |
> |
<delete dir="${build.extra166y.dir}"/> |
| 758 |
> |
<delete dir="${build.extra166ylib.dir}"/> |
| 759 |
|
|
| 760 |
|
</target> |
| 761 |
|
|
| 762 |
|
|
| 763 |
|
|
| 764 |
< |
<target name="jsr166xdist-clean" |
| 764 |
> |
<target name="extra166ydist-clean" |
| 765 |
|
description="Removes all build and distribution products"> |
| 766 |
|
|
| 767 |
|
</target> |
| 768 |
|
|
| 769 |
< |
|
| 1038 |
< |
|
| 1039 |
< |
<target name="jsr166xdist-docs" |
| 769 |
> |
<target name="extra166ydist-docs" |
| 770 |
|
description="Builds javadocs without custom tags to dist folder"> |
| 771 |
|
|
| 772 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
| 773 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
| 1044 |
< |
|
| 1045 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
| 1046 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
| 1047 |
< |
source="${build.sourcelevel}"> |
| 1048 |
< |
|
| 1049 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 1050 |
< |
<include name="jsr166x"/> |
| 1051 |
< |
</packageset> |
| 772 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
| 773 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
| 774 |
|
|
| 775 |
+ |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
| 776 |
+ |
link="http://java.sun.com/javase/6/docs/api/" |
| 777 |
+ |
source="${build.sourcelevel}" |
| 778 |
+ |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 779 |
+ |
> |
| 780 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 781 |
+ |
<include name="extra166y/*.java"/> |
| 782 |
+ |
</fileset> |
| 783 |
|
</javadoc> |
| 784 |
|
|
| 785 |
|
</target> |
| 786 |
|
|
| 787 |
< |
<target name="jsr166xdist-jar" |
| 788 |
< |
depends="jsr166xclean, jsr166xjar"> |
| 787 |
> |
<target name="extra166ydist-jar" |
| 788 |
> |
depends="extra166yclean, extra166yjar"> |
| 789 |
|
|
| 790 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
| 790 |
> |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
| 791 |
|
|
| 792 |
|
</target> |
| 793 |
|
|
