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.274 by jsr166, Fri Jun 22 18:55:33 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 101 | Line 104
104      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105        unless:set="have.java.base"/>
106      <local name="modules"/>
107 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
108      <local name="boot.jar.dir"/>
109      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110      <path id="bootclasspath@{v}" unless:set="modules">
# 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 <  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
194 <  <!-- The location of jdk9 early access 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="${java9.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 229 | Line 240
240  
241      <local name="modules"/>
242      <condition property="modules">
243 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
243 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
244      </condition>
245  
246      <local name="use-doclint"/>
# 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>
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="${jtreg8.src.dir}">
325 <    <patternset id="jdk8.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <    </patternset>
328 <  </fileset>
316 <
317 <  <fileset dir="${jtreg7.src.dir}">
318 <    <patternset id="jdk7.jtreg.tests">
319 <      <include name="**/*.java"/>
320 <    </patternset>
321 <  </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 339 | Line 346
346  
347      <local name="modules"/>
348      <condition property="modules">
349 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
349 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
350      </condition>
351  
352      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 381 | 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 475 | 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:"/> -->
483 <      <arg value="-tag"/>
484 <      <arg value="implSpec:a:Implementation Requirements:"/>
485 <      <arg value="-tag"/>
486 <      <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 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
496   <!-- tags added in jdk9: currently unused -->
497 < <!--       <arg value="-tag"/> -->
498 < <!--       <arg value="revised:X"/> -->
490 < <!--       <arg value="-tag"/> -->
491 < <!--       <arg value="spec:X"/> -->
497 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
499      </javadoc>
500    </target>
501  
# Line 600 | Line 607
607  
608   <!--   </target> -->
609  
610 <  <target name="test910"
610 >  <target name="test91011"
611            description="Runs tck and jtreg tests for src/main for multiple java versions">
612  
613      <antcall target="clean"/>
# Line 613 | Line 620
620        <param name="build.main.java.version" value="10"/>
621      </antcall>
622  
623 +    <antcall target="clean"/>
624 +    <antcall target="test">
625 +      <param name="build.main.java.version" value="11"/>
626 +    </antcall>
627 +
628      <!-- Clean up to avoid obscure wrong class file version bugs -->
629      <antcall target="clean"/>
630  
# Line 825 | Line 837
837        </fileset>
838        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
839        <arg value="-XDignore.symbol.file=true"/>
840 <      <arg value="-tag"/>
841 <      <arg value="${javadoc.jls.option}"/>
842 < <!-- @apiNote currently unused -->
843 < <!--       <arg value="-tag"/> -->
844 < <!--       <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;"/>
840 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
841 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
842 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
843 > <!-- @apiNote tag currently unused -->
844 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
845      </javadoc>
846    </target>
847  
# Line 1363 | Line 1371
1371  
1372   <!-- Find buglets that can be detected by static build tools -->
1373  
1374 <  <target name="lint">
1375 <    <antcall target="dists">
1376 <      <param name="build.javadoc.access" value="public"/>
1377 <    </antcall>
1378 <  </target>
1374 > <!--   <target name="lint"> -->
1375 > <!--     <antcall target="dists"> -->
1376 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1377 > <!--     </antcall> -->
1378 > <!--   </target> -->
1379  
1380   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1381 <  <target name="lint-private">
1381 >  <target name="doclint-private">
1382      <antcall target="dist">
1383        <param name="build.javadoc.access" value="private"/>
1384      </antcall>
# Line 1380 | Line 1388
1388   <!-- ==============================================================
1389    Experimental errorprone support - http://errorprone.info
1390   =================================================================== -->
1391 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1391 >  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1392 >  <property name="errorprone.jsr166.user.flags" value=""/>
1393 >  <property name="errorprone.jsr166.flags"
1394 >            value="-Xep:HashtableContains:OFF
1395 >                   -Xep:JdkObsolete:OFF
1396 >                   -Xep:MissingOverride:OFF
1397 >                   -Xep:MissingFail:OFF
1398 >                   -Xep:MixedArrayDimensions:ERROR
1399 >                   -Xep:RemoveUnusedImports:ERROR
1400 >                   -Xep:EmptyIf:ERROR
1401 >                   -Xep:MultipleTopLevelClasses:ERROR
1402 >                   -Xep:ClassName:ERROR
1403 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1404 >                   -Xep:RedundantThrows:ERROR
1405 >                   -Xep:IdentityBinaryExpression:WARN
1406 >                   -Xep:MethodCanBeStatic:WARN
1407 >                   ${errorprone.jsr166.user.flags}"/>
1408 >  <!-- -Xep:WildcardImport:ERROR -->
1409 >  <property name="errorprone.jsr166.test.flags"
1410 >            value="-Xep:StringSplitter:OFF
1411 >                   -Xep:BoxedPrimitiveConstructor:OFF
1412 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
1413 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1414    <target name="errorprone"
1415            depends="clean, configure-compiler"
1416            description="Run errorprone over jsr166 source code (experimental)">
# Line 1402 | Line 1432
1432             fork="true">
1433  
1434        <include name="**/*.java"/>
1435 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1436 +      <compilerarg value="-J--illegal-access=permit"/>
1437 +      <compilerarg value="-XDcompilePolicy=simple"/>
1438        <compilerarg line="-processorpath ${errorprone.jar}"/>
1439        <compilerarg value="-Xplugin:ErrorProne
1440 <                          -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"/>
1440 >                          ${errorprone.jsr166.flags}"/>
1441        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1442        <compilerarg value="-Xprefer:source"/>
1443        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1432 | Line 1456
1456        workdir="${build.dir}"
1457        classes="${product.jar}">
1458        <javac-elements>
1459 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1460 +        <compilerarg value="-J--illegal-access=permit"/>
1461 +        <compilerarg value="-XDcompilePolicy=simple"/>
1462          <compilerarg line="-processorpath ${errorprone.jar}"/>
1463          <compilerarg value="-Xplugin:ErrorProne
1464 <                            -Xep:IdentityBinaryExpression:WARN
1465 <                            -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"/>
1464 >                            ${errorprone.jsr166.flags}
1465 >                            ${errorprone.jsr166.test.flags}"/>
1466          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1467        </javac-elements>
1468      </run-tck-tests>
1469    </target>
1470  
1471 <  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1471 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1472 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1473    <target name="errorprone-jtreg"
1474            depends="jar"
1475            description="Run errorprone over jtreg tests (experimental)">
# Line 1463 | Line 1480
1480         classes="${product.jar}"
1481         verbose="all">
1482        <jtreg-elements>
1483 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1484          <arg value="-javacoption:-processorpath"/>
1485          <arg value="-javacoption:${errorprone.jar}"/>
1486          <arg value="-javacoption:-Xplugin:ErrorProne
1487 <                            -Xep:IdentityBinaryExpression:WARN
1488 <                            -Xep:BoxedPrimitiveConstructor:OFF
1489 <                            -Xep:HashtableContains:OFF
1490 <                            -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"/>
1487 >                            ${errorprone.jsr166.flags}
1488 >                            ${errorprone.jsr166.test.flags}
1489 >                            -Xep:MultipleTopLevelClasses:WARN
1490 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1491        </jtreg-elements>
1492      </run-jtreg-tests>
1493    </target>

Diff Legend

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