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.279 by jsr166, Mon Oct 1 03:04:48 2018 UTC vs.
Revision 1.282 by jsr166, Tue Oct 9 01:34:19 2018 UTC

# Line 398 | 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      </sequential>
409    </macrodef>
# Line 412 | Line 412
412    <target name="dists"
413            depends="dist, 4jdk8dist"
414            description="Builds all public jars and docs"/>
415 <          <!--
416 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
417 <          -->
415 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
416  
417    <target name="compile"
418            depends="configure-compiler"
# Line 483 | Line 481
481   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"
483               packagenames="none"
484 <             link="${java10.api.url}"
484 >             link="${java11.api.url}"
485               overview="${src.dir}/intro.html"
486               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"
# Line 498 | Line 496
496        <arg value="-XDignore.symbol.file=true"/>
497        <arg value="-html5"/>
498        <arg value="--patch-module=java.base=${src.dir}"/>
499 +      <arg value="--frames"/>
500        <arg value="--override-methods=summary"/>
501        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
502        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines