[cvs] / jsr166 / build.xml Repository:
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.279, Mon Oct 1 03:04:48 2018 UTC revision 1.280, Sun Oct 7 03:43:04 2018 UTC
# Line 398  Line 398 
398      <sequential>      <sequential>
399        <property name="build.main.java"    value="${java@{v}}"/>        <property name="build.main.java"    value="${java@{v}}"/>
400        <property name="build.main.javac"   value="${javac@{v}}"/>        <property name="build.main.javac"   value="${javac@{v}}"/>
401        <!-- Force javadoc version to be at least 10,        <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402             so we can use override-methods=summary -->        <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403        <condition property="build.main.javadoc"        <condition property="build.main.javadoc"
404                   value="${javadoc11}"                   value="${javadoc12}"
405                   else="${javadoc@{v}}">                   else="${javadoc@{v}}">
406          <equals arg1="@{v}" arg2="9"/>          <matches pattern="^(9|10|11)$" string="@{v}"/>
407        </condition>        </condition>
408          <property name="build.main.javadoc"   value="${javadoc12}"/>
409      </sequential>      </sequential>
410    </macrodef>    </macrodef>
411    <define-build-main-properties v="${build.main.java.version}"/>    <define-build-main-properties v="${build.main.java.version}"/>
# Line 483  Line 484 
484  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
485      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
486               packagenames="none"               packagenames="none"
487               link="${java10.api.url}"               link="${java11.api.url}"
488               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
489               access="${build.javadoc.access}"               access="${build.javadoc.access}"
490               sourcepath="${src.dir}"               sourcepath="${src.dir}"

Legend:
Removed from v.1.279  
changed lines
  Added in v.1.280

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8