/[cvs]/jsr166/build.xml

Diff of /jsr166/build.xml

Parent Directory | Revision Log | View Patch Patch

-revision 1.134 by jsr166,
Sun Feb  3 02:25:01 2013 UTC
+revision 1.235 by jsr166,
Sun Mar 19 01:37:51 2017 UTC
 Line 1
- <project name="jsr166" default="usage">
+ <project name="jsr166" default="usage"
+   xmlns:if="ant:if" xmlns:unless="ant:unless"
+   xmlns:ivy="antlib:org.apache.ivy.ant">
    <description>
  ------------------------------------------------------------------------------
-Line 6
+Line 8
    Usage: ant [target]
+   See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
+   more details.
    User-specific settings are read from user.properties.
    See user.properties.sample for an explanation of some useful settings.
-Line 13
+Line 18
    itself.  Because the JDK version matters and because different
    targets require different JDKs, we assume that users have created a
    hierarchy containing:
-   $HOME/jdk/jdk6
    $HOME/jdk/jdk7
    $HOME/jdk/jdk8
+   $HOME/jdk/jdk9
+   $HOME/jdk/jdk10
    where each of the above is a JDK or a symlink to same, and
-   $HOME/jdk/src/jdk6
    $HOME/jdk/src/jdk7
    $HOME/jdk/src/jdk8
+   $HOME/jdk/src/jdk9
+   $HOME/jdk/src/jdk10
    where each of the above is a complete JDK source tree
    (e.g. mercurial forest) or a symlink to same.
- As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
+   Alternatively, define ant variables thus:
+   ant -Djdk$N.home=... -Djdk$N.src.home=...
+   for $N in 7 8 9 10 ...
+   As of 2016-03, the sources in src/main are for jdk9+ only.
  ------------------------------------------------------------------------------
    </description>
-   <target name="usage" description="Display main targets by running 'ant -projecthelp'">
+   <!-- Run 'ant -projecthelp' (default target) -->
+   <target name="usage">
      <java classname="org.apache.tools.ant.Main">
        <arg value="-projecthelp" />
      </java>
    </target>
+   <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
    <!-- User-specific settings -->
    <property file="user.properties"/>
-Line 49 
 As of 2013-02, the very latest lambda 8
+Line 63 
 As of 2013-02, the very latest lambda 8
    <property name="build.classes.dir"           location="${build.dir}/classes"/>
    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
    <property name="build.loops.dir"             location="${build.dir}/loops"/>
-   <property name="build.reports.dir"           location="${build.dir}/reports"/>
    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
+   <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
+   <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
+   <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
+   <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
-Line 72 
 As of 2013-02, the very latest lambda 8
+Line 90 
 As of 2013-02, the very latest lambda 8
    <macrodef name="defjdklocations">
      <attribute name="v"/>
      <sequential>
-     <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
+     <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
-     <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
+     <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
-     <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
+     <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
-     <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
+     <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
-     <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
+     <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
+     <local name="have.java.base"/>
+     <available property="have.java.base"
+       file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
+     <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
+       if:set="have.java.base"/>
+     <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
+       unless:set="have.java.base"/>
+     <local name="modules"/>
+     <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
      <local name="boot.jar.dir"/>
-     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
+     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
-     <path id="bootclasspath@{v}">
+     <path id="bootclasspath@{v}" unless:set="modules">
        <pathelement path="${boot.jar.dir}/resources.jar"/>
        <pathelement path="${boot.jar.dir}/rt.jar"/>
        <pathelement path="${boot.jar.dir}/jsse.jar"/>
        <pathelement path="${boot.jar.dir}/jce.jar"/>
        <pathelement path="${boot.jar.dir}/charsets.jar"/>
      </path>
-     <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
+     <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
      </sequential>
    </macrodef>
-Line 105 
 As of 2013-02, the very latest lambda 8
+Line 132 
 As of 2013-02, the very latest lambda 8
    <defjdklocations v="6"/>
    <defjdklocations v="7"/>
    <defjdklocations v="8"/>
+   <defjdklocations v="9"/>
+   <defjdklocations v="10"/>
    <!-- Source locations -->
    <property name="src.dir"              location="${basedir}/src/main"/>
    <property name="test.src.dir"         location="${basedir}/src/test"/>
    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
-   <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
+   <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
+   <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
+   <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
+   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
+   <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
    <property name="lib.dir"              location="${basedir}/lib"/>
    <property name="dist.dir"             location="${basedir}/dist"/>
    <property name="topsrc.dir"           location="${basedir}/src"/>
    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
+   <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
-Line 124 
 As of 2013-02, the very latest lambda 8
+Line 158 
 As of 2013-02, the very latest lambda 8
    <!-- Javadoc locations -->
    <property name="docs.dir"          location="${build.dir}/docs"/>
    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
+   <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
-Line 131 
 As of 2013-02, the very latest lambda 8
+Line 166 
 As of 2013-02, the very latest lambda 8
    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
+   <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
-Line 139 
 As of 2013-02, the very latest lambda 8
+Line 175 
 As of 2013-02, the very latest lambda 8
    <!-- Jar locations -->
    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
+   <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
-   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
+   <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
-   <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
+   <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
-   <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
+   <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
-   <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
+   <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
+   <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
-   <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
+   <!-- The expected canonical location does not yet exist as of 2016-04 -->
-   <!-- The below does not yet exist as of 2013-01 -->
+   <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
-   <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
+   <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
+   <!-- Default jdk doc location (latest stable release seems best) -->
+   <property name="java.docroot.url"       value="${java8.docroot.url}"/>
-   <!-- Default jdk api doc location (latest stable release seems best) -->
+   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
-   <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
+   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
+   <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
+   <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
+   <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
+   <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
+   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
    <!-- Define the "jtreg" task -->
    <!-- See the docs in "jtreg -onlineHelp" -->
    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
             classpath="${lib.dir}/jtreg.jar" />
-   <!-- Test classpath -->
+   <!-- Tck options; see JSR166TestCase.java
-   <path id="test.classpath">
+    To profile a single tck test class:
-     <pathelement location="${build.testcases.dir}"/>
+    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
-     <pathelement location="${junit.jar}"/>
+    To stress test a single tck test class:
-   </path>
+    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
+    To stress test a single tck test method:
+    ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
+   -->
+   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
    <macrodef name="run-tck-tests">
      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
-     <attribute name="source" default="6"/>
      <attribute name="target"/>
+     <attribute name="compile-target" default="@{target}"/>
      <attribute name="workdir"/>
      <attribute name="classes"/>
-     <attribute name="jvmflags" default=""/>
+     <!--
+         <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
+     -->
+         <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
      <element name="javac-elements" optional="true"/>
      <