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

Diff of /jsr166/build.xml

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

revision 1.166, Mon Aug 10 06:32:23 2015 UTC revision 1.231, Sun Jan 29 20:19:00 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"
3      xmlns:ivy="antlib:org.apache.ivy.ant">
4    
5    <description>    <description>
6  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 6  Line 8 
8    
9    Usage: ant [target]    Usage: ant [target]
10    
11      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12      more details.
13    
14    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
15    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
16    
# Line 26  Line 31 
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=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
35    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
36    
37      As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
38      target is currently broken.
39  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
40    </description>    </description>
41    
42    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
43    <target name="usage">    <target name="usage">
44      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
45        <arg value="-projecthelp" />        <arg value="-projecthelp" />
46      </java>      </java>
47    </target>    </target>
48    
49      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
50    
51    <!-- User-specific settings -->    <!-- User-specific settings -->
52    <property file="user.properties"/>    <property file="user.properties"/>
# Line 50  Line 59 
59    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
60    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
61    
   <!-- Tck options; see JSR166TestCase.java  
    To profile a single tck test class:  
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck  
    To stress test a single tck test class:  
    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck  
   -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
62    <!-- Build locations -->    <!-- Build locations -->
63    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
64    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
67    
68    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
70    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72    
73      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77    
78    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 93  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98      <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}"/>
99        <local name="have.java.base"/>
100        <available property="have.java.base"
101          file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103          if:set="have.java.base"/>
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"/>
108      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
109      <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"/>
110      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
111        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
112        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
113        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
114        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
115        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
116      </path>      </path>
117      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118      </sequential>      </sequential>
119    </macrodef>    </macrodef>
120    
# Line 129  Line 140 
140    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
141    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
142    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
148    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
149    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
150    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 142  Line 157 
157    <!-- Javadoc locations -->    <!-- Javadoc locations -->
158    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
159    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 149  Line 165 
165    
166    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 157  Line 174 
174    <!-- Jar locations -->    <!-- Jar locations -->
175    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 168  Line 186 
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
# Line 187  Line 205 
205    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
206             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
207    
208    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
209    <path id="test.classpath">     To profile a single tck test class:
210      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
211      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
212    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
213       To stress test a single tck test method:
214       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
215      -->
216      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
217    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
218      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
219      <attribute name="target"/>      <attribute name="target"/>
220      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>      <attribute name="workdir"/>
222      <attribute name="classes"/>      <attribute name="classes"/>
223        <!--
224            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225        -->
226      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
228    
229      <sequential>      <sequential>
230    
231        <local name="modules"/>
232        <condition property="modules">
233          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234        </condition>
235    
236      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
237    
238      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 215  Line 245 
245             classpath="${junit.jar}"             classpath="${junit.jar}"
246             includeAntRuntime="false"             includeAntRuntime="false"
247             includeJavaRuntime="false"             includeJavaRuntime="false"
248               encoding="ASCII"
249             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
250             fork="true">             fork="true">
251    
252        <include name="*.java"/>        <include name="*.java"/>
253        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255        <compilerarg value="-Xbootclasspath/p:@{classes}"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256          <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
258        <javac-elements/>        <javac-elements/>
259    
# Line 231  Line 263 
263            failonerror="true"            failonerror="true"
264            jvm="${java@{target}}"            jvm="${java@{target}}"
265            fork="true">            fork="true">
266          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267            <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
268            <jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
269            <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
270            <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
271            <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
272            <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
273          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
274            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
275            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
276    
277          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
278          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
279            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
280              <propertyref prefix="jsr166."/>
281              <propertyref name="test.timeout.factor"/>
282          </syspropertyset>          </syspropertyset>
283    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
284          <classpath>          <classpath>
285            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
286            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 252  Line 291 
291    </macrodef>    </macrodef>
292    
293    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
294    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
295      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
296        <include name="**/*.java"/>        <include name="**/*.java"/>
297      </patternset>      </patternset>
298    </fileset>    </fileset>
299    
300    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
301      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
302        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>  
303      </patternset>      </patternset>
304    </fileset>    </fileset>
305    
306    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
307      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
308        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="util/Collection/CollectionDefaults.java"/>  
       <exclude name="util/List/ListDefaults.java"/>  
       <exclude name="util/Spliterator/**/*.java"/>  
       <exclude name="util/concurrent/CompletableFuture/**/*.java"/>  
       <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>  
       <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>  
