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

Diff of /jsr166/build.xml

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

revision 1.286, Wed Nov 21 21:05:59 2018 UTC revision 1.293, Thu Dec 13 01:15:07 2018 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 202  Line 204 
204    <!-- <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"/> -->
205    <!-- <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"/> -->
206    <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"/>
207    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
208    <!-- But pin to jdk 10 until fix for -->    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
   <!-- 8211194: javadoc -link doesn't take module path into consideration -->  
   <property name="java.docroot.url"   value="${java10.docroot.url}"/>  
209    
210    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 340  Line 340 
340    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
341    
342    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
343      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
344      <attribute name="target"/>      <attribute name="target"/>
345      <attribute name="workdir"/>      <attribute name="workdir"/>
346      <attribute name="classes"/>      <attribute name="classes"/>
# Line 393  Line 393 
393    <!-- Default values: may seem strange ... -->    <!-- Default values: may seem strange ... -->
394    <!-- At runtime, target latest LTS, i.e. jdk11 -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
395    <!-- But at build time, target jdk9, for maximal binary portability -->    <!-- But at build time, target jdk9, for maximal binary portability -->
396    <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
397    <property name="build.main.java.version" value="11"/>      o override-methods=summary
398        o {@systemProperty ...}
399        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
400        o 8202628: javadoc generates bad links in TestModules.java
401        -->
402      <property name="java.runtime.target" value="11"/>
403    <property name="build.main.java" value="${java11}"/>    <property name="build.main.java" value="${java11}"/>
404    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
405    <property name="build.main.javadoc" value="${javadoc12}"/>    <property name="build.main.javadoc" value="${javadoc12}"/>
406      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
407    
408    <target name="dists"    <target name="dists"
409            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
# Line 471  Line 477 
477  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
478      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
479               packagenames="none"               packagenames="none"
480               link="${java11.api.url}"               link="${java.api.url}"
481               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
482               access="${build.javadoc.access}"               access="${build.javadoc.access}"
483               sourcepath="${src.dir}"               sourcepath="${src.dir}"
484               classpath=""               classpath=""
485               source="11"               source="${build.main.javadoc.source}"
486               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
487    <!-- TODO: JDK-8214571 failonerror = "true" -->
488        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
489          <include name="**/*.java"/>          <include name="**/*.java"/>
490        </fileset>        </fileset>
491        <arg line="-Xdocrootparent ${java10.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
492        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
493        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
494        <arg value="-html5"/>        <arg value="-html5"/>
495        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
496    <!-- old school frames via docs/index.html?overview-summary.html -->
497        <arg value="--frames"/>        <arg value="--frames"/>
498        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
499        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532  Line 540 
540            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
541    
542      <run-tck-tests      <run-tck-tests
543        target="${build.main.java.version}"        target="${java.runtime.target}"
544        workdir="${build.dir}"        workdir="${build.dir}"
545        classes="${product.jar}">        classes="${product.jar}">
546        <javac-elements>        <javac-elements>
# Line 566  Line 574 
574            depends="jar"            depends="jar"
575            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
576      <run-jtreg-tests      <run-jtreg-tests
577         target="${build.main.java.version}"         target="${java.runtime.target}"
578         workdir="${build.dir}"         workdir="${build.dir}"
579         classes="${product.jar}"/>         classes="${product.jar}"/>
580    </target>    </target>
# Line 582  Line 590 
590    <target name="test9">    <target name="test9">
591      <antcall target="clean"/>      <antcall target="clean"/>
592      <antcall>      <antcall>
593        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="9"/>
       <param name="build.main.java" value="${java9}"/>  
594        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
595          <param name="build.main.javadoc" value="${javadoc12}"/>
596          <param name="build.main.javadoc.source" value="9"/>
597        <target name="test"/>        <target name="test"/>
598          <target name="docs"/>
599      </antcall>      </antcall>
600    </target>    </target>
601    
602    <target name="test10">    <target name="test10">
603      <antcall target="clean"/>      <antcall target="clean"/>
604      <antcall>      <antcall>
605        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="10"/>
       <param name="build.main.java" value="${java10}"/>  
