/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.227 by jsr166, Sat Dec 17 22:18:25 2016 UTC revision 1.236 by jsr166, Mon Mar 20 00:03:57 2017 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless">    xmlns:if="ant:if" xmlns:unless="ant:unless"
3      xmlns:ivy="antlib:org.apache.ivy.ant">
4    
5    <description>    <description>
6  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 17  Line 18 
18    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
20    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk6  
21    $HOME/jdk/jdk7    $HOME/jdk/jdk7
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24      $HOME/jdk/jdk10
25    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk6  
26    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
27    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
28    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
29      $HOME/jdk/src/jdk10
30    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
31    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
32    
33    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
35    for $N in 6 7 8 9 ...    for $N in 7 8 9 10 ...
36    
37    As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"    As of 2016-03, the sources in src/main are for jdk9+ only.
   target is currently broken.  
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
# Line 133  Line 133 
133    <defjdklocations v="7"/>    <defjdklocations v="7"/>
134    <defjdklocations v="8"/>    <defjdklocations v="8"/>
135    <defjdklocations v="9"/>    <defjdklocations v="9"/>
136      <defjdklocations v="10"/>
137    
138    <!-- Source locations -->    <!-- Source locations -->
139    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142  Line 143 
143    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <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}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
148    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
149    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 251  Line 253 
253        <include name="*.java"/>        <include name="*.java"/>
254        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
255        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
256          <compilerarg value="-Xdoclint:reference/private"/>
257        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258        <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
259        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
260        <javac-elements/>        <javac-elements/>
261    
# Line 263  Line 266 
266            jvm="${java@{target}}"            jvm="${java@{target}}"
267            fork="true">            fork="true">
268          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
269          <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
270          <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
271          <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
272          <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
273          <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>          <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}"/>          <jvmarg line="@{jvmflags}"/>
276          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
277          <jvmarg line="${vmoptions}" if:set="vmoptions"/>          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 298  Line 302 
302    <fileset dir="${jtreg8.src.dir}">    <fileset dir="${jtreg8.src.dir}">
303      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
304        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
305      </patternset>      </patternset>
306    </fileset>    </fileset>
307    
# Line 398  Line 401 
401             fork="true">             fork="true">
402    
403        <include name="**/*.java"/>        <include name="**/*.java"/>
404        <compilerarg value="-Xmodule:java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
405        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
406        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
407        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
408        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
409        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
410        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
411        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
412    
# Line 454  Line 457 
457        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
458        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
459        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
460        <arg value="-Xmodule:java.base"/>        <arg value="--patch-module=java.base=${src.dir}"/>
461        <arg value="-tag"/>        <arg value="-tag"/>
462        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
463  <!-- @apiNote currently unused -->  <!-- @apiNote currently unused -->
# Line 534  Line 537 
537      <run-tck-tests      <run-tck-tests
538        target="${build.main.java.version}"        target="${build.main.java.version}"
539        workdir="${build.dir}"        workdir="${build.dir}"
540        classes="${product.jar}"/>        classes="${product.jar}">
541          <javac-elements>
542            <compilerarg value="-Werror"/>
543          </javac-elements>
544        </run-tck-tests>
545    </target>    </target>
546    
547    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
# Line 739  Line 746 
746        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
747        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
748        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
749        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
750        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
751    
752      </javac>      </javac>
# Line 773  Line 780 
780          <!-- JDK9+ test classes -->          <!-- JDK9+ test classes -->
781          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
782          <exclude name="*10Test.java"/>          <exclude name="*10Test.java"/>
783            <compilerarg value="-Werror"/>
784        </javac-elements>        </javac-elements>
785      </run-tck-tests>      </run-tck-tests>
786    </target>    </target>
# Line 954  Line 962 
962          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
963          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
964          <exclude name="SubmissionPublisherTest.java"/>          <exclude name="SubmissionPublisherTest.java"/>
965            <compilerarg value="-Werror"/>
966        </javac-elements>        </javac-elements>
967      </run-tck-tests>      </run-tck-tests>
968    </target>    </target>
# Line 1509  Line 1518 
1518    </target>    </target>
1519    
1520    
1521    <!-- ==============================================================
1522      Experimental errorprone support - http://errorprone.info
1523      You may need to bring your own errorprone jar.
1524    =================================================================== -->
1525      <target name="errorprone"
1526              depends="clean, configure-compiler"
1527              description="Run errorprone over jsr166 source code">
1528    
1529        <local name="destdir"/>
1530        <property name="destdir" value="${build.classes.dir}/java.base"/>
1531        <mkdir dir="${destdir}"/>
1532    
1533        <javac srcdir="${src.dir}"
1534               destdir="${destdir}"
1535               debug="${build.debug}"
1536               debuglevel="${build.debuglevel}"
1537               deprecation="${build.deprecation}"
1538               classpath=""
1539               includeAntRuntime="false"
1540               includeJavaRuntime="false"
1541               encoding="ASCII"
1542               executable="${build.main.javac}"
1543               fork="true">
1544    
1545          <include name="**/*.java"/>
1546          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1547          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1548          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1549          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1550          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1551          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1552          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1553          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1554          <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1555          <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1556          <compilerarg value="-Xplugin:ErrorProne
1557                              -Xep:IdentityBinaryExpression:WARN
1558                              -Xep:MissingOverride:OFF
1559                              -Xep:MixedArrayDimensions:WARN
1560                              -Xep:RemoveUnusedImports:ERROR
1561                              -Xep:MethodCanBeStatic:WARN"/>
1562          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1563          <compilerarg value="-Xprefer:source"/>
1564          <compilerarg value="-XDignore.symbol.file=true"/>
1565          <compilerarg value="-Xlint:all"/>
1566          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1567          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1568          <compilerarg line="${build.args}"/>
1569        </javac>
1570    
1571        <jar destfile="${product.jar}">
1572          <fileset dir="${destdir}"/>
1573        </jar>
1574    
1575        <run-tck-tests
1576          target="${build.main.java.version}"
1577          workdir="${build.dir}"
1578          classes="${product.jar}">
1579          <javac-elements>
1580            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1581            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1582            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1583            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1584            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1585            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1586            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1587            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1588            <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1589            <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1590            <compilerarg value="-Xplugin:ErrorProne
1591                                -Xep:IdentityBinaryExpression:WARN
1592                                -Xep:BoxedPrimitiveConstructor:OFF
1593                                -Xep:HashtableContains:OFF
1594                                -Xep:ModifyingCollectionWithItself:OFF
1595                                -Xep:MissingOverride:OFF
1596                                -Xep:MixedArrayDimensions:WARN
1597                                -Xep:RemoveUnusedImports:ERROR
1598                                -Xep:MethodCanBeStatic:WARN"/>
1599            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1600          </javac-elements>
1601        </run-tck-tests>
1602      </target>
1603    
1604    
1605    <!-- ==============================================================
1606      Running guava tests against jsr166 code
1607    =================================================================== -->
1608    
1609    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1610    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1611    <!-- <property name="guava.version" value="21.0"/> -->
1612    
1613    <!-- HOWTO debug print a path id -->
1614    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1615    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1616    
1617    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1618    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1619    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1620    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1621    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1622    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1623    
1624    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1625    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1626    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1627    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1628    
1629    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1630    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1631    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1632    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1633    
1634    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1635    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1636    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1637    
1638      <target name="init-ivy">
1639        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1640             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1641        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1642                 classpath="${build.dir}/ivy.jar"/>
1643      </target>
1644    
1645      <target name="guava-tests" depends="jar, init-ivy"
1646              description="Guava tests run against jsr166 collections">
1647        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1648        <mkdir dir="${guava.dir}"/>
1649        <ivy:retrieve pathid="guava.testlib.classpath"
1650          type="jar,bundle" inline="true" conf="default,master"
1651          pattern="${guava.dir}/[artifact].[ext]"
1652          organisation="com.google.guava" module="guava-testlib"/>
1653        <property name="guava.version" value="21.0"/>
1654        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1655             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1656        <junit printsummary="true" showoutput="true" haltonfailure="true"
1657               jvm="${java9}" fork="true">
1658          <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1659          <formatter type="brief"/>
1660          <classpath>
1661            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1662            <path refid="guava.testlib.classpath"/>
1663          </classpath>
1664    
1665          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1666          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1667        </junit>
1668      </target>
1669    
1670  </project>  </project>

Legend:
Removed from v.1.227  
changed lines
  Added in v.1.236

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27