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.278 by jsr166, Mon Oct 1 00:10:52 2018 UTC vs.
Revision 1.280 by jsr166, Sun Oct 7 03:43:04 2018 UTC

# Line 204 | Line 204
204    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
207 >  <!-- But pin to jdk 10 until fix for -->
208 >  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
210  
211    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 396 | Line 398
398      <sequential>
399        <property name="build.main.java"    value="${java@{v}}"/>
400        <property name="build.main.javac"   value="${javac@{v}}"/>
401 <      <!-- Force javadoc version to be at least 10,
402 <           so we can use override-methods=summary -->
401 >      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402 >      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403        <condition property="build.main.javadoc"
404 <                 value="${javadoc11}"
404 >                 value="${javadoc12}"
405                   else="${javadoc@{v}}">
406 <        <equals arg1="@{v}" arg2="9"/>
406 >        <matches pattern="^(9|10|11)$" string="@{v}"/>
407        </condition>
408 +      <property name="build.main.javadoc"   value="${javadoc12}"/>
409      </sequential>
410    </macrodef>
411    <define-build-main-properties v="${build.main.java.version}"/>
# Line 481 | Line 484
484   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
485      <javadoc destdir="${docs.dir}"
486               packagenames="none"
487 <             link="${java10.api.url}"
487 >             link="${java11.api.url}"
488               overview="${src.dir}/intro.html"
489               access="${build.javadoc.access}"
490               sourcepath="${src.dir}"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines