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

Diff of /jsr166/build.xml

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

revision 1.285 by jsr166, Wed Nov 21 20:58:57 2018 UTC revision 1.295 by jsr166, Sun Mar 24 00:44:14 2019 UTC
# Line 24  Line 24 
24    $HOME/jdk/jdk10    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11    $HOME/jdk/jdk11
26    $HOME/jdk/jdk12    $HOME/jdk/jdk12
27      $HOME/jdk/jdk13
28    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
29    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk10
32    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
33    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
34      $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
37    
38    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
40    for $N in 8 9 10 ...    for $N in 8 .. 13 ...
41    
42    As of 2016-03, the sources in src/main are for jdk9+ only.    As of 2016-03, the sources in src/main are for jdk9+ only.
43  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 138  Line 140 
140    <defjdklocations v="10"/>    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>    <defjdklocations v="11"/>
142    <defjdklocations v="12"/>    <defjdklocations v="12"/>
143      <defjdklocations v="13"/>
144    
145    <!-- Source locations -->    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 150  Line 153 
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 197  Line 201 
201    <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"/>
202    <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"/>
203    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204      <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205    <!-- The location of jdk early access docs (RIP) -->    <!-- The location of jdk early access docs (RIP) -->
206    <!-- <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"/> -->
207    <!-- <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"/> -->
208    <!-- <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"/> -->
209    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>  <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
210    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211    <!-- But pin to jdk 10 until fix for -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
212    <!-- 8211194: javadoc -link doesn't take module path into consideration -->    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
   <property name="java.docroot.url"   value="${java10.docroot.url}"/>  
