[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.169, Wed Sep 2 03:45:13 2015 UTC revision 1.213, Sat Jun 4 23:49:29 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://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    
269          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
270          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
271            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
272              <propertyref prefix="jsr166."/>
273              <propertyref name="test.timeout.factor"/>
274          </syspropertyset>          </syspropertyset>
275    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
276          <classpath>          <classpath>
277            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
278            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 252  Line 283 
283    </macrodef>    </macrodef>
284    
285    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
286    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
287      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
288        <include name="**/*.java"/>        <include name="**/*.java"/>
289      </patternset>      </patternset>
290    </fileset>    </fileset>
291    
292    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
293      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
294        <include name="**/*.java"/>        <include name="**/*.java"/>
295        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
296        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297        <exclude name="util/WeakHashMap/GCDuringIteration.java"/>        <exclude name="**/GCDuringIteration.java"/>
298      </patternset>      </patternset>
299    </fileset>    </fileset>
300    
301    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
302      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
303        <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"/>  
       <exclude name="util/concurrent/atomic/Serial.java"/>  
304      </patternset>      </patternset>
305    </fileset>    </fileset>
306    
307      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
308      <property name="jtreg.flags" value=""/>
309    
310    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
311      <!-- 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}"/>  
312      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
313      <attribute name="target"/>      <attribute name="target"/>
314      <attribute name="workdir"/>      <attribute name="workdir"/>
315      <attribute name="classes"/>      <attribute name="classes"/>
316      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
317    
318      <sequential>      <sequential>
319    
320        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
321        <property name="jtreg.verbose" value="nopass,fail,error"/>
322    
323        <local name="modules"/>
324        <condition property="modules">
325          <available file="${jdk@{target}.home}/jmods" type="dir"/>
326        </condition>
327    
328      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
330      <mkdir dir="@{workdir}/JTwork/scratch"/>      <jtreg dir="${jtreg@{target}.src.dir}"
     <mkdir dir="@{workdir}/JTreport"/>  
     <jtreg dir="@{jtreg.src.dir}"  
