16 |
|
$HOME/jdk/jdk6 |
17 |
|
$HOME/jdk/jdk7 |
18 |
|
$HOME/jdk/jdk8 |
19 |
+ |
$HOME/jdk/jdk9 |
20 |
|
where each of the above is a JDK or a symlink to same, and |
21 |
|
$HOME/jdk/src/jdk6 |
22 |
|
$HOME/jdk/src/jdk7 |
23 |
|
$HOME/jdk/src/jdk8 |
24 |
+ |
$HOME/jdk/src/jdk9 |
25 |
|
where each of the above is a complete JDK source tree |
26 |
|
(e.g. mercurial forest) or a symlink to same. |
25 |
– |
As of 2013-02, the very latest lambda 8 jdk is needed for jdk8. |
27 |
|
------------------------------------------------------------------------------ |
28 |
|
</description> |
29 |
|
|
116 |
|
<defjdklocations v="6"/> |
117 |
|
<defjdklocations v="7"/> |
118 |
|
<defjdklocations v="8"/> |
119 |
+ |
<defjdklocations v="9"/> |
120 |
|
|
121 |
|
<!-- Source locations --> |
122 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
163 |
|
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
164 |
|
|
165 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
166 |
< |
<!-- The below does not yet exist as of 2013-01 --> |
166 |
> |
<!-- The expected canonical location does not yet exist as of 2014-02 --> |
167 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
168 |
|
|
169 |
+ |
<property name="jdkapi9docs.url" value="${jdkapi8docs.url}"/> |
170 |
+ |
<!-- No published jdk9 docs exist as of 2014-02 --> |
171 |
+ |
<!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> --> |
172 |
+ |
|
173 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
174 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
175 |
|
|
275 |
|
|
276 |
|
<!-- Main targets --> |
277 |
|
|
278 |
+ |
<property name="build.main.java.version" value="9"/> |
279 |
+ |
<property name="build.main.javac" value="${javac9}"/> |
280 |
+ |
|
281 |
|
<target name="dists" |
282 |
|
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
283 |
|
description="Builds all public jars and docs"/> |
296 |
|
classpath="" |
297 |
|
includeAntRuntime="false" |
298 |
|
includeJavaRuntime="false" |
299 |
< |
executable="${javac8}" |
299 |
> |
executable="${build.main.javac}" |
300 |
|
fork="true"> |
301 |
|
|
302 |
|
<include name="**/*.java"/> |
332 |
|
|
333 |
|
<javadoc destdir="${docs.dir}" |
334 |
|
packagenames="none" |
335 |
< |
link="${jdkapi8docs.url}" |
335 |
> |
link="${jdkapi9docs.url}" |
336 |
|
overview="${src.dir}/intro.html" |
337 |
|
access="${build.javadoc.access}" |
338 |
< |
sourcepath="${src.dir}:${jdk8src.dir}" |
338 |
> |
sourcepath="${src.dir}:${jdk9src.dir}" |
339 |
|
classpath="" |
340 |
< |
executable="${javadoc8}"> |
340 |
> |
executable="${javadoc9}"> |
341 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
342 |
|
<include name="**/*.java"/> |
343 |
|
</fileset> |
411 |
|
description="Runs tck tests for main directly"> |
412 |
|
|
413 |
|
<run-tck-tests |
414 |
< |
target="8" |
414 |
> |
target="${build.main.java.version}" |
415 |
|
workdir="${build.dir}" |
416 |
|
classes="${product.jar}"/> |
417 |
|
</target> |
420 |
|
depends="jar" |
421 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
422 |
|
<run-jtreg-tests |
423 |
< |
target="8" |
423 |
> |
target="${build.main.java.version}" |
424 |
|
workdir="${build.dir}" |
425 |
|
classes="${product.jar}"/> |
426 |
|
</target> |
430 |
|
description="Runs tck and jtreg tests for main"> |
431 |
|
</target> |
432 |
|
|
433 |
+ |
<target name="test89" |
434 |
+ |
description="Runs tck and jtreg tests for main for multiple java versions"> |
435 |
+ |
|
436 |
+ |
<antcall target="clean"/> |
437 |
+ |
<antcall target="test"> |
438 |
+ |
<param name="build.main.java.version" value="8"/> |
439 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
440 |
+ |
</antcall> |
441 |
+ |
|
442 |
+ |
<antcall target="clean"/> |
443 |
+ |
<antcall target="test"> |
444 |
+ |
<param name="build.main.java.version" value="9"/> |
445 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
446 |
+ |
</antcall> |
447 |
+ |
|
448 |
+ |
</target> |
449 |
+ |
|
450 |
|
|
451 |
|
|
452 |
|
<target name="configure-compiler"> |
578 |
|
<javac-elements> |
579 |
|
<!-- JDK8+ test classes --> |
580 |
|
<exclude name="*8Test.java"/> |
581 |
+ |
<exclude name="*9Test.java"/> |
582 |
|
<exclude name="DoubleAccumulatorTest.java"/> |
583 |
|
<exclude name="DoubleAdderTest.java"/> |
584 |
|
<exclude name="LongAccumulatorTest.java"/> |