ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.90 by dl, Fri Jul 15 13:21:07 2011 UTC vs.
Revision 1.91 by jsr166, Sun Nov 18 06:21:11 2012 UTC

# Line 64 | Line 64
64    <property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
65    <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
66    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
67 +
68    <!-- Distribution locations -->
69    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
70    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
# Line 82 | Line 83
83    <!-- Bootclasspath argument -->
84    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
85  
86 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
87 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
88 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
89 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
90 +
91 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
92 +  <!-- The below does not yet exist as of 2012-11 -->
93 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
94 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
95 +
96    <!-- Test classpath -->
97    <path id="test.classpath">
98      <pathelement location="${build.testcases.dir}"/>
# Line 160 | Line 171
171  
172      <javadoc destdir="${build.javadocs.dir}"
173               packagenames="none"
174 <             link="http://download.oracle.com/javase/7/docs/api/"
174 >             link="${jdkapidocs.url}"
175               overview="${src.dir}/intro.html"
176               sourcepath="${src.dir}:${jdksrc.dir}"
177               additionalparam="-XDignore.symbol.file=true" >
# Line 229 | Line 240
240  
241      <javadoc destdir="${dist.javadocs.dir}"
242               packagenames="none"
243 <             link="http://download.oracle.com/javase/7/docs/api/"
243 >             link="${jdkapidocs.url}"
244               overview="${src.dir}/intro.html"
245               sourcepath="${src.dir}:${jdksrc.dir}"
246               additionalparam="-XDignore.symbol.file=true" >
# Line 514 | Line 525
525  
526      <javadoc destdir="${build.jsr166xjavadocs.dir}"
527               packagenames="jsr166x"
528 <             link="http://download.oracle.com/javase/7/docs/api/"
528 >             link="${jdkapidocs.url}"
529               source="${build.sourcelevel}"
530               sourcepath="${topsrc.dir}:${jdksrc.dir}"
531               additionalparam="-XDignore.symbol.file=true" />
# Line 553 | Line 564
564  
565      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
566               packagenames="jsr166x"
567 <             link="http://download.oracle.com/javase/7/docs/api/"
567 >             link="${jdkapidocs.url}"
568               source="${build.sourcelevel}"
569               sourcepath="${topsrc.dir}:${jdksrc.dir}"
570               additionalparam="-XDignore.symbol.file=true" />
# Line 619 | Line 630
630  
631      <javadoc destdir="${build.jsr166yjavadocs.dir}"
632               packagenames="jsr166y"
633 <             link="http://download.oracle.com/javase/7/docs/api/"
633 >             link="${jdkapidocs.url}"
634               source="${build.sourcelevel}"
635               sourcepath="${topsrc.dir}:${jdksrc.dir}"
636               additionalparam="-XDignore.symbol.file=true" />
# Line 656 | Line 667
667  
668      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
669               packagenames="jsr166y"
670 <             link="http://download.oracle.com/javase/7/docs/api/"
670 >             link="${jdkapidocs.url}"
671               source="${build.sourcelevel}"
672               sourcepath="${topsrc.dir}:${jdksrc.dir}"
673               additionalparam="-XDignore.symbol.file=true" />
# Line 724 | Line 735
735  
736      <javadoc destdir="${build.extra166yjavadocs.dir}"
737               packagenames="extra166y"
738 <             link="http://download.oracle.com/javase/7/docs/api/"
738 >             link="${jdkapidocs.url}"
739               source="${build.sourcelevel}"
740               sourcepath="${topsrc.dir}:${jdksrc.dir}"
741               additionalparam="-XDignore.symbol.file=true" />
# Line 761 | Line 772
772  
773      <javadoc destdir="${dist.extra166yjavadocs.dir}"
774               packagenames="extra166y"
775 <             link="http://download.oracle.com/javase/7/docs/api/"
775 >             link="${jdkapidocs.url}"
776               source="${build.sourcelevel}"
777               sourcepath="${topsrc.dir}:${jdksrc.dir}"
778               additionalparam="-XDignore.symbol.file=true" />
# Line 827 | Line 838
838  
839      <javadoc destdir="${build.jsr166ejavadocs.dir}"
840               packagenames="jsr166e,jsr166e.extra"
841 <             link="http://download.oracle.com/javase/7/docs/api/"
841 >             link="${jdkapidocs.url}"
842               source="1.7"
843               sourcepath="${topsrc.dir}:${jdksrc.dir}"
844               additionalparam="-XDignore.symbol.file=true" />
# Line 864 | Line 875
875  
876      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
877               packagenames="jsr166e,jsr166e.extra"
878 <             link="http://download.oracle.com/javase/7/docs/api/"
878 >             link="${jdkapidocs.url}"
879               source="1.7"
880               sourcepath="${topsrc.dir}:${jdksrc.dir}"
881               additionalparam="-XDignore.symbol.file=true" />

Diff Legend

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