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

Diff of /jsr166/build.xml

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

revision 1.264 by jsr166, Wed Jan 24 01:11:10 2018 UTC revision 1.278 by jsr166, Mon Oct 1 00:10:52 2018 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless"    xmlns:if="ant:if"
3      xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
# Line 22  Line 23 
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11    $HOME/jdk/jdk11
26      $HOME/jdk/jdk12
27    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk10
31    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
32      $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
35    
# Line 103  Line 106 
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>        unless:set="have.java.base"/>
108      <local name="modules"/>      <local name="modules"/>
109      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 135  Line 138 
138    <defjdklocations v="9"/>    <defjdklocations v="9"/>
139    <defjdklocations v="10"/>    <defjdklocations v="10"/>
140    <defjdklocations v="11"/>    <defjdklocations v="11"/>
141      <defjdklocations v="12"/>
142    
143    <!-- Source locations -->    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 146  Line 150 
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 191  Line 196 
196    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
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    <!-- The location of jdk9 early access docs (RIP) -->    <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"/> -->    <!-- <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="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="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
   <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>  
   <property name="java.docroot.url"   value="${java9.docroot.url}"/>  
208    
209    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
210    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 206  Line 214 
214    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
215    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
216    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
217      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
218    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
219    
220    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 238  Line 247 
247    
248      <local name="modules"/>      <local name="modules"/>
249      <condition property="modules">      <condition property="modules">
250        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
251      </condition>      </condition>
252    
253      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 305  Line 314 
314    </macrodef>    </macrodef>
315    
316    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
317    <fileset dir="${jtreg11.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
318      <patternset id="jdk11.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
319        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
320      </patternset>    <macrodef name="defjtregtests">
321    </fileset>      <attribute name="v"/>
322        <sequential>
323    <fileset dir="${jtreg10.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
324      <patternset id="jdk10.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
325        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
326      </patternset>          </patternset>
327    </fileset>        </fileset>
328        </sequential>
329    <fileset dir="${jtreg9.src.dir}">    </macrodef>
     <patternset id="jdk9.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
   
   <fileset dir="${jtreg8.src.dir}">  
     <patternset id="jdk8.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
330    
331    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="12"/>
332      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="11"/>
333        <include name="**/*.java"/>    <defjtregtests v="10"/>
334      </patternset>    <defjtregtests v="9"/>
335    </fileset>    <defjtregtests v="8"/>
336      <defjtregtests v="7"/>
337    
338    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
339    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
# Line 354  Line 354 
354    
355      <local name="modules"/>      <local name="modules"/>
356      <condition property="modules">      <condition property="modules">
357        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
358      </condition>      </condition>
359    
360      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 389  Line 389 
389    
390    <!-- Main targets -->    <!-- Main targets -->
391    
392    <property name="build.main.java.version" value="9"/>    <property name="build.main.java.version" value="11"/>
393    <!-- Workaround "no nested properties in ant" -->    <!-- Workaround "no nested properties in ant" -->
394    <macrodef name="define-build-main-properties">    <macrodef name="define-build-main-properties">
395      <attribute name="v"/>      <attribute name="v"/>
396      <sequential>      <sequential>
397        <property name="build.main.java"    value="${java@{v}}"/>        <property name="build.main.java"    value="${java@{v}}"/>
398        <property name="build.main.javac"   value="${javac@{v}}"/>        <property name="build.main.javac"   value="${javac@{v}}"/>
399        <property name="build.main.javadoc" value="${javadoc@{v}}"/>        <!-- Force javadoc version to be at least 10,
400               so we can use override-methods=summary -->
401          <condition property="build.main.javadoc"
402                     value="${javadoc11}"
403                     else="${javadoc@{v}}">
404            <equals arg1="@{v}" arg2="9"/>
405          </condition>
406      </sequential>      </sequential>
407    </macrodef>    </macrodef>
408    <define-build-main-properties v="${build.main.java.version}"/>    <define-build-main-properties v="${build.main.java.version}"/>
# Line 475  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="${java10.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="-tag"/>        <arg value="--override-methods=summary"/>
500        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="-tag"/>  
       <arg value="implSpec:a:Implementation Requirements:"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
504  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
505  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
506  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
507      </javadoc>      </javadoc>
508    </target>    </target>
509    
# Line 615  Line 615 
615    
616  <!--   </target> -->  <!--   </target> -->
617    
618    <target name="test91011"    <target name="test9101112"
619            description="Runs tck and jtreg tests for src/main for multiple java versions">            description="Runs tck and jtreg tests for src/main for multiple java versions">
620    
621      <antcall target="clean"/>      <antcall target="clean"/>
622      <antcall target="test">      <antcall target="test">
623        <param name="build.main.java.version" value="9"/>        <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>      </antcall>
627    
628      <antcall target="clean"/>      <antcall target="clean"/>
629      <antcall target="test">      <antcall target="test">
630        <param name="build.main.java.version" value="10"/>        <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>      </antcall>
634    
635      <antcall target="clean"/>      <antcall target="clean"/>
636      <antcall target="test">      <antcall target="test">
637        <param name="build.main.java.version" value="11"/>        <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>      </antcall>
654    
655      <!-- Clean up to avoid obscure wrong class file version bugs -->      <!-- Clean up to avoid obscure wrong class file version bugs -->
# Line 845  Line 864 
864        </fileset>        </fileset>
865        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
866        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
867        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
868        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
869  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
871  <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->  <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
872      </javadoc>      </javadoc>
873    </target>    </target>
874    
# Line 1383  Line 1398 
1398    
1399  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1400    
1401    <target name="lint">  <!--   <target name="lint"> -->
1402      <antcall target="dists">  <!--     <antcall target="dists"> -->
1403        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1404      </antcall>  <!--     </antcall> -->
1405    </target>  <!--   </target> -->
1406    
1407  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1408    <target name="lint-private">    <target name="doclint-private">
1409      <antcall target="dist">      <antcall target="dist">
1410        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1411      </antcall>      </antcall>
# Line 1398  Line 1413 
1413    
1414    
1415  <!-- ==============================================================  <!-- ==============================================================
1416    Experimental errorprone support - http://errorprone.info    Experimental errorprone support - https://errorprone.info
1417  =================================================================== -->  =================================================================== -->
1418    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1419      <property name="errorprone.jsr166.user.flags" value=""/>
1420    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1421              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
1422                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
# Line 1414  Line 1430 
1430                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1431                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
1432                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
1433                     -Xep:MethodCanBeStatic:WARN"/>                     -Xep:MethodCanBeStatic:WARN
1434                       ${errorprone.jsr166.user.flags}"/>
1435    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
1436    <property name="errorprone.jsr166.test.flags"    <property name="errorprone.jsr166.test.flags"
1437              value="-Xep:StringSplitter:OFF              value="-Xep:StringSplitter:OFF
# Line 1442  Line 1459 
1459             fork="true">             fork="true">
1460    
1461        <include name="**/*.java"/>        <include name="**/*.java"/>
1462          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1463          <compilerarg value="-J--illegal-access=permit"/>
1464        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1465        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg line="-processorpath ${errorprone.jar}"/>
1466        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
# Line 1464  Line 1483 
1483        workdir="${build.dir}"        workdir="${build.dir}"
1484        classes="${product.jar}">        classes="${product.jar}">
1485        <javac-elements>        <javac-elements>
1486            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1487            <compilerarg value="-J--illegal-access=permit"/>
1488          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1489          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.jar}"/>
1490          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
# Line 1492  Line 1513 
1513          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1514                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1515                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}
1516                                -Xep:MultipleTopLevelClasses:WARN
1517                              -Xep:NonAtomicVolatileUpdate:OFF"/>                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1518        </jtreg-elements>        </jtreg-elements>
1519      </run-jtreg-tests>      </run-jtreg-tests>

Legend:
Removed from v.1.264  
changed lines
  Added in v.1.278

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