| 8 |
|
|
| 9 |
|
User-specific settings are read from user.properties. |
| 10 |
|
See user.properties.sample for an explanation of some useful settings. |
| 11 |
+ |
|
| 12 |
+ |
The repository contains all dependencies except for ant and the JDK |
| 13 |
+ |
itself. Because the JDK version matters and because different |
| 14 |
+ |
targets require different JDKs, we assume that users have created a |
| 15 |
+ |
hierarchy containing: |
| 16 |
+ |
$HOME/jdk/jdk6 |
| 17 |
+ |
$HOME/jdk/jdk7 |
| 18 |
+ |
$HOME/jdk/jdk8 |
| 19 |
+ |
where each of the above is a JDK or a symlink to same, and |
| 20 |
+ |
$HOME/jdk/src/jdk6 |
| 21 |
+ |
$HOME/jdk/src/jdk7 |
| 22 |
+ |
$HOME/jdk/src/jdk8 |
| 23 |
+ |
where each of the above is a complete JDK source tree |
| 24 |
+ |
(e.g. mercurial forest) or a symlink to same. |
| 25 |
|
------------------------------------------------------------------------------ |
| 26 |
|
</description> |
| 27 |
|
|
| 46 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
| 47 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
| 48 |
|
<property name="build.lib.dir" location="${build.dir}/lib"/> |
| 35 |
– |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
| 49 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
| 50 |
|
|
| 51 |
< |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
| 52 |
< |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
| 53 |
< |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
| 54 |
< |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
| 51 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/4jdk7"/> |
| 52 |
> |
<property name="build.4jdk7.lib.dir" location="${build.4jdk7.dir}"/> |
| 53 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
| 54 |
> |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/> |
| 55 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
| 56 |
|
|
| 57 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
| 58 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
| 45 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
| 59 |
|
|
| 60 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
| 61 |
|
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
| 49 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
| 62 |
|
|
| 63 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
| 64 |
|
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
| 53 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
| 65 |
|
|
| 66 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
| 67 |
|
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
| 57 |
– |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
| 68 |
|
|
| 69 |
|
<!-- JDK binary locations --> |
| 70 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
| 72 |
|
<macrodef name="defjdklocations"> |
| 73 |
|
<attribute name="v"/> |
| 74 |
|
<sequential> |
| 75 |
< |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
| 76 |
< |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
| 77 |
< |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
| 78 |
< |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
| 79 |
< |
<property name="bootclasspath@{v}" |
| 75 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
| 76 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
| 77 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
| 78 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
| 79 |
> |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
| 80 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
| 81 |
> |
<property name="bootclasspath@{v}" |
| 82 |
|
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
| 83 |
|
</sequential> |
| 84 |
|
</macrodef> |
| 87 |
|
<defjdklocations v="7"/> |
| 88 |
|
<defjdklocations v="8"/> |
| 89 |
|
|
| 90 |
+ |
<macrodef name="run-tck-tests"> |
| 91 |
+ |
<attribute name="jvm"/> |
| 92 |
+ |
<attribute name="tck.classes"/> |
| 93 |
+ |
<attribute name="product.jar" default="${product.jar}"/> |
| 94 |
+ |
<attribute name="jvmflags" default=""/> |
| 95 |
+ |
<sequential> |
| 96 |
+ |
<java classname="JSR166TestCase" |
| 97 |
+ |
jvm="@{jvm}" fork="true"> |
| 98 |
+ |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
| 99 |
+ |
<jvmarg line="@{jvmflags}"/> |
| 100 |
+ |
<classpath> |
| 101 |
+ |
<pathelement location="${junit.jar}"/> |
| 102 |
+ |
<pathelement location="@{tck.classes}"/> |
| 103 |
+ |
</classpath> |
| 104 |
+ |
</java> |
| 105 |
+ |
</sequential> |
| 106 |
+ |
</macrodef> |
| 107 |
+ |
|
| 108 |
|
<!-- Source locations --> |
| 109 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
| 110 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
| 114 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
| 115 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
| 116 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
| 117 |
< |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
| 117 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
| 118 |
|
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
| 119 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
| 120 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
| 122 |
|
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
| 123 |
|
|
| 124 |
|
<!-- Distribution locations --> |
| 125 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
| 126 |
< |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
| 127 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
| 128 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
| 129 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
| 130 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
| 125 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
| 126 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
| 127 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
| 128 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
| 129 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
| 130 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
| 131 |
|
|
| 132 |
|
<!-- Jar locations --> |
| 133 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
| 134 |
< |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
| 135 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
| 136 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
| 137 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
| 138 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
| 139 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
| 133 |
> |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
| 134 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
| 135 |
> |
<property name="jsr166x.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
| 136 |
> |
<property name="jsr166y.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
| 137 |
> |
<property name="jsr166e.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
| 138 |
> |
<property name="extra166y.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
| 139 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
| 140 |
|
|
| 141 |
|
<!-- Bootclasspath argument --> |
| 142 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
| 149 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
| 150 |
|
<!-- The below does not yet exist as of 2012-11 --> |
| 151 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
| 152 |
+ |
|
| 153 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
| 154 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
| 155 |
|
|
| 156 |
|
<!-- Test classpath --> |
| 164 |
|
<pathelement location="${build.loops.dir}"/> |
| 165 |
|
</path> |
| 166 |
|
|
| 167 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
| 168 |
+ |
<!-- TODO: How do we get &trade to work? --> |
| 169 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
| 170 |
+ |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
| 171 |
+ |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
| 172 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
| 173 |
|
|
| 174 |
|
<!-- Main targets --> |
| 175 |
|
|
| 176 |
|
<target name="dists" |
| 177 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
| 177 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
| 178 |
|
description="Builds all public jars and docs"/> |
| 179 |
|
|
| 180 |
|
<target name="compile" |
| 181 |
< |
depends="init, configure-compiler" |
| 182 |
< |
description="Compiles main sources to build folder"> |
| 181 |
> |
depends="configure-compiler" |
| 182 |
> |
description="Compiles src/main sources to build dir"> |
| 183 |
|
|
| 184 |
|
<mkdir dir="${build.classes.dir}"/> |
| 185 |
|
|
| 186 |
|
<javac srcdir="${src.dir}" |
| 187 |
< |
destdir="${build.classes.dir}" |
| 188 |
< |
debug="${build.debug}" |
| 189 |
< |
debuglevel="${build.debuglevel}" |
| 190 |
< |
deprecation="${build.deprecation}" |
| 191 |
< |
source="${build.sourcelevel}" |
| 192 |
< |
fork="true"> |
| 187 |
> |
destdir="${build.classes.dir}" |
| 188 |
> |
debug="${build.debug}" |
| 189 |
> |
debuglevel="${build.debuglevel}" |
| 190 |
> |
deprecation="${build.deprecation}" |
| 191 |
> |
classpath="" |
| 192 |
> |
includeAntRuntime="false" |
| 193 |
> |
includeJavaRuntime="false" |
| 194 |
> |
executable="${javac8}" |
| 195 |
> |
fork="true"> |
| 196 |
|
|
| 197 |
|
<include name="**/*.java"/> |
| 198 |
+ |
<compilerarg line="${build.args}"/> |
| 199 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 200 |
+ |
<compilerarg value="-Xlint:all"/> |
| 201 |
|
|
| 202 |
|
<!-- |
| 203 |
|
<exclude name="java/lang/**"/> |
| 226 |
|
|
| 227 |
|
|
| 228 |
|
<target name="test" |
| 229 |
< |
depends="init, configure-tests, report-tests" |
| 229 |
> |
depends="configure-tests, report-tests" |
| 230 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
| 231 |
|
|
| 232 |
|
|
| 233 |
|
|
| 234 |
|
<target name="docs" |
| 235 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 235 |
> |
description="Builds javadocs for src/main to dist dir"> |
| 236 |
|
|
| 237 |
< |
<delete dir="${build.javadocs.dir}"/> |
| 238 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
| 237 |
> |
<delete dir="${dist.javadocs.dir}"/> |
| 238 |
> |
<mkdir dir="${dist.javadocs.dir}"/> |
| 239 |
|
|
| 240 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
| 241 |
|
<!-- sourcepath for packages --> |
| 242 |
|
|
| 243 |
< |
<javadoc destdir="${build.javadocs.dir}" |
| 243 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
| 244 |
|
packagenames="none" |
| 245 |
< |
link="${jdkapidocs.url}" |
| 245 |
> |
link="${jdkapi8docs.url}" |
| 246 |
|
overview="${src.dir}/intro.html" |
| 247 |
< |
sourcepath="${src.dir}:${jdksrc.dir}" |
| 248 |
< |
additionalparam="-XDignore.symbol.file=true" > |
| 247 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
| 248 |
> |
classpath="" |
| 249 |
> |
executable="${javadoc8}"> |
| 250 |
> |
<arg value="-XDignore.symbol.file=true"/> |
| 251 |
> |
<arg value="-tag"/> |
| 252 |
> |
<arg value="${javadoc.jls.option}"/> |
| 253 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
| 254 |
|
<include name="**/*.java"/> |
| 255 |
|
</fileset> |
| 260 |
|
|
| 261 |
|
|
| 262 |
|
<target name="dist" |
| 263 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
| 263 |
> |
depends="dist-clean, dist-jar, docs" |
| 264 |
|
description="Puts all distributable products in single hierarchy"/> |
| 265 |
|
|
| 266 |
|
|
| 304 |
|
|
| 305 |
|
|
| 306 |
|
|
| 260 |
– |
<target name="dist-docs" |
| 261 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 262 |
– |
|
| 263 |
– |
<delete dir="${dist.javadocs.dir}"/> |
| 264 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
| 265 |
– |
|
| 266 |
– |
<!-- the packagenames="none" hack below prevents scanning the --> |
| 267 |
– |
<!-- sourcepath for packages --> |
| 268 |
– |
|
| 269 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
| 270 |
– |
packagenames="none" |
| 271 |
– |
link="${jdkapidocs.url}" |
| 272 |
– |
overview="${src.dir}/intro.html" |
| 273 |
– |
sourcepath="${src.dir}:${jdksrc.dir}" |
| 274 |
– |
additionalparam="-XDignore.symbol.file=true" > |
| 275 |
– |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
| 276 |
– |
<include name="**/*.java"/> |
| 277 |
– |
</fileset> |
| 278 |
– |
</javadoc> |
| 279 |
– |
|
| 280 |
– |
</target> |
| 281 |
– |
|
| 282 |
– |
|
| 283 |
– |
|
| 307 |
|
<!-- Internal targets --> |
| 308 |
|
|
| 309 |
|
|
| 287 |
– |
<target name="init"> |
| 288 |
– |
|
| 289 |
– |
<!-- Version is kept in a separate file --> |
| 290 |
– |
<loadfile property="version" srcFile="version.properties"/> |
| 291 |
– |
<echo>Building JSR-166 version ${version}</echo> |
| 292 |
– |
<echo>java.home is ${java.home}</echo> |
| 293 |
– |
|
| 294 |
– |
</target> |
| 295 |
– |
|
| 296 |
– |
|
| 310 |
|
<target name="dist-jar" |
| 311 |
|
depends="clean, jar"> |
| 312 |
|
|
| 491 |
|
<!-- Various demos and test programs --> |
| 492 |
|
|
| 493 |
|
|
| 494 |
< |
<target name="loops" depends="init, configure-compiler" |
| 494 |
> |
<target name="loops" depends="configure-compiler" |
| 495 |
|
description="Benchmark from Doug Lea's AQS paper"> |
| 496 |
|
|
| 497 |
|
<mkdir dir="${build.loops.dir}"/> |
| 517 |
|
</target> |
| 518 |
|
|
| 519 |
|
|
| 520 |
< |
<!-- jdk7 --> |
| 520 |
> |
<!-- jsr166 4jdk7 --> |
| 521 |
|
|
| 522 |
|
|
| 523 |
< |
<target name="jdk7compile" |
| 523 |
> |
<target name="4jdk7compile" |
| 524 |
|
depends="configure-compiler" |
| 525 |
< |
description="Compiles src/jdk7 sources"> |
| 525 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
| 526 |
|
|
| 527 |
< |
<mkdir dir="${build.jdk7.classes.dir}"/> |
| 527 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
| 528 |
|
|
| 529 |
< |
<javac srcdir="${jdk7src.dir}" |
| 530 |
< |
destdir="${build.jdk7.classes.dir}" |
| 529 |
> |
<javac srcdir="${4jdk7src.dir}" |
| 530 |
> |
destdir="${build.4jdk7.classes.dir}" |
| 531 |
|
debug="${build.debug}" |
| 532 |
|
debuglevel="${build.debuglevel}" |
| 533 |
|
deprecation="${build.deprecation}" |
| 534 |
< |
source="1.6" |
| 534 |
> |
source="6" |
| 535 |
|
classpath="" |
| 536 |
|
bootclasspath="${bootclasspath6}" |
| 537 |
|
includeAntRuntime="false" |
| 538 |
|
includeJavaRuntime="false" |
| 539 |
< |
executable="${javac6}" |
| 539 |
> |
executable="${javac7}" |
| 540 |
|
fork="true"> |
| 541 |
|
|
| 542 |
|
<include name="**/*.java"/> |
| 546 |
|
|
| 547 |
|
</javac> |
| 548 |
|
|
| 549 |
< |
</target> |
| 549 |
> |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
| 550 |
|
|
| 551 |
+ |
<jar destfile="${4jdk7product.jar}" index="true"> |
| 552 |
+ |
<fileset dir="${build.4jdk7.classes.dir}"/> |
| 553 |
+ |
</jar> |
| 554 |
|
|
| 555 |
+ |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
| 556 |
|
|
| 557 |
< |
<target name="jdk7jar" |
| 558 |
< |
depends="jdk7compile" |
| 559 |
< |
description="Builds library jar from compiled sources"> |
| 557 |
> |
<javac srcdir="${tck.src.dir}" |
| 558 |
> |
destdir="${build.4jdk7.tck.classes.dir}" |
| 559 |
> |
debug="${build.debug}" |
| 560 |
> |
debuglevel="${build.debuglevel}" |
| 561 |
> |
deprecation="${build.deprecation}" |
| 562 |
> |
source="6" |
| 563 |
> |
classpath="${junit.jar}" |
| 564 |
> |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
| 565 |
> |
includeAntRuntime="false" |
| 566 |
> |
includeJavaRuntime="false" |
| 567 |
> |
executable="${javac7}" |
| 568 |
> |
fork="true"> |
| 569 |
|
|
| 570 |
< |
<mkdir dir="${build.jdk7.lib.dir}"/> |
| 570 |
> |
<include name="**/*.java"/> |
| 571 |
> |
<compilerarg line="${build.args}"/> |
| 572 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 573 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 574 |
|
|
| 575 |
< |
<jar destfile="${jdk7product.jar}" index="true"> |
| 547 |
< |
<fileset dir="${build.jdk7.classes.dir}"/> |
| 548 |
< |
</jar> |
| 575 |
> |
</javac> |
| 576 |
|
|
| 577 |
|
</target> |
| 578 |
|
|
| 579 |
|
|
| 580 |
+ |
<target name="4jdk7-test-tck" |
| 581 |
+ |
depends="4jdk7compile" |
| 582 |
+ |
description="Runs tck tests for jsr166-4jdk7 directly"> |
| 583 |
+ |
<run-tck-tests |
| 584 |
+ |
jvm="${java7}" |
| 585 |
+ |
tck.classes="${build.4jdk7.tck.classes.dir}" |
| 586 |
+ |
product.jar="${4jdk7product.jar}"/> |
| 587 |
+ |
</target> |
| 588 |
+ |
|
| 589 |
+ |
|
| 590 |
+ |
<target name="4jdk7-test-tck-junit" |
| 591 |
+ |
depends="4jdk7compile" |
| 592 |
+ |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
| 593 |
+ |
|
| 594 |
+ |
<junit printsummary="true" |
| 595 |
+ |
showoutput="true" |
| 596 |
+ |
errorProperty="junit.failed" |
| 597 |
+ |
failureProperty="junit.failed" |
| 598 |
+ |
includeantruntime="true" |
| 599 |
+ |
jvm="${java7}" |
| 600 |
+ |
fork="true"> |
| 601 |
+ |
|
| 602 |
+ |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
| 603 |
+ |
<jvmarg value="-server"/> |
| 604 |
|
|
| 605 |
< |
<target name="jdk7docs" |
| 606 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 605 |
> |
<classpath> |
| 606 |
> |
<pathelement location="${junit.jar}"/> |
| 607 |
> |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
| 608 |
> |
</classpath> |
| 609 |
|
|
| 610 |
< |
<delete dir="${build.jdk7.docs.dir}"/> |
| 611 |
< |
<mkdir dir="${build.jdk7.docs.dir}"/> |
| 610 |
> |
<formatter type="brief"/> |
| 611 |
> |
|
| 612 |
> |
<test name="JSR166TestCase" haltonfailure="no"> |
| 613 |
> |
</test> |
| 614 |
> |
|
| 615 |
> |
</junit> |
| 616 |
> |
</target> |
| 617 |
|
|
| 618 |
< |
<javadoc destdir="${build.jdk7.docs.dir}" |
| 618 |
> |
|
| 619 |
> |
<target name="4jdk7docs" |
| 620 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
| 621 |
> |
|
| 622 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
| 623 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
| 624 |
> |
|
| 625 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
| 626 |
|
packagenames="none" |
| 627 |
|
link="${jdkapi7docs.url}" |
| 628 |
< |
overview="${jdk7src.dir}/intro.html" |
| 629 |
< |
sourcepath="${jdk7src.dir}" |
| 565 |
< |
bootclasspath="${bootclasspath6}" |
| 628 |
> |
overview="${4jdk7src.dir}/intro.html" |
| 629 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
| 630 |
|
classpath="" |
| 631 |
< |
source="1.6" |
| 632 |
< |
executable="${javadoc7}" |
| 633 |
< |
additionalparam="-XDignore.symbol.file=true" > |
| 570 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
| 631 |
> |
executable="${javadoc7}"> |
| 632 |
> |
<arg value="-XDignore.symbol.file=true"/> |
| 633 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
| 634 |
|
<include name="**/*.java"/> |
| 635 |
|
</fileset> |
| 636 |
|
</javadoc> |
| 638 |
|
</target> |
| 639 |
|
|
| 640 |
|
|
| 641 |
< |
<target name="jdk7dist" |
| 642 |
< |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
| 641 |
> |
<target name="4jdk7dist" |
| 642 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
| 643 |
|
description="Puts all distributable products in single hierarchy"/> |
| 644 |
|
|
| 645 |
|
|
| 646 |
|
|
| 647 |
< |
<target name="jdk7clean" |
| 647 |
> |
<target name="4jdk7clean" |
| 648 |
|
description="Removes all build products"> |
| 649 |
|
|
| 650 |
< |
<delete dir="${build.jdk7.dir}"/> |
| 650 |
> |
<delete dir="${build.4jdk7.dir}"/> |
| 651 |
|
|
| 652 |
|
</target> |
| 653 |
|
|
| 654 |
|
|
| 655 |
|
|
| 656 |
< |
<target name="jdk7dist-clean" |
| 656 |
> |
<target name="4jdk7dist-clean" |
| 657 |
|
description="Removes all build and distribution products"> |
| 658 |
|
|
| 659 |
|
</target> |
| 660 |
|
|
| 661 |
< |
<target name="jdk7dist-docs" |
| 662 |
< |
description="Builds javadocs without custom tags to dist folder"> |
| 661 |
> |
<target name="4jdk7dist-jar" |
| 662 |
> |
depends="4jdk7clean, 4jdk7compile"> |
| 663 |
|
|
| 664 |
< |
<delete dir="${dist.jdk7.docs.dir}"/> |
| 602 |
< |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
| 603 |
< |
|
| 604 |
< |
<javadoc destdir="${dist.jdk7.docs.dir}" |
| 605 |
< |
packagenames="none" |
| 606 |
< |
link="${jdkapi7docs.url}" |
| 607 |
< |
overview="${jdk7src.dir}/intro.html" |
| 608 |
< |
sourcepath="${jdk7src.dir}" |
| 609 |
< |
classpath="" |
| 610 |
< |
executable="${javadoc7}" |
| 611 |
< |
bootclasspath="${bootclasspath6}" |
| 612 |
< |
source="1.6"> |
| 613 |
< |
<arg value="-XDignore.symbol.file=true"/> |
| 614 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
| 615 |
< |
<include name="**/*.java"/> |
| 616 |
< |
</fileset> |
| 617 |
< |
</javadoc> |
| 618 |
< |
|
| 619 |
< |
</target> |
| 620 |
< |
|
| 621 |
< |
<target name="jdk7dist-jar" |
| 622 |
< |
depends="jdk7clean, jdk7jar"> |
| 623 |
< |
|
| 624 |
< |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
| 664 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
| 665 |
|
|
| 666 |
|
</target> |
| 667 |
|
|
| 669 |
|
|
| 670 |
|
|
| 671 |
|
<target name="jsr166xcompile" |
| 672 |
< |
depends="init, configure-compiler" |
| 673 |
< |
description="Compiles jsr166x sources"> |
| 672 |
> |
depends="configure-compiler" |
| 673 |
> |
description="Compiles jsr166x sources to build dir"> |
| 674 |
|
|
| 675 |
|
<mkdir dir="${build.jsr166x.dir}"/> |
| 676 |
|
|
| 677 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
| 678 |
< |
destdir="${build.jsr166x.dir}" |
| 679 |
< |
debug="${build.debug}" |
| 680 |
< |
debuglevel="${build.debuglevel}" |
| 681 |
< |
deprecation="${build.deprecation}" |
| 682 |
< |
source="${build.sourcelevel}" |
| 683 |
< |
fork="true"> |
| 677 |
> |
<javac srcdir="${topsrc.dir}" |
| 678 |
> |
destdir="${build.jsr166x.dir}" |
| 679 |
> |
debug="${build.debug}" |
| 680 |
> |
debuglevel="${build.debuglevel}" |
| 681 |
> |
deprecation="${build.deprecation}" |
| 682 |
> |
classpath="" |
| 683 |
> |
source="5" |
| 684 |
> |
bootclasspath="${bootclasspath6}" |
| 685 |
> |
includeAntRuntime="false" |
| 686 |
> |
includeJavaRuntime="false" |
| 687 |
> |
executable="${javac7}" |
| 688 |
> |
fork="true"> |
| 689 |
|
|
| 690 |
< |
<include name="**/*.java"/> |
| 690 |
> |
<include name="jsr166x/**/*.java"/> |
| 691 |
|
<compilerarg line="${build.args}"/> |
| 692 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 693 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
| 694 |
|
|
| 695 |
|
</javac> |
| 696 |
|
|
| 704 |
|
|
| 705 |
|
<mkdir dir="${build.jsr166xlib.dir}"/> |
| 706 |
|
|
| 707 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
| 707 |
> |
<jar destfile="${jsr166x.jar}"> |
| 708 |
|
<fileset dir="${build.jsr166x.dir}"/> |
| 709 |
|
</jar> |
| 710 |
|
|
| 713 |
|
|
| 714 |
|
|
| 715 |
|
<target name="jsr166xdocs" |
| 716 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 716 |
> |
description="Builds javadocs to dist dir"> |
| 717 |
|
|
| 718 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
| 719 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
| 718 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
| 719 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
| 720 |
|
|
| 721 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
| 722 |
< |
packagenames="jsr166x" |
| 721 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
| 722 |
> |
packagenames="jsr166x.*" |
| 723 |
|
link="${jdkapidocs.url}" |
| 724 |
< |
source="${build.sourcelevel}" |
| 725 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 724 |
> |
source="5" |
| 725 |
> |
bootclasspath="${bootclasspath6}" |
| 726 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
| 727 |
> |
executable="${javadoc7}" |
| 728 |
|
additionalparam="-XDignore.symbol.file=true" /> |
| 729 |
|
|
| 730 |
|
</target> |
| 731 |
|
|
| 732 |
|
|
| 733 |
|
<target name="jsr166xdist" |
| 734 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
| 734 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
| 735 |
|
description="Puts all distributable products in single hierarchy"/> |
| 736 |
|
|
| 737 |
|
|
| 752 |
|
</target> |
| 753 |
|
|
| 754 |
|
|
| 707 |
– |
|
| 708 |
– |
<target name="jsr166xdist-docs" |
| 709 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 710 |
– |
|
| 711 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
| 712 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
| 713 |
– |
|
| 714 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
| 715 |
– |
packagenames="jsr166x" |
| 716 |
– |
link="${jdkapidocs.url}" |
| 717 |
– |
source="${build.sourcelevel}" |
| 718 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 719 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 720 |
– |
|
| 721 |
– |
</target> |
| 722 |
– |
|
| 755 |
|
<target name="jsr166xdist-jar" |
| 756 |
|
depends="jsr166xclean, jsr166xjar"> |
| 757 |
|
|
| 758 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
| 758 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
| 759 |
|
|
| 760 |
|
</target> |
| 761 |
|
|
| 763 |
|
|
| 764 |
|
|
| 765 |
|
<target name="jsr166ycompile" |
| 766 |
< |
depends="init, configure-compiler" |
| 766 |
> |
depends="configure-compiler" |
| 767 |
|
description="Compiles jsr166y sources"> |
| 768 |
|
|
| 769 |
|
<mkdir dir="${build.jsr166y.dir}"/> |
| 770 |
|
|
| 771 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
| 772 |
< |
destdir="${build.jsr166y.dir}" |
| 773 |
< |
debug="${build.debug}" |
| 774 |
< |
debuglevel="${build.debuglevel}" |
| 775 |
< |
deprecation="${build.deprecation}" |
| 776 |
< |
source="${build.sourcelevel}" |
| 777 |
< |
fork="true"> |
| 771 |
> |
<javac srcdir="${topsrc.dir}" |
| 772 |
> |
destdir="${build.jsr166y.dir}" |
| 773 |
> |
debug="${build.debug}" |
| 774 |
> |
debuglevel="${build.debuglevel}" |
| 775 |
> |
deprecation="${build.deprecation}" |
| 776 |
> |
source="6" |
| 777 |
> |
classpath="" |
| 778 |
> |
bootclasspath="${bootclasspath6}" |
| 779 |
> |
includeAntRuntime="false" |
| 780 |
> |
includeJavaRuntime="false" |
| 781 |
> |
executable="${javac7}" |
| 782 |
> |
fork="true"> |
| 783 |
|
|
| 784 |
< |
<include name="**/*.java"/> |
| 784 |
> |
<include name="jsr166y/**/*.java"/> |
| 785 |
|
<compilerarg line="${build.args}"/> |
| 786 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 787 |
< |
<compilerarg value="${bootclasspath.args}"/> |
| 751 |
< |
|
| 752 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 753 |
< |
|
| 787 |
> |
<compilerarg value="-Xlint:all"/> |
| 788 |
|
</javac> |
| 755 |
– |
|
| 789 |
|
</target> |
| 790 |
|
|
| 791 |
|
|
| 759 |
– |
|
| 792 |
|
<target name="jsr166yjar" |
| 793 |
|
depends="jsr166ycompile" |
| 794 |
|
description="Builds library jar from compiled sources"> |
| 795 |
|
|
| 796 |
|
<mkdir dir="${build.jsr166ylib.dir}"/> |
| 797 |
|
|
| 798 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
| 798 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
| 799 |
|
<fileset dir="${build.jsr166y.dir}"/> |
| 800 |
|
</jar> |
| 801 |
|
|
| 804 |
|
|
| 805 |
|
|
| 806 |
|
<target name="jsr166ydocs" |
| 807 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 807 |
> |
description="Builds javadocs to dist dir"> |
| 808 |
|
|
| 809 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
| 810 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
| 809 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
| 810 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
| 811 |
|
|
| 812 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
| 813 |
< |
packagenames="jsr166y" |
| 812 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
| 813 |
> |
packagenames="jsr166y.*" |
| 814 |
|
link="${jdkapidocs.url}" |
| 815 |
< |
source="${build.sourcelevel}" |
| 816 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 815 |
> |
source="6" |
| 816 |
> |
bootclasspath="${bootclasspath6}" |
| 817 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
| 818 |
> |
executable="${javadoc7}" |
| 819 |
|
additionalparam="-XDignore.symbol.file=true" /> |
| 820 |
|
|
| 821 |
|
</target> |
| 822 |
|
|
| 823 |
|
|
| 824 |
|
<target name="jsr166ydist" |
| 825 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
| 825 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
| 826 |
|
description="Puts all distributable products in single hierarchy"/> |
| 827 |
|
|
| 828 |
|
|
| 842 |
|
|
| 843 |
|
</target> |
| 844 |
|
|
| 811 |
– |
<target name="jsr166ydist-docs" |
| 812 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 813 |
– |
|
| 814 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
| 815 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
| 816 |
– |
|
| 817 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
| 818 |
– |
packagenames="jsr166y" |
| 819 |
– |
link="${jdkapidocs.url}" |
| 820 |
– |
source="${build.sourcelevel}" |
| 821 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 822 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 823 |
– |
|
| 824 |
– |
</target> |
| 825 |
– |
|
| 845 |
|
<target name="jsr166ydist-jar" |
| 846 |
|
depends="jsr166yclean, jsr166yjar"> |
| 847 |
|
|
| 848 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
| 848 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
| 849 |
|
|
| 850 |
|
</target> |
| 851 |
|
|
| 854 |
|
|
| 855 |
|
|
| 856 |
|
<target name="extra166ycompile" |
| 857 |
< |
depends="init, configure-compiler, jsr166ycompile" |
| 857 |
> |
depends="configure-compiler, jsr166yjar" |
| 858 |
|
description="Compiles extra166y sources"> |
| 859 |
|
|
| 860 |
|
<mkdir dir="${build.extra166y.dir}"/> |
| 861 |
|
|
| 862 |
< |
<javac srcdir="${extra166ysrc.dir}" |
| 863 |
< |
destdir="${build.extra166y.dir}" |
| 864 |
< |
debug="${build.debug}" |
| 865 |
< |
classpath="${jsr166yproduct.jar}" |
| 866 |
< |
debuglevel="${build.debuglevel}" |
| 867 |
< |
deprecation="${build.deprecation}" |
| 868 |
< |
source="${build.sourcelevel}" |
| 869 |
< |
fork="true"> |
| 862 |
> |
<javac srcdir="${topsrc.dir}" |
| 863 |
> |
destdir="${build.extra166y.dir}" |
| 864 |
> |
debug="${build.debug}" |
| 865 |
> |
debuglevel="${build.debuglevel}" |
| 866 |
> |
deprecation="${build.deprecation}" |
| 867 |
> |
classpath="" |
| 868 |
> |
source="6" |
| 869 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
| 870 |
> |
includeAntRuntime="false" |
| 871 |
> |
includeJavaRuntime="false" |
| 872 |
> |
executable="${javac7}" |
| 873 |
> |
fork="true"> |
| 874 |
|
|
| 875 |
< |
<include name="**/*.java"/> |
| 875 |
> |
<include name="extra166y/**/*.java"/> |
| 876 |
|
<compilerarg line="${build.args}"/> |
| 877 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 878 |
< |
<compilerarg value="${bootclasspath.args}"/> |
| 856 |
< |
|
| 857 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 878 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
| 879 |
|
|
| 880 |
|
</javac> |
| 881 |
|
|
| 889 |
|
|
| 890 |
|
<mkdir dir="${build.extra166ylib.dir}"/> |
| 891 |
|
|
| 892 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
| 892 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
| 893 |
|
<fileset dir="${build.extra166y.dir}"/> |
| 894 |
|
</jar> |
| 895 |
|
|
| 898 |
|
|
| 899 |
|
|
| 900 |
|
<target name="extra166ydocs" |
| 901 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 901 |
> |
description="Builds javadocs to build dir"> |
| 902 |
|
|
| 903 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
| 904 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
| 903 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
| 904 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
| 905 |
|
|
| 906 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
| 907 |
< |
packagenames="extra166y" |
| 906 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
| 907 |
> |
packagenames="extra166y.*" |
| 908 |
|
link="${jdkapidocs.url}" |
| 909 |
< |
source="${build.sourcelevel}" |
| 910 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 909 |
> |
source="6" |
| 910 |
> |
bootclasspath="${bootclasspath6}" |
| 911 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
| 912 |
> |
executable="${javadoc7}" |
| 913 |
|
additionalparam="-XDignore.symbol.file=true" /> |
| 914 |
|
|
| 915 |
|
</target> |
| 916 |
|
|
| 917 |
|
|
| 918 |
|
<target name="extra166ydist" |
| 919 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
| 919 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
| 920 |
|
description="Puts all distributable products in single hierarchy"/> |
| 921 |
|
|
| 922 |
|
|
| 936 |
|
|
| 937 |
|
</target> |
| 938 |
|
|
| 916 |
– |
<target name="extra166ydist-docs" |
| 917 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 918 |
– |
|
| 919 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
| 920 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
| 921 |
– |
|
| 922 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
| 923 |
– |
packagenames="extra166y" |
| 924 |
– |
link="${jdkapidocs.url}" |
| 925 |
– |
source="${build.sourcelevel}" |
| 926 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 927 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 928 |
– |
|
| 929 |
– |
</target> |
| 930 |
– |
|
| 939 |
|
<target name="extra166ydist-jar" |
| 940 |
|
depends="extra166yclean, extra166yjar"> |
| 941 |
|
|
| 942 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
| 942 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
| 943 |
|
|
| 944 |
|
</target> |
| 945 |
|
|
| 946 |
|
<!-- jsr166e --> |
| 947 |
|
|
| 940 |
– |
|
| 948 |
|
<target name="jsr166ecompile" |
| 949 |
< |
depends="init, configure-compiler" |
| 949 |
> |
depends="configure-compiler" |
| 950 |
|
description="Compiles jsr166e sources"> |
| 951 |
|
|
| 952 |
|
<mkdir dir="${build.jsr166e.dir}"/> |
| 953 |
|
|
| 954 |
< |
<javac srcdir="${jsr166esrc.dir}" |
| 955 |
< |
destdir="${build.jsr166e.dir}" |
| 956 |
< |
debug="${build.debug}" |
| 957 |
< |
debuglevel="${build.debuglevel}" |
| 958 |
< |
deprecation="${build.deprecation}" |
| 959 |
< |
source="1.7" |
| 960 |
< |
fork="true"> |
| 954 |
> |
<javac srcdir="${topsrc.dir}" |
| 955 |
> |
destdir="${build.jsr166e.dir}" |
| 956 |
> |
debug="${build.debug}" |
| 957 |
> |
debuglevel="${build.debuglevel}" |
| 958 |
> |
deprecation="${build.deprecation}" |
| 959 |
> |
source="7" |
| 960 |
> |
classpath="" |
| 961 |
> |
includeAntRuntime="false" |
| 962 |
> |
includeJavaRuntime="false" |
| 963 |
> |
executable="${javac7}" |
| 964 |
> |
fork="true"> |
| 965 |
|
|
| 966 |
< |
<include name="**/*.java"/> |
| 966 |
> |
<include name="jsr166e/**/*.java"/> |
| 967 |
|
<compilerarg line="${build.args}"/> |
| 968 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 969 |
< |
<compilerarg value="${bootclasspath.args}"/> |
| 959 |
< |
|
| 960 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 969 |
> |
<compilerarg value="-Xlint:all"/> |
| 970 |
|
|
| 971 |
|
</javac> |
| 972 |
|
|
| 980 |
|
|
| 981 |
|
<mkdir dir="${build.jsr166elib.dir}"/> |
| 982 |
|
|
| 983 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
| 983 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
| 984 |
|
<fileset dir="${build.jsr166e.dir}"/> |
| 985 |
|
</jar> |
| 986 |
|
|
| 989 |
|
|
| 990 |
|
|
| 991 |
|
<target name="jsr166edocs" |
| 992 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 992 |
> |
description="Builds javadocs to build dir"> |
| 993 |
|
|
| 994 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
| 995 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
| 994 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
| 995 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
| 996 |
|
|
| 997 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
| 998 |
< |
packagenames="jsr166e,jsr166e.extra" |
| 997 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
| 998 |
> |
packagenames="jsr166e.*" |
| 999 |
|
link="${jdkapidocs.url}" |
| 1000 |
< |
source="1.7" |
| 1001 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 1002 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
| 1000 |
> |
source="7" |
| 1001 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
| 1002 |
> |
executable="${javadoc7}" |
| 1003 |
> |
additionalparam="-XDignore.symbol.file=true" > |
| 1004 |
> |
</javadoc> |
| 1005 |
|
|
| 1006 |
|
</target> |
| 1007 |
|
|
| 1008 |
|
|
| 1009 |
|
<target name="jsr166edist" |
| 1010 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
| 1010 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
| 1011 |
|
description="Puts all distributable products in single hierarchy"/> |
| 1012 |
|
|
| 1013 |
|
|
| 1021 |
|
</target> |
| 1022 |
|
|
| 1023 |
|
|
| 1013 |
– |
|
| 1024 |
|
<target name="jsr166edist-clean" |
| 1025 |
|
description="Removes all build and distribution products"> |
| 1026 |
|
|
| 1027 |
|
</target> |
| 1028 |
|
|
| 1019 |
– |
<target name="jsr166edist-docs" |
| 1020 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 1021 |
– |
|
| 1022 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
| 1023 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
| 1024 |
– |
|
| 1025 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
| 1026 |
– |
packagenames="jsr166e,jsr166e.extra" |
| 1027 |
– |
link="${jdkapidocs.url}" |
| 1028 |
– |
source="1.7" |
| 1029 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 1030 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 1031 |
– |
|
| 1032 |
– |
</target> |
| 1033 |
– |
|
| 1029 |
|
<target name="jsr166edist-jar" |
| 1030 |
|
depends="jsr166eclean, jsr166ejar"> |
| 1031 |
|
|
| 1032 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
| 1032 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
| 1033 |
|
|
| 1034 |
|
</target> |
| 1035 |
|
|
