ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC vs.
Revision 1.227 by jsr166, Sat Dec 17 22:18:25 2016 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless">
3  
4    <description>
5   ------------------------------------------------------------------------------
# Line 6 | Line 7
7  
8    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.
14    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.
31  
32    Alternatively, define ant variables thus:
33 <  ant -Djdk$N.home=...
33 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
34    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>
40  
41 <  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />
45      </java>
46    </target>
47  
48 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
49  
50    <!-- User-specific settings -->
51    <property file="user.properties"/>
# Line 50 | Line 58
58    <property name="build.deprecation"    value="false"/>
59    <property name="build.javadoc.access" value="protected"/>
60  
53  <!-- Tck options; see JSR166TestCase.java
54   To profile a single tck test class:
55   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56   To stress test a single tck test class:
57   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58  -->
59  <property name="jsr166.profileTests"     value="false"/>
60  <property name="jsr166.profileThreshold" value="100"/>
61  <property name="jsr166.runsPerTest"      value="1"/>
62  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63
61    <!-- Build locations -->
62    <property name="build.dir"                   location="build"/>
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66  
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71  
72 +  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73 +  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74 +  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75 +  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76 +
77    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 89 | Line 90
90    <macrodef name="defjdklocations">
91      <attribute name="v"/>
92      <sequential>
93 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
94 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
95 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
96 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
97 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
93 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
94 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
95 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
96 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
97 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98 >    <local name="have.java.base"/>
99 >    <available property="have.java.base"
100 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 >      if:set="have.java.base"/>
103 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 >      unless:set="have.java.base"/>
105 >    <local name="modules"/>
106 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107      <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
109 <    <path id="bootclasspath@{v}">
108 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 >    <path id="bootclasspath@{v}" unless:set="modules">
110        <pathelement path="${boot.jar.dir}/resources.jar"/>
111        <pathelement path="${boot.jar.dir}/rt.jar"/>
112        <pathelement path="${boot.jar.dir}/jsse.jar"/>
113        <pathelement path="${boot.jar.dir}/jce.jar"/>
114        <pathelement path="${boot.jar.dir}/charsets.jar"/>
115      </path>
116 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
116 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
117      </sequential>
118    </macrodef>
119  
# Line 129 | Line 139
139    <property name="test.src.dir"         location="${basedir}/src/test"/>
140    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
141    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
142 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>
148    <property name="topsrc.dir"           location="${basedir}/src"/>
149    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150 +  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 142 | Line 156
156    <!-- Javadoc locations -->
157    <property name="docs.dir"          location="${build.dir}/docs"/>
158    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 +  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 149 | Line 164
164  
165    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 +  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 157 | Line 173
173    <!-- Jar locations -->
174    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176 +  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 168 | Line 185
185    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
188 >  <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
190 >  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193  
# Line 187 | Line 204
204    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205             classpath="${lib.dir}/jtreg.jar" />
206  
207 <  <!-- Test classpath -->
208 <  <path id="test.classpath">
209 <    <pathelement location="${build.testcases.dir}"/>
210 <    <pathelement location="${junit.jar}"/>
211 <  </path>
212 <
207 >  <!-- Tck options; see JSR166TestCase.java
208 >   To profile a single tck test class:
209 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210 >   To stress test a single tck test class:
211 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212 >   To stress test a single tck test method:
213 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214 >  -->
215 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216    <macrodef name="run-tck-tests">
217      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
218      <attribute name="target"/>
219      <attribute name="compile-target" default="@{target}"/>
220      <attribute name="workdir"/>
221      <attribute name="classes"/>
222 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
222 >    <!--
223 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224 >    -->
225 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226      <element name="javac-elements" optional="true"/>
227 +
228      <sequential>
229  
230 +    <local name="modules"/>
231 +    <condition property="modules">
232 +      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233 +    </condition>
234 +
235      <mkdir dir="@{workdir}/tck-classes"/>
236  
237      <javac srcdir="@{tck.src.dir}"
# Line 215 | Line 244
244             classpath="${junit.jar}"
245             includeAntRuntime="false"
246             includeJavaRuntime="false"
247 +           encoding="ASCII"
248             executable="${javac@{compile-target}}"
249             fork="true">
250  
251        <include name="*.java"/>
252        <compilerarg value="-XDignore.symbol.file=true"/>
253 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
254 <      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
253 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255 >      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256        <compilerarg line="${build.args}"/>
257        <javac-elements/>
258  
# Line 231 | Line 262
262            failonerror="true"
263            jvm="${java@{target}}"
264            fork="true">
265 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
265 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 >        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
267 >        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
268 >        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
269 >        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
270 >        <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
271          <jvmarg line="@{jvmflags}"/>
272 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
274  
275 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
276 <        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
275 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
276 >        <syspropertyset id="system-properties-used-by-tck">
277            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
278 +          <propertyref prefix="jsr166."/>
279 +          <propertyref name="test.timeout.factor"/>
280          </syspropertyset>
281  
242        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
282          <classpath>
283            <pathelement location="${junit.jar}"/>
284            <pathelement location="@{workdir}/tck-classes"/>
# Line 252 | Line 289
289    </macrodef>
290  
291    <!-- Define jtreg test sets for different jdk versions -->
292 <  <fileset dir="${jtreg.src.dir}">
292 >  <fileset dir="${jtreg9.src.dir}">
293      <patternset id="jdk9.jtreg.tests">
294        <include name="**/*.java"/>
295      </patternset>
296    </fileset>
297  
298 <  <fileset dir="${jtreg.src.dir}">
298 >  <fileset dir="${jtreg8.src.dir}">
299      <patternset id="jdk8.jtreg.tests">
300        <include name="**/*.java"/>
301 <      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266 <      <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
301 >      <exclude name="**/SpliteratorCharacteristics.java"/>
302      </patternset>
303    </fileset>
304  
305 <  <fileset dir="${jtreg.src.dir}">
305 >  <fileset dir="${jtreg7.src.dir}">
306      <patternset id="jdk7.jtreg.tests">
307        <include name="**/*.java"/>
273      <exclude name="util/Collection/CollectionDefaults.java"/>
274      <exclude name="util/List/ListDefaults.java"/>
275      <exclude name="util/Spliterator/**/*.java"/>
276      <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
277      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
308      </patternset>
309    </fileset>
310  
311 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
312 +  <property name="jtreg.flags" value=""/>
313 +
314    <macrodef name="run-jtreg-tests">
315 <    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
315 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
316      <attribute name="source" default="7"/>
317      <attribute name="target"/>
318      <attribute name="workdir"/>
319      <attribute name="classes"/>
320      <attribute name="jtregflags" default=""/>
321 +
322      <sequential>
323 +
324 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
325 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
326 +
327 +    <local name="modules"/>
328 +    <condition property="modules">
329 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
330 +    </condition>
331 +
332      <delete dir="@{workdir}/JTwork"   quiet="true"/>
333 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
293 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
294 <    <mkdir dir="@{workdir}/JTreport"/>
295 <    <jtreg dir="@{jtreg.src.dir}"
333 >    <jtreg dir="${jtreg@{target}.src.dir}"
334             jdk="${jdk@{target}.home}"
335 <           workDir="@{workdir}/JTwork"
298 <           reportDir="@{workdir}/JTreport">
335 >           workDir="@{workdir}/JTwork">
336        <patternset refid="jdk@{target}.jtreg.tests"/>
337 <      <arg value="-Xbootclasspath/p:@{classes}"/>
337 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338 >      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339 >      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340        <arg value="-agentvm"/>
341 <      <arg value="-v:nopass,fail"/>
341 >      <arg value="-noreport"/>
342 >      <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>
344        <arg value="-automatic"/>
345        <arg value="-k:!ignore"/>
346        <arg line="@{jtregflags}"/>
347 +      <arg line="${jtreg.flags}"/>
348      </jtreg>
349      </sequential>
350    </macrodef>
# Line 323 | Line 364
364    <property name="build.main.javac" value="${javac9}"/>
365  
366    <target name="dists"
367 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367 >          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
368            description="Builds all public jars and docs"/>
369  
370    <target name="compile"
371            depends="configure-compiler"
372            description="Compiles src/main sources to build dir">
373  
374 <    <mkdir dir="${build.classes.dir}"/>
374 >    <local name="modules"/>
375 >    <condition property="modules">
376 >      <and>
377 >        <available file="${jdk9.home}/jmods" type="dir"/>
378 >        <equals arg1="9" arg2="${build.main.java.version}"/>
379 >      </and>
380 >    </condition>
381 >
382 >    <local name="destdir"/>
383 >    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384 >    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
385 >
386 >    <mkdir dir="${destdir}"/>
387  
388      <javac srcdir="${src.dir}"
389 <           destdir="${build.classes.dir}"
389 >           destdir="${destdir}"
390             debug="${build.debug}"
391             debuglevel="${build.debuglevel}"
392             deprecation="${build.deprecation}"
393             classpath=""
394             includeAntRuntime="false"
395             includeJavaRuntime="false"
396 +           encoding="ASCII"
397             executable="${build.main.javac}"
398             fork="true">
399  
400        <include name="**/*.java"/>
401 +      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
402        <compilerarg value="-Xprefer:source"/>
403        <compilerarg value="-XDignore.symbol.file=true"/>
404        <compilerarg value="-Xlint:all"/>
# Line 358 | Line 413
413  
414    <target name="jar"
415            depends="compile"
416 <          description="Builds library jar from compiled sources">
417 <
416 >          description="Builds library jar for src/main from compiled sources">
417 >    <local name="subdir"/>
418 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419      <jar destfile="${product.jar}">
420 <      <fileset dir="${build.classes.dir}"/>
420 >      <fileset dir="${build.classes.dir}${subdir}"/>
421 >      <manifest>
422 >        <attribute name="Built-By" value="${user.name}"/>
423 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
424 >      </manifest>
425      </jar>
426    </target>
427  
# Line 375 | Line 435
435      <!-- the packagenames="none" hack below prevents scanning the -->
436      <!-- sourcepath for packages -->
437  
438 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
443      <javadoc destdir="${docs.dir}"
444               packagenames="none"
445               link="${java9.api.url}"
446               overview="${src.dir}/intro.html"
447               access="${build.javadoc.access}"
448 <             sourcepath="${src.dir}:${jdk9src.dir}"
448 >             sourcepath="${src.dir}"
449               classpath=""
450               executable="${javadoc9}">
451        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 389 | Line 454
454        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
455        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
456        <arg value="-XDignore.symbol.file=true"/>
457 +      <arg value="-Xmodule:java.base"/>
458        <arg value="-tag"/>
459        <arg value="${javadoc.jls.option}"/>
460 + <!-- @apiNote currently unused -->
461 + <!--       <arg value="-tag"/> -->
462 + <!--       <arg value="apiNote:a:API Note:"/> -->
463        <arg value="-tag"/>
464 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
464 >      <arg value="implSpec:a:Implementation Requirements:"/>
465        <arg value="-tag"/>
466 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
467 <      <arg value="-tag"/>
468 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
466 >      <arg value="implNote:a:Implementation Note:"/>
467 > <!-- tags added in jdk9: currently unused -->
468 > <!--       <arg value="-tag"/> -->
469 > <!--       <arg value="revised:X"/> -->
470 > <!--       <arg value="-tag"/> -->
471 > <!--       <arg value="spec:X"/> -->
472      </javadoc>
473    </target>
474  
# Line 420 | Line 492
492        <exclude name="src/emulation/**"/>
493        <exclude name="**/SyntaxTest.java"/>
494        <exclude name="**/SuperfluousAbstract.java"/>
495 +      <manifest>
496 +        <attribute name="Built-By" value="${user.name}"/>
497 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
498 +      </manifest>
499      </jar>
500    </target>
501  
# Line 451 | Line 527
527      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
528    </target>
529  
530 <  <target name="tck" depends="test-tck" description="alias for test-tck"/>
455 <  <target name="test-tck"
530 >  <target name="tck"
531            depends="jar"
532 <          description="Runs tck tests for main directly">
532 >          description="Runs tck tests for src/main directly">
533  
534      <run-tck-tests
535        target="${build.main.java.version}"
# Line 462 | Line 537
537        classes="${product.jar}"/>
538    </target>
539  
540 <  <target name="test-tck-parallelism-1"
541 <          description="Runs test-tck with given common pool parallelism">
542 <    <antcall target="test-tck">
540 >  <target name="tck-parallelism-1"
541 >          description="Runs tck with common pool parallelism 1">
542 >    <antcall target="tck">
543        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
544      </antcall>
545    </target>
546  
547 <  <target name="test-tck-parallelism-0"
548 <          description="Runs test-tck with given common pool parallelism">
549 <    <antcall target="test-tck">
547 >  <target name="tck-parallelism-0"
548 >          description="Runs tck with common pool parallelism 0">
549 >    <antcall target="tck">
550        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
551      </antcall>
552    </target>
553  
554 <  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
555 <  <target name="test-jtreg"
554 >  <target name="tck-security-manager"
555 >          description="Runs tck with a security manager">
556 >    <antcall target="tck">
557 >      <param name="jsr166.useSecurityManager" value="true"/>
558 >    </antcall>
559 >  </target>
560 >
561 >  <target name="jtreg"
562            depends="jar"
563 <          description="Runs jtreg tests for main using the jtreg ant task">
563 >          description="Runs jtreg tests for src/main using the jtreg ant task">
564      <run-jtreg-tests
565         target="${build.main.java.version}"
566         workdir="${build.dir}"
# Line 487 | Line 568
568    </target>
569  
570    <target name="test"
571 <          depends="test-tck, test-tck-parallelism-1, test-jtreg"
572 <          description="Runs tck and jtreg tests for main">
571 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
572 >          description="Runs tck and jtreg tests for src/main">
573    </target>
574  
575 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
575 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
576  
577 <    <antcall target="jtreg">
578 <      <param name="build.main.java.version" value="8"/>
579 <      <param name="build.main.javac" value="${javac8}"/>
580 <    </antcall>
577 > <!--     <antcall target="jtreg"> -->
578 > <!--       <param name="build.main.java.version" value="8"/> -->
579 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
580 > <!--     </antcall> -->
581  
582 <  </target>
582 > <!--   </target> -->
583  
584 <  <target name="test89"
585 <          description="Runs tck and jtreg tests for main for multiple java versions">
584 > <!--   <target name="test89" -->
585 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
586  
587 <    <antcall target="clean"/>
588 <    <antcall target="test">
589 <      <param name="build.main.java.version" value="8"/>
590 <      <param name="build.main.javac" value="${javac8}"/>
591 <    </antcall>
587 > <!--     <antcall target="clean"/> -->
588 > <!--     <antcall target="test"> -->
589 > <!--       <param name="build.main.java.version" value="8"/> -->
590 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
591 > <!--     </antcall> -->
592  
593 <    <antcall target="clean"/>
594 <    <antcall target="test">
595 <      <param name="build.main.java.version" value="9"/>
596 <      <param name="build.main.javac" value="${javac9}"/>
597 <    </antcall>
593 > <!--     <antcall target="clean"/> -->
594 > <!--     <antcall target="test"> -->
595 > <!--       <param name="build.main.java.version" value="9"/> -->
596 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
597 > <!--     </antcall> -->
598  
599 <  </target>
599 > <!--   </target> -->
600  
601  
602  
603    <target name="configure-compiler">
604 +    <fail message="ant version too old">
605 +      <condition>
606 +        <not> <antversion atleast="1.9.1"/> </not>
607 +      </condition>
608 +    </fail>
609  
610      <property name="unchecked.option" value="-Xlint:unchecked"/>
611  
# Line 540 | Line 626
626    <!-- Various demos and test programs -->
627  
628  
629 <  <target name="loops" depends="configure-compiler"
630 <          description="Benchmark from Doug Lea's AQS paper">
629 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
630 >  <target name="loops" depends="configure-compiler">
631  
632      <mkdir dir="${build.loops.dir}"/>
633  
# Line 551 | Line 637
637         debuglevel="${build.debuglevel}"
638        deprecation="${build.deprecation}"
639             source="${build.sourcelevel}"
640 +           target="${build.sourcelevel}"
641 +         encoding="ASCII"
642               fork="true">
643  
644        <compilerarg line="${build.args}"/>
# Line 578 | Line 666
666             deprecation="${build.deprecation}"
667             includeAntRuntime="false"
668             includeJavaRuntime="false"
669 +           encoding="ASCII"
670             executable="${javac9}"
671             fork="true">
672  
# Line 592 | Line 681
681    </target>
682  
683  
684 +  <!-- jsr166 4jdk8 -->
685 +
686 +  <target name="4jdk8compile"
687 +          depends="configure-compiler"
688 +          description="Compiles src/jdk8 sources, targeting jdk8">
689 +
690 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
691 +
692 +    <javac srcdir="${4jdk8src.dir}"
693 +           destdir="${build.4jdk8.classes.dir}"
694 +           debug="${build.debug}"
695 +           debuglevel="${build.debuglevel}"
696 +           deprecation="${build.deprecation}"
697 +           source="8"
698 +           target="8"
699 +           classpath=""
700 +           bootclasspath="${bootclasspath8}"
701 +           includeAntRuntime="false"
702 +           includeJavaRuntime="false"
703 +           encoding="ASCII"
704 +           executable="${javac8}"
705 +           fork="true">
706 +
707 +      <include name="**/*.java"/>
708 +      <compilerarg value="-Xprefer:source"/>
709 +      <compilerarg value="-XDignore.symbol.file=true"/>
710 +      <compilerarg value="-Xlint:all"/>
711 +      <compilerarg value="-Werror"/>
712 +      <compilerarg line="${build.args}"/>
713 +
714 +    </javac>
715 +  </target>
716 +
717 +  <target name="4jdk8doclint"
718 +          depends="configure-compiler"
719 +          description="Finds doclint warnings">
720 +
721 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
722 +
723 +    <javac srcdir="${4jdk8src.dir}"
724 +           destdir="${build.4jdk8.classes.dir}"
725 +           debug="${build.debug}"
726 +           debuglevel="${build.debuglevel}"
727 +           deprecation="${build.deprecation}"
728 +           source="8"
729 +           target="8"
730 +           classpath=""
731 +           bootclasspath="${bootclasspath8}"
732 +           includeAntRuntime="false"
733 +           includeJavaRuntime="false"
734 +           encoding="ASCII"
735 +           executable="${javac8}"
736 +           fork="true">
737 +
738 +      <include name="**/*.java"/>
739 +      <compilerarg value="-Xprefer:source"/>
740 +      <compilerarg value="-XDignore.symbol.file=true"/>
741 +      <compilerarg value="-Xlint:all"/>
742 +      <compilerarg value="-Xdoclint:all/protected"/>
743 +      <compilerarg line="${build.args}"/>
744 +
745 +    </javac>
746 +  </target>
747 +
748 +
749 +  <target name="4jdk8jar"
750 +          depends="4jdk8compile"
751 +          description="Builds library jar from compiled sources">
752 +
753 +    <jar destfile="${4jdk8product.jar}">
754 +      <fileset dir="${build.4jdk8.classes.dir}"/>
755 +      <manifest>
756 +        <attribute name="Built-By" value="${user.name}"/>
757 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
758 +      </manifest>
759 +    </jar>
760 +
761 +  </target>
762 +
763 +
764 +  <target name="4jdk8-tck"
765 +          depends="4jdk8jar"
766 +          description="Runs tck tests for jsr166-4jdk8 directly">
767 +
768 +    <run-tck-tests
769 +      target="8"
770 +      workdir="${build.4jdk8.dir}"
771 +      classes="${4jdk8product.jar}">
772 +      <javac-elements>
773 +        <!-- JDK9+ test classes -->
774 +        <exclude name="*9Test.java"/>
775 +        <exclude name="*10Test.java"/>
776 +      </javac-elements>
777 +    </run-tck-tests>
778 +  </target>
779 +
780 +
781 +  <target name="4jdk8-jtreg"
782 +          depends="4jdk8jar"
783 +          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
784 +    <run-jtreg-tests
785 +       target="8"
786 +       workdir="${build.4jdk8.dir}"
787 +       classes="${4jdk8product.jar}"/>
788 +  </target>
789 +
790 +
791 +  <target name="4jdk8-test"
792 +          depends="4jdk8-tck, 4jdk8-jtreg"
793 +          description="Runs tck and jtreg tests for jsr166-4jdk8">
794 +  </target>
795 +
796 +
797 +  <target name="4jdk8docs"
798 +          description="Builds javadocs for src/jdk8 to dist dir">
799 +
800 +    <delete dir="${4jdk8docs.dir}"/>
801 +    <mkdir dir="${4jdk8docs.dir}"/>
802 +
803 +    <javadoc destdir="${4jdk8docs.dir}"
804 +             packagenames="none"
805 +             link="${java8.api.url}"
806 +             overview="${4jdk8src.dir}/intro.html"
807 +             access="${build.javadoc.access}"
808 +             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809 +             classpath=""
810 +             executable="${javadoc8}"
811 +             failonerror = "true">
812 +      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
813 +        <include name="**/*.java"/>
814 +      </fileset>
815 +      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
816 +      <arg value="-XDignore.symbol.file=true"/>
817 +      <arg value="-tag"/>
818 +      <arg value="${javadoc.jls.option}"/>
819 + <!-- @apiNote currently unused -->
820 + <!--       <arg value="-tag"/> -->
821 + <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822 +      <arg value="-tag"/>
823 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824 +      <arg value="-tag"/>
825 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
826 +    </javadoc>
827 +  </target>
828 +
829 +
830 +  <target name="4jdk8dist"
831 +          depends="4jdk8dist-jar, 4jdk8dist-docs"
832 +          description="Puts all distributable products in single hierarchy"/>
833 +
834 +
835 +  <target name="4jdk8clean"
836 +          description="Removes all 4jdk8 build products">
837 +
838 +    <delete dir="${build.4jdk8.dir}"/>
839 +
840 +  </target>
841 +
842 +
843 +  <target name="4jdk8dist-jar"
844 +          depends="4jdk8clean, 4jdk8jar">
845 +    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
846 +  </target>
847 +
848 +
849 +  <target name="4jdk8dist-docs"
850 +          depends="4jdk8clean, 4jdk8docs">
851 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
852 +  </target>
853 +
854 +
855 +
856    <!-- jsr166 4jdk7 -->
857  
858    <target name="4jdk7compile"
# Line 606 | Line 867
867             debuglevel="${build.debuglevel}"
868             deprecation="${build.deprecation}"
869             source="6"
870 +           target="6"
871             classpath=""
872             bootclasspath="${bootclasspath6}"
873             includeAntRuntime="false"
874             includeJavaRuntime="false"
875 +           encoding="ASCII"
876             executable="${javac7}"
877             fork="true">
878  
# Line 635 | Line 898
898             debuglevel="${build.debuglevel}"
899             deprecation="${build.deprecation}"
900             source="6"
901 +           target="6"
902             classpath=""
903 <           bootclasspath="${bootclasspath7}"
903 >           bootclasspath="${bootclasspath6}"
904             includeAntRuntime="false"
905             includeJavaRuntime="false"
906 +           encoding="ASCII"
907             executable="${javac8}"
908             fork="true">
909  
# Line 659 | Line 924
924  
925      <jar destfile="${4jdk7product.jar}">
926        <fileset dir="${build.4jdk7.classes.dir}"/>
927 +      <manifest>
928 +        <attribute name="Built-By" value="${user.name}"/>
929 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
930 +      </manifest>
931      </jar>
932  
933    </target>
934  
935  
936 <  <target name="4jdk7-test-tck"
936 >  <target name="4jdk7-tck"
937            depends="4jdk7jar"
938            description="Runs tck tests for jsr166-4jdk7 directly">
939  
# Line 676 | Line 945
945          <!-- JDK8+ test classes -->
946          <exclude name="*8Test.java"/>
947          <exclude name="*9Test.java"/>
948 +        <exclude name="*10Test.java"/>
949          <exclude name="DoubleAccumulatorTest.java"/>
950          <exclude name="DoubleAdderTest.java"/>
951          <exclude name="LongAccumulatorTest.java"/>
# Line 683 | Line 953
953          <exclude name="CompletableFutureTest.java"/>
954          <exclude name="SplittableRandomTest.java"/>
955          <exclude name="StampedLockTest.java"/>
956 +        <exclude name="SubmissionPublisherTest.java"/>
957        </javac-elements>
958      </run-tck-tests>
959    </target>
960  
961  
962 <  <target name="4jdk7-test-tck-junit"
963 <          depends="4jdk7compile"
964 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
962 >  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
963 >  <target name="4jdk7-tck-junit"
964 >          depends="4jdk7compile">
965  
966      <junit printsummary="true"
967             showoutput="true"
# Line 716 | Line 987
987      </junit>
988    </target>
989  
990 <  <target name="4jdk7-test-jtreg"
990 >  <target name="4jdk7-jtreg"
991            depends="4jdk7jar"
992            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
993      <run-jtreg-tests
# Line 727 | Line 998
998  
999  
1000    <target name="4jdk7-test"
1001 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
1001 >          depends="4jdk7-tck, 4jdk7-jtreg"
1002            description="Runs tck and jtreg tests for jsr166-4jdk7">
1003    </target>
1004  
# Line 743 | Line 1014
1014               link="${java7.api.url}"
1015               overview="${4jdk7src.dir}/intro.html"
1016               access="${build.javadoc.access}"
1017 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1017 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018               classpath=""
1019 <             executable="${javadoc7}">
1019 >             executable="${javadoc7}"
1020 >             failonerror = "true">
1021        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022          <include name="**/*.java"/>
1023        </fileset>
# Line 796 | Line 1068
1068             classpath=""
1069             bootclasspath="${bootclasspath6}"
1070             source="5"
1071 +           target="5"
1072             includeAntRuntime="false"
1073             includeJavaRuntime="false"
1074 +           encoding="ASCII"
1075             executable="${javac7}"
1076             fork="true">
1077  
# Line 817 | Line 1091
1091  
1092      <jar destfile="${jsr166x.jar}">
1093        <fileset dir="${build.jsr166x.classes.dir}"/>
1094 +      <manifest>
1095 +        <attribute name="Built-By" value="${user.name}"/>
1096 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1097 +      </manifest>
1098      </jar>
1099  
1100    </target>
# Line 832 | Line 1110
1110               packagenames="jsr166x.*"
1111               link="${java.api.url}"
1112               access="${build.javadoc.access}"
1113 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1113 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1114               bootclasspath="${bootclasspath6}"
1115               source="5"
1116 <             executable="${javadoc7}">
1116 >             executable="${javadoc7}"
1117 >             failonerror = "true">
1118        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119        <arg value="-XDignore.symbol.file=true"/>
1120  
# Line 881 | Line 1160
1160             debuglevel="${build.debuglevel}"
1161             deprecation="${build.deprecation}"
1162             source="6"
1163 +           target="6"
1164             classpath=""
1165             bootclasspath="${bootclasspath6}"
1166             includeAntRuntime="false"
1167             includeJavaRuntime="false"
1168 +           encoding="ASCII"
1169             executable="${javac7}"
1170             fork="true">
1171  
# Line 904 | Line 1185
1185  
1186      <jar destfile="${jsr166y.jar}" index="true">
1187        <fileset dir="${build.jsr166y.classes.dir}"/>
1188 +      <manifest>
1189 +        <attribute name="Built-By" value="${user.name}"/>
1190 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1191 +      </manifest>
1192      </jar>
1193  
1194    </target>
# Line 919 | Line 1204
1204               packagenames="jsr166y.*"
1205               link="${java.api.url}"
1206               access="${build.javadoc.access}"
1207 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1207 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1208               bootclasspath="${bootclasspath6}"
1209               source="6"
1210 <             executable="${javadoc7}">
1210 >             executable="${javadoc7}"
1211 >             failonerror = "true">
1212        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1213        <arg value="-XDignore.symbol.file=true"/>
1214  
# Line 971 | Line 1257
1257             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1258             classpath=""
1259             source="6"
1260 +           target="6"
1261             includeAntRuntime="false"
1262             includeJavaRuntime="false"
1263 +           encoding="ASCII"
1264             executable="${javac7}"
1265             fork="true">
1266  
# Line 992 | Line 1280
1280  
1281      <jar destfile="${extra166y.jar}" index="true">
1282        <fileset dir="${build.extra166y.classes.dir}"/>
1283 +      <manifest>
1284 +        <attribute name="Built-By" value="${user.name}"/>
1285 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1286 +      </manifest>
1287      </jar>
1288  
1289    </target>
# Line 1007 | Line 1299
1299               packagenames="extra166y.*"
1300               link="${java.api.url}"
1301               access="${build.javadoc.access}"
1302 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1302 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1303               bootclasspath="${bootclasspath6}"
1304               source="6"
1305               executable="${javadoc7}">
# Line 1058 | Line 1350
1350             debuglevel="${build.debuglevel}"
1351             deprecation="${build.deprecation}"
1352             source="${build.jsr166e.java.version}"
1353 +           target="${build.jsr166e.java.version}"
1354             classpath=""
1355             includeAntRuntime="false"
1356             includeJavaRuntime="false"
# Line 1084 | Line 1377
1377             debuglevel="${build.debuglevel}"
1378             deprecation="${build.deprecation}"
1379             source="${build.jsr166e.java.version}"
1380 +           target="${build.jsr166e.java.version}"
1381             classpath=""
1382 <           bootclasspath="${bootclasspath7}"
1382 >           bootclasspath="${bootclasspath6}"
1383             includeAntRuntime="false"
1384             includeJavaRuntime="false"
1385             executable="${javac8}"
# Line 1107 | Line 1401
1401  
1402      <jar destfile="${jsr166e.jar}" index="true">
1403        <fileset dir="${build.jsr166e.classes.dir}"/>
1404 +      <manifest>
1405 +        <attribute name="Built-By" value="${user.name}"/>
1406 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1407 +      </manifest>
1408      </jar>
1409  
1410    </target>
# Line 1122 | Line 1420
1420               packagenames="jsr166e.*"
1421               link="${java.api.url}"
1422               access="${build.javadoc.access}"
1423 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1423 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1424               source="${build.jsr166e.java.version}"
1425 <             executable="${javadoc7}">
1425 >             executable="${javadoc7}"
1426 >             failonerror = "true">
1427        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1428        <arg value="-XDignore.symbol.file=true"/>
1429  
# Line 1132 | Line 1431
1431    </target>
1432  
1433  
1434 <  <target name="jsr166e-test-tck-one-java-version"
1434 >  <target name="jsr166e-tck-one-java-version"
1435            depends="jsr166ejar">
1436  
1437      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1144 | Line 1443
1443        classes="${jsr166e.jar}"/>
1444    </target>
1445  
1446 <  <target name="jsr166e-test-tck"
1446 >  <target name="jsr166e-tck"
1447            description="Runs tck tests for jsr166e for multiple java versions">
1448  
1449   <!--     <antcall target="clean"/> -->
1450 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1450 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1451   <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1452   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1453   <!--     </antcall> -->
1454  
1455      <antcall target="clean"/>
1456 <    <antcall target="jsr166e-test-tck-one-java-version">
1456 >    <antcall target="jsr166e-tck-one-java-version">
1457        <param name="build.jsr166e.java.version" value="7"/>
1458        <param name="build.jsr166e.javac" value="${javac7}"/>
1459      </antcall>
1460  
1461      <antcall target="clean"/>
1462 <    <antcall target="jsr166e-test-tck-one-java-version">
1462 >    <antcall target="jsr166e-tck-one-java-version">
1463        <param name="build.jsr166e.java.version" value="6"/>
1464        <param name="build.jsr166e.javac" value="${javac6}"/>
1465      </antcall>
# Line 1168 | Line 1467
1467  
1468  
1469    <target name="jsr166e-test"
1470 <          depends="jsr166e-test-tck"
1470 >          depends="jsr166e-tck"
1471            description="Runs all tests for jsr166e">
1472    </target>
1473  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines