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.254 by jsr166, Mon Sep 25 22:54:09 2017 UTC vs.
Revision 1.275 by jsr166, Wed Jul 18 01:16:42 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 >  <!-- The location of jdk early access docs (RIP) -->
201    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202 +  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203 +  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
204 +  <property name="java12.docroot.url" value="http://download.java.net/java/jdk12/docs"/>
205    <!-- Default jdk doc location (latest stable release seems best) -->
206 <  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
206 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
207  
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 211
211    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
212    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
213    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
215 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
216 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
217    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
218  
219    <!-- Define the "jtreg" task -->
# Line 229 | Line 246
246  
247      <local name="modules"/>
248      <condition property="modules">
249 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
249 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250      </condition>
251  
252      <local name="use-doclint"/>
# Line 296 | Line 313
313    </macrodef>
314  
315    <!-- Define jtreg test sets for different jdk versions -->
316 <  <fileset dir="${jtreg10.src.dir}">
317 <    <patternset id="jdk10.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <fileset dir="${jtreg9.src.dir}">
323 <    <patternset id="jdk9.jtreg.tests">
324 <      <include name="**/*.java"/>
325 <    </patternset>
326 <  </fileset>
327 <
328 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
316 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
317 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
318 >  <property name="jtreg.test.pattern" value="**/*.java"/>
319 >  <macrodef name="defjtregtests">
320 >    <attribute name="v"/>
321 >    <sequential>
322 >      <fileset dir="${jtreg@{v}.src.dir}">
323 >        <patternset id="jdk@{v}.jtreg.tests">
324 >          <include name="${jtreg.test.pattern}"/>
325 >        </patternset>
326 >      </fileset>
327 >    </sequential>
328 >  </macrodef>
329  
330 <  <fileset dir="${jtreg7.src.dir}">
331 <    <patternset id="jdk7.jtreg.tests">
332 <      <include name="**/*.java"/>
333 <    </patternset>
334 <  </fileset>
330 >  <defjtregtests v="12"/>
331 >  <defjtregtests v="11"/>
332 >  <defjtregtests v="10"/>
333 >  <defjtregtests v="9"/>
334 >  <defjtregtests v="8"/>
335 >  <defjtregtests v="7"/>
336  
337    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
338    <property name="jtreg.flags" value=""/>
# Line 328 | Line 342
342      <attribute name="target"/>
343      <attribute name="workdir"/>
344      <attribute name="classes"/>
345 +    <attribute name="verbose" default="${jtreg.verbose}"/>
346      <attribute name="jtregflags" default=""/>
347 +    <element name="jtreg-elements" optional="true"/>
348  
349      <sequential>
350  
# Line 337 | Line 353
353  
354      <local name="modules"/>
355      <condition property="modules">
356 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
356 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
357      </condition>
358  
359      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 350 | Line 366
366        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367        <arg value="-agentvm"/>
368        <arg value="-noreport"/>
369 <      <arg value="-verbose:${jtreg.verbose}"/>
369 >      <arg value="-verbose:@{verbose}"/>
370        <arg value="-vmoptions:-esa -ea"/>
371        <arg value="-automatic"/>
372        <arg value="-k:!ignore"/>
373        <arg line="@{jtregflags}"/>
374        <arg line="${jtreg.flags}"/>
375 +      <jtreg-elements/>
376      </jtreg>
377      </sequential>
378    </macrodef>
# Line 378 | Line 395
395      <sequential>
396        <property name="build.main.java"    value="${java@{v}}"/>
397        <property name="build.main.javac"   value="${javac@{v}}"/>
398 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
398 >      <!-- Force javadoc version to be at least 10,
399 >           so we can use override-methods=summary -->
400 >      <condition property="build.main.javadoc"
401 >                 value="${javadoc11}"
402 >                 else="${javadoc@{v}}">
403 >        <equals arg1="@{v}" arg2="9"/>
404 >      </condition>
405      </sequential>
406    </macrodef>
407    <define-build-main-properties v="${build.main.java.version}"/>
# Line 472 | Line 495
495        <arg value="-XDignore.symbol.file=true"/>
496        <arg value="-html5"/>
497        <arg value="--patch-module=java.base=${src.dir}"/>
498 <      <arg value="-tag"/>
499 <      <arg value="${javadoc.jls.option}"/>
500 < <!-- @apiNote currently unused -->
501 < <!--       <arg value="-tag"/> -->
502 < <!--       <arg value="apiNote:a:API Note:"/> -->
480 <      <arg value="-tag"/>
481 <      <arg value="implSpec:a:Implementation Requirements:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
498 >      <arg value="--override-methods=summary"/>
499 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
500 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
501 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
502 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
503   <!-- tags added in jdk9: currently unused -->
504 < <!--       <arg value="-tag"/> -->
505 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
504 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
505 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
506      </javadoc>
507    </target>
508  
# Line 597 | Line 614
614  
615   <!--   </target> -->
616  
617 <  <target name="test910"
617 >  <target name="test9101112"
618            description="Runs tck and jtreg tests for src/main for multiple java versions">
619  
620      <antcall target="clean"/>
# Line 610 | Line 627
627        <param name="build.main.java.version" value="10"/>
628      </antcall>
629  
630 +    <antcall target="clean"/>
631 +    <antcall target="test">
632 +      <param name="build.main.java.version" value="11"/>
633 +    </antcall>
634 +
635 +    <antcall target="clean"/>
636 +    <antcall target="test">
637 +      <param name="build.main.java.version" value="12"/>
638 +    </antcall>
639 +
640      <!-- Clean up to avoid obscure wrong class file version bugs -->
641      <antcall target="clean"/>
642  
# Line 822 | Line 849
849        </fileset>
850        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
851        <arg value="-XDignore.symbol.file=true"/>
852 <      <arg value="-tag"/>
853 <      <arg value="${javadoc.jls.option}"/>
854 < <!-- @apiNote currently unused -->
855 < <!--       <arg value="-tag"/> -->
856 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
830 <      <arg value="-tag"/>
831 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
832 <      <arg value="-tag"/>
833 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
852 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
853 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
854 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
855 > <!-- @apiNote tag currently unused -->
856 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
857      </javadoc>
858    </target>
859  
# Line 1360 | Line 1383
1383  
1384   <!-- Find buglets that can be detected by static build tools -->
1385  
1386 <  <target name="lint">
1387 <    <antcall target="dists">
1388 <      <param name="build.javadoc.access" value="public"/>
1389 <    </antcall>
1390 <  </target>
1386 > <!--   <target name="lint"> -->
1387 > <!--     <antcall target="dists"> -->
1388 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1389 > <!--     </antcall> -->
1390 > <!--   </target> -->
1391  
1392   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1393 <  <target name="lint-private">
1393 >  <target name="doclint-private">
1394      <antcall target="dist">
1395        <param name="build.javadoc.access" value="private"/>
1396      </antcall>
# Line 1377 | Line 1400
1400   <!-- ==============================================================
1401    Experimental errorprone support - http://errorprone.info
1402   =================================================================== -->
1403 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1403 >  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1404 >  <property name="errorprone.jsr166.user.flags" value=""/>
1405 >  <property name="errorprone.jsr166.flags"
1406 >            value="-Xep:HashtableContains:OFF
1407 >                   -Xep:JdkObsolete:OFF
1408 >                   -Xep:MissingOverride:OFF
1409 >                   -Xep:MissingFail:OFF
1410 >                   -Xep:MixedArrayDimensions:ERROR
1411 >                   -Xep:RemoveUnusedImports:ERROR
1412 >                   -Xep:EmptyIf:ERROR
1413 >                   -Xep:MultipleTopLevelClasses:ERROR
1414 >                   -Xep:ClassName:ERROR
1415 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1416 >                   -Xep:RedundantThrows:ERROR
1417 >                   -Xep:IdentityBinaryExpression:WARN
1418 >                   -Xep:MethodCanBeStatic:WARN
1419 >                   ${errorprone.jsr166.user.flags}"/>
1420 >  <!-- -Xep:WildcardImport:ERROR -->
1421 >  <property name="errorprone.jsr166.test.flags"
1422 >            value="-Xep:StringSplitter:OFF
1423 >                   -Xep:BoxedPrimitiveConstructor:OFF
1424 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
1425 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1426    <target name="errorprone"
1427            depends="clean, configure-compiler"
1428            description="Run errorprone over jsr166 source code (experimental)">
# Line 1399 | Line 1444
1444             fork="true">
1445  
1446        <include name="**/*.java"/>
1447 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1448 +      <compilerarg value="-J--illegal-access=permit"/>
1449 +      <compilerarg value="-XDcompilePolicy=simple"/>
1450        <compilerarg line="-processorpath ${errorprone.jar}"/>
1451        <compilerarg value="-Xplugin:ErrorProne
1452 <                          -Xep:IdentityBinaryExpression:WARN
1405 <                          -Xep:MissingOverride:OFF
1406 <                          -Xep:MixedArrayDimensions:WARN
1407 <                          -Xep:RemoveUnusedImports:ERROR
1408 <                          -Xep:ClassName:ERROR
1409 <                          -Xep:MultipleTopLevelClasses:ERROR
1410 <                          -Xep:EmptyIf:ERROR
1411 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1412 <                          -Xep:RedundantThrows:ERROR
1413 <                          -Xep:MethodCanBeStatic:WARN"/>
1452 >                          ${errorprone.jsr166.flags}"/>
1453        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1454        <compilerarg value="-Xprefer:source"/>
1455        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1429 | Line 1468
1468        workdir="${build.dir}"
1469        classes="${product.jar}">
1470        <javac-elements>
1471 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1472 +        <compilerarg value="-J--illegal-access=permit"/>
1473 +        <compilerarg value="-XDcompilePolicy=simple"/>
1474          <compilerarg line="-processorpath ${errorprone.jar}"/>
1475          <compilerarg value="-Xplugin:ErrorProne
1476 <                            -Xep:IdentityBinaryExpression:WARN
1477 <                            -Xep:BoxedPrimitiveConstructor:OFF
1436 <                            -Xep:HashtableContains:OFF
1437 <                            -Xep:ModifyingCollectionWithItself:OFF
1438 <                            -Xep:MissingOverride:OFF
1439 <                            -Xep:MixedArrayDimensions:WARN
1440 <                            -Xep:RemoveUnusedImports:ERROR
1441 <                            -Xep:ClassName:ERROR
1442 <                            -Xep:MultipleTopLevelClasses:ERROR
1443 <                            -Xep:EmptyIf:ERROR
1444 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1445 <                            -Xep:RedundantThrows:ERROR
1446 <                            -Xep:MethodCanBeStatic:WARN"/>
1476 >                            ${errorprone.jsr166.flags}
1477 >                            ${errorprone.jsr166.test.flags}"/>
1478          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1479        </javac-elements>
1480      </run-tck-tests>
1481    </target>
1482  
1483 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1484 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1485 +  <target name="errorprone-jtreg"
1486 +          depends="jar"
1487 +          description="Run errorprone over jtreg tests (experimental)">
1488 +
1489 +    <run-jtreg-tests
1490 +       target="${build.main.java.version}"
1491 +       workdir="${build.dir}"
1492 +       classes="${product.jar}"
1493 +       verbose="all">
1494 +      <jtreg-elements>
1495 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1496 +        <arg value="-javacoption:-processorpath"/>
1497 +        <arg value="-javacoption:${errorprone.jar}"/>
1498 +        <arg value="-javacoption:-Xplugin:ErrorProne
1499 +                            ${errorprone.jsr166.flags}
1500 +                            ${errorprone.jsr166.test.flags}
1501 +                            -Xep:MultipleTopLevelClasses:WARN
1502 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1503 +      </jtreg-elements>
1504 +    </run-jtreg-tests>
1505 +  </target>
1506 +
1507  
1508   <!-- ==============================================================
1509    Running guava tests against jsr166 code

Diff Legend

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