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.255 by jsr166, Thu Sep 28 01:17:47 2017 UTC vs.
Revision 1.280 by jsr166, Sun Oct 7 03:43:04 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 21 | Line 22
22    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25 +  $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10
31 +  $HOME/jdk/src/jdk11
32 +  $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
# Line 101 | Line 106
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>
108      <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">
# Line 132 | Line 137
137    <defjdklocations v="8"/>
138    <defjdklocations v="9"/>
139    <defjdklocations v="10"/>
140 +  <defjdklocations v="11"/>
141 +  <defjdklocations v="12"/>
142  
143    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 149
149    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181 | Line 190
190    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191  
192    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193 <  <property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>
194 <  <property name="java6.docroot.url"  value="http://docs.oracle.com/javase/6/docs"/>
195 <  <property name="java7.docroot.url"  value="http://docs.oracle.com/javase/7/docs"/>
196 <  <property name="java8.docroot.url"  value="http://docs.oracle.com/javase/8/docs"/>
197 <  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
198 <  <!-- The location of jdk9 early access docs -->
193 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
194 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201 >  <!-- The location of jdk early access docs (RIP) -->
202    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203 +  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 +  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205 +  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
207 >  <!-- But pin to jdk 10 until fix for -->
208 >  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
210  
211    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 214
214    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
215    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
216    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
220    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
221  
222    <!-- Define the "jtreg" task -->
# Line 229 | Line 249
249  
250      <local name="modules"/>
251      <condition property="modules">
252 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
252 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253      </condition>
254  
255      <local name="use-doclint"/>
# Line 296 | Line 316
316    </macrodef>
317  
318    <!-- Define jtreg test sets for different jdk versions -->
319 <  <fileset dir="${jtreg10.src.dir}">
320 <    <patternset id="jdk10.jtreg.tests">
321 <      <include name="**/*.java"/>
322 <    </patternset>
323 <  </fileset>
324 <
325 <  <fileset dir="${jtreg9.src.dir}">
326 <    <patternset id="jdk9.jtreg.tests">
327 <      <include name="**/*.java"/>
328 <    </patternset>
329 <  </fileset>
330 <
331 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
319 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
320 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
321 >  <property name="jtreg.test.pattern" value="**/*.java"/>
322 >  <macrodef name="defjtregtests">
323 >    <attribute name="v"/>
324 >    <sequential>
325 >      <fileset dir="${jtreg@{v}.src.dir}">
326 >        <patternset id="jdk@{v}.jtreg.tests">
327 >          <include name="${jtreg.test.pattern}"/>
328 >        </patternset>
329 >      </fileset>
330 >    </sequential>
331 >  </macrodef>
332  
333 <  <fileset dir="${jtreg7.src.dir}">
334 <    <patternset id="jdk7.jtreg.tests">
335 <      <include name="**/*.java"/>
336 <    </patternset>
337 <  </fileset>
333 >  <defjtregtests v="12"/>
334 >  <defjtregtests v="11"/>
335 >  <defjtregtests v="10"/>
336 >  <defjtregtests v="9"/>
337 >  <defjtregtests v="8"/>
338 >  <defjtregtests v="7"/>
339  
340    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
341    <property name="jtreg.flags" value=""/>
# Line 339 | Line 356
356  
357      <local name="modules"/>
358      <condition property="modules">
359 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
359 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
360      </condition>
361  
362      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 374 | Line 391
391  
392    <!-- Main targets -->
393  
394 <  <property name="build.main.java.version" value="9"/>
394 >  <property name="build.main.java.version" value="11"/>
395    <!-- Workaround "no nested properties in ant" -->
396    <macrodef name="define-build-main-properties">
397      <attribute name="v"/>
398      <sequential>
399        <property name="build.main.java"    value="${java@{v}}"/>
400        <property name="build.main.javac"   value="${javac@{v}}"/>
401 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
401 >      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402 >      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403 >      <condition property="build.main.javadoc"
404 >                 value="${javadoc12}"
405 >                 else="${javadoc@{v}}">
406 >        <matches pattern="^(9|10|11)$" string="@{v}"/>
407 >      </condition>
408 >      <property name="build.main.javadoc"   value="${javadoc12}"/>
409      </sequential>
410    </macrodef>
411    <define-build-main-properties v="${build.main.java.version}"/>
# Line 460 | Line 484
484   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
485      <javadoc destdir="${docs.dir}"
486               packagenames="none"
487 <             link="${java9.api.url}"
487 >             link="${java11.api.url}"
488               overview="${src.dir}/intro.html"
489               access="${build.javadoc.access}"
490               sourcepath="${src.dir}"
491               classpath=""
492 <             source="9"
492 >             source="11"
493               executable="${build.main.javadoc}">
494        <fileset dir="${src.dir}" defaultexcludes="yes">
495          <include name="**/*.java"/>
496        </fileset>
497 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
497 >      <arg line="-Xdocrootparent ${java10.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 <      <arg value="-tag"/>
503 <      <arg value="${javadoc.jls.option}"/>
504 < <!-- @apiNote currently unused -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="apiNote:a:API Note:"/> -->
483 <      <arg value="-tag"/>
484 <      <arg value="implSpec:a:Implementation Requirements:"/>
485 <      <arg value="-tag"/>
486 <      <arg value="implNote:a:Implementation Note:"/>
502 >      <arg value="--override-methods=summary"/>
503 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
504 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
505 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
506 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
507   <!-- tags added in jdk9: currently unused -->
508 < <!--       <arg value="-tag"/> -->
509 < <!--       <arg value="revised:X"/> -->
490 < <!--       <arg value="-tag"/> -->
491 < <!--       <arg value="spec:X"/> -->
508 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
509 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
510      </javadoc>
511    </target>
512  
# Line 600 | Line 618
618  
619   <!--   </target> -->
620  
621 <  <target name="test910"
621 >  <target name="test9101112"
622            description="Runs tck and jtreg tests for src/main for multiple java versions">
623  
624      <antcall target="clean"/>
625      <antcall target="test">
626        <param name="build.main.java.version" value="9"/>
627 +      <param name="build.main.java" value="${java9}"/>
628 +      <param name="build.main.javac" value="${javac9}"/>
629      </antcall>
630  
631      <antcall target="clean"/>
632      <antcall target="test">
633        <param name="build.main.java.version" value="10"/>
634 +      <param name="build.main.java" value="${java10}"/>
635 +      <param name="build.main.javac" value="${javac10}"/>
636 +    </antcall>
637 +
638 +    <antcall target="clean"/>
639 +    <antcall target="test">
640 +      <param name="build.main.java.version" value="11"/>
641 +      <param name="build.main.java" value="${java11}"/>
642 +      <param name="build.main.javac" value="${javac11}"/>
643 +    </antcall>
644 +
645 +    <antcall target="clean"/>
646 +    <antcall target="test">
647 +      <param name="build.main.java.version" value="12"/>
648 +      <param name="build.main.java" value="${java12}"/>
649 +      <param name="build.main.javac" value="${javac12}"/>
650 +    </antcall>
651 +    <antcall target="docs">
652 +      <param name="build.main.java.version" value="12"/>
653 +      <param name="build.main.java" value="${java12}"/>
654 +      <param name="build.main.javac" value="${javac12}"/>
655 +      <param name="build.main.javadoc" value="${javadoc12}"/>
656      </antcall>
657  
658      <!-- Clean up to avoid obscure wrong class file version bugs -->
# Line 825 | Line 867
867        </fileset>
868        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
869        <arg value="-XDignore.symbol.file=true"/>
870 <      <arg value="-tag"/>
871 <      <arg value="${javadoc.jls.option}"/>
872 < <!-- @apiNote currently unused -->
873 < <!--       <arg value="-tag"/> -->
874 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833 <      <arg value="-tag"/>
834 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
835 <      <arg value="-tag"/>
836 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
871 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
872 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
873 > <!-- @apiNote tag currently unused -->
874 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
875      </javadoc>
876    </target>
877  
# Line 1363 | Line 1401
1401  
1402   <!-- Find buglets that can be detected by static build tools -->
1403  
1404 <  <target name="lint">
1405 <    <antcall target="dists">
1406 <      <param name="build.javadoc.access" value="public"/>
1407 <    </antcall>
1408 <  </target>
1404 > <!--   <target name="lint"> -->
1405 > <!--     <antcall target="dists"> -->
1406 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1407 > <!--     </antcall> -->
1408 > <!--   </target> -->
1409  
1410   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1411 <  <target name="lint-private">
1411 >  <target name="doclint-private">
1412      <antcall target="dist">
1413        <param name="build.javadoc.access" value="private"/>
1414      </antcall>
# Line 1378 | Line 1416
1416  
1417  
1418   <!-- ==============================================================
1419 <  Experimental errorprone support - http://errorprone.info
1419 >  Experimental errorprone support - https://errorprone.info
1420   =================================================================== -->
1421 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1421 >  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1422 >  <property name="errorprone.jsr166.user.flags" value=""/>
1423 >  <property name="errorprone.jsr166.flags"
1424 >            value="-Xep:HashtableContains:OFF
1425 >                   -Xep:JdkObsolete:OFF
1426 >                   -Xep:MissingOverride:OFF
1427 >                   -Xep:MissingFail:OFF
1428 >                   -Xep:MixedArrayDimensions:ERROR
1429 >                   -Xep:RemoveUnusedImports:ERROR
1430 >                   -Xep:EmptyIf:ERROR
1431 >                   -Xep:MultipleTopLevelClasses:ERROR
1432 >                   -Xep:ClassName:ERROR
1433 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1434 >                   -Xep:RedundantThrows:ERROR
1435 >                   -Xep:IdentityBinaryExpression:WARN
1436 >                   -Xep:MethodCanBeStatic:WARN
1437 >                   ${errorprone.jsr166.user.flags}"/>
1438 >  <!-- -Xep:WildcardImport:ERROR -->
1439 >  <property name="errorprone.jsr166.test.flags"
1440 >            value="-Xep:StringSplitter:OFF
1441 >                   -Xep:BoxedPrimitiveConstructor:OFF
1442 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
1443 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1444    <target name="errorprone"
1445            depends="clean, configure-compiler"
1446            description="Run errorprone over jsr166 source code (experimental)">
# Line 1402 | Line 1462
1462             fork="true">
1463  
1464        <include name="**/*.java"/>
1465 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466 +      <compilerarg value="-J--illegal-access=permit"/>
1467 +      <compilerarg value="-XDcompilePolicy=simple"/>
1468        <compilerarg line="-processorpath ${errorprone.jar}"/>
1469        <compilerarg value="-Xplugin:ErrorProne
1470 <                          -Xep:IdentityBinaryExpression:WARN
1408 <                          -Xep:MissingOverride:OFF
1409 <                          -Xep:MixedArrayDimensions:WARN
1410 <                          -Xep:RemoveUnusedImports:ERROR
1411 <                          -Xep:ClassName:ERROR
1412 <                          -Xep:MultipleTopLevelClasses:ERROR
1413 <                          -Xep:EmptyIf:ERROR
1414 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1415 <                          -Xep:RedundantThrows:ERROR
1416 <                          -Xep:MethodCanBeStatic:WARN"/>
1470 >                          ${errorprone.jsr166.flags}"/>
1471        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1472        <compilerarg value="-Xprefer:source"/>
1473        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1432 | Line 1486
1486        workdir="${build.dir}"
1487        classes="${product.jar}">
1488        <javac-elements>
1489 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1490 +        <compilerarg value="-J--illegal-access=permit"/>
1491 +        <compilerarg value="-XDcompilePolicy=simple"/>
1492          <compilerarg line="-processorpath ${errorprone.jar}"/>
1493          <compilerarg value="-Xplugin:ErrorProne
1494 <                            -Xep:IdentityBinaryExpression:WARN
1495 <                            -Xep:BoxedPrimitiveConstructor:OFF
1439 <                            -Xep:HashtableContains:OFF
1440 <                            -Xep:ModifyingCollectionWithItself:OFF
1441 <                            -Xep:MissingOverride:OFF
1442 <                            -Xep:MixedArrayDimensions:WARN
1443 <                            -Xep:RemoveUnusedImports:ERROR
1444 <                            -Xep:ClassName:ERROR
1445 <                            -Xep:MultipleTopLevelClasses:ERROR
1446 <                            -Xep:EmptyIf:ERROR
1447 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1448 <                            -Xep:RedundantThrows:ERROR
1449 <                            -Xep:MethodCanBeStatic:WARN"/>
1494 >                            ${errorprone.jsr166.flags}
1495 >                            ${errorprone.jsr166.test.flags}"/>
1496          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1497        </javac-elements>
1498      </run-tck-tests>
1499    </target>
1500  
1501 <  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1501 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1502 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1503    <target name="errorprone-jtreg"
1504            depends="jar"
1505            description="Run errorprone over jtreg tests (experimental)">
# Line 1463 | Line 1510
1510         classes="${product.jar}"
1511         verbose="all">
1512        <jtreg-elements>
1513 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1514          <arg value="-javacoption:-processorpath"/>
1515          <arg value="-javacoption:${errorprone.jar}"/>
1516          <arg value="-javacoption:-Xplugin:ErrorProne
1517 <                            -Xep:IdentityBinaryExpression:WARN
1518 <                            -Xep:BoxedPrimitiveConstructor:OFF
1519 <                            -Xep:HashtableContains:OFF
1520 <                            -Xep:ModifyingCollectionWithItself:OFF
1473 <                            -Xep:MissingOverride:OFF
1474 <                            -Xep:MixedArrayDimensions:WARN
1475 <                            -Xep:RemoveUnusedImports:ERROR
1476 <                            -Xep:ClassName:ERROR
1477 <                            -Xep:MultipleTopLevelClasses:ERROR
1478 <                            -Xep:EmptyIf:ERROR
1479 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1480 <                            -Xep:RedundantThrows:ERROR
1481 <                            -Xep:MethodCanBeStatic:WARN"/>
1517 >                            ${errorprone.jsr166.flags}
1518 >                            ${errorprone.jsr166.test.flags}
1519 >                            -Xep:MultipleTopLevelClasses:WARN
1520 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1521        </jtreg-elements>
1522      </run-jtreg-tests>
1523    </target>

Diff Legend

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