| 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. |
| 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 |
|
|
| 45 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 46 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
| 47 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
| 43 |
– |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
| 44 |
– |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
| 48 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
| 49 |
|
|
| 50 |
< |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
| 51 |
< |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
| 52 |
< |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
| 53 |
< |
<property name="build.jdk7.tck.classes.dir" location="${build.jdk7.dir}/tck/classes"/> |
| 51 |
< |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
| 50 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
| 51 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
| 52 |
> |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/> |
| 53 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
| 54 |
|
|
| 55 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
| 54 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
| 55 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
| 56 |
– |
|
| 56 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
| 58 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
| 59 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
| 60 |
– |
|
| 57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
| 62 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
| 63 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
| 64 |
– |
|
| 58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
| 66 |
– |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
| 67 |
– |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
| 59 |
|
|
| 60 |
|
<!-- JDK binary locations --> |
| 61 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
| 63 |
|
<macrodef name="defjdklocations"> |
| 64 |
|
<attribute name="v"/> |
| 65 |
|
<sequential> |
| 66 |
< |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
| 67 |
< |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
| 68 |
< |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
| 69 |
< |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
| 70 |
< |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
| 66 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
| 67 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
| 68 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
| 69 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
| 70 |
> |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
| 71 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
| 72 |
|
<property name="bootclasspath@{v}" |
| 73 |
|
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
| 74 |
|
</sequential> |
| 105 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
| 106 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
| 107 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
| 108 |
< |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
| 108 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
| 109 |
|
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
| 110 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
| 111 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
| 112 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
| 121 |
– |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
| 113 |
|
|
| 114 |
|
<!-- Distribution locations --> |
| 115 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
| 116 |
< |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
| 117 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
| 118 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
| 119 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
| 120 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
| 115 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
| 116 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
| 117 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
| 118 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
| 119 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
| 120 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
| 121 |
|
|
| 122 |
|
<!-- Jar locations --> |
| 123 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
| 124 |
< |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
| 125 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
| 126 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
| 127 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
| 128 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
| 129 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
| 123 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
| 124 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
| 125 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
| 126 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
| 127 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
| 128 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
| 129 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
| 130 |
|
|
| 131 |
|
<!-- Bootclasspath argument --> |
| 132 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
| 139 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
| 140 |
|
<!-- The below does not yet exist as of 2012-11 --> |
| 141 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
| 142 |
+ |
|
| 143 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
| 144 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
| 145 |
|
|
| 146 |
|
<!-- Test classpath --> |
| 154 |
|
<pathelement location="${build.loops.dir}"/> |
| 155 |
|
</path> |
| 156 |
|
|
| 157 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
| 158 |
+ |
<!-- TODO: How do we get &trade to work? --> |
| 159 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
| 160 |
+ |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
| 161 |
+ |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
| 162 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
| 163 |
|
|
| 164 |
|
<!-- Main targets --> |
| 165 |
|
|
| 166 |
|
<target name="dists" |
| 167 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
| 167 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
| 168 |
|
description="Builds all public jars and docs"/> |
| 169 |
|
|
| 170 |
|
<target name="compile" |
| 171 |
< |
depends="init, configure-compiler" |
| 172 |
< |
description="Compiles main sources to build folder"> |
| 171 |
> |
depends="configure-compiler" |
| 172 |
> |
description="Compiles src/main sources to build dir"> |
| 173 |
|
|
| 174 |
|
<mkdir dir="${build.classes.dir}"/> |
| 175 |
|
|
| 176 |
|
<javac srcdir="${src.dir}" |
| 177 |
< |
destdir="${build.classes.dir}" |
| 178 |
< |
debug="${build.debug}" |
| 179 |
< |
debuglevel="${build.debuglevel}" |
| 180 |
< |
deprecation="${build.deprecation}" |
| 181 |
< |
source="${build.sourcelevel}" |
| 182 |
< |
fork="true"> |
| 177 |
> |
destdir="${build.classes.dir}" |
| 178 |
> |
debug="${build.debug}" |
| 179 |
> |
debuglevel="${build.debuglevel}" |
| 180 |
> |
deprecation="${build.deprecation}" |
| 181 |
> |
classpath="" |
| 182 |
> |
includeAntRuntime="false" |
| 183 |
> |
includeJavaRuntime="false" |
| 184 |
> |
executable="${javac8}" |
| 185 |
> |
fork="true"> |
| 186 |
|
|
| 187 |
|
<include name="**/*.java"/> |
| 188 |
+ |
<compilerarg line="${build.args}"/> |
| 189 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 190 |
+ |
<compilerarg value="-Xlint:all"/> |
| 191 |
|
|
| 192 |
|
<!-- |
| 193 |
|
<exclude name="java/lang/**"/> |
| 205 |
|
depends="compile" |
| 206 |
|
description="Builds library jar from compiled sources"> |
| 207 |
|
|
| 204 |
– |
<mkdir dir="${build.lib.dir}"/> |
| 205 |
– |
|
| 208 |
|
<jar destfile="${product.jar}"> |
| 209 |
|
<fileset dir="${build.classes.dir}"/> |
| 210 |
|
</jar> |
| 214 |
|
|
| 215 |
|
|
| 216 |
|
<target name="test" |
| 217 |
< |
depends="init, configure-tests, report-tests" |
| 217 |
> |
depends="configure-tests, report-tests" |
| 218 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
| 219 |
|
|
| 220 |
|
|
| 221 |
|
|
| 222 |
|
<target name="docs" |
| 223 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 223 |
> |
description="Builds javadocs for src/main to dist dir"> |
| 224 |
|
|
| 225 |
< |
<delete dir="${build.javadocs.dir}"/> |
| 226 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
| 225 |
> |
<delete dir="${dist.javadocs.dir}"/> |
| 226 |
> |
<mkdir dir="${dist.javadocs.dir}"/> |
| 227 |
|
|
| 228 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
| 229 |
|
<!-- sourcepath for packages --> |
| 230 |
|
|
| 231 |
< |
<javadoc destdir="${build.javadocs.dir}" |
| 231 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
| 232 |
|
packagenames="none" |
| 233 |
< |
link="${jdkapidocs.url}" |
| 233 |
> |
link="${jdkapi8docs.url}" |
| 234 |
|
overview="${src.dir}/intro.html" |
| 235 |
< |
sourcepath="${src.dir}:${jdksrc.dir}" |
| 236 |
< |
additionalparam="-XDignore.symbol.file=true" > |
| 235 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
| 236 |
> |
classpath="" |
| 237 |
> |
executable="${javadoc8}"> |
| 238 |
> |
<arg value="-XDignore.symbol.file=true"/> |
| 239 |
> |
<arg value="-tag"/> |
| 240 |
> |
<arg value="${javadoc.jls.option}"/> |
| 241 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
| 242 |
|
<include name="**/*.java"/> |
| 243 |
|
</fileset> |
| 248 |
|
|
| 249 |
|
|
| 250 |
|
<target name="dist" |
| 251 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
| 251 |
> |
depends="dist-clean, dist-jar, docs" |
| 252 |
|
description="Puts all distributable products in single hierarchy"/> |
| 253 |
|
|
| 254 |
|
|
| 276 |
|
description="Removes all build products"> |
| 277 |
|
|
| 278 |
|
<delete dir="${build.dir}"/> |
| 273 |
– |
<delete dir="${build.classes.dir}"/> |
| 274 |
– |
<delete dir="${build.lib.dir}"/> |
| 279 |
|
|
| 280 |
|
</target> |
| 281 |
|
|
| 290 |
|
|
| 291 |
|
|
| 292 |
|
|
| 289 |
– |
<target name="dist-docs" |
| 290 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 291 |
– |
|
| 292 |
– |
<delete dir="${dist.javadocs.dir}"/> |
| 293 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
| 294 |
– |
|
| 295 |
– |
<!-- the packagenames="none" hack below prevents scanning the --> |
| 296 |
– |
<!-- sourcepath for packages --> |
| 297 |
– |
|
| 298 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
| 299 |
– |
packagenames="none" |
| 300 |
– |
link="${jdkapidocs.url}" |
| 301 |
– |
overview="${src.dir}/intro.html" |
| 302 |
– |
sourcepath="${src.dir}:${jdksrc.dir}" |
| 303 |
– |
additionalparam="-XDignore.symbol.file=true" > |
| 304 |
– |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
| 305 |
– |
<include name="**/*.java"/> |
| 306 |
– |
</fileset> |
| 307 |
– |
</javadoc> |
| 308 |
– |
|
| 309 |
– |
</target> |
| 310 |
– |
|
| 311 |
– |
|
| 312 |
– |
|
| 293 |
|
<!-- Internal targets --> |
| 294 |
|
|
| 295 |
|
|
| 316 |
– |
<target name="init"> |
| 317 |
– |
|
| 318 |
– |
<!-- Version is kept in a separate file --> |
| 319 |
– |
<loadfile property="version" srcFile="version.properties"/> |
| 320 |
– |
<echo>Building JSR-166 version ${version}</echo> |
| 321 |
– |
<echo>java.home is ${java.home}</echo> |
| 322 |
– |
|
| 323 |
– |
</target> |
| 324 |
– |
|
| 325 |
– |
|
| 296 |
|
<target name="dist-jar" |
| 297 |
|
depends="clean, jar"> |
| 298 |
|
|
| 307 |
|
<mkdir dir="${build.testcases.dir}"/> |
| 308 |
|
|
| 309 |
|
<javac srcdir="${tck.src.dir}" |
| 310 |
< |
destdir="${build.testcases.dir}" |
| 311 |
< |
debug="${build.debug}" |
| 312 |
< |
debuglevel="${build.debuglevel}" |
| 313 |
< |
deprecation="${build.deprecation}" |
| 314 |
< |
source="${build.sourcelevel}" |
| 315 |
< |
fork="true"> |
| 310 |
> |
destdir="${build.testcases.dir}" |
| 311 |
> |
debug="${build.debug}" |
| 312 |
> |
debuglevel="${build.debuglevel}" |
| 313 |
> |
deprecation="${build.deprecation}" |
| 314 |
> |
source="6" |
| 315 |
> |
classpath="${junit.jar}" |
| 316 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
| 317 |
> |
includeAntRuntime="false" |
| 318 |
> |
includeJavaRuntime="false" |
| 319 |
> |
executable="${javac8}" |
| 320 |
> |
fork="true"> |
| 321 |
|
|
| 322 |
< |
<compilerarg value="${bootclasspath.args}"/> |
| 322 |
> |
<include name="**/*.java"/> |
| 323 |
|
<compilerarg line="${build.args}"/> |
| 324 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 325 |
< |
|
| 351 |
< |
<classpath refid="test.classpath"/> |
| 325 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 326 |
|
|
| 327 |
|
</javac> |
| 328 |
|
|
| 329 |
|
<javac srcdir="${test.src.dir}" |
| 330 |
< |
destdir="${build.testcases.dir}" |
| 331 |
< |
debug="${build.debug}" |
| 332 |
< |
debuglevel="${build.debuglevel}" |
| 333 |
< |
deprecation="${build.deprecation}" |
| 334 |
< |
source="${build.sourcelevel}" |
| 335 |
< |
fork="true"> |
| 330 |
> |
destdir="${build.testcases.dir}" |
| 331 |
> |
debug="${build.debug}" |
| 332 |
> |
debuglevel="${build.debuglevel}" |
| 333 |
> |
deprecation="${build.deprecation}" |
| 334 |
> |
source="6" |
| 335 |
> |
classpath="" |
| 336 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
| 337 |
> |
includeAntRuntime="false" |
| 338 |
> |
includeJavaRuntime="false" |
| 339 |
> |
executable="${javac8}" |
| 340 |
> |
fork="true"> |
| 341 |
|
|
| 342 |
< |
<include name="jsr166/test/**"/> |
| 342 |
> |
<include name="jsr166/test/**/*.java"/> |
| 343 |
|
|
| 365 |
– |
<compilerarg value="${bootclasspath.args}"/> |
| 344 |
|
<compilerarg line="${build.args}"/> |
| 345 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 346 |
< |
|
| 369 |
< |
<classpath refid="test.classpath"/> |
| 346 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 347 |
|
|
| 348 |
|
</javac> |
| 349 |
|
|
| 360 |
|
<compilerarg line="${build.args}"/> |
| 361 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 362 |
|
|
| 386 |
– |
<classpath refid="test.classpath"/> |
| 387 |
– |
|
| 363 |
|
</javac> |
| 364 |
|
--> |
| 365 |
|
|
| 379 |
|
errorProperty="junit.failed" |
| 380 |
|
failureProperty="junit.failed" |
| 381 |
|
dir="${build.reports.dir}" |
| 382 |
+ |
jvm="${java8}" |
| 383 |
|
fork="true"> |
| 384 |
|
|
| 385 |
< |
<jvmarg value="${bootclasspath.args}"/> |
| 385 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
| 386 |
|
<jvmarg value="-server"/> |
| 387 |
|
<jvmarg value="-showversion"/> |
| 388 |
|
|
| 483 |
|
<!-- Various demos and test programs --> |
| 484 |
|
|
| 485 |
|
|
| 486 |
< |
<target name="loops" depends="init, configure-compiler" |
| 486 |
> |
<target name="loops" depends="configure-compiler" |
| 487 |
|
description="Benchmark from Doug Lea's AQS paper"> |
| 488 |
|
|
| 489 |
|
<mkdir dir="${build.loops.dir}"/> |
| 509 |
|
</target> |
| 510 |
|
|
| 511 |
|
|
| 512 |
< |
<!-- jdk7 --> |
| 512 |
> |
<!-- jsr166 4jdk7 --> |
| 513 |
|
|
| 514 |
|
|
| 515 |
< |
<target name="jdk7compile" |
| 515 |
> |
<target name="4jdk7compile" |
| 516 |
|
depends="configure-compiler" |
| 517 |
< |
description="Compiles src/jdk7 sources"> |
| 517 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
| 518 |
|
|
| 519 |
< |
<mkdir dir="${build.jdk7.classes.dir}"/> |
| 519 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
| 520 |
|
|
| 521 |
< |
<javac srcdir="${jdk7src.dir}" |
| 522 |
< |
destdir="${build.jdk7.classes.dir}" |
| 521 |
> |
<javac srcdir="${4jdk7src.dir}" |
| 522 |
> |
destdir="${build.4jdk7.classes.dir}" |
| 523 |
|
debug="${build.debug}" |
| 524 |
|
debuglevel="${build.debuglevel}" |
| 525 |
|
deprecation="${build.deprecation}" |
| 526 |
< |
source="1.6" |
| 526 |
> |
source="6" |
| 527 |
|
classpath="" |
| 528 |
|
bootclasspath="${bootclasspath6}" |
| 529 |
|
includeAntRuntime="false" |
| 538 |
|
|
| 539 |
|
</javac> |
| 540 |
|
|
| 541 |
< |
<mkdir dir="${build.jdk7.lib.dir}"/> |
| 542 |
< |
|
| 567 |
< |
<jar destfile="${jdk7product.jar}" index="true"> |
| 568 |
< |
<fileset dir="${build.jdk7.classes.dir}"/> |
| 541 |
> |
<jar destfile="${4jdk7product.jar}" index="true"> |
| 542 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
| 543 |
|
</jar> |
| 544 |
|
|
| 545 |
< |
<mkdir dir="${build.jdk7.tck.classes.dir}"/> |
| 545 |
> |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
| 546 |
|
|
| 547 |
|
<javac srcdir="${tck.src.dir}" |
| 548 |
< |
destdir="${build.jdk7.tck.classes.dir}" |
| 548 |
> |
destdir="${build.4jdk7.tck.classes.dir}" |
| 549 |
|
debug="${build.debug}" |
| 550 |
|
debuglevel="${build.debuglevel}" |
| 551 |
|
deprecation="${build.deprecation}" |
| 552 |
< |
source="1.6" |
| 552 |
> |
source="6" |
| 553 |
|
classpath="${junit.jar}" |
| 554 |
< |
bootclasspath="${jdk7product.jar}:${bootclasspath6}" |
| 554 |
> |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
| 555 |
|
includeAntRuntime="false" |
| 556 |
|
includeJavaRuntime="false" |
| 557 |
|
executable="${javac7}" |
| 567 |
|
</target> |
| 568 |
|
|
| 569 |
|
|
| 570 |
< |
<target name="run-jdk7-tck-tests" |
| 571 |
< |
depends="jdk7compile" |
| 572 |
< |
description="Runs tck tests for jsr166-jdk7 directly"> |
| 570 |
> |
<target name="4jdk7-test-tck" |
| 571 |
> |
depends="4jdk7compile" |
| 572 |
> |
description="Runs tck tests for jsr166-4jdk7 directly"> |
| 573 |
|
<run-tck-tests |
| 574 |
|
jvm="${java7}" |
| 575 |
< |
tck.classes="${build.jdk7.tck.classes.dir}" |
| 576 |
< |
product.jar="${jdk7product.jar}"/> |
| 575 |
> |
tck.classes="${build.4jdk7.tck.classes.dir}" |
| 576 |
> |
product.jar="${4jdk7product.jar}"/> |
| 577 |
|
</target> |
| 578 |
|
|
| 579 |
|
|
| 580 |
< |
<target name="run-jdk7-tck-tests-via-junit-task" |
| 581 |
< |
depends="jdk7compile"> |
| 580 |
> |
<target name="4jdk7-test-tck-junit" |
| 581 |
> |
depends="4jdk7compile" |
| 582 |
> |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
| 583 |
|
|
| 584 |
|
<junit printsummary="true" |
| 585 |
|
showoutput="true" |
| 589 |
|
jvm="${java7}" |
| 590 |
|
fork="true"> |
| 591 |
|
|
| 592 |
< |
<jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/> |
| 592 |
> |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
| 593 |
|
<jvmarg value="-server"/> |
| 594 |
|
|
| 595 |
|
<classpath> |
| 596 |
|
<pathelement location="${junit.jar}"/> |
| 597 |
< |
<pathelement location="${build.jdk7.tck.classes.dir}"/> |
| 597 |
> |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
| 598 |
|
</classpath> |
| 599 |
|
|
| 600 |
|
<formatter type="brief"/> |
| 606 |
|
</target> |
| 607 |
|
|
| 608 |
|
|
| 609 |
< |
<target name="jdk7docs" |
| 610 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 609 |
> |
<target name="4jdk7docs" |
| 610 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
| 611 |
|
|
| 612 |
< |
<delete dir="${build.jdk7.docs.dir}"/> |
| 613 |
< |
<mkdir dir="${build.jdk7.docs.dir}"/> |
| 612 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
| 613 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
| 614 |
|
|
| 615 |
< |
<javadoc destdir="${build.jdk7.docs.dir}" |
| 615 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
| 616 |
|
packagenames="none" |
| 617 |
|
link="${jdkapi7docs.url}" |
| 618 |
< |
overview="${jdk7src.dir}/intro.html" |
| 619 |
< |
sourcepath="${jdk7src.dir}" |
| 645 |
< |
bootclasspath="${bootclasspath6}" |
| 618 |
> |
overview="${4jdk7src.dir}/intro.html" |
| 619 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
| 620 |
|
classpath="" |
| 621 |
< |
source="1.6" |
| 622 |
< |
executable="${javadoc7}" |
| 623 |
< |
additionalparam="-XDignore.symbol.file=true" > |
| 650 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
| 621 |
> |
executable="${javadoc7}"> |
| 622 |
> |
<arg value="-XDignore.symbol.file=true"/> |
| 623 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
| 624 |
|
<include name="**/*.java"/> |
| 625 |
|
</fileset> |
| 626 |
|
</javadoc> |
| 628 |
|
</target> |
| 629 |
|
|
| 630 |
|
|
| 631 |
< |
<target name="jdk7dist" |
| 632 |
< |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
| 631 |
> |
<target name="4jdk7dist" |
| 632 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
| 633 |
|
description="Puts all distributable products in single hierarchy"/> |
| 634 |
|
|
| 635 |
|
|
| 636 |
|
|
| 637 |
< |
<target name="jdk7clean" |
| 638 |
< |
description="Removes all build products"> |
| 637 |
> |
<target name="4jdk7clean" |
| 638 |
> |
description="Removes all 4jdk7 build products"> |
| 639 |
|
|
| 640 |
< |
<delete dir="${build.jdk7.dir}"/> |
| 640 |
> |
<delete dir="${build.4jdk7.dir}"/> |
| 641 |
|
|
| 642 |
|
</target> |
| 643 |
|
|
| 644 |
|
|
| 645 |
|
|
| 646 |
< |
<target name="jdk7dist-clean" |
| 646 |
> |
<target name="4jdk7dist-clean" |
| 647 |
|
description="Removes all build and distribution products"> |
| 648 |
|
|
| 649 |
|
</target> |
| 650 |
|
|
| 651 |
< |
<target name="jdk7dist-docs" |
| 652 |
< |
description="Builds javadocs without custom tags to dist folder"> |
| 651 |
> |
<target name="4jdk7dist-jar" |
| 652 |
> |
depends="4jdk7clean, 4jdk7compile"> |
| 653 |
|
|
| 654 |
< |
<delete dir="${dist.jdk7.docs.dir}"/> |
| 682 |
< |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
| 683 |
< |
|
| 684 |
< |
<javadoc destdir="${dist.jdk7.docs.dir}" |
| 685 |
< |
packagenames="none" |
| 686 |
< |
link="${jdkapi7docs.url}" |
| 687 |
< |
overview="${jdk7src.dir}/intro.html" |
| 688 |
< |
sourcepath="${jdk7src.dir}" |
| 689 |
< |
classpath="" |
| 690 |
< |
executable="${javadoc7}" |
| 691 |
< |
bootclasspath="${bootclasspath6}" |
| 692 |
< |
source="1.6"> |
| 693 |
< |
<arg value="-XDignore.symbol.file=true"/> |
| 694 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
| 695 |
< |
<include name="**/*.java"/> |
| 696 |
< |
</fileset> |
| 697 |
< |
</javadoc> |
| 654 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
| 655 |
|
|
| 656 |
|
</target> |
| 657 |
|
|
| 701 |
– |
<target name="jdk7dist-jar" |
| 702 |
– |
depends="jdk7clean, jdk7compile"> |
| 703 |
– |
|
| 704 |
– |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
| 705 |
– |
|
| 706 |
– |
</target> |
| 658 |
|
|
| 659 |
|
<!-- jsr166x --> |
| 660 |
|
|
| 710 |
– |
|
| 661 |
|
<target name="jsr166xcompile" |
| 662 |
< |
depends="init, configure-compiler" |
| 663 |
< |
description="Compiles jsr166x sources"> |
| 662 |
> |
depends="configure-compiler" |
| 663 |
> |
description="Compiles jsr166x sources to build dir"> |
| 664 |
|
|
| 665 |
|
<mkdir dir="${build.jsr166x.dir}"/> |
| 666 |
|
|
| 667 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
| 668 |
< |
destdir="${build.jsr166x.dir}" |
| 669 |
< |
debug="${build.debug}" |
| 670 |
< |
debuglevel="${build.debuglevel}" |
| 671 |
< |
deprecation="${build.deprecation}" |
| 672 |
< |
source="${build.sourcelevel}" |
| 673 |
< |
fork="true"> |
| 667 |
> |
<javac srcdir="${topsrc.dir}" |
| 668 |
> |
destdir="${build.jsr166x.dir}" |
| 669 |
> |
debug="${build.debug}" |
| 670 |
> |
debuglevel="${build.debuglevel}" |
| 671 |
> |
deprecation="${build.deprecation}" |
| 672 |
> |
classpath="" |
| 673 |
> |
source="5" |
| 674 |
> |
bootclasspath="${bootclasspath6}" |
| 675 |
> |
includeAntRuntime="false" |
| 676 |
> |
includeJavaRuntime="false" |
| 677 |
> |
executable="${javac7}" |
| 678 |
> |
fork="true"> |
| 679 |
|
|
| 680 |
< |
<include name="**/*.java"/> |
| 680 |
> |
<include name="jsr166x/**/*.java"/> |
| 681 |
|
<compilerarg line="${build.args}"/> |
| 682 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 683 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
| 684 |
|
|
| 685 |
|
</javac> |
| 686 |
|
|
| 692 |
|
depends="jsr166xcompile" |
| 693 |
|
description="Builds library jar from compiled sources"> |
| 694 |
|
|
| 695 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
| 740 |
< |
|
| 741 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
| 695 |
> |
<jar destfile="${jsr166x.jar}"> |
| 696 |
|
<fileset dir="${build.jsr166x.dir}"/> |
| 697 |
|
</jar> |
| 698 |
|
|
| 701 |
|
|
| 702 |
|
|
| 703 |
|
<target name="jsr166xdocs" |
| 704 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 704 |
> |
description="Builds javadocs to dist dir"> |
| 705 |
|
|
| 706 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
| 707 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
| 706 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
| 707 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
| 708 |
|
|
| 709 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
| 710 |
< |
packagenames="jsr166x" |
| 709 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
| 710 |
> |
packagenames="jsr166x.*" |
| 711 |
|
link="${jdkapidocs.url}" |
| 712 |
< |
source="${build.sourcelevel}" |
| 713 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 712 |
> |
source="5" |
| 713 |
> |
bootclasspath="${bootclasspath6}" |
| 714 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
| 715 |
> |
executable="${javadoc7}" |
| 716 |
|
additionalparam="-XDignore.symbol.file=true" /> |
| 717 |
|
|
| 718 |
|
</target> |
| 719 |
|
|
| 720 |
|
|
| 721 |
|
<target name="jsr166xdist" |
| 722 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
| 722 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
| 723 |
|
description="Puts all distributable products in single hierarchy"/> |
| 724 |
|
|
| 725 |
|
|
| 726 |
|
|
| 727 |
|
<target name="jsr166xclean" |
| 728 |
< |
description="Removes all build products"> |
| 728 |
> |
description="Removes all jsr166x build products"> |
| 729 |
|
|
| 730 |
|
<delete dir="${build.jsr166x.dir}"/> |
| 775 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
| 731 |
|
|
| 732 |
|
</target> |
| 733 |
|
|
| 739 |
|
</target> |
| 740 |
|
|
| 741 |
|
|
| 787 |
– |
|
| 788 |
– |
<target name="jsr166xdist-docs" |
| 789 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 790 |
– |
|
| 791 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
| 792 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
| 793 |
– |
|
| 794 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
| 795 |
– |
packagenames="jsr166x" |
| 796 |
– |
link="${jdkapidocs.url}" |
| 797 |
– |
source="${build.sourcelevel}" |
| 798 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 799 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 800 |
– |
|
| 801 |
– |
</target> |
| 802 |
– |
|
| 742 |
|
<target name="jsr166xdist-jar" |
| 743 |
|
depends="jsr166xclean, jsr166xjar"> |
| 744 |
|
|
| 745 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
| 745 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
| 746 |
|
|
| 747 |
|
</target> |
| 748 |
|
|
| 750 |
|
|
| 751 |
|
|
| 752 |
|
<target name="jsr166ycompile" |
| 753 |
< |
depends="init, configure-compiler" |
| 753 |
> |
depends="configure-compiler" |
| 754 |
|
description="Compiles jsr166y sources"> |
| 755 |
|
|
| 756 |
|
<mkdir dir="${build.jsr166y.dir}"/> |
| 757 |
|
|
| 758 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
| 759 |
< |
destdir="${build.jsr166y.dir}" |
| 760 |
< |
debug="${build.debug}" |
| 761 |
< |
debuglevel="${build.debuglevel}" |
| 762 |
< |
deprecation="${build.deprecation}" |
| 763 |
< |
source="${build.sourcelevel}" |
| 764 |
< |
fork="true"> |
| 758 |
> |
<javac srcdir="${topsrc.dir}" |
| 759 |
> |
destdir="${build.jsr166y.dir}" |
| 760 |
> |
debug="${build.debug}" |
| 761 |
> |
debuglevel="${build.debuglevel}" |
| 762 |
> |
deprecation="${build.deprecation}" |
| 763 |
> |
source="6" |
| 764 |
> |
classpath="" |
| 765 |
> |
bootclasspath="${bootclasspath6}" |
| 766 |
> |
includeAntRuntime="false" |
| 767 |
> |
includeJavaRuntime="false" |
| 768 |
> |
executable="${javac7}" |
| 769 |
> |
fork="true"> |
| 770 |
|
|
| 771 |
< |
<include name="**/*.java"/> |
| 771 |
> |
<include name="jsr166y/**/*.java"/> |
| 772 |
|
<compilerarg line="${build.args}"/> |
| 773 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 774 |
< |
<compilerarg value="${bootclasspath.args}"/> |
| 831 |
< |
|
| 832 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 833 |
< |
|
| 774 |
> |
<compilerarg value="-Xlint:all"/> |
| 775 |
|
</javac> |
| 835 |
– |
|
| 776 |
|
</target> |
| 777 |
|
|
| 778 |
|
|
| 839 |
– |
|
| 779 |
|
<target name="jsr166yjar" |
| 780 |
|
depends="jsr166ycompile" |
| 781 |
|
description="Builds library jar from compiled sources"> |
| 782 |
|
|
| 783 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
| 845 |
< |
|
| 846 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
| 783 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
| 784 |
|
<fileset dir="${build.jsr166y.dir}"/> |
| 785 |
|
</jar> |
| 786 |
|
|
| 789 |
|
|
| 790 |
|
|
| 791 |
|
<target name="jsr166ydocs" |
| 792 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 792 |
> |
description="Builds javadocs to dist dir"> |
| 793 |
|
|
| 794 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
| 795 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
| 794 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
| 795 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
| 796 |
|
|
| 797 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
| 798 |
< |
packagenames="jsr166y" |
| 797 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
| 798 |
> |
packagenames="jsr166y.*" |
| 799 |
|
link="${jdkapidocs.url}" |
| 800 |
< |
source="${build.sourcelevel}" |
| 801 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 800 |
> |
source="6" |
| 801 |
> |
bootclasspath="${bootclasspath6}" |
| 802 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
| 803 |
> |
executable="${javadoc7}" |
| 804 |
|
additionalparam="-XDignore.symbol.file=true" /> |
| 805 |
|
|
| 806 |
|
</target> |
| 807 |
|
|
| 808 |
|
|
| 809 |
|
<target name="jsr166ydist" |
| 810 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
| 810 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
| 811 |
|
description="Puts all distributable products in single hierarchy"/> |
| 812 |
|
|
| 813 |
|
|
| 814 |
|
|
| 815 |
|
<target name="jsr166yclean" |
| 816 |
< |
description="Removes all build products"> |
| 816 |
> |
description="Removes all jsr166y build products"> |
| 817 |
|
|
| 818 |
|
<delete dir="${build.jsr166y.dir}"/> |
| 880 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
| 819 |
|
|
| 820 |
|
</target> |
| 821 |
|
|
| 826 |
|
|
| 827 |
|
</target> |
| 828 |
|
|
| 891 |
– |
<target name="jsr166ydist-docs" |
| 892 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 893 |
– |
|
| 894 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
| 895 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
| 896 |
– |
|
| 897 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
| 898 |
– |
packagenames="jsr166y" |
| 899 |
– |
link="${jdkapidocs.url}" |
| 900 |
– |
source="${build.sourcelevel}" |
| 901 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 902 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 903 |
– |
|
| 904 |
– |
</target> |
| 905 |
– |
|
| 829 |
|
<target name="jsr166ydist-jar" |
| 830 |
|
depends="jsr166yclean, jsr166yjar"> |
| 831 |
|
|
| 832 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
| 832 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
| 833 |
|
|
| 834 |
|
</target> |
| 835 |
|
|
| 838 |
|
|
| 839 |
|
|
| 840 |
|
<target name="extra166ycompile" |
| 841 |
< |
depends="init, configure-compiler, jsr166ycompile" |
| 841 |
> |
depends="configure-compiler, jsr166yjar" |
| 842 |
|
description="Compiles extra166y sources"> |
| 843 |
|
|
| 844 |
|
<mkdir dir="${build.extra166y.dir}"/> |
| 845 |
|
|
| 846 |
< |
<javac srcdir="${extra166ysrc.dir}" |
| 847 |
< |
destdir="${build.extra166y.dir}" |
| 848 |
< |
debug="${build.debug}" |
| 849 |
< |
classpath="${jsr166yproduct.jar}" |
| 850 |
< |
debuglevel="${build.debuglevel}" |
| 851 |
< |
deprecation="${build.deprecation}" |
| 852 |
< |
source="${build.sourcelevel}" |
| 853 |
< |
fork="true"> |
| 846 |
> |
<javac srcdir="${topsrc.dir}" |
| 847 |
> |
destdir="${build.extra166y.dir}" |
| 848 |
> |
debug="${build.debug}" |
| 849 |
> |
debuglevel="${build.debuglevel}" |
| 850 |
> |
deprecation="${build.deprecation}" |
| 851 |
> |
classpath="" |
| 852 |
> |
source="6" |
| 853 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
| 854 |
> |
includeAntRuntime="false" |
| 855 |
> |
includeJavaRuntime="false" |
| 856 |
> |
executable="${javac7}" |
| 857 |
> |
fork="true"> |
| 858 |
|
|
| 859 |
< |
<include name="**/*.java"/> |
| 859 |
> |
<include name="extra166y/**/*.java"/> |
| 860 |
|
<compilerarg line="${build.args}"/> |
| 861 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 862 |
< |
<compilerarg value="${bootclasspath.args}"/> |
| 936 |
< |
|
| 937 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 862 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
| 863 |
|
|
| 864 |
|
</javac> |
| 865 |
|
|
| 871 |
|
depends="extra166ycompile" |
| 872 |
|
description="Builds library jar from compiled sources"> |
| 873 |
|
|
| 874 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
| 950 |
< |
|
| 951 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
| 874 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
| 875 |
|
<fileset dir="${build.extra166y.dir}"/> |
| 876 |
|
</jar> |
| 877 |
|
|
| 880 |
|
|
| 881 |
|
|
| 882 |
|
<target name="extra166ydocs" |
| 883 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 883 |
> |
description="Builds javadocs to build dir"> |
| 884 |
|
|
| 885 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
| 886 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
| 885 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
| 886 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
| 887 |
|
|
| 888 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
| 889 |
< |
packagenames="extra166y" |
| 888 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
| 889 |
> |
packagenames="extra166y.*" |
| 890 |
|
link="${jdkapidocs.url}" |
| 891 |
< |
source="${build.sourcelevel}" |
| 892 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 891 |
> |
source="6" |
| 892 |
> |
bootclasspath="${bootclasspath6}" |
| 893 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
| 894 |
> |
executable="${javadoc7}" |
| 895 |
|
additionalparam="-XDignore.symbol.file=true" /> |
| 896 |
|
|
| 897 |
|
</target> |
| 898 |
|
|
| 899 |
|
|
| 900 |
|
<target name="extra166ydist" |
| 901 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
| 901 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
| 902 |
|
description="Puts all distributable products in single hierarchy"/> |
| 903 |
|
|
| 904 |
|
|
| 905 |
|
|
| 906 |
|
<target name="extra166yclean" |
| 907 |
< |
description="Removes all build products"> |
| 907 |
> |
description="Removes all extra166y build products"> |
| 908 |
|
|
| 909 |
|
<delete dir="${build.extra166y.dir}"/> |
| 985 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
| 910 |
|
|
| 911 |
|
</target> |
| 912 |
|
|
| 917 |
|
|
| 918 |
|
</target> |
| 919 |
|
|
| 996 |
– |
<target name="extra166ydist-docs" |
| 997 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 998 |
– |
|
| 999 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
| 1000 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
| 1001 |
– |
|
| 1002 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
| 1003 |
– |
packagenames="extra166y" |
| 1004 |
– |
link="${jdkapidocs.url}" |
| 1005 |
– |
source="${build.sourcelevel}" |
| 1006 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 1007 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 1008 |
– |
|
| 1009 |
– |
</target> |
| 1010 |
– |
|
| 920 |
|
<target name="extra166ydist-jar" |
| 921 |
|
depends="extra166yclean, extra166yjar"> |
| 922 |
|
|
| 923 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
| 923 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
| 924 |
|
|
| 925 |
|
</target> |
| 926 |
|
|
| 937 |
|
debug="${build.debug}" |
| 938 |
|
debuglevel="${build.debuglevel}" |
| 939 |
|
deprecation="${build.deprecation}" |
| 940 |
< |
source="1.7" |
| 940 |
> |
source="7" |
| 941 |
|
classpath="" |
| 942 |
|
includeAntRuntime="false" |
| 943 |
|
includeJavaRuntime="false" |
| 959 |
|
depends="jsr166ecompile" |
| 960 |
|
description="Builds library jar from compiled sources"> |
| 961 |
|
|
| 962 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
| 1054 |
< |
|
| 1055 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
| 962 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
| 963 |
|
<fileset dir="${build.jsr166e.dir}"/> |
| 964 |
|
</jar> |
| 965 |
|
|
| 968 |
|
|
| 969 |
|
|
| 970 |
|
<target name="jsr166edocs" |
| 971 |
< |
description="Builds javadocs with custom tags to build folder"> |
| 971 |
> |
description="Builds javadocs to build dir"> |
| 972 |
|
|
| 973 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
| 974 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
| 973 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
| 974 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
| 975 |
|
|
| 976 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
| 977 |
< |
packagenames="jsr166e,jsr166e.extra" |
| 978 |
< |
link="${jdkapi7docs.url}" |
| 979 |
< |
source="1.7" |
| 980 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" |
| 976 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
| 977 |
> |
packagenames="jsr166e.*" |
| 978 |
> |
link="${jdkapidocs.url}" |
| 979 |
> |
source="7" |
| 980 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
| 981 |
|
executable="${javadoc7}" |
| 982 |
|
additionalparam="-XDignore.symbol.file=true" > |
| 1076 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 1077 |
– |
<include name="jsr166e/**/*.java"/> |
| 1078 |
– |
</fileset> |
| 983 |
|
</javadoc> |
| 984 |
|
|
| 985 |
|
</target> |
| 986 |
|
|
| 987 |
|
|
| 988 |
|
<target name="jsr166edist" |
| 989 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
| 989 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
| 990 |
|
description="Puts all distributable products in single hierarchy"/> |
| 991 |
|
|
| 992 |
|
|
| 993 |
|
|
| 994 |
|
<target name="jsr166eclean" |
| 995 |
< |
description="Removes all build products"> |
| 995 |
> |
description="Removes all jsr166e build products"> |
| 996 |
|
|
| 997 |
|
<delete dir="${build.jsr166e.dir}"/> |
| 1094 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
| 998 |
|
|
| 999 |
|
</target> |
| 1000 |
|
|
| 1001 |
|
|
| 1099 |
– |
|
| 1002 |
|
<target name="jsr166edist-clean" |
| 1003 |
|
description="Removes all build and distribution products"> |
| 1004 |
|
|
| 1005 |
|
</target> |
| 1006 |
|
|
| 1105 |
– |
<target name="jsr166edist-docs" |
| 1106 |
– |
description="Builds javadocs without custom tags to dist folder"> |
| 1107 |
– |
|
| 1108 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
| 1109 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
| 1110 |
– |
|
| 1111 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
| 1112 |
– |
packagenames="jsr166e,jsr166e.extra" |
| 1113 |
– |
link="${jdkapidocs.url}" |
| 1114 |
– |
source="1.7" |
| 1115 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
| 1116 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
| 1117 |
– |
|
| 1118 |
– |
</target> |
| 1119 |
– |
|
| 1007 |
|
<target name="jsr166edist-jar" |
| 1008 |
|
depends="jsr166eclean, jsr166ejar"> |
| 1009 |
|
|
| 1010 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
| 1010 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
| 1011 |
|
|
| 1012 |
|
</target> |
| 1013 |
|
|
