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/"/> |
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="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
166 |
< |
|
169 |
< |
<property name="jdkapi9docs.url" value="${jdkapi8docs.url}"/> |
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="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> --> |
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" --> |
242 |
|
</macrodef> |
243 |
|
|
244 |
|
<macrodef name="run-jtreg-tests"> |
245 |
+ |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
246 |
|
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
247 |
|
<attribute name="source" default="7"/> |
248 |
|
<attribute name="target"/> |
338 |
|
|
339 |
|
<javadoc destdir="${docs.dir}" |
340 |
|
packagenames="none" |
341 |
< |
link="${jdkapi9docs.url}" |
341 |
> |
link="${java9.api.url}" |
342 |
|
overview="${src.dir}/intro.html" |
343 |
|
access="${build.javadoc.access}" |
344 |
|
sourcepath="${src.dir}:${jdk9src.dir}" |
347 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
348 |
|
<include name="**/*.java"/> |
349 |
|
</fileset> |
350 |
+ |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
351 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
352 |
|
<arg value="-XDignore.symbol.file=true"/> |
353 |
|
<arg value="-tag"/> |
651 |
|
|
652 |
|
<javadoc destdir="${4jdk7docs.dir}" |
653 |
|
packagenames="none" |
654 |
< |
link="${jdkapi7docs.url}" |
654 |
> |
link="${java7.api.url}" |
655 |
|
overview="${4jdk7src.dir}/intro.html" |
656 |
|
access="${build.javadoc.access}" |
657 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
660 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
661 |
|
<include name="**/*.java"/> |
662 |
|
</fileset> |
663 |
+ |
<arg line="-Xdocrootparent ${java7.docroot.url}"/> |
664 |
|
<arg value="-XDignore.symbol.file=true"/> |
665 |
|
</javadoc> |
666 |
|
</target> |
740 |
|
|
741 |
|
<javadoc destdir="${jsr166xdocs.dir}" |
742 |
|
packagenames="jsr166x.*" |
743 |
< |
link="${jdkapidocs.url}" |
743 |
> |
link="${java.api.url}" |
744 |
|
access="${build.javadoc.access}" |
745 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
746 |
|
bootclasspath="${bootclasspath6}" |
747 |
|
source="5" |
748 |
|
executable="${javadoc7}"> |
749 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
750 |
|
<arg value="-XDignore.symbol.file=true"/> |
751 |
|
|
752 |
|
</javadoc> |
826 |
|
|
827 |
|
<javadoc destdir="${jsr166ydocs.dir}" |
828 |
|
packagenames="jsr166y.*" |
829 |
< |
link="${jdkapidocs.url}" |
829 |
> |
link="${java.api.url}" |
830 |
|
access="${build.javadoc.access}" |
831 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
832 |
|
bootclasspath="${bootclasspath6}" |
833 |
|
source="6" |
834 |
|
executable="${javadoc7}"> |
835 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
836 |
|
<arg value="-XDignore.symbol.file=true"/> |
837 |
|
|
838 |
|
</javadoc> |
913 |
|
|
914 |
|
<javadoc destdir="${extra166ydocs.dir}" |
915 |
|
packagenames="extra166y.*" |
916 |
< |
link="${jdkapidocs.url}" |
916 |
> |
link="${java.api.url}" |
917 |
|
access="${build.javadoc.access}" |
918 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
919 |
|
bootclasspath="${bootclasspath6}" |
920 |
|
source="6" |
921 |
|
executable="${javadoc7}"> |
922 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
923 |
|
<arg value="-XDignore.symbol.file=true"/> |
924 |
|
|
925 |
|
</javadoc> |
1026 |
|
|
1027 |
|
<javadoc destdir="${jsr166edocs.dir}" |
1028 |
|
packagenames="jsr166e.*" |
1029 |
< |
link="${jdkapidocs.url}" |
1029 |
> |
link="${java.api.url}" |
1030 |
|
access="${build.javadoc.access}" |
1031 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1032 |
|
source="${build.jsr166e.java.version}" |
1033 |
|
executable="${javadoc7}"> |
1034 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1035 |
|
<arg value="-XDignore.symbol.file=true"/> |
1036 |
|
|
1037 |
|
</javadoc> |