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

Diff of /jsr166/build.xml

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

revision 1.277 by jsr166, Wed Sep 26 16:11:08 2018 UTC 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"/> -->    <!-- <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"/>    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
207    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <!-- 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 -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 389  Line 391 
391    
392    <!-- Main targets -->    <!-- Main targets -->
393    
394    <property name="build.main.java.version" value="9"/>    <property name="build.main.java.version" value="11"/>
395    <!-- Workaround "no nested properties in ant" -->    <!-- Workaround "no nested properties in ant" -->
396    <macrodef name="define-build-main-properties">    <macrodef name="define-build-main-properties">
397      <attribute name="v"/>      <attribute name="v"/>
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 481  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="${java9.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}"
491               classpath=""               classpath=""
492               source="9"               source="11"
493               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
494        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
495          <include name="**/*.java"/>          <include name="**/*.java"/>
496        </fileset>        </fileset>
497        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java10.docroot.url}"/>
498        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
500        <arg value="-html5"/>        <arg value="-html5"/>
# Line 621  Line 624 
624      <antcall target="clean"/>      <antcall target="clean"/>
625      <antcall target="test">      <antcall target="test">
626        <param name="build.main.java.version" value="9"/>        <param name="build.main.java.version" value="9"/>
627          <param name="build.main.java" value="${java9}"/>
628          <param name="build.main.javac" value="${javac9}"/>
629      </antcall>      </antcall>
630    
631      <antcall target="clean"/>      <antcall target="clean"/>
632      <antcall target="test">      <antcall target="test">
633        <param name="build.main.java.version" value="10"/>        <param name="build.main.java.version" value="10"/>
634          <param name="build.main.java" value="${java10}"/>
635          <param name="build.main.javac" value="${javac10}"/>
636      </antcall>      </antcall>
637    
638      <antcall target="clean"/>      <antcall target="clean"/>
639      <antcall target="test">      <antcall target="test">
640        <param name="build.main.java.version" value="11"/>        <param name="build.main.java.version" value="11"/>
641          <param name="build.main.java" value="${java11}"/>
642          <param name="build.main.javac" value="${javac11}"/>
643      </antcall>      </antcall>
644    
645      <antcall target="clean"/>      <antcall target="clean"/>
646      <antcall target="test">      <antcall target="test">
647        <param name="build.main.java.version" value="12"/>        <param name="build.main.java.version" value="12"/>
648          <param name="build.main.java" value="${java12}"/>
649          <param name="build.main.javac" value="${javac12}"/>
650        </antcall>
651        <antcall target="docs">
652          <param name="build.main.java.version" value="12"/>
653          <param name="build.main.java" value="${java12}"/>
654          <param name="build.main.javac" value="${javac12}"/>
655          <param name="build.main.javadoc" value="${javadoc12}"/>
656      </antcall>      </antcall>
657    
658      <!-- Clean up to avoid obscure wrong class file version bugs -->      <!-- Clean up to avoid obscure wrong class file version bugs -->

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

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27