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"/> |
157 |
|
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
158 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
159 |
|
|
160 |
< |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
161 |
< |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
162 |
< |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
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 --> |
167 |
< |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
160 |
> |
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
161 |
> |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
162 |
> |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
163 |
> |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
164 |
> |
<!-- The expected canonical location does not yet exist as of 2014-02 --> |
165 |
> |
<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> --> |
166 |
> |
<property name="java8.docroot.url" value="http://download.java.net/jdk8/docs"/> |
167 |
> |
<!-- No published jdk9 docs exist as of 2014-02 --> |
168 |
> |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
169 |
> |
<property name="java9.docroot.url" value="${java8.docroot.url}"/> |
170 |
> |
<!-- Default jdk doc location (latest stable release seems best) --> |
171 |
> |
<property name="java.docroot.url" value="${java7.docroot.url}"/> |
172 |
|
|
173 |
< |
<!-- Default jdk api doc location (latest stable release seems best) --> |
174 |
< |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
173 |
> |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
174 |
> |
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
175 |
> |
<property name="java6.api.url" value="${java6.docroot.url}/api/"/> |
176 |
> |
<property name="java7.api.url" value="${java7.docroot.url}/api/"/> |
177 |
> |
<property name="java8.api.url" value="${java8.docroot.url}/api/"/> |
178 |
> |
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
179 |
> |
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
180 |
|
|
181 |
|
<!-- Define the "jtreg" task --> |
182 |
|
<!-- See the docs in "jtreg -onlineHelp" --> |
280 |
|
|
281 |
|
<!-- Main targets --> |
282 |
|
|
283 |
+ |
<property name="build.main.java.version" value="9"/> |
284 |
+ |
<property name="build.main.javac" value="${javac9}"/> |
285 |
+ |
|
286 |
|
<target name="dists" |
287 |
|
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
288 |
|
description="Builds all public jars and docs"/> |
301 |
|
classpath="" |
302 |
|
includeAntRuntime="false" |
303 |
|
includeJavaRuntime="false" |
304 |
< |
executable="${javac8}" |
304 |
> |
executable="${build.main.javac}" |
305 |
|
fork="true"> |
306 |
|
|
307 |
|
<include name="**/*.java"/> |
337 |
|
|
338 |
|
<javadoc destdir="${docs.dir}" |
339 |
|
packagenames="none" |
340 |
< |
link="${jdkapi8docs.url}" |
340 |
> |
link="${java9.api.url}" |
341 |
|
overview="${src.dir}/intro.html" |
342 |
|
access="${build.javadoc.access}" |
343 |
< |
sourcepath="${src.dir}:${jdk8src.dir}" |
343 |
> |
sourcepath="${src.dir}:${jdk9src.dir}" |
344 |
|
classpath="" |
345 |
< |
executable="${javadoc8}"> |
345 |
> |
executable="${javadoc9}"> |
346 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
347 |
|
<include name="**/*.java"/> |
348 |
|
</fileset> |
349 |
+ |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
350 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
351 |
|
<arg value="-XDignore.symbol.file=true"/> |
352 |
|
<arg value="-tag"/> |
417 |
|
description="Runs tck tests for main directly"> |
418 |
|
|
419 |
|
<run-tck-tests |
420 |
< |
target="8" |
420 |
> |
target="${build.main.java.version}" |
421 |
|
workdir="${build.dir}" |
422 |
|
classes="${product.jar}"/> |
423 |
|
</target> |
426 |
|
depends="jar" |
427 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
428 |
|
<run-jtreg-tests |
429 |
< |
target="8" |
429 |
> |
target="${build.main.java.version}" |
430 |
|
workdir="${build.dir}" |
431 |
|
classes="${product.jar}"/> |
432 |
|
</target> |
436 |
|
description="Runs tck and jtreg tests for main"> |
437 |
|
</target> |
438 |
|
|
439 |
+ |
<target name="test89" |
440 |
+ |
description="Runs tck and jtreg tests for main for multiple java versions"> |
441 |
+ |
|
442 |
+ |
<antcall target="clean"/> |
443 |
+ |
<antcall target="test"> |
444 |
+ |
<param name="build.main.java.version" value="8"/> |
445 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
446 |
+ |
</antcall> |
447 |
+ |
|
448 |
+ |
<antcall target="clean"/> |
449 |
+ |
<antcall target="test"> |
450 |
+ |
<param name="build.main.java.version" value="9"/> |
451 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
452 |
+ |
</antcall> |
453 |
+ |
|
454 |
+ |
</target> |
455 |
+ |
|
456 |
|
|
457 |
|
|
458 |
|
<target name="configure-compiler"> |
584 |
|
<javac-elements> |
585 |
|
<!-- JDK8+ test classes --> |
586 |
|
<exclude name="*8Test.java"/> |
587 |
+ |
<exclude name="*9Test.java"/> |
588 |
|
<exclude name="DoubleAccumulatorTest.java"/> |
589 |
|
<exclude name="DoubleAdderTest.java"/> |
590 |
|
<exclude name="LongAccumulatorTest.java"/> |
650 |
|
|
651 |
|
<javadoc destdir="${4jdk7docs.dir}" |
652 |
|
packagenames="none" |
653 |
< |
link="${jdkapi7docs.url}" |
653 |
> |
link="${java7.api.url}" |
654 |
|
overview="${4jdk7src.dir}/intro.html" |
655 |
|
access="${build.javadoc.access}" |
656 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
659 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
660 |
|
<include name="**/*.java"/> |
661 |
|
</fileset> |
662 |
+ |
<arg line="-Xdocrootparent ${java7.docroot.url}"/> |
663 |
|
<arg value="-XDignore.symbol.file=true"/> |
664 |
|
</javadoc> |
665 |
|
</target> |
739 |
|
|
740 |
|
<javadoc destdir="${jsr166xdocs.dir}" |
741 |
|
packagenames="jsr166x.*" |
742 |
< |
link="${jdkapidocs.url}" |
742 |
> |
link="${java.api.url}" |
743 |
|
access="${build.javadoc.access}" |
744 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
745 |
|
bootclasspath="${bootclasspath6}" |
746 |
|
source="5" |
747 |
|
executable="${javadoc7}"> |
748 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
749 |
|
<arg value="-XDignore.symbol.file=true"/> |
750 |
|
|
751 |
|
</javadoc> |
825 |
|
|
826 |
|
<javadoc destdir="${jsr166ydocs.dir}" |
827 |
|
packagenames="jsr166y.*" |
828 |
< |
link="${jdkapidocs.url}" |
828 |
> |
link="${java.api.url}" |
829 |
|
access="${build.javadoc.access}" |
830 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
831 |
|
bootclasspath="${bootclasspath6}" |
832 |
|
source="6" |
833 |
|
executable="${javadoc7}"> |
834 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
835 |
|
<arg value="-XDignore.symbol.file=true"/> |
836 |
|
|
837 |
|
</javadoc> |
912 |
|
|
913 |
|
<javadoc destdir="${extra166ydocs.dir}" |
914 |
|
packagenames="extra166y.*" |
915 |
< |
link="${jdkapidocs.url}" |
915 |
> |
link="${java.api.url}" |
916 |
|
access="${build.javadoc.access}" |
917 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
918 |
|
bootclasspath="${bootclasspath6}" |
919 |
|
source="6" |
920 |
|
executable="${javadoc7}"> |
921 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
922 |
|
<arg value="-XDignore.symbol.file=true"/> |
923 |
|
|
924 |
|
</javadoc> |
979 |
|
</javac> |
980 |
|
</target> |
981 |
|
|
982 |
+ |
<!-- jsr166e: find doclint errors --> |
983 |
+ |
<target name="jsr166edoclint"> |
984 |
+ |
|
985 |
+ |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
986 |
+ |
|
987 |
+ |
<javac srcdir="${topsrc.dir}" |
988 |
+ |
destdir="${build.jsr166e.classes.dir}" |
989 |
+ |
debug="${build.debug}" |
990 |
+ |
debuglevel="${build.debuglevel}" |
991 |
+ |
deprecation="${build.deprecation}" |
992 |
+ |
source="${build.jsr166e.java.version}" |
993 |
+ |
classpath="" |
994 |
+ |
bootclasspath="${bootclasspath7}" |
995 |
+ |
includeAntRuntime="false" |
996 |
+ |
includeJavaRuntime="false" |
997 |
+ |
executable="${javac8}" |
998 |
+ |
fork="true"> |
999 |
+ |
|
1000 |
+ |
<include name="jsr166e/**/*.java"/> |
1001 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1002 |
+ |
<compilerarg value="-Xlint:all"/> |
1003 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
1004 |
+ |
|
1005 |
+ |
</javac> |
1006 |
+ |
</target> |
1007 |
+ |
|
1008 |
|
|
1009 |
|
<target name="jsr166ejar" |
1010 |
|
depends="jsr166ecompile" |
1025 |
|
|
1026 |
|
<javadoc destdir="${jsr166edocs.dir}" |
1027 |
|
packagenames="jsr166e.*" |
1028 |
< |
link="${jdkapidocs.url}" |
1028 |
> |
link="${java.api.url}" |
1029 |
|
access="${build.javadoc.access}" |
1030 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1031 |
|
source="${build.jsr166e.java.version}" |
1032 |
|
executable="${javadoc7}"> |
1033 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1034 |
|
<arg value="-XDignore.symbol.file=true"/> |
1035 |
|
|
1036 |
|
</javadoc> |