309      </patternset>      </patternset>
310    </fileset>    </fileset>
311    
312      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
313      <property name="jtreg.flags" value=""/>
314    
315    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
316      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>  
317      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
318      <attribute name="target"/>      <attribute name="target"/>
319      <attribute name="workdir"/>      <attribute name="workdir"/>
320      <attribute name="classes"/>      <attribute name="classes"/>
321      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
322    
323      <sequential>      <sequential>
324    
325        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
326        <property name="jtreg.verbose" value="nopass,fail,error"/>
327    
328        <local name="modules"/>
329        <condition property="modules">
330          <available file="${jdk@{target}.home}/jmods" type="dir"/>
331        </condition>
332    
333      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
334      <delete dir="@{workdir}/JTreport" quiet="true"/>      <jtreg dir="${jtreg@{target}.src.dir}"
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <mkdir dir="@{workdir}/JTreport"/>  
     <jtreg dir="@{jtreg.src.dir}"  
335             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
336             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
337        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
338        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339          <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340          <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
341        <arg value="-agentvm"/>        <arg value="-agentvm"/>
342        <arg value="-v:nopass,fail"/>        <arg value="-noreport"/>
343          <arg value="-verbose:${jtreg.verbose}"/>
344        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
345        <arg value="-automatic"/>        <arg value="-automatic"/>
346        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
347        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
348          <arg line="${jtreg.flags}"/>
349      </jtreg>      </jtreg>
350      </sequential>      </sequential>
351    </macrodef>    </macrodef>
# Line 321  Line 365 
365    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
366    
367    <target name="dists"    <target name="dists"
368            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
369            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
370    
371    <target name="compile"    <target name="compile"
372            depends="configure-compiler"            depends="configure-compiler"
373            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
374    
375      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
376        <condition property="modules">
377          <and>
378            <available file="${jdk9.home}/jmods" type="dir"/>
379            <equals arg1="9" arg2="${build.main.java.version}"/>
380          </and>
381        </condition>
382    
383        <local name="destdir"/>
384        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
385        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
386    
387        <mkdir dir="${destdir}"/>
388    
389      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
390             destdir="${build.classes.dir}"             destdir="${destdir}"
391             debug="${build.debug}"             debug="${build.debug}"
392             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
393             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
394             classpath=""             classpath=""
395             includeAntRuntime="false"             includeAntRuntime="false"
396             includeJavaRuntime="false"             includeJavaRuntime="false"
397               encoding="ASCII"
398             executable="${build.main.javac}"             executable="${build.main.javac}"
399             fork="true">             fork="true">
400    
401        <include name="**/*.java"/>        <include name="**/*.java"/>
402          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
403        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
404        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
405        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 356  Line 414 
414    
415    <target name="jar"    <target name="jar"
416            depends="compile"            depends="compile"
417            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
418        <local name="subdir"/>
419        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
420      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
421        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
422          <manifest>
423            <attribute name="Built-By" value="${user.name}"/>
424            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
425          </manifest>
426      </jar>      </jar>
427    </target>    </target>
428    
# Line 373  Line 436 
436      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
437      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
438    
439    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
440    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
441    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
442    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
443    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
444      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
445               packagenames="none"               packagenames="none"
446               link="${java9.api.url}"               link="${java9.api.url}"
447               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
448               access="${build.javadoc.access}"               access="${build.javadoc.access}"
449               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
450               classpath=""               classpath=""
451               executable="${javadoc9}">               executable="${javadoc9}">
452        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 387  Line 455 
455        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
456        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
457        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
458          <arg value="-Xmodule:java.base"/>
459        <arg value="-tag"/>        <arg value="-tag"/>
460        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
461    <!-- @apiNote currently unused -->
462    <!--       <arg value="-tag"/> -->
463    <!--       <arg value="apiNote:a:API Note:"/> -->
464        <arg value="-tag"/>        <arg value="-tag"/>
465        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
466        <arg value="-tag"/>        <arg value="-tag"/>
467        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
468        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
469        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
470    <!--       <arg value="revised:X"/> -->
471    <!--       <arg value="-tag"/> -->
472    <!--       <arg value="spec:X"/> -->
473      </javadoc>      </javadoc>
474    </target>    </target>
475    
# Line 418  Line 493 
493        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
494        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
495        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
496          <manifest>
497            <attribute name="Built-By" value="${user.name}"/>
498            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
499          </manifest>
500      </jar>      </jar>
501    </target>    </target>
502    
# Line 449  Line 528 
528      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
529    </target>    </target>
530    
531    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
532            depends="jar"            depends="jar"
533            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
534    
535      <run-tck-tests      <run-tck-tests
536        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 460  Line 538 
538        classes="${product.jar}"/>        classes="${product.jar}"/>
539    </target>    </target>
540    
541    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
542            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
543      <antcall target="test-tck">      <antcall target="tck">
544        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
545      </antcall>      </antcall>
546    </target>    </target>
547    
548    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
549            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
550      <antcall target="test-tck">      <antcall target="tck">
551        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
552      </antcall>      </antcall>
553    </target>    </target>
554    
555    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="tck-security-manager"
556    <target name="test-jtreg"            description="Runs tck with a security manager">
557        <antcall target="tck">
558          <param name="jsr166.useSecurityManager" value="true"/>
559        </antcall>
560      </target>
561    
562      <target name="jtreg"
563            depends="jar"            depends="jar"
564            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
565      <run-jtreg-tests      <run-jtreg-tests
566         target="${build.main.java.version}"         target="${build.main.java.version}"
567         workdir="${build.dir}"         workdir="${build.dir}"
# Line 485  Line 569 
569    </target>    </target>
570    
571    <target name="test"    <target name="test"
572            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
573            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
574    </target>    </target>
575    
576    <target name="test89"  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
           description="Runs tck and jtreg tests for main for multiple java versions">  
577    
578      <antcall target="clean"/>  <!--     <antcall target="jtreg"> -->
579      <antcall target="test">  <!--       <param name="build.main.java.version" value="8"/> -->
580        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
581        <param name="build.main.javac" value="${javac8}"/>  <!--     </antcall> -->
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
     </antcall>  
582    
583      <antcall target="clean"/>  <!--   </target> -->
     <antcall target="test">  
       <param name="build.main.java.version" value="9"/>  
       <param name="build.main.javac" value="${javac9}"/>  
     </antcall>  
584    
585    </target>  <!--   <target name="test89" -->
586    <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
587    
588    <!--     <antcall target="clean"/> -->
589    <!--     <antcall target="test"> -->
590    <!--       <param name="build.main.java.version" value="8"/> -->
591    <!--       <param name="build.main.javac" value="${javac8}"/> -->
592    <!--     </antcall> -->
593    
594    <!--     <antcall target="clean"/> -->
595    <!--     <antcall target="test"> -->
596    <!--       <param name="build.main.java.version" value="9"/> -->
597    <!--       <param name="build.main.javac" value="${javac9}"/> -->
598    <!--     </antcall> -->
599    
600    <!--   </target> -->
601    
602    
603    
604    <target name="configure-compiler">    <target name="configure-compiler">
605        <fail message="ant version too old">
606          <condition>
607            <not> <antversion atleast="1.9.1"/> </not>
608          </condition>
609        </fail>
610    
611      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
612    
# Line 530  Line 627 
627    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
628    
629    
630    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
631            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
632    
633      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
634    
# Line 541  Line 638 
638         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
639        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
640             source="${build.sourcelevel}"             source="${build.sourcelevel}"
641               target="${build.sourcelevel}"
642             encoding="ASCII"
643               fork="true">               fork="true">
644    
645        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 568  Line 667 
667             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
668             includeAntRuntime="false"             includeAntRuntime="false"
669             includeJavaRuntime="false"             includeJavaRuntime="false"
670               encoding="ASCII"
671             executable="${javac9}"             executable="${javac9}"
672             fork="true">             fork="true">
673    
674        <include name="*.java"/>        <include name="*.java"/>
675        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
676        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
677        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
678        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
679    
# Line 582  Line 682 
682    </target>    </target>
683    
684    
685      <!-- jsr166 4jdk8 -->
686    
687      <target name="4jdk8compile"
688              depends="configure-compiler"
689              description="Compiles src/jdk8 sources, targeting jdk8">
690    
691        <mkdir dir="${build.4jdk8.classes.dir}"/>
692    
693        <javac srcdir="${4jdk8src.dir}"
694               destdir="${build.4jdk8.classes.dir}"
695               debug="${build.debug}"
696               debuglevel="${build.debuglevel}"
697               deprecation="${build.deprecation}"
698               source="8"
699               target="8"
700               classpath=""
701               bootclasspath="${bootclasspath8}"
702               includeAntRuntime="false"
703               includeJavaRuntime="false"
704               encoding="ASCII"
705               executable="${javac8}"
706               fork="true">
707    
708          <include name="**/*.java"/>
709          <compilerarg value="-Xprefer:source"/>
710          <compilerarg value="-XDignore.symbol.file=true"/>
711          <compilerarg value="-Xlint:all"/>
712          <compilerarg value="-Werror"/>
713          <compilerarg line="${build.args}"/>
714    
715        </javac>
716      </target>
717    
718      <target name="4jdk8doclint"
719              depends="configure-compiler"
720              description="Finds doclint warnings">
721    
722        <mkdir dir="${build.4jdk8.classes.dir}"/>
723    
724        <javac srcdir="${4jdk8src.dir}"
725               destdir="${build.4jdk8.classes.dir}"
726               debug="${build.debug}"
727               debuglevel="${build.debuglevel}"
728               deprecation="${build.deprecation}"
729               source="8"
730               target="8"
731               classpath=""
732               bootclasspath="${bootclasspath8}"
733               includeAntRuntime="false"
734               includeJavaRuntime="false"
735               encoding="ASCII"
736               executable="${javac8}"
737               fork="true">
738    
739          <include name="**/*.java"/>
740          <compilerarg value="-Xprefer:source"/>
741          <compilerarg value="-XDignore.symbol.file=true"/>
742          <compilerarg value="-Xlint:all"/>
743          <compilerarg value="-Xdoclint:all/protected"/>
744          <compilerarg line="${build.args}"/>
745    
746        </javac>
747      </target>
748    
749    
750      <target name="4jdk8jar"
751              depends="4jdk8compile"
752              description="Builds library jar from compiled sources">
753    
754        <jar destfile="${4jdk8product.jar}">
755          <fileset dir="${build.4jdk8.classes.dir}"/>
756          <manifest>
757            <attribute name="Built-By" value="${user.name}"/>
758            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759          </manifest>
760        </jar>
761    
762      </target>
763    
764    
765      <target name="4jdk8-tck"
766              depends="4jdk8jar"
767              description="Runs tck tests for jsr166-4jdk8 directly">
768    
769        <run-tck-tests
770          target="8"
771          workdir="${build.4jdk8.dir}"
772          classes="${4jdk8product.jar}">
773          <javac-elements>
774            <!-- JDK9+ test classes -->
775            <exclude name="*9Test.java"/>
776            <exclude name="*10Test.java"/>
777          </javac-elements>
778        </run-tck-tests>
779      </target>
780    
781    
782      <target name="4jdk8-jtreg"
783              depends="4jdk8jar"
784              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
785        <run-jtreg-tests
786           target="8"
787           workdir="${build.4jdk8.dir}"
788           classes="${4jdk8product.jar}"/>
789      </target>
790    
791    
792      <target name="4jdk8-test"
793              depends="4jdk8-tck, 4jdk8-jtreg"
794              description="Runs tck and jtreg tests for jsr166-4jdk8">
795      </target>
796    
797    
798      <target name="4jdk8docs"
799              description="Builds javadocs for src/jdk8 to dist dir">
800    
801        <delete dir="${4jdk8docs.dir}"/>
802        <mkdir dir="${4jdk8docs.dir}"/>
803    
804        <javadoc destdir="${4jdk8docs.dir}"
805                 packagenames="none"
806                 link="${java8.api.url}"
807                 overview="${4jdk8src.dir}/intro.html"
808                 access="${build.javadoc.access}"
809                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
810                 classpath=""
811                 executable="${javadoc8}"
812                 failonerror = "true">
813          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
814            <include name="**/*.java"/>
815          </fileset>
816          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
817          <arg value="-XDignore.symbol.file=true"/>
818          <arg value="-tag"/>
819          <arg value="${javadoc.jls.option}"/>
820    <!-- @apiNote currently unused -->
821    <!--       <arg value="-tag"/> -->
822    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
823          <arg value="-tag"/>
824          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
825          <arg value="-tag"/>
826          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
827        </javadoc>
828      </target>
829    
830    
831      <target name="4jdk8dist"
832              depends="4jdk8dist-jar, 4jdk8dist-docs"
833              description="Puts all distributable products in single hierarchy"/>
834    
835    
836      <target name="4jdk8clean"
837              description="Removes all 4jdk8 build products">
838    
839        <delete dir="${build.4jdk8.dir}"/>
840    
841      </target>
842    
843    
844      <target name="4jdk8dist-jar"
845              depends="4jdk8clean, 4jdk8jar">
846        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
847      </target>
848    
849    
850      <target name="4jdk8dist-docs"
851              depends="4jdk8clean, 4jdk8docs">
852        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
853      </target>
854    
855    
856    
857    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
858    
859    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 596  Line 868 
868             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
869             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
870             source="6"             source="6"
871               target="6"
872             classpath=""             classpath=""
873             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
874             includeAntRuntime="false"             includeAntRuntime="false"
875             includeJavaRuntime="false"             includeJavaRuntime="false"
876               encoding="ASCII"
877             executable="${javac7}"             executable="${javac7}"
878             fork="true">             fork="true">
879    
# Line 625  Line 899 
899             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
900             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
901             source="6"             source="6"
902               target="6"
903             classpath=""             classpath=""
904             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
905             includeAntRuntime="false"             includeAntRuntime="false"
906             includeJavaRuntime="false"             includeJavaRuntime="false"
907               encoding="ASCII"
908             executable="${javac8}"             executable="${javac8}"
909             fork="true">             fork="true">
910    
# Line 649  Line 925 
925    
926      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
927        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
928          <manifest>
929            <attribute name="Built-By" value="${user.name}"/>
930            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
931          </manifest>
932      </jar>      </jar>
933    
934    </target>    </target>
935    
936    
937    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
938            depends="4jdk7jar"            depends="4jdk7jar"
939            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
940    
# Line 666  Line 946 
946          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
947          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
948          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
949            <exclude name="*10Test.java"/>
950          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
951          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
952          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 673  Line 954 
954          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
955          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
956          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
957            <exclude name="SubmissionPublisherTest.java"/>
958        </javac-elements>        </javac-elements>
959      </run-tck-tests>      </run-tck-tests>
960    </target>    </target>
961    
962    
963    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
964            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
965            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
966    
967      <junit printsummary="true"      <junit printsummary="true"
968             showoutput="true"             showoutput="true"
# Line 706  Line 988 
988      </junit>      </junit>
989    </target>    </target>
990    
991    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
992            depends="4jdk7jar"            depends="4jdk7jar"
993            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
994      <run-jtreg-tests      <run-jtreg-tests
# Line 717  Line 999 
999    
1000    
1001    <target name="4jdk7-test"    <target name="4jdk7-test"
1002            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
1003            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
1004    </target>    </target>
1005    
# Line 733  Line 1015 
1015               link="${java7.api.url}"               link="${java7.api.url}"
1016               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1017               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1018               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1019               classpath=""               classpath=""
1020               executable="${javadoc7}">               executable="${javadoc7}"
1021                 failonerror = "true">
1022        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1023          <include name="**/*.java"/>          <include name="**/*.java"/>
1024        </fileset>        </fileset>
# Line 786  Line 1069 
1069             classpath=""             classpath=""
1070             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1071             source="5"             source="5"
1072               target="5"
1073             includeAntRuntime="false"             includeAntRuntime="false"
1074             includeJavaRuntime="false"             includeJavaRuntime="false"
1075               encoding="ASCII"
1076             executable="${javac7}"             executable="${javac7}"
1077             fork="true">             fork="true">
1078    
# Line 807  Line 1092 
1092    
1093      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1094        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1095          <manifest>
1096            <attribute name="Built-By" value="${user.name}"/>
1097            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1098          </manifest>
1099      </jar>      </jar>
1100    
1101    </target>    </target>
# Line 822  Line 1111 
1111               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1112               link="${java.api.url}"               link="${java.api.url}"
1113               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1114               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1115               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1116               source="5"               source="5"
1117               executable="${javadoc7}">               executable="${javadoc7}"
1118                 failonerror = "true">
1119        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1120        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1121    
# Line 871  Line 1161 
1161             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1162             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1163             source="6"             source="6"
1164               target="6"
1165             classpath=""             classpath=""
1166             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1167             includeAntRuntime="false"             includeAntRuntime="false"
1168             includeJavaRuntime="false"             includeJavaRuntime="false"
1169               encoding="ASCII"
1170             executable="${javac7}"             executable="${javac7}"
1171             fork="true">             fork="true">
1172    
# Line 894  Line 1186 
1186    
1187      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1188        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1189          <manifest>
1190            <attribute name="Built-By" value="${user.name}"/>
1191            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1192          </manifest>
1193      </jar>      </jar>
1194    
1195    </target>    </target>
# Line 909  Line 1205 
1205               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1206               link="${java.api.url}"               link="${java.api.url}"
1207               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1208               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1209               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1210               source="6"               source="6"
1211               executable="${javadoc7}">               executable="${javadoc7}"
1212                 failonerror = "true">
1213        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1214        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1215    
# Line 961  Line 1258 
1258             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1259             classpath=""             classpath=""
1260             source="6"             source="6"
1261               target="6"
1262             includeAntRuntime="false"             includeAntRuntime="false"
1263             includeJavaRuntime="false"             includeJavaRuntime="false"
1264               encoding="ASCII"
1265             executable="${javac7}"             executable="${javac7}"
1266             fork="true">             fork="true">
1267    
# Line 982  Line 1281 
1281    
1282      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1283        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1284          <manifest>
1285            <attribute name="Built-By" value="${user.name}"/>
1286            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1287          </manifest>
1288      </jar>      </jar>
1289    
1290    </target>    </target>
# Line 997  Line 1300 
1300               packagenames="extra166y.*"               packagenames="extra166y.*"
1301               link="${java.api.url}"               link="${java.api.url}"
1302               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1303               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1304               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1305               source="6"               source="6"
1306               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1048  Line 1351 
1351             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1352             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1353             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1354               target="${build.jsr166e.java.version}"
1355             classpath=""             classpath=""
1356             includeAntRuntime="false"             includeAntRuntime="false"
1357             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1074  Line 1378 
1378             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1379             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1380             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1381               target="${build.jsr166e.java.version}"
1382             classpath=""             classpath=""
1383             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1384             includeAntRuntime="false"             includeAntRuntime="false"
1385             includeJavaRuntime="false"             includeJavaRuntime="false"
1386             executable="${javac8}"             executable="${javac8}"
# Line 1097  Line 1402 
1402    
1403      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1404        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1405          <manifest>
1406            <attribute name="Built-By" value="${user.name}"/>
1407            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1408          </manifest>
1409      </jar>      </jar>
1410    
1411    </target>    </target>
# Line 1112  Line 1421 
1421               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1422               link="${java.api.url}"               link="${java.api.url}"
1423               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1424               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1425               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1426               executable="${javadoc7}">               executable="${javadoc7}"
1427                 failonerror = "true">
1428        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1429        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1430    
# Line 1122  Line 1432 
1432    </target>    </target>
1433    
1434    
1435    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1436            depends="jsr166ejar">            depends="jsr166ejar">
1437    
1438      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1134  Line 1444 
1444        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1445    </target>    </target>
1446    
1447    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1448            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1449    
1450  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1451  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1452  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1453  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1454  <!--     </antcall> -->  <!--     </antcall> -->
1455    
1456      <antcall target="clean"/>      <antcall target="clean"/>
1457      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1458        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1459        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1460      </antcall>      </antcall>
1461    
1462      <antcall target="clean"/>      <antcall target="clean"/>
1463      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1464        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1465        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1466      </antcall>      </antcall>
# Line 1158  Line 1468 
1468    
1469    
1470    <target name="jsr166e-test"    <target name="jsr166e-test"
1471            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1472            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1473    </target>    </target>
1474    
# Line 1199  Line 1509 
1509      </antcall>      </antcall>
1510    </target>    </target>
1511    
1512    <!-- ==============================================================
1513      Running guava tests against jsr166 code
1514    =================================================================== -->
1515    
1516    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1517    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1518    <!-- <property name="guava.version" value="21.0"/> -->
1519    
1520    <!-- HOWTO debug print a path id -->
1521    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1522    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1523    
1524    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1525    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1526    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1527    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1528    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1529    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1530    
1531    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1532    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1533    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1534    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1535    
1536    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1537    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1538    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1539    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1540    
1541    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1542    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1543    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1544    
1545      <target name="init-ivy">
1546        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1547             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1548        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1549                 classpath="${build.dir}/ivy.jar"/>
1550      </target>
1551    
1552      <target name="guava-tests" depends="jar, init-ivy"
1553              description="Guava tests run against jsr166 collections">
1554        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1555        <mkdir dir="${guava.dir}"/>
1556        <ivy:retrieve pathid="guava.testlib.classpath"
1557          type="jar,bundle" inline="true" conf="default,master"
1558          pattern="${guava.dir}/[artifact].[ext]"
1559          organisation="com.google.guava" module="guava-testlib"/>
1560        <property name="guava.version" value="21.0"/>
1561        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1562             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1563        <junit printsummary="true" showoutput="true" haltonfailure="true"
1564               jvm="${java9}" fork="true">
1565          <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1566          <formatter type="brief"/>
1567          <classpath>
1568            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1569            <path refid="guava.testlib.classpath"/>
1570          </classpath>
1571    
1572          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1573          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1574        </junit>
1575      </target>
1576    
1577  </project>  </project>

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.231

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8