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

Diff of /jsr166/build.xml

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

revision 1.275 by jsr166, Wed Jul 18 01:16:42 2018 UTC revision 1.282 by jsr166, Tue Oct 9 01:34:19 2018 UTC
# Line 197  Line 197 
197    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>    <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"/>    <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"/>    <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) -->    <!-- The location of jdk early access docs (RIP) -->
202    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->    <!-- <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"/> -->    <!-- <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"/>    <!-- <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"/>    <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      <!-- 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}"/>    <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 -->
# Line 388  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      </sequential>      </sequential>
409    </macrodef>    </macrodef>
# Line 409  Line 412 
412    <target name="dists"    <target name="dists"
413            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
414            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
415            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
416    
417    <target name="compile"    <target name="compile"
418            depends="configure-compiler"            depends="configure-compiler"
# Line 480  Line 481 
481  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
483               packagenames="none"               packagenames="none"
484               link="${java9.api.url}"               link="${java11.api.url}"
485               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
486               access="${build.javadoc.access}"               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"               sourcepath="${src.dir}"
488               classpath=""               classpath=""
489               source="9"               source="11"
490               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
491        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
492          <include name="**/*.java"/>          <include name="**/*.java"/>
493        </fileset>        </fileset>
494        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java10.docroot.url}"/>
495        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
497        <arg value="-html5"/>        <arg value="-html5"/>
498        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
499          <arg value="--frames"/>
500        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
501        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
502        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 620  Line 622 
622      <antcall target="clean"/>      <antcall target="clean"/>
623      <antcall target="test">      <antcall target="test">
624        <param name="build.main.java.version" value="9"/>        <param name="build.main.java.version" value="9"/>
625          <param name="build.main.java" value="${java9}"/>
626          <param name="build.main.javac" value="${javac9}"/>
627      </antcall>      </antcall>
628    
629      <antcall target="clean"/>      <antcall target="clean"/>
630      <antcall target="test">      <antcall target="test">
631        <param name="build.main.java.version" value="10"/>        <param name="build.main.java.version" value="10"/>
632          <param name="build.main.java" value="${java10}"/>
633          <param name="build.main.javac" value="${javac10}"/>
634      </antcall>      </antcall>
635    
636      <antcall target="clean"/>      <antcall target="clean"/>
637      <antcall target="test">      <antcall target="test">
638        <param name="build.main.java.version" value="11"/>        <param name="build.main.java.version" value="11"/>
639          <param name="build.main.java" value="${java11}"/>
640          <param name="build.main.javac" value="${javac11}"/>
641      </antcall>      </antcall>
642    
643      <antcall target="clean"/>      <antcall target="clean"/>
644      <antcall target="test">      <antcall target="test">
645        <param name="build.main.java.version" value="12"/>        <param name="build.main.java.version" value="12"/>
646          <param name="build.main.java" value="${java12}"/>
647          <param name="build.main.javac" value="${javac12}"/>
648        </antcall>
649        <antcall target="docs">
650          <param name="build.main.java.version" value="12"/>
651          <param name="build.main.java" value="${java12}"/>
652          <param name="build.main.javac" value="${javac12}"/>
653          <param name="build.main.javadoc" value="${javadoc12}"/>
654      </antcall>      </antcall>
655    
656      <!-- Clean up to avoid obscure wrong class file version bugs -->      <!-- Clean up to avoid obscure wrong class file version bugs -->
# Line 1398  Line 1414 
1414    
1415    
1416  <!-- ==============================================================  <!-- ==============================================================
1417    Experimental errorprone support - http://errorprone.info    Experimental errorprone support - https://errorprone.info
1418  =================================================================== -->  =================================================================== -->
1419    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1420    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>

Legend:
Removed from v.1.275  
changed lines
  Added in v.1.282

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