213    
214    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 216  Line 220 
220    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
225    
226    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 329  Line 334 
334      </sequential>      </sequential>
335    </macrodef>    </macrodef>
336    
337      <defjtregtests v="13"/>
338    <defjtregtests v="12"/>    <defjtregtests v="12"/>
339    <defjtregtests v="11"/>    <defjtregtests v="11"/>
340    <defjtregtests v="10"/>    <defjtregtests v="10"/>
# Line 340  Line 346 
346    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
347    
348    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
349      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
350      <attribute name="target"/>      <attribute name="target"/>
351      <attribute name="workdir"/>      <attribute name="workdir"/>
352      <attribute name="classes"/>      <attribute name="classes"/>
# Line 393  Line 399 
399    <!-- Default values: may seem strange ... -->    <!-- Default values: may seem strange ... -->
400    <!-- At runtime, target latest LTS, i.e. jdk11 -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
401    <!-- But at build time, target jdk9, for maximal binary portability -->    <!-- But at build time, target jdk9, for maximal binary portability -->
402    <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403    <property name="build.main.java.version" value="11"/>      o override-methods=summary
404        o {@systemProperty ...}
405        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
406        o 8202628: javadoc generates bad links in TestModules.java
407        -->
408      <property name="java.runtime.target" value="11"/>
409    <property name="build.main.java" value="${java11}"/>    <property name="build.main.java" value="${java11}"/>
410    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
411    <property name="build.main.javadoc" value="${javadoc12}"/>    <property name="build.main.javadoc" value="${javadoc12}"/>
412      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
413    
414    <target name="dists"    <target name="dists"
415            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
# Line 471  Line 483 
483  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
485               packagenames="none"               packagenames="none"
486               link="${java11.api.url}"               link="${java.api.url}"
487               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"               access="${build.javadoc.access}"
489               sourcepath="${src.dir}"               sourcepath="${src.dir}"
490               classpath=""               classpath=""
491               source="11"               source="${build.main.javadoc.source}"
492               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
493    <!-- TODO: JDK-8214571 failonerror = "true" -->
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 ${java10.docroot.url}"/>        <arg line="-Xdocrootparent ${java.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    <!-- old school frames via docs/index.html?overview-summary.html -->
503        <arg value="--frames"/>        <arg value="--frames"/>
504        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
505        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532  Line 546 
546            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
547    
548      <run-tck-tests      <run-tck-tests
549        target="${build.main.java.version}"        target="${java.runtime.target}"
550        workdir="${build.dir}"        workdir="${build.dir}"
551        classes="${product.jar}">        classes="${product.jar}">
552        <javac-elements>        <javac-elements>
# Line 566  Line 580 
580            depends="jar"            depends="jar"
581            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
582      <run-jtreg-tests      <run-jtreg-tests
583         target="${build.main.java.version}"         target="${java.runtime.target}"
584         workdir="${build.dir}"         workdir="${build.dir}"
585         classes="${product.jar}"/>         classes="${product.jar}"/>
586    </target>    </target>
# Line 576  Line 590 
590            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
591    
592    <target name="test-version-permutations"    <target name="test-version-permutations"
593            depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">            depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
594    </target>    </target>
595    
596    <target name="test9">    <target name="test9">
597      <antcall target="clean"/>      <antcall target="clean"/>
598      <antcall>      <antcall>
599        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="9"/>
       <param name="build.main.java" value="${java9}"/>  
600        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
601          <param name="build.main.javadoc" value="${javadoc12}"/>
602          <param name="build.main.javadoc.source" value="9"/>
603        <target name="test"/>        <target name="test"/>
604          <target name="docs"/>
605      </antcall>      </antcall>
606    </target>    </target>
607    
608    <target name="test10">    <target name="test10">
609      <antcall target="clean"/>      <antcall target="clean"/>
610      <antcall>      <antcall>
611        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="10"/>
       <param name="build.main.java" value="${java10}"/>  
612        <param name="build.main.javac" value="${javac10}"/>        <param name="build.main.javac" value="${javac10}"/>
613        <param name="build.main.javadoc" value="${javadoc10}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
614          <param name="build.main.javadoc.source" value="10"/>
615        <target name="test"/>        <target name="test"/>
616        <target name="docs"/>        <target name="docs"/>
617      </antcall>      </antcall>
# Line 604  Line 620 
620    <target name="test11">    <target name="test11">
621      <antcall target="clean"/>      <antcall target="clean"/>
622      <antcall>      <antcall>
623        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
624        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
625        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
626          <param name="build.main.javadoc.source" value="11"/>
627        <target name="test"/>        <target name="test"/>
628        <target name="docs"/>        <target name="docs"/>
629      </antcall>      </antcall>
# Line 616  Line 632 
632    <target name="test12">    <target name="test12">
633      <antcall target="clean"/>      <antcall target="clean"/>
634      <antcall>      <antcall>
635        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
636        <param name="build.main.javac" value="${javac12}"/>        <param name="build.main.javac" value="${javac12}"/>
637        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
638          <param name="build.main.javadoc.source" value="12"/>
639          <target name="test"/>
640          <target name="docs"/>
641        </antcall>
642      </target>
643    
644      <target name="test13">
645        <antcall target="clean"/>
646        <antcall>
647          <param name="java.runtime.target" value="13"/>
648          <param name="build.main.javac" value="${javac13}"/>
649          <param name="build.main.javadoc" value="${javadoc13}"/>
650          <param name="build.main.javadoc.source" value="13"/>
651        <target name="test"/>        <target name="test"/>
652        <target name="docs"/>        <target name="docs"/>
653      </antcall>      </antcall>
# Line 628  Line 656 
656    <target name="test9-11">    <target name="test9-11">
657      <antcall target="clean"/>      <antcall target="clean"/>
658      <antcall>      <antcall>
659        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
660        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
661        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
662          <param name="build.main.javadoc.source" value="9"/>
663        <target name="test"/>        <target name="test"/>
664        <target name="docs"/>        <target name="docs"/>
665      </antcall>      </antcall>
# Line 640  Line 668 
668    <target name="test9-12">    <target name="test9-12">
669      <antcall target="clean"/>      <antcall target="clean"/>
670      <antcall>      <antcall>
671        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
672        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
673        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
674          <param name="build.main.javadoc.source" value="9"/>
675          <target name="test"/>
676          <target name="docs"/>
677        </antcall>
678      </target>
679    
680      <target name="test9-13">
681        <antcall target="clean"/>
682        <antcall>
683          <param name="java.runtime.target" value="13"/>
684          <param name="build.main.javac" value="${javac9}"/>
685          <param name="build.main.javadoc" value="${javadoc13}"/>
686          <param name="build.main.javadoc.source" value="9"/>
687        <target name="test"/>        <target name="test"/>
688        <target name="docs"/>        <target name="docs"/>
689      </antcall>      </antcall>
# Line 1373  Line 1413 
1413    
1414    
1415  <!-- ==============================================================  <!-- ==============================================================
1416    Experimental errorprone support - https://errorprone.info    Experimental errorprone support
1417      https://errorprone.info
1418      https://errorprone.info/docs/installation
1419      https://github.com/google/error-prone/issues/1143
1420  =================================================================== -->  =================================================================== -->
1421    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>    <path id="errorprone.processorpath.path">
1422        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1423        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1424        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1425        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1426      </path>
1427      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1428    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
1429    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1430              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
1431                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
1432                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
1433                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
1434                       -Xep:ThreadPriorityCheck:OFF
1435                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
1436                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
1437                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1390  Line 1440 
1440                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1441                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
1442                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
1443                       -Xep:ConstructorInvokesOverridable:WARN
1444                     -Xep:MethodCanBeStatic:WARN                     -Xep:MethodCanBeStatic:WARN
1445                     ${errorprone.jsr166.user.flags}"/>                     ${errorprone.jsr166.user.flags}"/>
1446    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
# Line 1422  Line 1473 
1473        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1474        <compilerarg value="-J--illegal-access=permit"/>        <compilerarg value="-J--illegal-access=permit"/>
1475        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1476        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg value="-processorpath"/>
1477          <compilerarg pathref="errorprone.processorpath.path"/>
1478        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1479                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
1480        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1439  Line 1491 
1491      </jar>      </jar>
1492    
1493      <run-tck-tests      <run-tck-tests
1494        target="${build.main.java.version}"        target="${java.runtime.target}"
1495        workdir="${build.dir}"        workdir="${build.dir}"
1496        classes="${product.jar}">        classes="${product.jar}">
1497        <javac-elements>        <javac-elements>
1498          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1499          <compilerarg value="-J--illegal-access=permit"/>          <compilerarg value="-J--illegal-access=permit"/>
1500          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1501          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1502          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1503                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1504                              ${errorprone.jsr166.test.flags}"/>                              ${errorprone.jsr166.test.flags}"/>
# Line 1462  Line 1514 
1514            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1515    
1516      <run-jtreg-tests      <run-jtreg-tests
1517         target="${build.main.java.version}"         target="${java.runtime.target}"
1518         workdir="${build.dir}"         workdir="${build.dir}"
1519         classes="${product.jar}"         classes="${product.jar}"
1520         verbose="all">         verbose="all">
1521        <jtreg-elements>        <jtreg-elements>
1522          <arg value="-javacoption:-XDcompilePolicy=simple"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1523          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
1524          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
1525          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1526                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1527                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}

Legend:
Removed from v.1.285  
changed lines
  Added in v.1.295

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