606        <param name="build.main.javac" value="${javac10}"/>        <param name="build.main.javac" value="${javac10}"/>
607        <param name="build.main.javadoc" value="${javadoc10}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
608          <param name="build.main.javadoc.source" value="10"/>
609        <target name="test"/>        <target name="test"/>
610        <target name="docs"/>        <target name="docs"/>
611      </antcall>      </antcall>
# Line 604  Line 614 
614    <target name="test11">    <target name="test11">
615      <antcall target="clean"/>      <antcall target="clean"/>
616      <antcall>      <antcall>
617        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
618        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
619        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
620          <param name="build.main.javadoc.source" value="11"/>
621        <target name="test"/>        <target name="test"/>
622        <target name="docs"/>        <target name="docs"/>
623      </antcall>      </antcall>
# Line 616  Line 626 
626    <target name="test12">    <target name="test12">
627      <antcall target="clean"/>      <antcall target="clean"/>
628      <antcall>      <antcall>
629        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
630        <param name="build.main.javac" value="${javac12}"/>        <param name="build.main.javac" value="${javac12}"/>
631        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
632          <param name="build.main.javadoc.source" value="12"/>
633        <target name="test"/>        <target name="test"/>
634        <target name="docs"/>        <target name="docs"/>
635      </antcall>      </antcall>
# Line 628  Line 638 
638    <target name="test9-11">    <target name="test9-11">
639      <antcall target="clean"/>      <antcall target="clean"/>
640      <antcall>      <antcall>
641        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
642        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
643        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
644          <param name="build.main.javadoc.source" value="9"/>
645        <target name="test"/>        <target name="test"/>
646        <target name="docs"/>        <target name="docs"/>
647      </antcall>      </antcall>
# Line 640  Line 650 
650    <target name="test9-12">    <target name="test9-12">
651      <antcall target="clean"/>      <antcall target="clean"/>
652      <antcall>      <antcall>
653        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
654        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
655        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
656          <param name="build.main.javadoc.source" value="9"/>
657        <target name="test"/>        <target name="test"/>
658        <target name="docs"/>        <target name="docs"/>
659      </antcall>      </antcall>
# Line 1373  Line 1383 
1383    
1384    
1385  <!-- ==============================================================  <!-- ==============================================================
1386    Experimental errorprone support - https://errorprone.info    Experimental errorprone support
1387      https://errorprone.info
1388      https://errorprone.info/docs/installation
1389      https://github.com/google/error-prone/issues/1143
1390  =================================================================== -->  =================================================================== -->
1391    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>    <path id="errorprone.processorpath.path">
1392    <property name="errorprone.processorpath" value="${errorprone.jar}"/>      <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1393        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1394        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1395        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1396      </path>
1397      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1398    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
1399    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1400              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
1401                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
1402                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
1403                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
1404                       -Xep:ThreadPriorityCheck:OFF
1405                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
1406                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
1407                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1391  Line 1410 
1410                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1411                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
1412                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
1413                       -Xep:ConstructorInvokesOverridable:WARN
1414                     -Xep:MethodCanBeStatic:WARN                     -Xep:MethodCanBeStatic:WARN
1415                     ${errorprone.jsr166.user.flags}"/>                     ${errorprone.jsr166.user.flags}"/>
1416    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
# Line 1423  Line 1443 
1443        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1444        <compilerarg value="-J--illegal-access=permit"/>        <compilerarg value="-J--illegal-access=permit"/>
1445        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1446        <compilerarg line="-processorpath ${errorprone.processorpath}"/>        <compilerarg value="-processorpath"/>
1447          <compilerarg pathref="errorprone.processorpath.path"/>
1448        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1449                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
1450        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1440  Line 1461 
1461      </jar>      </jar>
1462    
1463      <run-tck-tests      <run-tck-tests
1464        target="${build.main.java.version}"        target="${java.runtime.target}"
1465        workdir="${build.dir}"        workdir="${build.dir}"
1466        classes="${product.jar}">        classes="${product.jar}">
1467        <javac-elements>        <javac-elements>
# Line 1463  Line 1484 
1484            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1485    
1486      <run-jtreg-tests      <run-jtreg-tests
1487         target="${build.main.java.version}"         target="${java.runtime.target}"
1488         workdir="${build.dir}"         workdir="${build.dir}"
1489         classes="${product.jar}"         classes="${product.jar}"
1490         verbose="all">         verbose="all">

Legend:
Removed from v.1.286  
changed lines
  Added in v.1.293

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8