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.300 by jsr166, Sat Jul 13 18:31:40 2019 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 +  $HOME/jdk/jdk14
29    where each of the above is a JDK or a symlink to same, and
30    $HOME/jdk/src/jdk8
31    $HOME/jdk/src/jdk9
32    $HOME/jdk/src/jdk10
33    $HOME/jdk/src/jdk11
34    $HOME/jdk/src/jdk12
35 +  $HOME/jdk/src/jdk13
36 +  $HOME/jdk/src/jdk14
37    where each of the above is a complete JDK source tree
38    (e.g. mercurial forest) or a symlink to same.
39  
40    Alternatively, define ant variables thus:
41    ant -Djdk$N.home=... -Djdk$N.src.home=...
42 <  for $N in 8 9 10 ...
42 >  for $N in 8 .. 14 ...
43  
44    As of 2016-03, the sources in src/main are for jdk9+ only.
45   ------------------------------------------------------------------------------
# Line 138 | Line 142
142    <defjdklocations v="10"/>
143    <defjdklocations v="11"/>
144    <defjdklocations v="12"/>
145 +  <defjdklocations v="13"/>
146 +  <defjdklocations v="14"/>
147  
148    <!-- Source locations -->
149    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 150 | Line 156
156    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
158    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
159 +  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
160 +  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
161    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
162    <property name="lib.dir"              location="${basedir}/lib"/>
163    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 197 | Line 205
205    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
206    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
207    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208 +  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
209    <!-- The location of jdk early access docs (RIP) -->
210    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
211    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
212    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
213 <  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
214 <  <!-- Default jdk doc location (latest stable release seems best) -->
215 <  <!-- But pin to jdk 10 until fix for -->
216 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
217 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
213 > <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
214 >  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
215 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
216 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
217 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
218  
219    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
220    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 216 | Line 225
225    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
226    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
227    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
228 +  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
229 +  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
230    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
231  
232    <!-- Define the "jtreg" task -->
# Line 329 | Line 340
340      </sequential>
341    </macrodef>
342  
343 +  <defjtregtests v="14"/>
344 +  <defjtregtests v="13"/>
345    <defjtregtests v="12"/>
346    <defjtregtests v="11"/>
347    <defjtregtests v="10"/>
# Line 340 | Line 353
353    <property name="jtreg.flags" value=""/>
354  
355    <macrodef name="run-jtreg-tests">
356 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
356 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
357      <attribute name="target"/>
358      <attribute name="workdir"/>
359      <attribute name="classes"/>
# Line 385 | Line 398
398    </path>
399  
400    <!-- Support @jls tag, used in jdk8+ javadoc -->
401 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
402    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
403    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
404  
# Line 393 | Line 407
407    <!-- Default values: may seem strange ... -->
408    <!-- At runtime, target latest LTS, i.e. jdk11 -->
409    <!-- But at build time, target jdk9, for maximal binary portability -->
410 <  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
411 <  <property name="build.main.java.version" value="11"/>
410 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
411 >    o override-methods=summary
412 >    o {@systemProperty ...}
413 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
414 >    o 8202628: javadoc generates bad links in TestModules.java
415 >    -->
416 >  <property name="java.runtime.target" value="11"/>
417    <property name="build.main.java" value="${java11}"/>
418    <property name="build.main.javac" value="${javac9}"/>
419    <property name="build.main.javadoc" value="${javadoc12}"/>
420 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
421  
422    <target name="dists"
423            depends="dist, 4jdk8dist"
# Line 432 | Line 452
452        <compilerarg value="-Xlint:all,-removal"/>
453        <compilerarg line="--doclint-format html5"/>
454        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
455 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
456        <compilerarg value="-Werror"/>
457        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
458        <compilerarg line="${build.args}"/>
# Line 471 | Line 492
492   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
493      <javadoc destdir="${docs.dir}"
494               packagenames="none"
495 <             link="${java11.api.url}"
495 >             link="${java.api.url}"
496               overview="${src.dir}/intro.html"
497               access="${build.javadoc.access}"
498               sourcepath="${src.dir}"
499               classpath=""
500 <             source="11"
500 >             source="${build.main.javadoc.source}"
501               executable="${build.main.javadoc}">
502 + <!-- TODO: JDK-8214571 failonerror = "true" -->
503        <fileset dir="${src.dir}" defaultexcludes="yes">
504          <include name="**/*.java"/>
505        </fileset>
506 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
506 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
507        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
508        <arg value="-XDignore.symbol.file=true"/>
509        <arg value="-html5"/>
510        <arg value="--patch-module=java.base=${src.dir}"/>
511 + <!-- old school frames via docs/index.html?overview-summary.html -->
512 + <!-- TODO: - -frames no longer a supported option in jdk13+ -->
513        <arg value="--frames"/>
514        <arg value="--override-methods=summary"/>
515        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532 | Line 556
556            description="Runs tck tests for src/main directly">
557  
558      <run-tck-tests
559 <      target="${build.main.java.version}"
559 >      target="${java.runtime.target}"
560        workdir="${build.dir}"
561        classes="${product.jar}">
562        <javac-elements>
# Line 566 | Line 590
590            depends="jar"
591            description="Runs jtreg tests for src/main using the jtreg ant task">
592      <run-jtreg-tests
593 <       target="${build.main.java.version}"
593 >       target="${java.runtime.target}"
594         workdir="${build.dir}"
595         classes="${product.jar}"/>
596    </target>
# Line 576 | Line 600
600            description="Runs tck and jtreg tests for src/main"/>
601  
602    <target name="test-version-permutations"
603 <          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
603 >          depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
604    </target>
605  
606    <target name="test9">
607      <antcall target="clean"/>
608      <antcall>
609 <      <param name="build.main.java.version" value="9"/>
586 <      <param name="build.main.java" value="${java9}"/>
609 >      <param name="java.runtime.target" value="9"/>
610        <param name="build.main.javac" value="${javac9}"/>
611 +      <param name="build.main.javadoc" value="${javadoc12}"/>
612 +      <param name="build.main.javadoc.source" value="9"/>
613        <target name="test"/>
614 +      <target name="docs"/>
615      </antcall>
616    </target>
617  
618    <target name="test10">
619      <antcall target="clean"/>
620      <antcall>
621 <      <param name="build.main.java.version" value="10"/>
596 <      <param name="build.main.java" value="${java10}"/>
621 >      <param name="java.runtime.target" value="10"/>
622        <param name="build.main.javac" value="${javac10}"/>
623 <      <param name="build.main.javadoc" value="${javadoc10}"/>
623 >      <param name="build.main.javadoc" value="${javadoc12}"/>
624 >      <param name="build.main.javadoc.source" value="10"/>
625        <target name="test"/>
626        <target name="docs"/>
627      </antcall>
# Line 604 | Line 630
630    <target name="test11">
631      <antcall target="clean"/>
632      <antcall>
633 <      <param name="build.main.java.version" value="11"/>
608 <      <param name="build.main.java" value="${java11}"/>
633 >      <param name="java.runtime.target" value="11"/>
634        <param name="build.main.javac" value="${javac11}"/>
635 <      <param name="build.main.javadoc" value="${javadoc11}"/>
635 >      <param name="build.main.javadoc" value="${javadoc12}"/>
636 >      <param name="build.main.javadoc.source" value="11"/>
637        <target name="test"/>
638        <target name="docs"/>
639      </antcall>
# Line 616 | Line 642
642    <target name="test12">
643      <antcall target="clean"/>
644      <antcall>
645 <      <param name="build.main.java.version" value="12"/>
620 <      <param name="build.main.java" value="${java12}"/>
645 >      <param name="java.runtime.target" value="12"/>
646        <param name="build.main.javac" value="${javac12}"/>
647        <param name="build.main.javadoc" value="${javadoc12}"/>
648 +      <param name="build.main.javadoc.source" value="12"/>
649 +      <target name="test"/>
650 +      <target name="docs"/>
651 +    </antcall>
652 +  </target>
653 +
654 +  <target name="test13">
655 +    <antcall target="clean"/>
656 +    <antcall>
657 +      <param name="java.runtime.target" value="13"/>
658 +      <param name="build.main.javac" value="${javac13}"/>
659 +      <param name="build.main.javadoc" value="${javadoc13}"/>
660 +      <param name="build.main.javadoc.source" value="13"/>
661 +      <target name="test"/>
662 +      <target name="docs"/>
663 +    </antcall>
664 +  </target>
665 +
666 +  <target name="test14">
667 +    <antcall target="clean"/>
668 +    <antcall>
669 +      <param name="java.runtime.target" value="14"/>
670 +      <param name="build.main.javac" value="${javac14}"/>
671 +      <param name="build.main.javadoc" value="${javadoc14}"/>
672 +      <param name="build.main.javadoc.source" value="14"/>
673        <target name="test"/>
674        <target name="docs"/>
675      </antcall>
# Line 628 | Line 678
678    <target name="test9-11">
679      <antcall target="clean"/>
680      <antcall>
681 <      <param name="build.main.java.version" value="11"/>
632 <      <param name="build.main.java" value="${java11}"/>
681 >      <param name="java.runtime.target" value="11"/>
682        <param name="build.main.javac" value="${javac9}"/>
683 <      <param name="build.main.javadoc" value="${javadoc11}"/>
683 >      <param name="build.main.javadoc" value="${javadoc12}"/>
684 >      <param name="build.main.javadoc.source" value="9"/>
685        <target name="test"/>
686        <target name="docs"/>
687      </antcall>
# Line 640 | Line 690
690    <target name="test9-12">
691      <antcall target="clean"/>
692      <antcall>
693 <      <param name="build.main.java.version" value="12"/>
644 <      <param name="build.main.java" value="${java12}"/>
693 >      <param name="java.runtime.target" value="12"/>
694        <param name="build.main.javac" value="${javac9}"/>
695        <param name="build.main.javadoc" value="${javadoc12}"/>
696 +      <param name="build.main.javadoc.source" value="9"/>
697 +      <target name="test"/>
698 +      <target name="docs"/>
699 +    </antcall>
700 +  </target>
701 +
702 +  <target name="test9-13">
703 +    <antcall target="clean"/>
704 +    <antcall>
705 +      <param name="java.runtime.target" value="13"/>
706 +      <param name="build.main.javac" value="${javac9}"/>
707 +      <param name="build.main.javadoc" value="${javadoc13}"/>
708 +      <param name="build.main.javadoc.source" value="9"/>
709 +      <target name="test"/>
710 +      <target name="docs"/>
711 +    </antcall>
712 +  </target>
713 +
714 +  <target name="test9-14">
715 +    <antcall target="clean"/>
716 +    <antcall>
717 +      <param name="java.runtime.target" value="14"/>
718 +      <param name="build.main.javac" value="${javac9}"/>
719 +      <param name="build.main.javadoc" value="${javadoc14}"/>
720 +      <param name="build.main.javadoc.source" value="9"/>
721        <target name="test"/>
722        <target name="docs"/>
723      </antcall>
# Line 1373 | Line 1447
1447  
1448  
1449   <!-- ==============================================================
1450 <  Experimental errorprone support - https://errorprone.info
1450 >  Experimental errorprone support
1451 >  https://errorprone.info
1452 >  https://errorprone.info/docs/installation
1453 >  https://github.com/google/error-prone/issues/1143
1454   =================================================================== -->
1455 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1455 >  <path id="errorprone.processorpath.path">
1456 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1457 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1458 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1459 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1460 >  </path>
1461 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1462    <property name="errorprone.jsr166.user.flags" value=""/>
1463    <property name="errorprone.jsr166.flags"
1464              value="-Xep:HashtableContains:OFF
1465                     -Xep:JdkObsolete:OFF
1466                     -Xep:MissingOverride:OFF
1467                     -Xep:MissingFail:OFF
1468 +                   -Xep:ThreadPriorityCheck:OFF
1469                     -Xep:MixedArrayDimensions:ERROR
1470                     -Xep:RemoveUnusedImports:ERROR
1471                     -Xep:EmptyIf:ERROR
# Line 1390 | Line 1474
1474                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1475                     -Xep:RedundantThrows:ERROR
1476                     -Xep:IdentityBinaryExpression:WARN
1477 +                   -Xep:ConstructorInvokesOverridable:WARN
1478                     -Xep:MethodCanBeStatic:WARN
1479                     ${errorprone.jsr166.user.flags}"/>
1480    <!-- -Xep:WildcardImport:ERROR -->
# Line 1422 | Line 1507
1507        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1508        <compilerarg value="-J--illegal-access=permit"/>
1509        <compilerarg value="-XDcompilePolicy=simple"/>
1510 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1510 >      <compilerarg value="-processorpath"/>
1511 >      <compilerarg pathref="errorprone.processorpath.path"/>
1512        <compilerarg value="-Xplugin:ErrorProne
1513                            ${errorprone.jsr166.flags}"/>
1514        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1439 | Line 1525
1525      </jar>
1526  
1527      <run-tck-tests
1528 <      target="${build.main.java.version}"
1528 >      target="${java.runtime.target}"
1529        workdir="${build.dir}"
1530        classes="${product.jar}">
1531        <javac-elements>
1532          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1533          <compilerarg value="-J--illegal-access=permit"/>
1534          <compilerarg value="-XDcompilePolicy=simple"/>
1535 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1535 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1536          <compilerarg value="-Xplugin:ErrorProne
1537                              ${errorprone.jsr166.flags}
1538                              ${errorprone.jsr166.test.flags}"/>
# Line 1462 | Line 1548
1548            description="Run errorprone over jtreg tests (experimental)">
1549  
1550      <run-jtreg-tests
1551 <       target="${build.main.java.version}"
1551 >       target="${java.runtime.target}"
1552         workdir="${build.dir}"
1553         classes="${product.jar}"
1554         verbose="all">
1555        <jtreg-elements>
1556          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1557          <arg value="-javacoption:-processorpath"/>
1558 <        <arg value="-javacoption:${errorprone.jar}"/>
1558 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1559          <arg value="-javacoption:-Xplugin:ErrorProne
1560                              ${errorprone.jsr166.flags}
1561                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines