[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.217, Tue Aug 30 02:41:07 2016 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    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 6  Line 7 
7    
8    Usage: ant [target]    Usage: ant [target]
9    
10      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11      more details.
12    
13    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
15    
# Line 26  Line 30 
30    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
31    
32    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
33    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
35    
36      As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37      target is currently broken.
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
45      </java>      </java>
46    </target>    </target>
47    
48      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
49    
50    <!-- User-specific settings -->    <!-- User-specific settings -->
51    <property file="user.properties"/>    <property file="user.properties"/>
# Line 50  Line 58 
58    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
59    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
60    
   <!-- 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"/>  
   
61    <!-- Build locations -->    <!-- Build locations -->
62    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 73  Line 70 
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 220  Line 250 
250    
251        <include name="*.java"/>        <include name="*.java"/>
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255          <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257        <javac-elements/>        <javac-elements/>
258    
# Line 231  Line 262 
262            failonerror="true"            failonerror="true"
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266            <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
268            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
270    
271          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
273            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274              <propertyref prefix="jsr166."/>
275              <propertyref name="test.timeout.factor"/>
276          </syspropertyset>          </syspropertyset>
277    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
278          <classpath>          <classpath>
279            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
280            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 252  Line 285 
285    </macrodef>    </macrodef>
286    
287    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
288    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
289      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
290        <include name="**/*.java"/>        <include name="**/*.java"/>
291      </patternset>      </patternset>
292    </fileset>    </fileset>
293    
294    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
295      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
296        <include name="**/*.java"/>        <include name="**/*.java"/>
297        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
298          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
299          <exclude name="**/GCDuringIteration.java"/>
300      </patternset>      </patternset>
301    </fileset>    </fileset>
302    
303    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
304      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
305        <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"/>  
306      </patternset>      </patternset>
307    </fileset>    </fileset>
308    
309      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
310      <property name="jtreg.flags" value=""/>
311    
312    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
313      <!-- 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}"/>  
314      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
315      <attribute name="target"/>      <attribute name="target"/>
316      <attribute name="workdir"/>      <attribute name="workdir"/>
317      <attribute name="classes"/>      <attribute name="classes"/>
318      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
319    
320      <sequential>      <sequential>
321    
322        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
323        <property name="jtreg.verbose" value="nopass,fail,error"/>
324    
325        <local name="modules"/>
326        <condition property="modules">
327          <available file="${jdk@{target}.home}/jmods" type="dir"/>
328        </condition>
329    
330      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
331      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
332      <mkdir dir="@{workdir}/JTwork/scratch"/>      <jtreg dir="${jtreg@{target}.src.dir}"
     <mkdir dir="@{workdir}/JTreport"/>  
     <jtreg dir="@{jtreg.src.dir}"  
