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.298 by jsr166, Wed May 22 17:36:58 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 432 | Line 444
444        <compilerarg value="-Xlint:all,-removal"/>
445        <compilerarg line="--doclint-format html5"/>
446        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
447 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
448        <compilerarg value="-Werror"/>
449        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450        <compilerarg line="${build.args}"/>
# Line 471 | Line 484
484   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
485      <javadoc destdir="${docs.dir}"
486               packagenames="none"
487 <             link="${java11.api.url}"
487 >             link="${java.api.url}"
488               overview="${src.dir}/intro.html"
489               access="${build.javadoc.access}"
490               sourcepath="${src.dir}"
491               classpath=""
492 <             source="11"
492 >             source="${build.main.javadoc.source}"
493               executable="${build.main.javadoc}">
494 + <!-- TODO: JDK-8214571 failonerror = "true" -->
495        <fileset dir="${src.dir}" defaultexcludes="yes">
496          <include name="**/*.java"/>
497        </fileset>
498 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
498 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
499        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
500        <arg value="-XDignore.symbol.file=true"/>
501        <arg value="-html5"/>
502        <arg value="--patch-module=java.base=${src.dir}"/>
503 + <!-- old school frames via docs/index.html?overview-summary.html -->
504 + <!-- TODO: - -frames no longer a supported option in jdk13+ -->
505        <arg value="--frames"/>
506        <arg value="--override-methods=summary"/>
507        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532 | Line 548
548            description="Runs tck tests for src/main directly">
549  
550      <run-tck-tests
551 <      target="${build.main.java.version}"
551 >      target="${java.runtime.target}"
552        workdir="${build.dir}"
553        classes="${product.jar}">
554        <javac-elements>
# Line 566 | Line 582
582            depends="jar"
583            description="Runs jtreg tests for src/main using the jtreg ant task">
584      <run-jtreg-tests
585 <       target="${build.main.java.version}"
585 >       target="${java.runtime.target}"
586         workdir="${build.dir}"
587         classes="${product.jar}"/>
588    </target>
# Line 576 | Line 592
592            description="Runs tck and jtreg tests for src/main"/>
593  
594    <target name="test-version-permutations"
595 <          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
595 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
596    </target>
597  
598    <target name="test9">
599      <antcall target="clean"/>
600      <antcall>
601 <      <param name="build.main.java.version" value="9"/>
586 <      <param name="build.main.java" value="${java9}"/>
601 >      <param name="java.runtime.target" value="9"/>
602        <param name="build.main.javac" value="${javac9}"/>
603 +      <param name="build.main.javadoc" value="${javadoc12}"/>
604 +      <param name="build.main.javadoc.source" value="9"/>
605        <target name="test"/>
606 +      <target name="docs"/>
607      </antcall>
608    </target>
609  
610    <target name="test10">
611      <antcall target="clean"/>
612      <antcall>
613 <      <param name="build.main.java.version" value="10"/>
596 <      <param name="build.main.java" value="${java10}"/>
613 >      <param name="java.runtime.target" value="10"/>
614        <param name="build.main.javac" value="${javac10}"/>
615 <      <param name="build.main.javadoc" value="${javadoc10}"/>
615 >      <param name="build.main.javadoc" value="${javadoc12}"/>
616 >      <param name="build.main.javadoc.source" value="10"/>
617        <target name="test"/>
618        <target name="docs"/>
619      </antcall>
# Line 604 | Line 622
622    <target name="test11">
623      <antcall target="clean"/>
624      <antcall>
625 <      <param name="build.main.java.version" value="11"/>
608 <      <param name="build.main.java" value="${java11}"/>
625 >      <param name="java.runtime.target" value="11"/>
626        <param name="build.main.javac" value="${javac11}"/>
627 <      <param name="build.main.javadoc" value="${javadoc11}"/>
627 >      <param name="build.main.javadoc" value="${javadoc12}"/>
628 >      <param name="build.main.javadoc.source" value="11"/>
629        <target name="test"/>
630        <target name="docs"/>
631      </antcall>
# Line 616 | Line 634
634    <target name="test12">
635      <antcall target="clean"/>
636      <antcall>
637 <      <param name="build.main.java.version" value="12"/>
620 <      <param name="build.main.java" value="${java12}"/>
637 >      <param name="java.runtime.target" value="12"/>
638        <param name="build.main.javac" value="${javac12}"/>
639        <param name="build.main.javadoc" value="${javadoc12}"/>
640 +      <param name="build.main.javadoc.source" value="12"/>
641 +      <target name="test"/>
642 +      <target name="docs"/>
643 +    </antcall>
644 +  </target>
645 +
646 +  <target name="test13">
647 +    <antcall target="clean"/>
648 +    <antcall>
649 +      <param name="java.runtime.target" value="13"/>
650 +      <param name="build.main.javac" value="${javac13}"/>
651 +      <param name="build.main.javadoc" value="${javadoc13}"/>
652 +      <param name="build.main.javadoc.source" value="13"/>
653        <target name="test"/>
654        <target name="docs"/>
655      </antcall>
# Line 628 | Line 658
658    <target name="test9-11">
659      <antcall target="clean"/>
660      <antcall>
661 <      <param name="build.main.java.version" value="11"/>
632 <      <param name="build.main.java" value="${java11}"/>
661 >      <param name="java.runtime.target" value="11"/>
662        <param name="build.main.javac" value="${javac9}"/>
663 <      <param name="build.main.javadoc" value="${javadoc11}"/>
663 >      <param name="build.main.javadoc" value="${javadoc12}"/>
664 >      <param name="build.main.javadoc.source" value="9"/>
665        <target name="test"/>
666        <target name="docs"/>
667      </antcall>
# Line 640 | Line 670
670    <target name="test9-12">
671      <antcall target="clean"/>
672      <antcall>
673 <      <param name="build.main.java.version" value="12"/>
644 <      <param name="build.main.java" value="${java12}"/>
673 >      <param name="java.runtime.target" value="12"/>
674        <param name="build.main.javac" value="${javac9}"/>
675        <param name="build.main.javadoc" value="${javadoc12}"/>
676 +      <param name="build.main.javadoc.source" value="9"/>
677 +      <target name="test"/>
678 +      <target name="docs"/>
679 +    </antcall>
680 +  </target>
681 +
682 +  <target name="test9-13">
683 +    <antcall target="clean"/>
684 +    <antcall>
685 +      <param name="java.runtime.target" value="13"/>
686 +      <param name="build.main.javac" value="${javac9}"/>
687 +      <param name="build.main.javadoc" value="${javadoc13}"/>
688 +      <param name="build.main.javadoc.source" value="9"/>
689        <target name="test"/>
690        <target name="docs"/>
691      </antcall>
# Line 1373 | Line 1415
1415  
1416  
1417   <!-- ==============================================================
1418 <  Experimental errorprone support - https://errorprone.info
1418 >  Experimental errorprone support
1419 >  https://errorprone.info
1420 >  https://errorprone.info/docs/installation
1421 >  https://github.com/google/error-prone/issues/1143
1422   =================================================================== -->
1423 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1424 <  <property name="errorprone.processorpath" value="${errorprone.jar}"/>
1423 >  <path id="errorprone.processorpath.path">
1424 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1425 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1426 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1427 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1428 >  </path>
1429 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1430    <property name="errorprone.jsr166.user.flags" value=""/>
1431    <property name="errorprone.jsr166.flags"
1432              value="-Xep:HashtableContains:OFF
1433                     -Xep:JdkObsolete:OFF
1434                     -Xep:MissingOverride:OFF
1435                     -Xep:MissingFail:OFF
1436 +                   -Xep:ThreadPriorityCheck:OFF
1437                     -Xep:MixedArrayDimensions:ERROR
1438                     -Xep:RemoveUnusedImports:ERROR
1439                     -Xep:EmptyIf:ERROR
# Line 1391 | Line 1442
1442                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1443                     -Xep:RedundantThrows:ERROR
1444                     -Xep:IdentityBinaryExpression:WARN
1445 +                   -Xep:ConstructorInvokesOverridable:WARN
1446                     -Xep:MethodCanBeStatic:WARN
1447                     ${errorprone.jsr166.user.flags}"/>
1448    <!-- -Xep:WildcardImport:ERROR -->
# Line 1423 | Line 1475
1475        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1476        <compilerarg value="-J--illegal-access=permit"/>
1477        <compilerarg value="-XDcompilePolicy=simple"/>
1478 <      <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1478 >      <compilerarg value="-processorpath"/>
1479 >      <compilerarg pathref="errorprone.processorpath.path"/>
1480        <compilerarg value="-Xplugin:ErrorProne
1481                            ${errorprone.jsr166.flags}"/>
1482        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1440 | Line 1493
1493      </jar>
1494  
1495      <run-tck-tests
1496 <      target="${build.main.java.version}"
1496 >      target="${java.runtime.target}"
1497        workdir="${build.dir}"
1498        classes="${product.jar}">
1499        <javac-elements>
# Line 1463 | Line 1516
1516            description="Run errorprone over jtreg tests (experimental)">
1517  
1518      <run-jtreg-tests
1519 <       target="${build.main.java.version}"
1519 >       target="${java.runtime.target}"
1520         workdir="${build.dir}"
1521         classes="${product.jar}"
1522         verbose="all">

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines