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.276 by jsr166, Wed Sep 26 06:40:33 2018 UTC vs.
Revision 1.279 by jsr166, Mon Oct 1 03:04:48 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 389 | Line 391
391  
392    <!-- Main targets -->
393  
394 <  <property name="build.main.java.version" value="9"/>
394 >  <property name="build.main.java.version" value="11"/>
395    <!-- Workaround "no nested properties in ant" -->
396    <macrodef name="define-build-main-properties">
397      <attribute name="v"/>
# Line 481 | Line 483
483   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"
485               packagenames="none"
486 <             link="${java9.api.url}"
486 >             link="${java10.api.url}"
487               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"
489               sourcepath="${src.dir}"
490               classpath=""
491 <             source="9"
491 >             source="11"
492               executable="${build.main.javadoc}">
493        <fileset dir="${src.dir}" defaultexcludes="yes">
494          <include name="**/*.java"/>
495        </fileset>
496 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
496 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
497        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
498        <arg value="-XDignore.symbol.file=true"/>
499        <arg value="-html5"/>
# Line 621 | Line 623
623      <antcall target="clean"/>
624      <antcall target="test">
625        <param name="build.main.java.version" value="9"/>
626 +      <param name="build.main.java" value="${java9}"/>
627 +      <param name="build.main.javac" value="${javac9}"/>
628      </antcall>
629  
630      <antcall target="clean"/>
631      <antcall target="test">
632        <param name="build.main.java.version" value="10"/>
633 +      <param name="build.main.java" value="${java10}"/>
634 +      <param name="build.main.javac" value="${javac10}"/>
635      </antcall>
636  
637      <antcall target="clean"/>
638      <antcall target="test">
639        <param name="build.main.java.version" value="11"/>
640 +      <param name="build.main.java" value="${java11}"/>
641 +      <param name="build.main.javac" value="${javac11}"/>
642      </antcall>
643  
644      <antcall target="clean"/>
645      <antcall target="test">
646        <param name="build.main.java.version" value="12"/>
647 +      <param name="build.main.java" value="${java12}"/>
648 +      <param name="build.main.javac" value="${javac12}"/>
649 +    </antcall>
650 +    <antcall target="docs">
651 +      <param name="build.main.java.version" value="12"/>
652 +      <param name="build.main.java" value="${java12}"/>
653 +      <param name="build.main.javac" value="${javac12}"/>
654 +      <param name="build.main.javadoc" value="${javadoc12}"/>
655      </antcall>
656  
657      <!-- Clean up to avoid obscure wrong class file version bugs -->
# Line 1399 | Line 1415
1415  
1416  
1417   <!-- ==============================================================
1418 <  Experimental errorprone support - http://errorprone.info
1418 >  Experimental errorprone support - https://errorprone.info
1419   =================================================================== -->
1420    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1421    <property name="errorprone.jsr166.user.flags" value=""/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines