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.252 by jsr166, Tue Sep 19 22:41:18 2017 UTC vs.
Revision 1.269 by jsr166, Wed Mar 21 23:10:39 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    where each of the above is a JDK or a symlink to same, and
27    $HOME/jdk/src/jdk8
28    $HOME/jdk/src/jdk9
29    $HOME/jdk/src/jdk10
30 +  $HOME/jdk/src/jdk11
31    where each of the above is a complete JDK source tree
32    (e.g. mercurial forest) or a symlink to same.
33  
# Line 132 | Line 135
135    <defjdklocations v="8"/>
136    <defjdklocations v="9"/>
137    <defjdklocations v="10"/>
138 +  <defjdklocations v="11"/>
139  
140    <!-- Source locations -->
141    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 146
146    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
150    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151    <property name="lib.dir"              location="${basedir}/lib"/>
152    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181 | Line 186
186    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
187  
188    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
189 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
190 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
191 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
192 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
193 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
194 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
195 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
189 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
190 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
191 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
192 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
193 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
194 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
196 >  <!-- The location of jdk early access docs (RIP) -->
197 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
198 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
199 >  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
200    <!-- Default jdk doc location (latest stable release seems best) -->
201 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
201 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
202  
203    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
204    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 206
206    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
207    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
208    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
209 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
210 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
211    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
212  
213    <!-- Define the "jtreg" task -->
# Line 296 | Line 307
307    </macrodef>
308  
309    <!-- Define jtreg test sets for different jdk versions -->
310 <  <fileset dir="${jtreg10.src.dir}">
311 <    <patternset id="jdk10.jtreg.tests">
312 <      <include name="**/*.java"/>
313 <    </patternset>
314 <  </fileset>
315 <
316 <  <fileset dir="${jtreg9.src.dir}">
317 <    <patternset id="jdk9.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
310 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
311 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
312 >  <property name="jtreg.test.pattern" value="**/*.java"/>
313 >  <macrodef name="defjtregtests">
314 >    <attribute name="v"/>
315 >    <sequential>
316 >      <fileset dir="${jtreg@{v}.src.dir}">
317 >        <patternset id="jdk@{v}.jtreg.tests">
318 >          <include name="${jtreg.test.pattern}"/>
319 >        </patternset>
320 >      </fileset>
321 >    </sequential>
322 >  </macrodef>
323  
324 <  <fileset dir="${jtreg7.src.dir}">
325 <    <patternset id="jdk7.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <    </patternset>
328 <  </fileset>
324 >  <defjtregtests v="11"/>
325 >  <defjtregtests v="10"/>
326 >  <defjtregtests v="9"/>
327 >  <defjtregtests v="8"/>
328 >  <defjtregtests v="7"/>
329  
330    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331    <property name="jtreg.flags" value=""/>
# Line 328 | Line 335
335      <attribute name="target"/>
336      <attribute name="workdir"/>
337      <attribute name="classes"/>
338 +    <attribute name="verbose" default="${jtreg.verbose}"/>
339      <attribute name="jtregflags" default=""/>
340 +    <element name="jtreg-elements" optional="true"/>
341  
342      <sequential>
343  
# Line 350 | Line 359
359        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
360        <arg value="-agentvm"/>
361        <arg value="-noreport"/>
362 <      <arg value="-verbose:${jtreg.verbose}"/>
362 >      <arg value="-verbose:@{verbose}"/>
363        <arg value="-vmoptions:-esa -ea"/>
364        <arg value="-automatic"/>
365        <arg value="-k:!ignore"/>
366        <arg line="@{jtregflags}"/>
367        <arg line="${jtreg.flags}"/>
368 +      <jtreg-elements/>
369      </jtreg>
370      </sequential>
371    </macrodef>
# Line 378 | Line 388
388      <sequential>
389        <property name="build.main.java"    value="${java@{v}}"/>
390        <property name="build.main.javac"   value="${javac@{v}}"/>
391 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
391 >      <!-- Force javadoc version to be at least 10,
392 >           so we can use override-methods=summary -->
393 >      <condition property="build.main.javadoc"
394 >                 value="${javadoc11}"
395 >                 else="${javadoc@{v}}">
396 >        <equals arg1="@{v}" arg2="9"/>
397 >      </condition>
398      </sequential>
399    </macrodef>
400    <define-build-main-properties v="${build.main.java.version}"/>
# Line 472 | Line 488
488        <arg value="-XDignore.symbol.file=true"/>
489        <arg value="-html5"/>
490        <arg value="--patch-module=java.base=${src.dir}"/>
491 <      <arg value="-tag"/>
492 <      <arg value="${javadoc.jls.option}"/>
493 < <!-- @apiNote currently unused -->
494 < <!--       <arg value="-tag"/> -->
495 < <!--       <arg value="apiNote:a:API Note:"/> -->
496 <      <arg value="-tag"/>
481 <      <arg value="implSpec:a:Implementation Requirements:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
491 >      <arg value="--override-methods=summary"/>
492 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
495 > <!-- @apiNote tag currently unused -->
496 > <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
497   <!-- tags added in jdk9: currently unused -->
498 < <!--       <arg value="-tag"/> -->
499 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
498 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
499 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
500      </javadoc>
501    </target>
502  
# Line 597 | Line 608
608  
609   <!--   </target> -->
610  
611 <  <target name="test910"
611 >  <target name="test91011"
612            description="Runs tck and jtreg tests for src/main for multiple java versions">
613  
614      <antcall target="clean"/>
# Line 610 | Line 621
621        <param name="build.main.java.version" value="10"/>
622      </antcall>
623  
624 +    <antcall target="clean"/>
625 +    <antcall target="test">
626 +      <param name="build.main.java.version" value="11"/>
627 +    </antcall>
628 +
629      <!-- Clean up to avoid obscure wrong class file version bugs -->
630      <antcall target="clean"/>
631  
# Line 822 | Line 838
838        </fileset>
839        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
840        <arg value="-XDignore.symbol.file=true"/>
841 <      <arg value="-tag"/>
842 <      <arg value="${javadoc.jls.option}"/>
843 < <!-- @apiNote currently unused -->
844 < <!--       <arg value="-tag"/> -->
845 < <!--       <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;"/>
841 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
842 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
843 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
844 > <!-- @apiNote tag currently unused -->
845 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
846      </javadoc>
847    </target>
848  
# Line 1360 | Line 1372
1372  
1373   <!-- Find buglets that can be detected by static build tools -->
1374  
1375 <  <target name="lint">
1376 <    <antcall target="dists">
1377 <      <param name="build.javadoc.access" value="public"/>
1378 <    </antcall>
1379 <  </target>
1375 > <!--   <target name="lint"> -->
1376 > <!--     <antcall target="dists"> -->
1377 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1378 > <!--     </antcall> -->
1379 > <!--   </target> -->
1380  
1381   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1382 <  <target name="lint-private">
1382 >  <target name="doclint-private">
1383      <antcall target="dist">
1384        <param name="build.javadoc.access" value="private"/>
1385      </antcall>
# Line 1377 | Line 1389
1389   <!-- ==============================================================
1390    Experimental errorprone support - http://errorprone.info
1391   =================================================================== -->
1392 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1393 +  <property name="errorprone.jsr166.user.flags" value=""/>
1394 +  <property name="errorprone.jsr166.flags"
1395 +            value="-Xep:HashtableContains:OFF
1396 +                   -Xep:JdkObsolete:OFF
1397 +                   -Xep:MissingOverride:OFF
1398 +                   -Xep:MissingFail:OFF
1399 +                   -Xep:MixedArrayDimensions:ERROR
1400 +                   -Xep:RemoveUnusedImports:ERROR
1401 +                   -Xep:EmptyIf:ERROR
1402 +                   -Xep:MultipleTopLevelClasses:ERROR
1403 +                   -Xep:ClassName:ERROR
1404 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1405 +                   -Xep:RedundantThrows:ERROR
1406 +                   -Xep:IdentityBinaryExpression:WARN
1407 +                   -Xep:MethodCanBeStatic:WARN
1408 +                   ${errorprone.jsr166.user.flags}"/>
1409 +  <!-- -Xep:WildcardImport:ERROR -->
1410 +  <property name="errorprone.jsr166.test.flags"
1411 +            value="-Xep:StringSplitter:OFF
1412 +                   -Xep:BoxedPrimitiveConstructor:OFF
1413 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1414 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1415    <target name="errorprone"
1416            depends="clean, configure-compiler"
1417            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1433
1433             fork="true">
1434  
1435        <include name="**/*.java"/>
1436 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1436 >      <compilerarg value="-XDcompilePolicy=simple"/>
1437 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1438        <compilerarg value="-Xplugin:ErrorProne
1439 <                          -Xep:IdentityBinaryExpression:WARN
1404 <                          -Xep:MissingOverride:OFF
1405 <                          -Xep:MixedArrayDimensions:WARN
1406 <                          -Xep:RemoveUnusedImports:ERROR
1407 <                          -Xep:ClassName:ERROR
1408 <                          -Xep:MultipleTopLevelClasses:ERROR
1409 <                          -Xep:EmptyIf:ERROR
1410 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1411 <                          -Xep:RedundantThrows:ERROR
1412 <                          -Xep:MethodCanBeStatic:WARN"/>
1439 >                          ${errorprone.jsr166.flags}"/>
1440        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1441        <compilerarg value="-Xprefer:source"/>
1442        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1428 | Line 1455
1455        workdir="${build.dir}"
1456        classes="${product.jar}">
1457        <javac-elements>
1458 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1458 >        <compilerarg value="-XDcompilePolicy=simple"/>
1459 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1460          <compilerarg value="-Xplugin:ErrorProne
1461 <                            -Xep:IdentityBinaryExpression:WARN
1462 <                            -Xep:BoxedPrimitiveConstructor:OFF
1435 <                            -Xep:HashtableContains:OFF
1436 <                            -Xep:ModifyingCollectionWithItself:OFF
1437 <                            -Xep:MissingOverride:OFF
1438 <                            -Xep:MixedArrayDimensions:WARN
1439 <                            -Xep:RemoveUnusedImports:ERROR
1440 <                            -Xep:ClassName:ERROR
1441 <                            -Xep:MultipleTopLevelClasses:ERROR
1442 <                            -Xep:EmptyIf:ERROR
1443 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1444 <                            -Xep:RedundantThrows:ERROR
1445 <                            -Xep:MethodCanBeStatic:WARN"/>
1461 >                            ${errorprone.jsr166.flags}
1462 >                            ${errorprone.jsr166.test.flags}"/>
1463          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1464        </javac-elements>
1465      </run-tck-tests>
1466    </target>
1467  
1468 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1469 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1470 +  <target name="errorprone-jtreg"
1471 +          depends="jar"
1472 +          description="Run errorprone over jtreg tests (experimental)">
1473 +
1474 +    <run-jtreg-tests
1475 +       target="${build.main.java.version}"
1476 +       workdir="${build.dir}"
1477 +       classes="${product.jar}"
1478 +       verbose="all">
1479 +      <jtreg-elements>
1480 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1481 +        <arg value="-javacoption:-processorpath"/>
1482 +        <arg value="-javacoption:${errorprone.jar}"/>
1483 +        <arg value="-javacoption:-Xplugin:ErrorProne
1484 +                            ${errorprone.jsr166.flags}
1485 +                            ${errorprone.jsr166.test.flags}
1486 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1487 +      </jtreg-elements>
1488 +    </run-jtreg-tests>
1489 +  </target>
1490 +
1491  
1492   <!-- ==============================================================
1493    Running guava tests against jsr166 code

Diff Legend

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