333             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
334             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
335             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
336        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
337        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338          <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
339        <arg value="-agentvm"/>        <arg value="-agentvm"/>
340        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
341        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
342        <arg value="-automatic"/>        <arg value="-automatic"/>
343        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
344        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
345          <arg line="${jtreg.flags}"/>
346      </jtreg>      </jtreg>
347      </sequential>      </sequential>
348    </macrodef>    </macrodef>
# Line 321  Line 362 
362    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
363    
364    <target name="dists"    <target name="dists"
365            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
367    
368    <target name="compile"    <target name="compile"
369            depends="configure-compiler"            depends="configure-compiler"
370            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
371    
372      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
373        <condition property="modules">
374          <and>
375            <available file="${jdk9.home}/jmods" type="dir"/>
376            <equals arg1="9" arg2="${build.main.java.version}"/>
377          </and>
378        </condition>
379    
380        <local name="destdir"/>
381        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
383    
384        <mkdir dir="${destdir}"/>
385    
386      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
387             destdir="${build.classes.dir}"             destdir="${destdir}"
388             debug="${build.debug}"             debug="${build.debug}"
389             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
390             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 342  Line 395 
395             fork="true">             fork="true">
396    
397        <include name="**/*.java"/>        <include name="**/*.java"/>
398          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
399        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
400        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
401        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 356  Line 410 
410    
411    <target name="jar"    <target name="jar"
412            depends="compile"            depends="compile"
413            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
414        <local name="subdir"/>
415        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
416      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
417        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
418          <manifest>
419            <attribute name="Built-By" value="${user.name}"/>
420            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
421          </manifest>
422      </jar>      </jar>
423    </target>    </target>
424    
# Line 373  Line 432 
432      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
433      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
434    
435    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
436    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
437      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
438               packagenames="none"               packagenames="none"
439               link="${java9.api.url}"               link="${java9.api.url}"
440               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
441               access="${build.javadoc.access}"               access="${build.javadoc.access}"
442               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
443               classpath=""               classpath=""
444               executable="${javadoc9}">               executable="${javadoc9}">
445        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 387  Line 448 
448        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
449        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
451          <arg value="-Xmodule:java.base"/>
452        <arg value="-tag"/>        <arg value="-tag"/>
453        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
454        <arg value="-tag"/>        <arg value="-tag"/>
# Line 395  Line 457 
457        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
458        <arg value="-tag"/>        <arg value="-tag"/>
459        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
460    <!-- tags added in jdk9 -->
461          <arg value="-tag"/>
462          <arg value="revised:X"/>
463          <arg value="-tag"/>
464          <arg value="spec:X"/>
465      </javadoc>      </javadoc>
466    </target>    </target>
467    
# Line 418  Line 485 
485        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
486        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
487        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
488          <manifest>
489            <attribute name="Built-By" value="${user.name}"/>
490            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
491          </manifest>
492      </jar>      </jar>
493    </target>    </target>
494    
# Line 449  Line 520 
520      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
521    </target>    </target>
522    
523    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
524            depends="jar"            depends="jar"
525            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
526    
527      <run-tck-tests      <run-tck-tests
528        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 460  Line 530 
530        classes="${product.jar}"/>        classes="${product.jar}"/>
531    </target>    </target>
532    
533    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
534            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
535      <antcall target="test-tck">      <antcall target="tck">
536        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
537      </antcall>      </antcall>
538    </target>    </target>
539    
540    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
541            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
542      <antcall target="test-tck">      <antcall target="tck">
543        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
544      </antcall>      </antcall>
545    </target>    </target>
546    
547    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="tck-security-manager"
548    <target name="test-jtreg"            description="Runs tck with a security manager">
549        <antcall target="tck">
550          <param name="jsr166.useSecurityManager" value="true"/>
551        </antcall>
552      </target>
553    
554      <target name="jtreg"
555            depends="jar"            depends="jar"
556            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
557      <run-jtreg-tests      <run-jtreg-tests
558         target="${build.main.java.version}"         target="${build.main.java.version}"
559         workdir="${build.dir}"         workdir="${build.dir}"
# Line 485  Line 561 
561    </target>    </target>
562    
563    <target name="test"    <target name="test"
564            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
565            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
566    </target>    </target>
567    
568    <target name="test89"  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
           description="Runs tck and jtreg tests for main for multiple java versions">  
569    
570      <antcall target="clean"/>  <!--     <antcall target="jtreg"> -->
571      <antcall target="test">  <!--       <param name="build.main.java.version" value="8"/> -->
572        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
573        <param name="build.main.javac" value="${javac8}"/>  <!--     </antcall> -->
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
     </antcall>  
574    
575      <antcall target="clean"/>  <!--   </target> -->
     <antcall target="test">  
       <param name="build.main.java.version" value="9"/>  
       <param name="build.main.javac" value="${javac9}"/>  
     </antcall>  
576    
577    </target>  <!--   <target name="test89" -->
578    <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
579    
580    <!--     <antcall target="clean"/> -->
581    <!--     <antcall target="test"> -->
582    <!--       <param name="build.main.java.version" value="8"/> -->
583    <!--       <param name="build.main.javac" value="${javac8}"/> -->
584    <!--     </antcall> -->
585    
586    <!--     <antcall target="clean"/> -->
587    <!--     <antcall target="test"> -->
588    <!--       <param name="build.main.java.version" value="9"/> -->
589    <!--       <param name="build.main.javac" value="${javac9}"/> -->
590    <!--     </antcall> -->
591    
592    <!--   </target> -->
593    
594    
595    
596    <target name="configure-compiler">    <target name="configure-compiler">
597        <fail message="ant version too old">
598          <condition>
599            <not> <antversion atleast="1.9.1"/> </not>
600          </condition>
601        </fail>
602    
603      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
604    
# Line 530  Line 619 
619    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
620    
621    
622    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
623            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
624    
625      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
626    
# Line 541  Line 630 
630         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
631        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
632             source="${build.sourcelevel}"             source="${build.sourcelevel}"
633               target="${build.sourcelevel}"
634               fork="true">               fork="true">
635    
636        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 573  Line 663 
663    
664        <include name="*.java"/>        <include name="*.java"/>
665        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
666        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
667        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
668        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
669    
# Line 582  Line 672 
672    </target>    </target>
673    
674    
675      <!-- jsr166 4jdk8 -->
676    
677      <target name="4jdk8compile"
678              depends="configure-compiler"
679              description="Compiles src/jdk8 sources, targeting jdk8">
680    
681        <mkdir dir="${build.4jdk8.classes.dir}"/>
682    
683        <javac srcdir="${4jdk8src.dir}"
684               destdir="${build.4jdk8.classes.dir}"
685               debug="${build.debug}"
686               debuglevel="${build.debuglevel}"
687               deprecation="${build.deprecation}"
688               source="8"
689               target="8"
690               classpath=""
691               bootclasspath="${bootclasspath8}"
692               includeAntRuntime="false"
693               includeJavaRuntime="false"
694               executable="${javac8}"
695               fork="true">
696    
697          <include name="**/*.java"/>
698          <compilerarg value="-Xprefer:source"/>
699          <compilerarg value="-XDignore.symbol.file=true"/>
700          <compilerarg value="-Xlint:all"/>
701          <compilerarg value="-Werror"/>
702          <compilerarg line="${build.args}"/>
703    
704        </javac>
705      </target>
706    
707      <target name="4jdk8doclint"
708              depends="configure-compiler"
709              description="Finds doclint warnings">
710    
711        <mkdir dir="${build.4jdk8.classes.dir}"/>
712    
713        <javac srcdir="${4jdk8src.dir}"
714               destdir="${build.4jdk8.classes.dir}"
715               debug="${build.debug}"
716               debuglevel="${build.debuglevel}"
717               deprecation="${build.deprecation}"
718               source="8"
719               target="8"
720               classpath=""
721               bootclasspath="${bootclasspath8}"
722               includeAntRuntime="false"
723               includeJavaRuntime="false"
724               executable="${javac8}"
725               fork="true">
726    
727          <include name="**/*.java"/>
728          <compilerarg value="-Xprefer:source"/>
729          <compilerarg value="-XDignore.symbol.file=true"/>
730          <compilerarg value="-Xlint:all"/>
731          <compilerarg value="-Xdoclint:all/protected"/>
732          <compilerarg line="${build.args}"/>
733    
734        </javac>
735      </target>
736    
737    
738      <target name="4jdk8jar"
739              depends="4jdk8compile"
740              description="Builds library jar from compiled sources">
741    
742        <jar destfile="${4jdk8product.jar}">
743          <fileset dir="${build.4jdk8.classes.dir}"/>
744          <manifest>
745            <attribute name="Built-By" value="${user.name}"/>
746            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
747          </manifest>
748        </jar>
749    
750      </target>
751    
752    
753      <target name="4jdk8-tck"
754              depends="4jdk8jar"
755              description="Runs tck tests for jsr166-4jdk8 directly">
756    
757        <run-tck-tests
758          target="8"
759          workdir="${build.4jdk8.dir}"
760          classes="${4jdk8product.jar}">
761          <javac-elements>
762            <!-- JDK9+ test classes -->
763            <exclude name="*9Test.java"/>
764            <exclude name="*10Test.java"/>
765          </javac-elements>
766        </run-tck-tests>
767      </target>
768    
769    
770      <target name="4jdk8-jtreg"
771              depends="4jdk8jar"
772              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
773        <run-jtreg-tests
774           target="8"
775           workdir="${build.4jdk8.dir}"
776           classes="${4jdk8product.jar}"/>
777      </target>
778    
779    
780      <target name="4jdk8-test"
781              depends="4jdk8-tck, 4jdk8-jtreg"
782              description="Runs tck and jtreg tests for jsr166-4jdk8">
783      </target>
784    
785    
786      <target name="4jdk8docs"
787              description="Builds javadocs for src/jdk8 to dist dir">
788    
789        <delete dir="${4jdk8docs.dir}"/>
790        <mkdir dir="${4jdk8docs.dir}"/>
791    
792        <javadoc destdir="${4jdk8docs.dir}"
793                 packagenames="none"
794                 link="${java8.api.url}"
795                 overview="${4jdk8src.dir}/intro.html"
796                 access="${build.javadoc.access}"
797                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
798                 classpath=""
799                 executable="${javadoc8}"
800                 failonerror = "true">
801          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
802            <include name="**/*.java"/>
803          </fileset>
804          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
805          <arg value="-XDignore.symbol.file=true"/>
806          <arg value="-tag"/>
807          <arg value="${javadoc.jls.option}"/>
808          <arg value="-tag"/>
809          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
810          <arg value="-tag"/>
811          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
812          <arg value="-tag"/>
813          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
814        </javadoc>
815      </target>
816    
817    
818      <target name="4jdk8dist"
819              depends="4jdk8dist-jar, 4jdk8dist-docs"
820              description="Puts all distributable products in single hierarchy"/>
821    
822    
823      <target name="4jdk8clean"
824              description="Removes all 4jdk8 build products">
825    
826        <delete dir="${build.4jdk8.dir}"/>
827    
828      </target>
829    
830    
831      <target name="4jdk8dist-jar"
832              depends="4jdk8clean, 4jdk8jar">
833        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
834      </target>
835    
836    
837      <target name="4jdk8dist-docs"
838              depends="4jdk8clean, 4jdk8docs">
839        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
840      </target>
841    
842    
843    
844    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
845    
846    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 596  Line 855 
855             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
856             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
857             source="6"             source="6"
858               target="6"
859             classpath=""             classpath=""
860             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
861             includeAntRuntime="false"             includeAntRuntime="false"
# Line 625  Line 885 
885             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
886             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
887             source="6"             source="6"
888               target="6"
889             classpath=""             classpath=""
890             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
891             includeAntRuntime="false"             includeAntRuntime="false"
892             includeJavaRuntime="false"             includeJavaRuntime="false"
893             executable="${javac8}"             executable="${javac8}"
# Line 649  Line 910 
910    
911      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
912        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
913          <manifest>
914            <attribute name="Built-By" value="${user.name}"/>
915            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
916          </manifest>
917      </jar>      </jar>
918    
919    </target>    </target>
920    
921    
922    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
923            depends="4jdk7jar"            depends="4jdk7jar"
924            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
925    
# Line 666  Line 931 
931          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
932          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
933          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
934            <exclude name="*10Test.java"/>
935          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
936          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
937          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 673  Line 939 
939          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
940          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
941          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
942            <exclude name="SubmissionPublisherTest.java"/>
943        </javac-elements>        </javac-elements>
944      </run-tck-tests>      </run-tck-tests>
945    </target>    </target>
946    
947    
948    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
949            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
950            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
951    
952      <junit printsummary="true"      <junit printsummary="true"
953             showoutput="true"             showoutput="true"
# Line 706  Line 973 
973      </junit>      </junit>
974    </target>    </target>
975    
976    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
977            depends="4jdk7jar"            depends="4jdk7jar"
978            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
979      <run-jtreg-tests      <run-jtreg-tests
# Line 717  Line 984 
984    
985    
986    <target name="4jdk7-test"    <target name="4jdk7-test"
987            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
988            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
989    </target>    </target>
990    
# Line 733  Line 1000 
1000               link="${java7.api.url}"               link="${java7.api.url}"
1001               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1002               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1003               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1004               classpath=""               classpath=""
1005               executable="${javadoc7}">               executable="${javadoc7}"
1006                 failonerror = "true">
1007        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1008          <include name="**/*.java"/>          <include name="**/*.java"/>
1009        </fileset>        </fileset>
# Line 786  Line 1054 
1054             classpath=""             classpath=""
1055             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1056             source="5"             source="5"
1057               target="5"
1058             includeAntRuntime="false"             includeAntRuntime="false"
1059             includeJavaRuntime="false"             includeJavaRuntime="false"
1060             executable="${javac7}"             executable="${javac7}"
# Line 807  Line 1076 
1076    
1077      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1078        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1079          <manifest>
1080            <attribute name="Built-By" value="${user.name}"/>
1081            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1082          </manifest>
1083      </jar>      </jar>
1084    
1085    </target>    </target>
# Line 822  Line 1095 
1095               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1096               link="${java.api.url}"               link="${java.api.url}"
1097               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1098               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1099               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1100               source="5"               source="5"
1101               executable="${javadoc7}">               executable="${javadoc7}"
1102                 failonerror = "true">
1103        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1104        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1105    
# Line 871  Line 1145 
1145             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1146             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1147             source="6"             source="6"
1148               target="6"
1149             classpath=""             classpath=""
1150             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1151             includeAntRuntime="false"             includeAntRuntime="false"
# Line 894  Line 1169 
1169    
1170      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1171        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1172          <manifest>
1173            <attribute name="Built-By" value="${user.name}"/>
1174            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1175          </manifest>
1176      </jar>      </jar>
1177    
1178    </target>    </target>
# Line 909  Line 1188 
1188               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1189               link="${java.api.url}"               link="${java.api.url}"
1190               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1191               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1192               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1193               source="6"               source="6"
1194               executable="${javadoc7}">               executable="${javadoc7}"
1195                 failonerror = "true">
1196        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1197        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1198    
# Line 961  Line 1241 
1241             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1242             classpath=""             classpath=""
1243             source="6"             source="6"
1244               target="6"
1245             includeAntRuntime="false"             includeAntRuntime="false"
1246             includeJavaRuntime="false"             includeJavaRuntime="false"
1247             executable="${javac7}"             executable="${javac7}"
# Line 982  Line 1263 
1263    
1264      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1265        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1266          <manifest>
1267            <attribute name="Built-By" value="${user.name}"/>
1268            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1269          </manifest>
1270      </jar>      </jar>
1271    
1272    </target>    </target>
# Line 997  Line 1282 
1282               packagenames="extra166y.*"               packagenames="extra166y.*"
1283               link="${java.api.url}"               link="${java.api.url}"
1284               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1285               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1286               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1287               source="6"               source="6"
1288               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1048  Line 1333 
1333             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1334             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1335             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1336               target="${build.jsr166e.java.version}"
1337             classpath=""             classpath=""
1338             includeAntRuntime="false"             includeAntRuntime="false"
1339             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1074  Line 1360 
1360             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1361             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1362             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1363               target="${build.jsr166e.java.version}"
1364             classpath=""             classpath=""
1365             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1366             includeAntRuntime="false"             includeAntRuntime="false"
1367             includeJavaRuntime="false"             includeJavaRuntime="false"
1368             executable="${javac8}"             executable="${javac8}"
# Line 1097  Line 1384 
1384    
1385      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1386        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1387          <manifest>
1388            <attribute name="Built-By" value="${user.name}"/>
1389            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1390          </manifest>
1391      </jar>      </jar>
1392    
1393    </target>    </target>
# Line 1112  Line 1403 
1403               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1404               link="${java.api.url}"               link="${java.api.url}"
1405               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1406               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1407               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1408               executable="${javadoc7}">               executable="${javadoc7}"
1409                 failonerror = "true">
1410        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1411        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1412    
# Line 1122  Line 1414 
1414    </target>    </target>
1415    
1416    
1417    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1418            depends="jsr166ejar">            depends="jsr166ejar">
1419    
1420      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1134  Line 1426 
1426        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1427    </target>    </target>
1428    
1429    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1430            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1431    
1432  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1433  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1434  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1435  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1436  <!--     </antcall> -->  <!--     </antcall> -->
1437    
1438      <antcall target="clean"/>      <antcall target="clean"/>
1439      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1440        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1441        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1442      </antcall>      </antcall>
1443    
1444      <antcall target="clean"/>      <antcall target="clean"/>
1445      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1446        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1447        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1448      </antcall>      </antcall>
# Line 1158  Line 1450 
1450    
1451    
1452    <target name="jsr166e-test"    <target name="jsr166e-test"
1453            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1454            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1455    </target>    </target>
1456    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8