331             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
332             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
333             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
334        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
335        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336          <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
337        <arg value="-agentvm"/>        <arg value="-agentvm"/>
338        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
339        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
340        <arg value="-automatic"/>        <arg value="-automatic"/>
341        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
342        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
343          <arg line="${jtreg.flags}"/>
344      </jtreg>      </jtreg>
345      </sequential>      </sequential>
346    </macrodef>    </macrodef>
# Line 324  Line 360 
360    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
361    
362    <target name="dists"    <target name="dists"
363            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
364            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
365    
366    <target name="compile"    <target name="compile"
367            depends="configure-compiler"            depends="configure-compiler"
368            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
369    
370      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
371        <condition property="modules">
372          <and>
373            <available file="${jdk9.home}/jmods" type="dir"/>
374            <equals arg1="9" arg2="${build.main.java.version}"/>
375          </and>
376        </condition>
377    
378        <local name="destdir"/>
379        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
381    
382        <mkdir dir="${destdir}"/>
383    
384      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
385             destdir="${build.classes.dir}"             destdir="${destdir}"
386             debug="${build.debug}"             debug="${build.debug}"
387             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
388             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 345  Line 393 
393             fork="true">             fork="true">
394    
395        <include name="**/*.java"/>        <include name="**/*.java"/>
396          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
397        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
398        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
399        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 359  Line 408 
408    
409    <target name="jar"    <target name="jar"
410            depends="compile"            depends="compile"
411            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
412        <local name="subdir"/>
413        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
414      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
415        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
416          <manifest>
417            <attribute name="Built-By" value="${user.name}"/>
418            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
419          </manifest>
420      </jar>      </jar>
421    </target>    </target>
422    
# Line 381  Line 435 
435               link="${java9.api.url}"               link="${java9.api.url}"
436               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
437               access="${build.javadoc.access}"               access="${build.javadoc.access}"
438               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9.src.dir}"
439               classpath=""               classpath=""
440               executable="${javadoc9}">               executable="${javadoc9}">
441        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 390  Line 444 
444        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
445        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
446        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
447    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
448        <arg value="-tag"/>        <arg value="-tag"/>
449        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
450        <arg value="-tag"/>        <arg value="-tag"/>
# Line 398  Line 453 
453        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
454        <arg value="-tag"/>        <arg value="-tag"/>
455        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
456    <!-- tags added in jdk9 -->
457          <arg value="-tag"/>
458          <arg value="revised:X"/>
459          <arg value="-tag"/>
460          <arg value="spec:X"/>
461      </javadoc>      </javadoc>
462    </target>    </target>
463    
# Line 421  Line 481 
481        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
482        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
483        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
484          <manifest>
485            <attribute name="Built-By" value="${user.name}"/>
486            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
487          </manifest>
488      </jar>      </jar>
489    </target>    </target>
490    
# Line 452  Line 516 
516      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
517    </target>    </target>
518    
519    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
520            depends="jar"            depends="jar"
521            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
522    
523      <run-tck-tests      <run-tck-tests
524        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 463  Line 526 
526        classes="${product.jar}"/>        classes="${product.jar}"/>
527    </target>    </target>
528    
529    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
530            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
531      <antcall target="test-tck">      <antcall target="tck">
532        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
533      </antcall>      </antcall>
534    </target>    </target>
535    
536    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
537            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
538      <antcall target="test-tck">      <antcall target="tck">
539        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
540      </antcall>      </antcall>
541    </target>    </target>
542    
543    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="tck-security-manager"
544    <target name="test-jtreg"            description="Runs tck with a security manager">
545        <antcall target="tck">
546          <param name="jsr166.useSecurityManager" value="true"/>
547        </antcall>
548      </target>
549    
550      <target name="jtreg"
551            depends="jar"            depends="jar"
552            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
553      <run-jtreg-tests      <run-jtreg-tests
554         target="${build.main.java.version}"         target="${build.main.java.version}"
555         workdir="${build.dir}"         workdir="${build.dir}"
# Line 488  Line 557 
557    </target>    </target>
558    
559    <target name="test"    <target name="test"
560            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
561            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
562    </target>    </target>
563    
564    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
565    
566      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
567        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
568        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
569      </antcall>  <!--     </antcall> -->
570    
571    </target>  <!--   </target> -->
572    
573    <target name="test89"  <!--   <target name="test89" -->
574            description="Runs tck and jtreg tests for main for multiple java versions">  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
575    
576      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
577      <antcall target="test">  <!--     <antcall target="test"> -->
578        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
579        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
580      </antcall>  <!--     </antcall> -->
581    
582      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
583      <antcall target="test">  <!--     <antcall target="test"> -->
584        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
585        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
586      </antcall>  <!--     </antcall> -->
587    
588    </target>  <!--   </target> -->
589    
590    
591    
592    <target name="configure-compiler">    <target name="configure-compiler">
593        <fail message="ant version too old">
594          <condition>
595            <not> <antversion atleast="1.9.1"/> </not>
596          </condition>
597        </fail>
598    
599      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
600    
# Line 541  Line 615 
615    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
616    
617    
618    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
619            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
620    
621      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
622    
# Line 552  Line 626 
626         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
627        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
628             source="${build.sourcelevel}"             source="${build.sourcelevel}"
629               target="${build.sourcelevel}"
630               fork="true">               fork="true">
631    
632        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 593  Line 668 
668    </target>    </target>
669    
670    
671      <!-- jsr166 4jdk8 -->
672    
673      <target name="4jdk8compile"
674              depends="configure-compiler"
675              description="Compiles src/jdk8 sources, targeting jdk8">
676    
677        <mkdir dir="${build.4jdk8.classes.dir}"/>
678    
679        <javac srcdir="${4jdk8src.dir}"
680               destdir="${build.4jdk8.classes.dir}"
681               debug="${build.debug}"
682               debuglevel="${build.debuglevel}"
683               deprecation="${build.deprecation}"
684               source="8"
685               target="8"
686               classpath=""
687               bootclasspath="${bootclasspath8}"
688               includeAntRuntime="false"
689               includeJavaRuntime="false"
690               executable="${javac8}"
691               fork="true">
692    
693          <include name="**/*.java"/>
694          <compilerarg value="-Xprefer:source"/>
695          <compilerarg value="-XDignore.symbol.file=true"/>
696          <compilerarg value="-Xlint:all"/>
697          <compilerarg value="-Werror"/>
698          <compilerarg line="${build.args}"/>
699    
700        </javac>
701      </target>
702    
703      <target name="4jdk8doclint"
704              depends="configure-compiler"
705              description="Finds doclint warnings">
706    
707        <mkdir dir="${build.4jdk8.classes.dir}"/>
708    
709        <javac srcdir="${4jdk8src.dir}"
710               destdir="${build.4jdk8.classes.dir}"
711               debug="${build.debug}"
712               debuglevel="${build.debuglevel}"
713               deprecation="${build.deprecation}"
714               source="8"
715               target="8"
716               classpath=""
717               bootclasspath="${bootclasspath8}"
718               includeAntRuntime="false"
719               includeJavaRuntime="false"
720               executable="${javac8}"
721               fork="true">
722    
723          <include name="**/*.java"/>
724          <compilerarg value="-Xprefer:source"/>
725          <compilerarg value="-XDignore.symbol.file=true"/>
726          <compilerarg value="-Xlint:all"/>
727          <compilerarg value="-Xdoclint:all/protected"/>
728          <compilerarg line="${build.args}"/>
729    
730        </javac>
731      </target>
732    
733    
734      <target name="4jdk8jar"
735              depends="4jdk8compile"
736              description="Builds library jar from compiled sources">
737    
738        <jar destfile="${4jdk8product.jar}">
739          <fileset dir="${build.4jdk8.classes.dir}"/>
740          <manifest>
741            <attribute name="Built-By" value="${user.name}"/>
742            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
743          </manifest>
744        </jar>
745    
746      </target>
747    
748    
749      <target name="4jdk8-tck"
750              depends="4jdk8jar"
751              description="Runs tck tests for jsr166-4jdk8 directly">
752    
753        <run-tck-tests
754          target="8"
755          workdir="${build.4jdk8.dir}"
756          classes="${4jdk8product.jar}">
757          <javac-elements>
758            <!-- JDK9+ test classes -->
759            <exclude name="*9Test.java"/>
760            <exclude name="*10Test.java"/>
761          </javac-elements>
762        </run-tck-tests>
763      </target>
764    
765    
766      <target name="4jdk8-jtreg"
767              depends="4jdk8jar"
768              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
769        <run-jtreg-tests
770           target="8"
771           workdir="${build.4jdk8.dir}"
772           classes="${4jdk8product.jar}"/>
773      </target>
774    
775    
776      <target name="4jdk8-test"
777              depends="4jdk8-tck, 4jdk8-jtreg"
778              description="Runs tck and jtreg tests for jsr166-4jdk8">
779      </target>
780    
781    
782      <target name="4jdk8docs"
783              description="Builds javadocs for src/jdk8 to dist dir">
784    
785        <delete dir="${4jdk8docs.dir}"/>
786        <mkdir dir="${4jdk8docs.dir}"/>
787    
788        <javadoc destdir="${4jdk8docs.dir}"
789                 packagenames="none"
790                 link="${java8.api.url}"
791                 overview="${4jdk8src.dir}/intro.html"
792                 access="${build.javadoc.access}"
793                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
794                 classpath=""
795                 executable="${javadoc8}"
796                 failonerror = "true">
797          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
798            <include name="**/*.java"/>
799          </fileset>
800          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
801          <arg value="-XDignore.symbol.file=true"/>
802          <arg value="-tag"/>
803          <arg value="${javadoc.jls.option}"/>
804          <arg value="-tag"/>
805          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
806          <arg value="-tag"/>
807          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808          <arg value="-tag"/>
809          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
810        </javadoc>
811      </target>
812    
813    
814      <target name="4jdk8dist"
815              depends="4jdk8dist-jar, 4jdk8dist-docs"
816              description="Puts all distributable products in single hierarchy"/>
817    
818    
819      <target name="4jdk8clean"
820              description="Removes all 4jdk8 build products">
821    
822        <delete dir="${build.4jdk8.dir}"/>
823    
824      </target>
825    
826    
827      <target name="4jdk8dist-jar"
828              depends="4jdk8clean, 4jdk8jar">
829        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
830      </target>
831    
832    
833      <target name="4jdk8dist-docs"
834              depends="4jdk8clean, 4jdk8docs">
835        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
836      </target>
837    
838    
839    
840    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
841    
842    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 607  Line 851 
851             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
852             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
853             source="6"             source="6"
854               target="6"
855             classpath=""             classpath=""
856             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
857             includeAntRuntime="false"             includeAntRuntime="false"
# Line 636  Line 881 
881             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
882             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
883             source="6"             source="6"
884               target="6"
885             classpath=""             classpath=""
886             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
887             includeAntRuntime="false"             includeAntRuntime="false"
888             includeJavaRuntime="false"             includeJavaRuntime="false"
889             executable="${javac8}"             executable="${javac8}"
# Line 660  Line 906 
906    
907      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
908        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
909          <manifest>
910            <attribute name="Built-By" value="${user.name}"/>
911            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
912          </manifest>
913      </jar>      </jar>
914    
915    </target>    </target>
916    
917    
918    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
919            depends="4jdk7jar"            depends="4jdk7jar"
920            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
921    
# Line 677  Line 927 
927          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
928          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
929          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
930            <exclude name="*10Test.java"/>
931          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
932          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
933          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 684  Line 935 
935          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
936          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
937          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
938            <exclude name="SubmissionPublisherTest.java"/>
939        </javac-elements>        </javac-elements>
940      </run-tck-tests>      </run-tck-tests>
941    </target>    </target>
942    
943    
944    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
945            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
946            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
947    
948      <junit printsummary="true"      <junit printsummary="true"
949             showoutput="true"             showoutput="true"
# Line 717  Line 969 
969      </junit>      </junit>
970    </target>    </target>
971    
972    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
973            depends="4jdk7jar"            depends="4jdk7jar"
974            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
975      <run-jtreg-tests      <run-jtreg-tests
# Line 728  Line 980 
980    
981    
982    <target name="4jdk7-test"    <target name="4jdk7-test"
983            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
984            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
985    </target>    </target>
986    
# Line 744  Line 996 
996               link="${java7.api.url}"               link="${java7.api.url}"
997               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
998               access="${build.javadoc.access}"               access="${build.javadoc.access}"
999               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1000               classpath=""               classpath=""
1001               executable="${javadoc7}">               executable="${javadoc7}"
1002                 failonerror = "true">
1003        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1004          <include name="**/*.java"/>          <include name="**/*.java"/>
1005        </fileset>        </fileset>
# Line 797  Line 1050 
1050             classpath=""             classpath=""
1051             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1052             source="5"             source="5"
1053               target="5"
1054             includeAntRuntime="false"             includeAntRuntime="false"
1055             includeJavaRuntime="false"             includeJavaRuntime="false"
1056             executable="${javac7}"             executable="${javac7}"
# Line 818  Line 1072 
1072    
1073      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1074        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1075          <manifest>
1076            <attribute name="Built-By" value="${user.name}"/>
1077            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1078          </manifest>
1079      </jar>      </jar>
1080    
1081    </target>    </target>
# Line 833  Line 1091 
1091               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1092               link="${java.api.url}"               link="${java.api.url}"
1093               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1094               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1095               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1096               source="5"               source="5"
1097               executable="${javadoc7}">               executable="${javadoc7}"
1098                 failonerror = "true">
1099        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1100        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1101    
# Line 882  Line 1141 
1141             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1142             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1143             source="6"             source="6"
1144               target="6"
1145             classpath=""             classpath=""
1146             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1147             includeAntRuntime="false"             includeAntRuntime="false"
# Line 905  Line 1165 
1165    
1166      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1167        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1168          <manifest>
1169            <attribute name="Built-By" value="${user.name}"/>
1170            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1171          </manifest>
1172      </jar>      </jar>
1173    
1174    </target>    </target>
# Line 920  Line 1184 
1184               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1185               link="${java.api.url}"               link="${java.api.url}"
1186               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1187               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1188               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1189               source="6"               source="6"
1190               executable="${javadoc7}">               executable="${javadoc7}"
1191                 failonerror = "true">
1192        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1193        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1194    
# Line 972  Line 1237 
1237             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1238             classpath=""             classpath=""
1239             source="6"             source="6"
1240               target="6"
1241             includeAntRuntime="false"             includeAntRuntime="false"
1242             includeJavaRuntime="false"             includeJavaRuntime="false"
1243             executable="${javac7}"             executable="${javac7}"
# Line 993  Line 1259 
1259    
1260      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1261        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1262          <manifest>
1263            <attribute name="Built-By" value="${user.name}"/>
1264            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1265          </manifest>
1266      </jar>      </jar>
1267    
1268    </target>    </target>
# Line 1008  Line 1278 
1278               packagenames="extra166y.*"               packagenames="extra166y.*"
1279               link="${java.api.url}"               link="${java.api.url}"
1280               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1281               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1282               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1283               source="6"               source="6"
1284               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1059  Line 1329 
1329             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1330             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1331             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1332               target="${build.jsr166e.java.version}"
1333             classpath=""             classpath=""
1334             includeAntRuntime="false"             includeAntRuntime="false"
1335             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1085  Line 1356 
1356             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1357             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1358             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1359               target="${build.jsr166e.java.version}"
1360             classpath=""             classpath=""
1361             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1362             includeAntRuntime="false"             includeAntRuntime="false"
1363             includeJavaRuntime="false"             includeJavaRuntime="false"
1364             executable="${javac8}"             executable="${javac8}"
# Line 1108  Line 1380 
1380    
1381      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1382        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1383          <manifest>
1384            <attribute name="Built-By" value="${user.name}"/>
1385            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1386          </manifest>
1387      </jar>      </jar>
1388    
1389    </target>    </target>
# Line 1123  Line 1399 
1399               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1400               link="${java.api.url}"               link="${java.api.url}"
1401               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1402               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1403               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1404               executable="${javadoc7}">               executable="${javadoc7}"
1405                 failonerror = "true">
1406        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1407        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1408    
# Line 1133  Line 1410 
1410    </target>    </target>
1411    
1412    
1413    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1414            depends="jsr166ejar">            depends="jsr166ejar">
1415    
1416      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1145  Line 1422 
1422        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1423    </target>    </target>
1424    
1425    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1426            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1427    
1428  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1429  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1430  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1431  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1432  <!--     </antcall> -->  <!--     </antcall> -->
1433    
1434      <antcall target="clean"/>      <antcall target="clean"/>
1435      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1436        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1437        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1438      </antcall>      </antcall>
1439    
1440      <antcall target="clean"/>      <antcall target="clean"/>
1441      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1442        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1443        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1444      </antcall>      </antcall>
# Line 1169  Line 1446 
1446    
1447    
1448    <target name="jsr166e-test"    <target name="jsr166e-test"
1449            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1450            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1451    </target>    </target>
1452    

Legend:
Removed from v.1.169  
changed lines
  Added in v.1.213

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8