ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.284 by jsr166, Sat Oct 27 01:16:23 2018 UTC vs.
Revision 1.293 by jsr166, Thu Dec 13 01:15:07 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 24 | Line 24
24    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11
26    $HOME/jdk/jdk12
27 +  $HOME/jdk/jdk13
28    where each of the above is a JDK or a symlink to same, and
29    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10
32    $HOME/jdk/src/jdk11
33    $HOME/jdk/src/jdk12
34 +  $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.
37  
38    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...
40 <  for $N in 8 9 10 ...
40 >  for $N in 8 .. 13 ...
41  
42    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"/> -->
205    <!-- <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"/>
207 <  <!-- Default jdk doc location (latest stable release seems best) -->
208 <  <!-- But pin to jdk 10 until fix for -->
207 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
208 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
207 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
208 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
209  
210    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 340 | Line 340
340    <property name="jtreg.flags" value=""/>
341  
342    <macrodef name="run-jtreg-tests">
343 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
343 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
344      <attribute name="target"/>
345      <attribute name="workdir"/>
346      <attribute name="classes"/>
# Line 393 | Line 393
393    <!-- Default values: may seem strange ... -->
394    <!-- At runtime, target latest LTS, i.e. jdk11 -->
395    <!-- But at build time, target jdk9, for maximal binary portability -->
396 <  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
397 <  <property name="build.main.java.version" value="11"/>
396 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
397 >    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}"/>
404    <property name="build.main.javac" value="${javac9}"/>
405    <property name="build.main.javadoc" value="${javadoc12}"/>
406 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
407  
408    <target name="dists"
409            depends="dist, 4jdk8dist"
# Line 471 | Line 477
477   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
478      <javadoc destdir="${docs.dir}"
479               packagenames="none"
480 <             link="${java11.api.url}"
480 >             link="${java.api.url}"
481               overview="${src.dir}/intro.html"
482               access="${build.javadoc.access}"
483               sourcepath="${src.dir}"
484               classpath=""
485 <             source="11"
485 >             source="${build.main.javadoc.source}"
486               executable="${build.main.javadoc}">
487 + <!-- TODO: JDK-8214571 failonerror = "true" -->
488        <fileset dir="${src.dir}" defaultexcludes="yes">
489          <include name="**/*.java"/>
490        </fileset>
491 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
491 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
492        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
493        <arg value="-XDignore.symbol.file=true"/>
494        <arg value="-html5"/>
495        <arg value="--patch-module=java.base=${src.dir}"/>
496 + <!-- old school frames via docs/index.html?overview-summary.html -->
497        <arg value="--frames"/>
498        <arg value="--override-methods=summary"/>
499        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532 | Line 540
540            description="Runs tck tests for src/main directly">
541  
542      <run-tck-tests
543 <      target="${build.main.java.version}"
543 >      target="${java.runtime.target}"
544        workdir="${build.dir}"
545        classes="${product.jar}">
546        <javac-elements>
# Line 566 | Line 574
574            depends="jar"
575            description="Runs jtreg tests for src/main using the jtreg ant task">
576      <run-jtreg-tests
577 <       target="${build.main.java.version}"
577 >       target="${java.runtime.target}"
578         workdir="${build.dir}"
579         classes="${product.jar}"/>
580    </target>
# Line 582 | Line 590
590    <target name="test9">
591      <antcall target="clean"/>
592      <antcall>
593 <      <param name="build.main.java.version" value="9"/>
586 <      <param name="build.main.java" value="${java9}"/>
593 >      <param name="java.runtime.target" value="9"/>
594        <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"/>
598 +      <target name="docs"/>
599      </antcall>
600    </target>
601  
602    <target name="test10">
603      <antcall target="clean"/>
604      <antcall>
605 <      <param name="build.main.java.version" value="10"/>
596 <      <param name="build.main.java" value="${java10}"/>
605 >      <param name="java.runtime.target" value="10"/>
606        <param name="build.main.javac" value="${javac10}"/>
607 <      <param name="build.main.javadoc" value="${javadoc10}"/>
607 >      <param name="build.main.javadoc" value="${javadoc12}"/>
608 >      <param name="build.main.javadoc.source" value="10"/>
609        <target name="test"/>
610        <target name="docs"/>
611      </antcall>
# Line 604 | Line 614
614    <target name="test11">
615      <antcall target="clean"/>
616      <antcall>
617 <      <param name="build.main.java.version" value="11"/>
608 <      <param name="build.main.java" value="${java11}"/>
617 >      <param name="java.runtime.target" value="11"/>
618        <param name="build.main.javac" value="${javac11}"/>
619 <      <param name="build.main.javadoc" value="${javadoc11}"/>
619 >      <param name="build.main.javadoc" value="${javadoc12}"/>
620 >      <param name="build.main.javadoc.source" value="11"/>
621        <target name="test"/>
622        <target name="docs"/>
623      </antcall>
# Line 616 | Line 626
626    <target name="test12">
627      <antcall target="clean"/>
628      <antcall>
629 <      <param name="build.main.java.version" value="12"/>
620 <      <param name="build.main.java" value="${java12}"/>
629 >      <param name="java.runtime.target" value="12"/>
630        <param name="build.main.javac" value="${javac12}"/>
631        <param name="build.main.javadoc" value="${javadoc12}"/>
632 +      <param name="build.main.javadoc.source" value="12"/>
633        <target name="test"/>
634        <target name="docs"/>
635      </antcall>
# Line 628 | Line 638
638    <target name="test9-11">
639      <antcall target="clean"/>
640      <antcall>
641 <      <param name="build.main.java.version" value="11"/>
632 <      <param name="build.main.java" value="${java11}"/>
641 >      <param name="java.runtime.target" value="11"/>
642        <param name="build.main.javac" value="${javac9}"/>
643 <      <param name="build.main.javadoc" value="${javadoc11}"/>
643 >      <param name="build.main.javadoc" value="${javadoc12}"/>
644 >      <param name="build.main.javadoc.source" value="9"/>
645        <target name="test"/>
646        <target name="docs"/>
647      </antcall>
# Line 640 | Line 650
650    <target name="test9-12">
651      <antcall target="clean"/>
652      <antcall>
653 <      <param name="build.main.java.version" value="12"/>
644 <      <param name="build.main.java" value="${java12}"/>
653 >      <param name="java.runtime.target" value="12"/>
654        <param name="build.main.javac" value="${javac9}"/>
655        <param name="build.main.javadoc" value="${javadoc12}"/>
656 +      <param name="build.main.javadoc.source" value="9"/>
657        <target name="test"/>
658        <target name="docs"/>
659      </antcall>
# Line 1373 | Line 1383
1383  
1384  
1385   <!-- ==============================================================
1386 <  Experimental errorprone support - https://errorprone.info
1386 >  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"/>
1391 >  <path id="errorprone.processorpath.path">
1392 >    <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=""/>
1399    <property name="errorprone.jsr166.flags"
1400              value="-Xep:HashtableContains:OFF
1401                     -Xep:JdkObsolete:OFF
1402                     -Xep:MissingOverride:OFF
1403                     -Xep:MissingFail:OFF
1404 +                   -Xep:ThreadPriorityCheck:OFF
1405                     -Xep:MixedArrayDimensions:ERROR
1406                     -Xep:RemoveUnusedImports:ERROR
1407                     -Xep:EmptyIf:ERROR
# Line 1390 | Line 1410
1410                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1411                     -Xep:RedundantThrows:ERROR
1412                     -Xep:IdentityBinaryExpression:WARN
1413 +                   -Xep:ConstructorInvokesOverridable:WARN
1414                     -Xep:MethodCanBeStatic:WARN
1415                     ${errorprone.jsr166.user.flags}"/>
1416    <!-- -Xep:WildcardImport:ERROR -->
# Line 1422 | Line 1443
1443        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1444        <compilerarg value="-J--illegal-access=permit"/>
1445        <compilerarg value="-XDcompilePolicy=simple"/>
1446 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1446 >      <compilerarg value="-processorpath"/>
1447 >      <compilerarg pathref="errorprone.processorpath.path"/>
1448        <compilerarg value="-Xplugin:ErrorProne
1449                            ${errorprone.jsr166.flags}"/>
1450        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1439 | Line 1461
1461      </jar>
1462  
1463      <run-tck-tests
1464 <      target="${build.main.java.version}"
1464 >      target="${java.runtime.target}"
1465        workdir="${build.dir}"
1466        classes="${product.jar}">
1467        <javac-elements>
1468          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1469          <compilerarg value="-J--illegal-access=permit"/>
1470          <compilerarg value="-XDcompilePolicy=simple"/>
1471 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1471 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1472          <compilerarg value="-Xplugin:ErrorProne
1473                              ${errorprone.jsr166.flags}
1474                              ${errorprone.jsr166.test.flags}"/>
# Line 1462 | Line 1484
1484            description="Run errorprone over jtreg tests (experimental)">
1485  
1486      <run-jtreg-tests
1487 <       target="${build.main.java.version}"
1487 >       target="${java.runtime.target}"
1488         workdir="${build.dir}"
1489         classes="${product.jar}"
1490         verbose="all">
1491        <jtreg-elements>
1492          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1493          <arg value="-javacoption:-processorpath"/>
1494 <        <arg value="-javacoption:${errorprone.jar}"/>
1494 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1495          <arg value="-javacoption:-Xplugin:ErrorProne
1496                              ${errorprone.jsr166.flags}
1497                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines