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.220 by jsr166, Sun Sep 25 01:28:54 2016 UTC vs.
Revision 1.237 by jsr166, Fri Mar 24 15:57:26 2017 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" xmlns:unless="ant:unless"
3 >  xmlns:ivy="antlib:org.apache.ivy.ant">
4  
5    <description>
6   ------------------------------------------------------------------------------
# Line 17 | Line 18
18    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a
20    hierarchy containing:
20 –  $HOME/jdk/jdk6
21    $HOME/jdk/jdk7
22    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9
24 +  $HOME/jdk/jdk10
25    where each of the above is a JDK or a symlink to same, and
25 –  $HOME/jdk/src/jdk6
26    $HOME/jdk/src/jdk7
27    $HOME/jdk/src/jdk8
28    $HOME/jdk/src/jdk9
29 +  $HOME/jdk/src/jdk10
30    where each of the above is a complete JDK source tree
31    (e.g. mercurial forest) or a symlink to same.
32  
33    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...
35 <  for $N in 6 7 8 9 ...
35 >  for $N in 7 8 9 10 ...
36  
37 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 <  target is currently broken.
37 >  As of 2016-03, the sources in src/main are for jdk9+ only.
38   ------------------------------------------------------------------------------
39    </description>
40  
# Line 63 | Line 63
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66 –  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66  
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 134 | Line 133
133    <defjdklocations v="7"/>
134    <defjdklocations v="8"/>
135    <defjdklocations v="9"/>
136 +  <defjdklocations v="10"/>
137  
138    <!-- Source locations -->
139    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143 | Line 143
143    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
147    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
148    <property name="lib.dir"              location="${basedir}/lib"/>
149    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 252 | Line 253
253        <include name="*.java"/>
254        <compilerarg value="-XDignore.symbol.file=true"/>
255        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
256 +      <compilerarg value="-Xdoclint:reference/private"/>
257        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258 <      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
258 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
259        <compilerarg line="${build.args}"/>
260        <javac-elements/>
261  
# Line 264 | Line 266
266            jvm="${java@{target}}"
267            fork="true">
268          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
269 <        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
269 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
270 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
271 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
272 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
273 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
274 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
275          <jvmarg line="@{jvmflags}"/>
276          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
277          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 295 | Line 302
302    <fileset dir="${jtreg8.src.dir}">
303      <patternset id="jdk8.jtreg.tests">
304        <include name="**/*.java"/>
298 –      <exclude name="**/SpliteratorCharacteristics.java"/>
299 –      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
300 –      <exclude name="**/GCDuringIteration.java"/>
305      </patternset>
306    </fileset>
307  
# Line 329 | Line 333
333      </condition>
334  
335      <delete dir="@{workdir}/JTwork"   quiet="true"/>
332 –    <delete dir="@{workdir}/JTreport" quiet="true"/>
336      <jtreg dir="${jtreg@{target}.src.dir}"
337             jdk="${jdk@{target}.home}"
338 <           workDir="@{workdir}/JTwork"
336 <           reportDir="@{workdir}/JTreport">
338 >           workDir="@{workdir}/JTwork">
339        <patternset refid="jdk@{target}.jtreg.tests"/>
340        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
341 <      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
341 >      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
342 >      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
343        <arg value="-agentvm"/>
344 +      <arg value="-noreport"/>
345        <arg value="-verbose:${jtreg.verbose}"/>
346        <arg value="-vmoptions:-esa -ea"/>
347        <arg value="-automatic"/>
# Line 397 | Line 401
401             fork="true">
402  
403        <include name="**/*.java"/>
404 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
404 >      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
405        <compilerarg value="-Xprefer:source"/>
406        <compilerarg value="-XDignore.symbol.file=true"/>
407        <compilerarg value="-Xlint:all"/>
408        <compilerarg value="-Werror"/>
409 <      <compilerarg value="-Xdoclint:all/protected"/>
409 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
410        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
411        <compilerarg line="${build.args}"/>
412  
# Line 434 | Line 438
438      <!-- the packagenames="none" hack below prevents scanning the -->
439      <!-- sourcepath for packages -->
440  
441 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
442 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
441 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
442 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
443 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
444 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
445 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
446      <javadoc destdir="${docs.dir}"
447               packagenames="none"
448               link="${java9.api.url}"
# Line 450 | Line 457
457        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
458        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
459        <arg value="-XDignore.symbol.file=true"/>
460 <      <arg value="-Xmodule:java.base"/>
460 >      <arg value="--patch-module=java.base=${src.dir}"/>
461        <arg value="-tag"/>
462        <arg value="${javadoc.jls.option}"/>
463   <!-- @apiNote currently unused -->
464   <!--       <arg value="-tag"/> -->
465 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
465 > <!--       <arg value="apiNote:a:API Note:"/> -->
466        <arg value="-tag"/>
467 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
467 >      <arg value="implSpec:a:Implementation Requirements:"/>
468        <arg value="-tag"/>
469 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
469 >      <arg value="implNote:a:Implementation Note:"/>
470   <!-- tags added in jdk9: currently unused -->
471   <!--       <arg value="-tag"/> -->
472   <!--       <arg value="revised:X"/> -->
# Line 530 | Line 537
537      <run-tck-tests
538        target="${build.main.java.version}"
539        workdir="${build.dir}"
540 <      classes="${product.jar}"/>
540 >      classes="${product.jar}">
541 >      <javac-elements>
542 >        <compilerarg value="-Werror"/>
543 >      </javac-elements>
544 >    </run-tck-tests>
545    </target>
546  
547    <target name="tck-parallelism-1"
# Line 598 | Line 609
609  
610    <target name="configure-compiler">
611      <fail message="ant version too old">
612 <      <condition>
602 <        <not> <antversion atleast="1.9.1"/> </not>
603 <      </condition>
612 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
613      </fail>
614  
615      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 735 | Line 744
744        <compilerarg value="-Xprefer:source"/>
745        <compilerarg value="-XDignore.symbol.file=true"/>
746        <compilerarg value="-Xlint:all"/>
747 <      <compilerarg value="-Xdoclint:all/protected"/>
747 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
748        <compilerarg line="${build.args}"/>
749  
750      </javac>
# Line 769 | Line 778
778          <!-- JDK9+ test classes -->
779          <exclude name="*9Test.java"/>
780          <exclude name="*10Test.java"/>
781 +        <compilerarg value="-Werror"/>
782        </javac-elements>
783      </run-tck-tests>
784    </target>
# Line 950 | Line 960
960          <exclude name="SplittableRandomTest.java"/>
961          <exclude name="StampedLockTest.java"/>
962          <exclude name="SubmissionPublisherTest.java"/>
963 +        <compilerarg value="-Werror"/>
964        </javac-elements>
965      </run-tck-tests>
966    </target>
# Line 1505 | Line 1516
1516    </target>
1517  
1518  
1519 + <!-- ==============================================================
1520 +  Experimental errorprone support - http://errorprone.info
1521 +  You may need to bring your own errorprone jar.
1522 + =================================================================== -->
1523 +  <target name="errorprone"
1524 +          depends="clean, configure-compiler"
1525 +          description="Run errorprone over jsr166 source code">
1526 +
1527 +    <local name="destdir"/>
1528 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1529 +    <mkdir dir="${destdir}"/>
1530 +
1531 +    <javac srcdir="${src.dir}"
1532 +           destdir="${destdir}"
1533 +           debug="${build.debug}"
1534 +           debuglevel="${build.debuglevel}"
1535 +           deprecation="${build.deprecation}"
1536 +           classpath=""
1537 +           includeAntRuntime="false"
1538 +           includeJavaRuntime="false"
1539 +           encoding="ASCII"
1540 +           executable="${build.main.javac}"
1541 +           fork="true">
1542 +
1543 +      <include name="**/*.java"/>
1544 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1545 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1546 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1547 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1548 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1549 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1550 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1551 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1552 +      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1553 +      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1554 +      <compilerarg value="-Xplugin:ErrorProne
1555 +                          -Xep:IdentityBinaryExpression:WARN
1556 +                          -Xep:MissingOverride:OFF
1557 +                          -Xep:MixedArrayDimensions:WARN
1558 +                          -Xep:RemoveUnusedImports:ERROR
1559 +                          -Xep:MethodCanBeStatic:WARN"/>
1560 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1561 +      <compilerarg value="-Xprefer:source"/>
1562 +      <compilerarg value="-XDignore.symbol.file=true"/>
1563 +      <compilerarg value="-Xlint:all"/>
1564 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1565 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1566 +      <compilerarg line="${build.args}"/>
1567 +    </javac>
1568 +
1569 +    <jar destfile="${product.jar}">
1570 +      <fileset dir="${destdir}"/>
1571 +    </jar>
1572 +
1573 +    <run-tck-tests
1574 +      target="${build.main.java.version}"
1575 +      workdir="${build.dir}"
1576 +      classes="${product.jar}">
1577 +      <javac-elements>
1578 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1579 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1580 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1581 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1582 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1583 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1584 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1585 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1586 +        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1587 +        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1588 +        <compilerarg value="-Xplugin:ErrorProne
1589 +                            -Xep:IdentityBinaryExpression:WARN
1590 +                            -Xep:BoxedPrimitiveConstructor:OFF
1591 +                            -Xep:HashtableContains:OFF
1592 +                            -Xep:ModifyingCollectionWithItself:OFF
1593 +                            -Xep:MissingOverride:OFF
1594 +                            -Xep:MixedArrayDimensions:WARN
1595 +                            -Xep:RemoveUnusedImports:ERROR
1596 +                            -Xep:MethodCanBeStatic:WARN"/>
1597 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1598 +      </javac-elements>
1599 +    </run-tck-tests>
1600 +  </target>
1601 +
1602 +
1603 + <!-- ==============================================================
1604 +  Running guava tests against jsr166 code
1605 + =================================================================== -->
1606 +
1607 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1608 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1609 + <!-- <property name="guava.version" value="21.0"/> -->
1610 +
1611 + <!-- HOWTO debug print a path id -->
1612 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1613 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1614 +
1615 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1616 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1617 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1618 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1619 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1620 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1621 +
1622 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1623 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1624 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1625 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1626 +
1627 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1628 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1629 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1630 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1631 +
1632 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1633 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1634 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1635 +
1636 +  <target name="init-ivy">
1637 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1638 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1639 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1640 +             classpath="${build.dir}/ivy.jar"/>
1641 +  </target>
1642 +
1643 +  <target name="guava-tests" depends="jar, init-ivy"
1644 +          description="Guava tests run against jsr166 collections">
1645 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1646 +    <mkdir dir="${guava.dir}"/>
1647 +    <ivy:retrieve pathid="guava.testlib.classpath"
1648 +      type="jar,bundle" inline="true" conf="default,master"
1649 +      pattern="${guava.dir}/[artifact].[ext]"
1650 +      organisation="com.google.guava" module="guava-testlib"/>
1651 +    <property name="guava.version" value="21.0"/>
1652 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1653 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1654 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1655 +           jvm="${java9}" fork="true">
1656 +      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1657 +      <formatter type="brief"/>
1658 +      <classpath>
1659 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1660 +        <path refid="guava.testlib.classpath"/>
1661 +      </classpath>
1662 +
1663 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1664 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1665 +    </junit>
1666 +  </target>
1667 +
1668   </project>

Diff Legend

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