ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.151 by jsr166, Sun Feb 16 14:25:46 2014 UTC vs.
Revision 1.152 by jsr166, Tue Feb 25 16:33:15 2014 UTC

#	Line 157 | Line 157
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" -->
#	Line 332 | Line 337
337
338		<javadoc destdir="${docs.dir}"
339		packagenames="none"
340	<	link="${jdkapi9docs.url}"
340	>	link="${java9.api.url}"
341		overview="${src.dir}/intro.html"
342		access="${build.javadoc.access}"
343		sourcepath="${src.dir}:${jdk9src.dir}"
#	Line 341 | Line 346
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"/>
#	Line 644 | Line 650
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}"
#	Line 653 | Line 659
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>
#	Line 732 | Line 739
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>
#	Line 817 | Line 825
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>
#	Line 903 | Line 912
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>
#	Line 1015 | Line 1025
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>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines