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.275 by jsr166, Wed Jul 18 01:16:42 2018 UTC vs.
Revision 1.278 by jsr166, Mon Oct 1 00:10:52 2018 UTC

# Line 197 | Line 197
197    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 +  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201    <!-- The location of jdk early access docs (RIP) -->
202    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
205 <  <property name="java12.docroot.url" value="http://download.java.net/java/jdk12/docs"/>
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="${java10.docroot.url}"/>
207 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
208  
209    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
210    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 388 | Line 389
389  
390    <!-- Main targets -->
391  
392 <  <property name="build.main.java.version" value="9"/>
392 >  <property name="build.main.java.version" value="11"/>
393    <!-- Workaround "no nested properties in ant" -->
394    <macrodef name="define-build-main-properties">
395      <attribute name="v"/>
# Line 480 | Line 481
481   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"
483               packagenames="none"
484 <             link="${java9.api.url}"
484 >             link="${java10.api.url}"
485               overview="${src.dir}/intro.html"
486               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"
488               classpath=""
489 <             source="9"
489 >             source="11"
490               executable="${build.main.javadoc}">
491        <fileset dir="${src.dir}" defaultexcludes="yes">
492          <include name="**/*.java"/>
493        </fileset>
494 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
494 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
495        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496        <arg value="-XDignore.symbol.file=true"/>
497        <arg value="-html5"/>
# Line 620 | Line 621
621      <antcall target="clean"/>
622      <antcall target="test">
623        <param name="build.main.java.version" value="9"/>
624 +      <param name="build.main.java" value="${java9}"/>
625 +      <param name="build.main.javac" value="${javac9}"/>
626      </antcall>
627  
628      <antcall target="clean"/>
629      <antcall target="test">
630        <param name="build.main.java.version" value="10"/>
631 +      <param name="build.main.java" value="${java10}"/>
632 +      <param name="build.main.javac" value="${javac10}"/>
633      </antcall>
634  
635      <antcall target="clean"/>
636      <antcall target="test">
637        <param name="build.main.java.version" value="11"/>
638 +      <param name="build.main.java" value="${java11}"/>
639 +      <param name="build.main.javac" value="${javac11}"/>
640      </antcall>
641  
642      <antcall target="clean"/>
643      <antcall target="test">
644        <param name="build.main.java.version" value="12"/>
645 +      <param name="build.main.java" value="${java12}"/>
646 +      <param name="build.main.javac" value="${javac12}"/>
647 +    </antcall>
648 +    <antcall target="docs">
649 +      <param name="build.main.java.version" value="12"/>
650 +      <param name="build.main.java" value="${java12}"/>
651 +      <param name="build.main.javac" value="${javac12}"/>
652 +      <param name="build.main.javadoc" value="${javadoc12}"/>
653      </antcall>
654  
655      <!-- Clean up to avoid obscure wrong class file version bugs -->
# Line 1398 | Line 1413
1413  
1414  
1415   <!-- ==============================================================
1416 <  Experimental errorprone support - http://errorprone.info
1416 >  Experimental errorprone support - https://errorprone.info
1417   =================================================================== -->
1418    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1419    <property name="errorprone.jsr166.user.flags" value=""/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines