/[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.280 by jsr166, Sun Oct 7 03:43:04 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"/>    <!-- But pin to jdk 10 until fix for -->
208    <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>    <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209    <property name="java.docroot.url"   value="${java9.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 -->
212    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 206  Line 216 
216    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
220    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
221    
222    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 238  Line 249 
249    
250      <local name="modules"/>      <local name="modules"/>
251      <condition property="modules">      <condition property="modules">
252        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253      </condition>      </condition>
254    
255      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 305  Line 316 
316    </macrodef>    </macrodef>
317    
318    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
319    <fileset dir="${jtreg11.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
320      <patternset id="jdk11.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
321        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
322      </patternset>    <macrodef name="defjtregtests">
323    </fileset>      <attribute name="v"/>
324        <sequential>
325    <fileset dir="${jtreg10.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
326      <patternset id="jdk10.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
327        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
328      </patternset>          </patternset>
329    </fileset>        </fileset>
330        </sequential>
331    <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>  
332    
333    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="12"/>
334      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="11"/>
335        <include name="**/*.java"/>    <defjtregtests v="10"/>
336      </patternset>    <defjtregtests v="9"/>
337    </fileset>    <defjtregtests v="8"/>
338      <defjtregtests v="7"/>
339    
340    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
341    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
# Line 354  Line 356 
356    
357      <local name="modules"/>      <local name="modules"/>
358      <condition property="modules">      <condition property="modules">
359        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
360      </condition>      </condition>
361    
362      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# 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        <property name="build.main.javadoc" value="${javadoc@{v}}"/>        <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402          <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403          <condition property="build.main.javadoc"
404                     value="${javadoc12}"
405                     else="${javadoc@{v}}">
406            <matches pattern="^(9|10|11)$" string="@{v}"/>
407          </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 475  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"/>
501        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
502        <arg value="-tag"/>        <arg value="--override-methods=summary"/>
503        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
504  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
505  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
506  <!--       <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:"/>  
507  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
508  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
509  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
510      </javadoc>      </javadoc>
511    </target>    </target>
512    
# Line 615  Line 618 
618    
619  <!--   </target> -->  <!--   </target> -->
620    
621    <target name="test91011"    <target name="test9101112"
622            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">
623    
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>
644    
645        <antcall target="clean"/>
646        <antcall target="test">
647          <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 -->
# Line 845  Line 867 
867        </fileset>        </fileset>
868        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
869        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
870        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
871        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
872  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
873  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
874  <!--       <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;"/>  
875      </javadoc>      </javadoc>
876    </target>    </target>
877    
# Line 1383  Line 1401 
1401    
1402  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1403    
1404    <target name="lint">  <!--   <target name="lint"> -->
1405      <antcall target="dists">  <!--     <antcall target="dists"> -->
1406        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1407      </antcall>  <!--     </antcall> -->
1408    </target>  <!--   </target> -->
1409    
1410  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1411    <target name="lint-private">    <target name="doclint-private">
1412      <antcall target="dist">      <antcall target="dist">
1413        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1414      </antcall>      </antcall>
# Line 1398  Line 1416 
1416    
1417    
1418  <!-- ==============================================================  <!-- ==============================================================
1419    Experimental errorprone support - http://errorprone.info    Experimental errorprone support - https://errorprone.info
1420  =================================================================== -->  =================================================================== -->
1421    <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"/>
1422      <property name="errorprone.jsr166.user.flags" value=""/>
1423    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1424              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
1425                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
# Line 1414  Line 1433 
1433                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1434                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
1435                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
1436                     -Xep:MethodCanBeStatic:WARN"/>                     -Xep:MethodCanBeStatic:WARN
1437                       ${errorprone.jsr166.user.flags}"/>
1438    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
1439    <property name="errorprone.jsr166.test.flags"    <property name="errorprone.jsr166.test.flags"
1440              value="-Xep:StringSplitter:OFF              value="-Xep:StringSplitter:OFF
# Line 1442  Line 1462 
1462             fork="true">             fork="true">
1463    
1464        <include name="**/*.java"/>        <include name="**/*.java"/>
1465          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466          <compilerarg value="-J--illegal-access=permit"/>
1467        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1468        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg line="-processorpath ${errorprone.jar}"/>
1469        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
# Line 1464  Line 1486 
1486        workdir="${build.dir}"        workdir="${build.dir}"
1487        classes="${product.jar}">        classes="${product.jar}">
1488        <javac-elements>        <javac-elements>
1489            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1490            <compilerarg value="-J--illegal-access=permit"/>
1491          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1492          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.jar}"/>
1493          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
# Line 1492  Line 1516 
1516          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1517                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1518                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}
1519                                -Xep:MultipleTopLevelClasses:WARN
1520                              -Xep:NonAtomicVolatileUpdate:OFF"/>                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1521        </jtreg-elements>        </jtreg-elements>
1522      </run-jtreg-tests>      </run-jtreg-tests>

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

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