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.286 by jsr166, Wed Nov 21 21:05:59 2018 UTC vs.
Revision 1.296 by jsr166, Sat Apr 27 14:32:21 2019 UTC

# 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 138 | Line 140
140    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>
142    <defjdklocations v="12"/>
143 +  <defjdklocations v="13"/>
144  
145    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 150 | Line 153
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155    <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}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>
159    <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"/>
202    <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"/>
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) -->
206    <!-- <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"/> -->
208    <!-- <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"/>
210 <  <!-- Default jdk doc location (latest stable release seems best) -->
211 <  <!-- But pin to jdk 10 until fix for -->
212 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
208 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
209 > <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
210 >  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
212 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
213  
214    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215    <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/"/>
221    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222    <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/"/>
225  
226    <!-- Define the "jtreg" task -->
# Line 329 | Line 334
334      </sequential>
335    </macrodef>
336  
337 +  <defjtregtests v="13"/>
338    <defjtregtests v="12"/>
339    <defjtregtests v="11"/>
340    <defjtregtests v="10"/>
# Line 340 | Line 346
346    <property name="jtreg.flags" value=""/>
347  
348    <macrodef name="run-jtreg-tests">
349 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
349 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
350      <attribute name="target"/>
351      <attribute name="workdir"/>
352      <attribute name="classes"/>
# Line 393 | Line 399
399    <!-- Default values: may seem strange ... -->
400    <!-- At runtime, target latest LTS, i.e. jdk11 -->
401    <!-- But at build time, target jdk9, for maximal binary portability -->
402 <  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
403 <  <property name="build.main.java.version" value="11"/>
402 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403 >    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}"/>
410    <property name="build.main.javac" value="${javac9}"/>
411    <property name="build.main.javadoc" value="${javadoc12}"/>
412 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
413  
414    <target name="dists"
415            depends="dist, 4jdk8dist"
# Line 471 | Line 483
483   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"
485               packagenames="none"
486 <             link="${java11.api.url}"
486 >             link="${java.api.url}"
487               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"
489               sourcepath="${src.dir}"
490               classpath=""
491 <             source="11"
491 >             source="${build.main.javadoc.source}"
492               executable="${build.main.javadoc}">
493 + <!-- TODO: JDK-8214571 failonerror = "true" -->
494        <fileset dir="${src.dir}" defaultexcludes="yes">
495          <include name="**/*.java"/>
496        </fileset>
497 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
497 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
498        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499        <arg value="-XDignore.symbol.file=true"/>
500        <arg value="-html5"/>
501        <arg value="--patch-module=java.base=${src.dir}"/>
502 + <!-- old school frames via docs/index.html?overview-summary.html -->
503 + <!-- TODO: --frames no longer a supported option in jdk13+ -->
504        <arg value="--frames"/>
505        <arg value="--override-methods=summary"/>
506        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532 | Line 547
547            description="Runs tck tests for src/main directly">
548  
549      <run-tck-tests
550 <      target="${build.main.java.version}"
550 >      target="${java.runtime.target}"
551        workdir="${build.dir}"
552        classes="${product.jar}">
553        <javac-elements>
# Line 566 | Line 581
581            depends="jar"
582            description="Runs jtreg tests for src/main using the jtreg ant task">
583      <run-jtreg-tests
584 <       target="${build.main.java.version}"
584 >       target="${java.runtime.target}"
585         workdir="${build.dir}"
586         classes="${product.jar}"/>
587    </target>
# Line 576 | Line 591
591            description="Runs tck and jtreg tests for src/main"/>
592  
593    <target name="test-version-permutations"
594 <          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
594 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
595    </target>
596  
597    <target name="test9">
598      <antcall target="clean"/>
599      <antcall>
600 <      <param name="build.main.java.version" value="9"/>
586 <      <param name="build.main.java" value="${java9}"/>
600 >      <param name="java.runtime.target" value="9"/>
601        <param name="build.main.javac" value="${javac9}"/>
602 +      <param name="build.main.javadoc" value="${javadoc12}"/>
603 +      <param name="build.main.javadoc.source" value="9"/>
604        <target name="test"/>
605 +      <target name="docs"/>
606      </antcall>
607    </target>
608  
609    <target name="test10">
610      <antcall target="clean"/>
611      <antcall>
612 <      <param name="build.main.java.version" value="10"/>
596 <      <param name="build.main.java" value="${java10}"/>
612 >      <param name="java.runtime.target" value="10"/>
613        <param name="build.main.javac" value="${javac10}"/>
614 <      <param name="build.main.javadoc" value="${javadoc10}"/>
614 >      <param name="build.main.javadoc" value="${javadoc12}"/>
615 >      <param name="build.main.javadoc.source" value="10"/>
616        <target name="test"/>
617        <target name="docs"/>
618      </antcall>
# Line 604 | Line 621
621    <target name="test11">
622      <antcall target="clean"/>
623      <antcall>
624 <      <param name="build.main.java.version" value="11"/>
608 <      <param name="build.main.java" value="${java11}"/>
624 >      <param name="java.runtime.target" value="11"/>
625        <param name="build.main.javac" value="${javac11}"/>
626 <      <param name="build.main.javadoc" value="${javadoc11}"/>
626 >      <param name="build.main.javadoc" value="${javadoc12}"/>
627 >      <param name="build.main.javadoc.source" value="11"/>
628        <target name="test"/>
629        <target name="docs"/>
630      </antcall>
# Line 616 | Line 633
633    <target name="test12">
634      <antcall target="clean"/>
635      <antcall>
636 <      <param name="build.main.java.version" value="12"/>
620 <      <param name="build.main.java" value="${java12}"/>
636 >      <param name="java.runtime.target" value="12"/>
637        <param name="build.main.javac" value="${javac12}"/>
638        <param name="build.main.javadoc" value="${javadoc12}"/>
639 +      <param name="build.main.javadoc.source" value="12"/>
640 +      <target name="test"/>
641 +      <target name="docs"/>
642 +    </antcall>
643 +  </target>
644 +
645 +  <target name="test13">
646 +    <antcall target="clean"/>
647 +    <antcall>
648 +      <param name="java.runtime.target" value="13"/>
649 +      <param name="build.main.javac" value="${javac13}"/>
650 +      <param name="build.main.javadoc" value="${javadoc13}"/>
651 +      <param name="build.main.javadoc.source" value="13"/>
652        <target name="test"/>
653        <target name="docs"/>
654      </antcall>
# Line 628 | Line 657
657    <target name="test9-11">
658      <antcall target="clean"/>
659      <antcall>
660 <      <param name="build.main.java.version" value="11"/>
632 <      <param name="build.main.java" value="${java11}"/>
660 >      <param name="java.runtime.target" value="11"/>
661        <param name="build.main.javac" value="${javac9}"/>
662 <      <param name="build.main.javadoc" value="${javadoc11}"/>
662 >      <param name="build.main.javadoc" value="${javadoc12}"/>
663 >      <param name="build.main.javadoc.source" value="9"/>
664        <target name="test"/>
665        <target name="docs"/>
666      </antcall>
# Line 640 | Line 669
669    <target name="test9-12">
670      <antcall target="clean"/>
671      <antcall>
672 <      <param name="build.main.java.version" value="12"/>
644 <      <param name="build.main.java" value="${java12}"/>
672 >      <param name="java.runtime.target" value="12"/>
673        <param name="build.main.javac" value="${javac9}"/>
674        <param name="build.main.javadoc" value="${javadoc12}"/>
675 +      <param name="build.main.javadoc.source" value="9"/>
676 +      <target name="test"/>
677 +      <target name="docs"/>
678 +    </antcall>
679 +  </target>
680 +
681 +  <target name="test9-13">
682 +    <antcall target="clean"/>
683 +    <antcall>
684 +      <param name="java.runtime.target" value="13"/>
685 +      <param name="build.main.javac" value="${javac9}"/>
686 +      <param name="build.main.javadoc" value="${javadoc13}"/>
687 +      <param name="build.main.javadoc.source" value="9"/>
688        <target name="test"/>
689        <target name="docs"/>
690      </antcall>
# Line 1373 | Line 1414
1414  
1415  
1416   <!-- ==============================================================
1417 <  Experimental errorprone support - https://errorprone.info
1417 >  Experimental errorprone support
1418 >  https://errorprone.info
1419 >  https://errorprone.info/docs/installation
1420 >  https://github.com/google/error-prone/issues/1143
1421   =================================================================== -->
1422 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1423 <  <property name="errorprone.processorpath" value="${errorprone.jar}"/>
1422 >  <path id="errorprone.processorpath.path">
1423 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1424 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1425 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1426 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1427 >  </path>
1428 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1429    <property name="errorprone.jsr166.user.flags" value=""/>
1430    <property name="errorprone.jsr166.flags"
1431              value="-Xep:HashtableContains:OFF
1432                     -Xep:JdkObsolete:OFF
1433                     -Xep:MissingOverride:OFF
1434                     -Xep:MissingFail:OFF
1435 +                   -Xep:ThreadPriorityCheck:OFF
1436                     -Xep:MixedArrayDimensions:ERROR
1437                     -Xep:RemoveUnusedImports:ERROR
1438                     -Xep:EmptyIf:ERROR
# Line 1391 | Line 1441
1441                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1442                     -Xep:RedundantThrows:ERROR
1443                     -Xep:IdentityBinaryExpression:WARN
1444 +                   -Xep:ConstructorInvokesOverridable:WARN
1445                     -Xep:MethodCanBeStatic:WARN
1446                     ${errorprone.jsr166.user.flags}"/>
1447    <!-- -Xep:WildcardImport:ERROR -->
# Line 1423 | Line 1474
1474        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1475        <compilerarg value="-J--illegal-access=permit"/>
1476        <compilerarg value="-XDcompilePolicy=simple"/>
1477 <      <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1477 >      <compilerarg value="-processorpath"/>
1478 >      <compilerarg pathref="errorprone.processorpath.path"/>
1479        <compilerarg value="-Xplugin:ErrorProne
1480                            ${errorprone.jsr166.flags}"/>
1481        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1440 | Line 1492
1492      </jar>
1493  
1494      <run-tck-tests
1495 <      target="${build.main.java.version}"
1495 >      target="${java.runtime.target}"
1496        workdir="${build.dir}"
1497        classes="${product.jar}">
1498        <javac-elements>
# Line 1463 | Line 1515
1515            description="Run errorprone over jtreg tests (experimental)">
1516  
1517      <run-jtreg-tests
1518 <       target="${build.main.java.version}"
1518 >       target="${java.runtime.target}"
1519         workdir="${build.dir}"
1520         classes="${product.jar}"
1521         verbose="all">

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines