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.132 by jsr166, Fri Feb 1 21:58:27 2013 UTC vs.
Revision 1.198 by jsr166, Thu Mar 24 20:44:47 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 16 | Line 17
17    $HOME/jdk/jdk6
18    $HOME/jdk/jdk7
19    $HOME/jdk/jdk8
20 +  $HOME/jdk/jdk9
21    where each of the above is a JDK or a symlink to same, and
22    $HOME/jdk/src/jdk6
23    $HOME/jdk/src/jdk7
24    $HOME/jdk/src/jdk8
25 +  $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.
28 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
28 >
29 >  Alternatively, define ant variables thus:
30 >  ant -Djdk$N.home=...
31 >  for $N in 6 7 8 9 ...
32 >
33 >  As of 2015-09, there is incomplete hacky support for jigsaw
34 >  Build for jigsaw using something like:
35 >  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 >  "docs" target is still broken.
37   ------------------------------------------------------------------------------
38    </description>
39  
40 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
40 >  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <target name="usage">
42      <java classname="org.apache.tools.ant.Main">
43        <arg value="-projecthelp" />
44      </java>
45    </target>
46  
47 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48  
49    <!-- User-specific settings -->
50    <property file="user.properties"/>
# Line 76 | Line 89 | As of 2013-02, the very latest lambda 8
89      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
92 >    <local name="have.java.base"/>
93 >    <available property="have.java.base"
94 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96 >      if:set="have.java.base"/>
97 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98 >      unless:set="have.java.base"/>
99 >    <local name="modules"/>
100 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101      <local name="boot.jar.dir"/>
102 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
103 <    <path id="bootclasspath@{v}">
102 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103 >    <path id="bootclasspath@{v}" unless:set="modules">
104        <pathelement path="${boot.jar.dir}/resources.jar"/>
105        <pathelement path="${boot.jar.dir}/rt.jar"/>
106        <pathelement path="${boot.jar.dir}/jsse.jar"/>
107        <pathelement path="${boot.jar.dir}/jce.jar"/>
108        <pathelement path="${boot.jar.dir}/charsets.jar"/>
109      </path>
110 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
110 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111      </sequential>
112    </macrodef>
113  
# Line 105 | Line 126 | As of 2013-02, the very latest lambda 8
126    <defjdklocations v="6"/>
127    <defjdklocations v="7"/>
128    <defjdklocations v="8"/>
129 +  <defjdklocations v="9"/>
130  
131    <!-- Source locations -->
132    <property name="src.dir"              location="${basedir}/src/main"/>
133    <property name="test.src.dir"         location="${basedir}/src/test"/>
134    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
135    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
136 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
136 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
137 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
138 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
139 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
140    <property name="lib.dir"              location="${basedir}/lib"/>
141    <property name="dist.dir"             location="${basedir}/dist"/>
142    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 145 | Line 170 | As of 2013-02, the very latest lambda 8
170    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
171    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
172  
173 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
174 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
175 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
176 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
177 <
178 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
179 <  <!-- The below does not yet exist as of 2013-01 -->
180 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
173 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
174 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
175 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
177 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178 >  <!-- The expected canonical location does not yet exist as of 2015-11 -->
179 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181 >  <!-- Default jdk doc location (latest stable release seems best) -->
182 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
183  
184 <  <!-- Default jdk api doc location (latest stable release seems best) -->
185 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
184 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
185 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
186 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
187 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
188 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
189 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
190 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
191  
192    <!-- Define the "jtreg" task -->
193    <!-- See the docs in "jtreg -onlineHelp" -->
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />
196  
197 <  <!-- Test classpath -->
198 <  <path id="test.classpath">
199 <    <pathelement location="${build.testcases.dir}"/>
200 <    <pathelement location="${junit.jar}"/>
201 <  </path>
202 <
197 >  <!-- Tck options; see JSR166TestCase.java
198 >   To profile a single tck test class:
199 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200 >   To stress test a single tck test class:
201 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202 >   To stress test a single tck test method:
203 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204 >  -->
205 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206    <macrodef name="run-tck-tests">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173    <attribute name="source" default="6"/>
208      <attribute name="target"/>
209 +    <attribute name="compile-target" default="@{target}"/>
210      <attribute name="workdir"/>
211      <attribute name="classes"/>
212 <    <attribute name="jvmflags" default=""/>
212 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213      <element name="javac-elements" optional="true"/>
214 +
215      <sequential>
216  
217 +    <local name="modules"/>
218 +    <condition property="modules">
219 +      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220 +    </condition>
221 +
222      <mkdir dir="@{workdir}/tck-classes"/>
223  
224      <javac srcdir="@{tck.src.dir}"
# Line 185 | Line 226 | As of 2013-02, the very latest lambda 8
226             debug="${build.debug}"
227             debuglevel="${build.debuglevel}"
228             deprecation="${build.deprecation}"
229 <           source="@{source}"
229 >           source="@{compile-target}"
230 >           target="@{compile-target}"
231             classpath="${junit.jar}"
190           bootclasspath="@{classes}:${bootclasspath@{source}}"
232             includeAntRuntime="false"
233             includeJavaRuntime="false"
234 <           executable="${javac@{target}}"
234 >           executable="${javac@{compile-target}}"
235             fork="true">
236  
237        <include name="*.java"/>
238        <compilerarg value="-XDignore.symbol.file=true"/>
239 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
239 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241 >      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>
243        <javac-elements/>
244  
245      </javac>
246  
247 <    <java classname="JSR166TestCase"
247 >    <java classname="${jsr166.tckTestClass}"
248            failonerror="true"
249            jvm="${java@{target}}"
250            fork="true">
251 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
251 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252 >        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
253          <jvmarg line="@{jvmflags}"/>
254 +
255 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256 +        <syspropertyset id="system-properties-used-by-tck">
257 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258 +          <propertyref prefix="jsr166."/>
259 +          <propertyref name="test.timeout.factor"/>
260 +        </syspropertyset>
261 +
262          <classpath>
263            <pathelement location="${junit.jar}"/>
264            <pathelement location="@{workdir}/tck-classes"/>
# Line 216 | Line 268 | As of 2013-02, the very latest lambda 8
268      </sequential>
269    </macrodef>
270  
271 +  <!-- Define jtreg test sets for different jdk versions -->
272 +  <fileset dir="${jtreg9.src.dir}">
273 +    <patternset id="jdk9.jtreg.tests">
274 +      <include name="**/*.java"/>
275 +    </patternset>
276 +  </fileset>
277 +
278 +  <fileset dir="${jtreg8.src.dir}">
279 +    <patternset id="jdk8.jtreg.tests">
280 +      <include name="**/*.java"/>
281 +      <exclude name="**/SpliteratorCharacteristics.java"/>
282 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
283 +      <exclude name="**/GCDuringIteration.java"/>
284 +    </patternset>
285 +  </fileset>
286 +
287 +  <fileset dir="${jtreg7.src.dir}">
288 +    <patternset id="jdk7.jtreg.tests">
289 +      <include name="**/*.java"/>
290 +    </patternset>
291 +  </fileset>
292 +
293 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
294 +  <property name="jtreg.flags" value=""/>
295 +
296 +  <macrodef name="run-jtreg-tests">
297 +    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
298 +    <attribute name="source" default="7"/>
299 +    <attribute name="target"/>
300 +    <attribute name="workdir"/>
301 +    <attribute name="classes"/>
302 +    <attribute name="jtregflags" default=""/>
303 +
304 +    <sequential>
305 +
306 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
307 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
308 +
309 +    <local name="modules"/>
310 +    <condition property="modules">
311 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
312 +    </condition>
313 +
314 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
315 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
316 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
317 +    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
318 +    <mkdir dir="@{workdir}/JTreport/html"/>
319 +    <mkdir dir="@{workdir}/JTreport/text"/>
320 +    <jtreg dir="${jtreg@{target}.src.dir}"
321 +           jdk="${jdk@{target}.home}"
322 +           workDir="@{workdir}/JTwork"
323 +           reportDir="@{workdir}/JTreport">
324 +      <patternset refid="jdk@{target}.jtreg.tests"/>
325 +      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
326 +      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
327 +      <arg value="-agentvm"/>
328 +      <arg value="-verbose:${jtreg.verbose}"/>
329 +      <arg value="-vmoptions:-esa -ea"/>
330 +      <arg value="-automatic"/>
331 +      <arg value="-k:!ignore"/>
332 +      <arg line="@{jtregflags}"/>
333 +      <arg line="${jtreg.flags}"/>
334 +    </jtreg>
335 +    </sequential>
336 +  </macrodef>
337 +
338    <!-- ALoops classpath -->
339    <path id="loops.classpath">
340      <pathelement location="${build.loops.dir}"/>
# Line 227 | Line 346 | As of 2013-02, the very latest lambda 8
346  
347    <!-- Main targets -->
348  
349 +  <property name="build.main.java.version" value="9"/>
350 +  <property name="build.main.javac" value="${javac9}"/>
351 +
352    <target name="dists"
353            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
354            description="Builds all public jars and docs"/>
# Line 235 | Line 357 | As of 2013-02, the very latest lambda 8
357            depends="configure-compiler"
358            description="Compiles src/main sources to build dir">
359  
360 <    <mkdir dir="${build.classes.dir}"/>
360 >    <local name="modules"/>
361 >    <condition property="modules">
362 >      <and>
363 >        <available file="${jdk9.home}/jmods" type="dir"/>
364 >        <equals arg1="9" arg2="${build.main.java.version}"/>
365 >      </and>
366 >    </condition>
367 >
368 >    <local name="destdir"/>
369 >    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
370 >    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
371 >
372 >    <mkdir dir="${destdir}"/>
373  
374      <javac srcdir="${src.dir}"
375 <           destdir="${build.classes.dir}"
375 >           destdir="${destdir}"
376             debug="${build.debug}"
377             debuglevel="${build.debuglevel}"
378             deprecation="${build.deprecation}"
379             classpath=""
380             includeAntRuntime="false"
381             includeJavaRuntime="false"
382 <           executable="${javac8}"
382 >           executable="${build.main.javac}"
383             fork="true">
384  
385        <include name="**/*.java"/>
386 +      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
387 +      <compilerarg value="-Xprefer:source"/>
388        <compilerarg value="-XDignore.symbol.file=true"/>
389        <compilerarg value="-Xlint:all"/>
390 +      <compilerarg value="-Werror"/>
391 +      <compilerarg value="-Xdoclint:all/protected"/>
392 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
393        <compilerarg line="${build.args}"/>
394  
395      </javac>
396 +
397 +    <!-- We need jdk9's Contended annotation, but at compile time only -->
398 +    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
399    </target>
400  
401  
# Line 263 | Line 405 | As of 2013-02, the very latest lambda 8
405  
406      <jar destfile="${product.jar}">
407        <fileset dir="${build.classes.dir}"/>
408 +      <manifest>
409 +        <attribute name="Built-By" value="${user.name}"/>
410 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
411 +      </manifest>
412      </jar>
413    </target>
414  
415  
270  <target name="test"
271          depends="configure-tests, report-tests"
272          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
273
274
416    <target name="docs"
417            description="Builds javadocs for src/main to dist dir">
418  
# Line 283 | Line 424 | As of 2013-02, the very latest lambda 8
424  
425      <javadoc destdir="${docs.dir}"
426               packagenames="none"
427 <             link="${jdkapi8docs.url}"
427 >             link="${java9.api.url}"
428               overview="${src.dir}/intro.html"
429               access="${build.javadoc.access}"
430 <             sourcepath="${src.dir}:${jdk8src.dir}"
430 >             sourcepath="${src.dir}:${jdk9src.dir}"
431               classpath=""
432 <             executable="${javadoc8}">
432 >             executable="${javadoc9}">
433        <fileset dir="${src.dir}" defaultexcludes="yes">
434          <include name="**/*.java"/>
435        </fileset>
436 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
437 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438        <arg value="-XDignore.symbol.file=true"/>
439 + <!--  TODO     <arg value="-Xmodule:java.base"/> -->
440        <arg value="-tag"/>
441        <arg value="${javadoc.jls.option}"/>
442 +      <arg value="-tag"/>
443 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
444 +      <arg value="-tag"/>
445 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
446 +      <arg value="-tag"/>
447 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
448 + <!-- tags added in jdk9 -->
449 +      <arg value="-tag"/>
450 +      <arg value="revised:X"/>
451 +      <arg value="-tag"/>
452 +      <arg value="spec:X"/>
453      </javadoc>
454    </target>
455  
# Line 318 | Line 473 | As of 2013-02, the very latest lambda 8
473        <exclude name="src/emulation/**"/>
474        <exclude name="**/SyntaxTest.java"/>
475        <exclude name="**/SuperfluousAbstract.java"/>
476 +      <manifest>
477 +        <attribute name="Built-By" value="${user.name}"/>
478 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
479 +      </manifest>
480      </jar>
481    </target>
482  
# Line 333 | Line 492 | As of 2013-02, the very latest lambda 8
492    <target name="dist-clean"
493            description="Removes all build and distribution products">
494  
495 +    <delete dir="${build.dir}"/>
496      <delete dir="${dist.dir}"/>
497  
498    </target>
499  
500  
341  <!-- Internal targets -->
342
343
501    <target name="dist-jar"
502            depends="clean, jar">
503      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 351 | Line 508 | As of 2013-02, the very latest lambda 8
508      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
509    </target>
510  
511 <
355 <  <target name="compile-tests"
356 <          depends="jar">
357 <
358 <    <mkdir dir="${build.testcases.dir}"/>
359 <
360 <    <javac srcdir="${tck.src.dir}"
361 <           destdir="${build.testcases.dir}"
362 <           debug="${build.debug}"
363 <           debuglevel="${build.debuglevel}"
364 <           deprecation="${build.deprecation}"
365 <           source="6"
366 <           classpath="${junit.jar}"
367 <           bootclasspath="@{product.jar}:${bootclasspath6}"
368 <           includeAntRuntime="false"
369 <           includeJavaRuntime="false"
370 <           executable="${javac8}"
371 <           fork="true">
372 <
373 <      <include name="**/*.java"/>
374 <      <compilerarg value="-XDignore.symbol.file=true"/>
375 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
376 <      <compilerarg line="${build.args}"/>
377 <
378 <    </javac>
379 <
380 <    <javac srcdir="${test.src.dir}"
381 <           destdir="${build.testcases.dir}"
382 <           debug="${build.debug}"
383 <           debuglevel="${build.debuglevel}"
384 <           deprecation="${build.deprecation}"
385 <           source="6"
386 <           classpath=""
387 <           bootclasspath="@{product.jar}:${bootclasspath6}"
388 <           includeAntRuntime="false"
389 <           includeJavaRuntime="false"
390 <           executable="${javac8}"
391 <           fork="true">
392 <
393 <      <include name="jsr166/test/**/*.java"/>
394 <      <compilerarg value="-XDignore.symbol.file=true"/>
395 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
396 <      <compilerarg line="${build.args}"/>
397 <
398 <    </javac>
399 <
400 < <!--
401 <    <javac srcdir="${jtreg.src.dir}"
402 <          destdir="${build.testcases.dir}"
403 <            debug="${build.debug}"
404 <       debuglevel="${build.debuglevel}"
405 <      deprecation="${build.deprecation}"
406 <           source="${build.sourcelevel}"
407 <             fork="true">
408 <
409 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
410 <      <compilerarg value="-XDignore.symbol.file=true"/>
411 <      <compilerarg line="${build.args}"/>
412 <
413 <    </javac>
414 < -->
415 <
416 <  </target>
417 <
418 <  <target name="test-tck"
511 >  <target name="tck"
512            depends="jar"
513            description="Runs tck tests for main directly">
514  
515      <run-tck-tests
516 <      target="8"
516 >      target="${build.main.java.version}"
517        workdir="${build.dir}"
518        classes="${product.jar}"/>
519    </target>
520  
521 <  <target name="run-tests"
522 <          depends="compile-tests">
523 <
524 <    <!-- May be overridden by user.properties -->
525 <    <property name="testcase" value="*"/>
526 <
434 <    <mkdir dir="${build.reports.dir}"/>
435 <
436 <    <junit printsummary="true"
437 <             showoutput="true"
438 <          errorProperty="junit.failed"
439 <        failureProperty="junit.failed"
440 <                    dir="${build.reports.dir}"
441 <                    jvm="${java8}"
442 <                   fork="true">
521 >  <target name="tck-parallelism-1"
522 >          description="Runs tck with given common pool parallelism">
523 >    <antcall target="tck">
524 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
525 >    </antcall>
526 >  </target>
527  
528 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
529 <      <jvmarg value="-server"/>
530 <      <jvmarg value="-showversion"/>
528 >  <target name="tck-parallelism-0"
529 >          description="Runs tck with given common pool parallelism">
530 >    <antcall target="tck">
531 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
532 >    </antcall>
533 >  </target>
534  
535 <      <classpath refid="test.classpath"/>
535 >  <target name="jtreg"
536 >          depends="jar"
537 >          description="Runs jtreg tests for main using the jtreg ant task">
538 >    <run-jtreg-tests
539 >       target="${build.main.java.version}"
540 >       workdir="${build.dir}"
541 >       classes="${product.jar}"/>
542 >  </target>
543  
544 <      <formatter type="xml"/>
544 >  <target name="test"
545 >          depends="tck, tck-parallelism-1, jtreg"
546 >          description="Runs tck and jtreg tests for main">
547 >  </target>
548  
549 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
453 <        <fileset dir="${tck.src.dir}">
454 <          <include name="**/${testcase}Test.java"/>
455 <        </fileset>
456 <      </batchtest>
457 <
458 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
459 <        <fileset dir="${test.src.dir}">
460 <          <include name="jsr166/test/**/${testcase}Test.java"/>
461 <        </fileset>
462 <      </batchtest>
463 <
464 < <!--
465 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
466 <        <fileset dir="${jtreg.src.dir}">
467 <          <include name="**/${testcase}Test.java"/>
468 <        </fileset>
469 <      </batchtest>
470 < -->
549 >  <target name="jtreg8" description="Runs jtreg tests with jdk8">
550  
551 <    </junit>
551 >    <antcall target="jtreg">
552 >      <param name="build.main.java.version" value="8"/>
553 >      <param name="build.main.javac" value="${javac8}"/>
554 >    </antcall>
555  
556    </target>
557  
558 +  <target name="test89"
559 +          description="Runs tck and jtreg tests for main for multiple java versions">
560  
561 <  <target name="report-tests"
562 <          depends="run-tests">
563 <
564 <    <!-- Sets junit.report.format to frames if redirection is present,
565 <         otherwise sets it to noframes. -->
482 <    <available property="junit.report.format"
483 <                  value="frames"
484 <              classname="org.apache.xalan.lib.Redirect"
485 <    />
486 <    <property name="junit.report.format" value="noframes"/>
487 <
488 <    <junitreport todir="${build.reports.dir}">
489 <      <fileset dir="${build.reports.dir}">
490 <        <include name="TEST-*.xml"/>
491 <      </fileset>
492 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
493 <      />
494 <    </junitreport>
561 >    <antcall target="clean"/>
562 >    <antcall target="test">
563 >      <param name="build.main.java.version" value="8"/>
564 >      <param name="build.main.javac" value="${javac8}"/>
565 >    </antcall>
566  
567 <    <fail message="Test Cases Failed" if="junit.failed"/>
567 >    <antcall target="clean"/>
568 >    <antcall target="test">
569 >      <param name="build.main.java.version" value="9"/>
570 >      <param name="build.main.javac" value="${javac9}"/>
571 >    </antcall>
572  
573    </target>
574  
575  
576 +
577    <target name="configure-compiler">
578 +    <fail message="ant version too old">
579 +      <condition>
580 +        <not> <antversion atleast="1.9.1"/> </not>
581 +      </condition>
582 +    </fail>
583  
584      <property name="unchecked.option" value="-Xlint:unchecked"/>
585  
# Line 515 | Line 596 | As of 2013-02, the very latest lambda 8
596    </target>
597  
598  
518  <target name="configure-tests"
519       depends="configure-compiler">
520
521    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
522    <available property="junit.available"
523               classname="junit.framework.Protectable"/>
524
525    <!-- Xalan -->
526    <available property="xalan.available"
527               classname="org.apache.xalan.Version"/>
528
529
530    <!-- Ant 1.6beta and later don't need or want this check -->
531    <!--
532    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
533          unless="junit.available"/>
534
535    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
536          unless="xalan.available"/>
537    -->
538
539  </target>
540
599  
600    <!-- Various demos and test programs -->
601  
# Line 553 | Line 611 | As of 2013-02, the very latest lambda 8
611         debuglevel="${build.debuglevel}"
612        deprecation="${build.deprecation}"
613             source="${build.sourcelevel}"
614 +           target="${build.sourcelevel}"
615               fork="true">
616  
617        <compilerarg line="${build.args}"/>
# Line 568 | Line 627 | As of 2013-02, the very latest lambda 8
627    </target>
628  
629  
630 +  <target name="compile-test-loops" depends="jar"
631 +          description="compile all the perf tests in src/test/loops">
632 +
633 +    <mkdir dir="${build.dir}/test/loops"/>
634 +
635 +    <javac srcdir="${basedir}/src/test/loops"
636 +           destdir="${build.dir}/test/loops"
637 +           debug="${build.debug}"
638 +           debuglevel="${build.debuglevel}"
639 +           deprecation="${build.deprecation}"
640 +           includeAntRuntime="false"
641 +           includeJavaRuntime="false"
642 +           executable="${javac9}"
643 +           fork="true">
644 +
645 +      <include name="*.java"/>
646 +      <compilerarg value="-XDignore.symbol.file=true"/>
647 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
648 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
649 +      <compilerarg line="${build.args}"/>
650 +
651 +    </javac>
652 +
653 +  </target>
654 +
655 +
656    <!-- jsr166 4jdk7 -->
657  
658    <target name="4jdk7compile"
# Line 582 | Line 667 | As of 2013-02, the very latest lambda 8
667             debuglevel="${build.debuglevel}"
668             deprecation="${build.deprecation}"
669             source="6"
670 +           target="6"
671             classpath=""
672             bootclasspath="${bootclasspath6}"
673             includeAntRuntime="false"
# Line 590 | Line 676 | As of 2013-02, the very latest lambda 8
676             fork="true">
677  
678        <include name="**/*.java"/>
679 +      <compilerarg value="-Xprefer:source"/>
680 +      <compilerarg value="-XDignore.symbol.file=true"/>
681 +      <compilerarg value="-Xlint:all"/>
682 +      <compilerarg value="-Werror"/>
683 +      <compilerarg line="${build.args}"/>
684 +
685 +    </javac>
686 +  </target>
687 +
688 +  <target name="4jdk7doclint"
689 +          depends="configure-compiler"
690 +          description="Finds doclint warnings">
691 +
692 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
693 +
694 +    <javac srcdir="${4jdk7src.dir}"
695 +           destdir="${build.4jdk7.classes.dir}"
696 +           debug="${build.debug}"
697 +           debuglevel="${build.debuglevel}"
698 +           deprecation="${build.deprecation}"
699 +           source="6"
700 +           target="6"
701 +           classpath=""
702 +           bootclasspath="${bootclasspath6}"
703 +           includeAntRuntime="false"
704 +           includeJavaRuntime="false"
705 +           executable="${javac8}"
706 +           fork="true">
707 +
708 +      <include name="**/*.java"/>
709 +      <compilerarg value="-Xprefer:source"/>
710        <compilerarg value="-XDignore.symbol.file=true"/>
711        <compilerarg value="-Xlint:all"/>
712 +      <compilerarg value="-Xdoclint:all/protected"/>
713        <compilerarg line="${build.args}"/>
714  
715      </javac>
# Line 604 | Line 722 | As of 2013-02, the very latest lambda 8
722  
723      <jar destfile="${4jdk7product.jar}">
724        <fileset dir="${build.4jdk7.classes.dir}"/>
725 +      <manifest>
726 +        <attribute name="Built-By" value="${user.name}"/>
727 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
728 +      </manifest>
729      </jar>
730  
731    </target>
732  
733  
734 <  <target name="4jdk7-test-tck"
734 >  <target name="4jdk7-tck"
735            depends="4jdk7jar"
736            description="Runs tck tests for jsr166-4jdk7 directly">
737  
# Line 618 | Line 740 | As of 2013-02, the very latest lambda 8
740        workdir="${build.4jdk7.dir}"
741        classes="${4jdk7product.jar}">
742        <javac-elements>
743 +        <!-- JDK8+ test classes -->
744 +        <exclude name="*8Test.java"/>
745 +        <exclude name="*9Test.java"/>
746 +        <exclude name="*10Test.java"/>
747 +        <exclude name="DoubleAccumulatorTest.java"/>
748 +        <exclude name="DoubleAdderTest.java"/>
749 +        <exclude name="LongAccumulatorTest.java"/>
750 +        <exclude name="LongAdderTest.java"/>
751 +        <exclude name="CompletableFutureTest.java"/>
752 +        <exclude name="SplittableRandomTest.java"/>
753          <exclude name="StampedLockTest.java"/>
754 +        <exclude name="SubmissionPublisherTest.java"/>
755        </javac-elements>
756      </run-tck-tests>
757    </target>
758  
759  
760 <  <target name="4jdk7-test-tck-junit"
760 >  <target name="4jdk7-tck-junit"
761            depends="4jdk7compile"
762            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
763  
# Line 646 | Line 779 | As of 2013-02, the very latest lambda 8
779  
780        <formatter type="brief"/>
781  
782 <      <test name="JSR166TestCase" haltonfailure="no">
782 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
783        </test>
784  
785      </junit>
786    </target>
787  
788 <  <target name="4jdk7-test-jtreg"
789 <          depends="4jdk7compile"
788 >  <target name="4jdk7-jtreg"
789 >          depends="4jdk7jar"
790            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
791 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
792 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
793 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
794 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
662 <    <jtreg dir="${jtreg.src.dir}"
663 <           jdk="${jdk7.home}"
664 <           workDir="${build.4jdk7.dir}/JTwork"
665 <           reportDir="${build.4jdk7.dir}/JTreport">
666 <
667 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
668 <      <arg value="-agentvm"/>
669 <      <arg value="-v:nopass,fail"/>
670 <      <arg value="-vmoptions:-esa -ea"/>
671 <      <arg value="-automatic"/>
672 <      <arg value="-k:!ignore"/>
673 <    </jtreg>
791 >    <run-jtreg-tests
792 >       target="7"
793 >       workdir="${build.4jdk7.dir}"
794 >       classes="${4jdk7product.jar}"/>
795    </target>
796  
797  
798    <target name="4jdk7-test"
799 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
799 >          depends="4jdk7-tck, 4jdk7-jtreg"
800            description="Runs tck and jtreg tests for jsr166-4jdk7">
801    </target>
802  
# Line 688 | Line 809 | As of 2013-02, the very latest lambda 8
809  
810      <javadoc destdir="${4jdk7docs.dir}"
811               packagenames="none"
812 <             link="${jdkapi7docs.url}"
812 >             link="${java7.api.url}"
813               overview="${4jdk7src.dir}/intro.html"
814               access="${build.javadoc.access}"
815               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 697 | Line 818 | As of 2013-02, the very latest lambda 8
818        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
819          <include name="**/*.java"/>
820        </fileset>
821 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
822        <arg value="-XDignore.symbol.file=true"/>
823      </javadoc>
824    </target>
# Line 715 | Line 837 | As of 2013-02, the very latest lambda 8
837    </target>
838  
839  
718  <target name="4jdk7dist-clean"
719          description="Removes all build and distribution products">
720
721  </target>
722
840    <target name="4jdk7dist-jar"
841            depends="4jdk7clean, 4jdk7jar">
842      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 748 | Line 865 | As of 2013-02, the very latest lambda 8
865             classpath=""
866             bootclasspath="${bootclasspath6}"
867             source="5"
868 +           target="5"
869             includeAntRuntime="false"
870             includeJavaRuntime="false"
871             executable="${javac7}"
# Line 756 | Line 874 | As of 2013-02, the very latest lambda 8
874        <include name="jsr166x/**/*.java"/>
875        <compilerarg value="-XDignore.symbol.file=true"/>
876        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
877 +      <compilerarg value="-Werror"/>
878        <compilerarg line="${build.args}"/>
879  
880      </javac>
# Line 768 | Line 887 | As of 2013-02, the very latest lambda 8
887  
888      <jar destfile="${jsr166x.jar}">
889        <fileset dir="${build.jsr166x.classes.dir}"/>
890 +      <manifest>
891 +        <attribute name="Built-By" value="${user.name}"/>
892 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
893 +      </manifest>
894      </jar>
895  
896    </target>
# Line 781 | Line 904 | As of 2013-02, the very latest lambda 8
904  
905      <javadoc destdir="${jsr166xdocs.dir}"
906               packagenames="jsr166x.*"
907 <             link="${jdkapidocs.url}"
907 >             link="${java.api.url}"
908               access="${build.javadoc.access}"
909               sourcepath="${topsrc.dir}:${jdk6src.dir}"
910               bootclasspath="${bootclasspath6}"
911               source="5"
912               executable="${javadoc7}">
913 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
914        <arg value="-XDignore.symbol.file=true"/>
915  
916      </javadoc>
# Line 806 | Line 930 | As of 2013-02, the very latest lambda 8
930    </target>
931  
932  
809  <target name="jsr166xdist-clean"
810          description="Removes all build and distribution products">
811
812  </target>
813
814
933    <target name="jsr166xdist-jar"
934            depends="jsr166xclean, jsr166xjar">
935      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 837 | Line 955 | As of 2013-02, the very latest lambda 8
955             debuglevel="${build.debuglevel}"
956             deprecation="${build.deprecation}"
957             source="6"
958 +           target="6"
959             classpath=""
960             bootclasspath="${bootclasspath6}"
961             includeAntRuntime="false"
# Line 847 | Line 966 | As of 2013-02, the very latest lambda 8
966        <include name="jsr166y/**/*.java"/>
967        <compilerarg value="-XDignore.symbol.file=true"/>
968        <compilerarg value="-Xlint:all"/>
969 +      <compilerarg value="-Werror"/>
970        <compilerarg line="${build.args}"/>
971  
972      </javac>
# Line 859 | Line 979 | As of 2013-02, the very latest lambda 8
979  
980      <jar destfile="${jsr166y.jar}" index="true">
981        <fileset dir="${build.jsr166y.classes.dir}"/>
982 +      <manifest>
983 +        <attribute name="Built-By" value="${user.name}"/>
984 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
985 +      </manifest>
986      </jar>
987  
988    </target>
# Line 872 | Line 996 | As of 2013-02, the very latest lambda 8
996  
997      <javadoc destdir="${jsr166ydocs.dir}"
998               packagenames="jsr166y.*"
999 <             link="${jdkapidocs.url}"
999 >             link="${java.api.url}"
1000               access="${build.javadoc.access}"
1001               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002               bootclasspath="${bootclasspath6}"
1003               source="6"
1004               executable="${javadoc7}">
1005 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1006        <arg value="-XDignore.symbol.file=true"/>
1007  
1008      </javadoc>
# Line 897 | Line 1022 | As of 2013-02, the very latest lambda 8
1022    </target>
1023  
1024  
900  <target name="jsr166ydist-clean"
901          description="Removes all build and distribution products">
902
903  </target>
904
1025    <target name="jsr166ydist-jar"
1026            depends="jsr166yclean, jsr166yjar">
1027      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 930 | Line 1050 | As of 2013-02, the very latest lambda 8
1050             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1051             classpath=""
1052             source="6"
1053 +           target="6"
1054             includeAntRuntime="false"
1055             includeJavaRuntime="false"
1056             executable="${javac7}"
# Line 938 | Line 1059 | As of 2013-02, the very latest lambda 8
1059        <include name="extra166y/**/*.java"/>
1060        <compilerarg value="-XDignore.symbol.file=true"/>
1061        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1062 +      <compilerarg value="-Werror"/>
1063        <compilerarg line="${build.args}"/>
1064  
1065      </javac>
# Line 950 | Line 1072 | As of 2013-02, the very latest lambda 8
1072  
1073      <jar destfile="${extra166y.jar}" index="true">
1074        <fileset dir="${build.extra166y.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>
1080  
1081    </target>
# Line 963 | Line 1089 | As of 2013-02, the very latest lambda 8
1089  
1090      <javadoc destdir="${extra166ydocs.dir}"
1091               packagenames="extra166y.*"
1092 <             link="${jdkapidocs.url}"
1092 >             link="${java.api.url}"
1093               access="${build.javadoc.access}"
1094               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1095               bootclasspath="${bootclasspath6}"
1096               source="6"
1097               executable="${javadoc7}">
1098 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1099        <arg value="-XDignore.symbol.file=true"/>
1100  
1101      </javadoc>
# Line 988 | Line 1115 | As of 2013-02, the very latest lambda 8
1115    </target>
1116  
1117  
991  <target name="extra166ydist-clean"
992          description="Removes all build and distribution products">
993
994  </target>
995
1118    <target name="extra166ydist-jar"
1119            depends="extra166yclean, extra166yjar">
1120      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1005 | Line 1127 | As of 2013-02, the very latest lambda 8
1127  
1128    <!-- jsr166e -->
1129  
1130 +  <property name="build.jsr166e.java.version" value="6"/>
1131 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1132 +
1133    <target name="jsr166ecompile"
1134            depends="configure-compiler"
1135            description="Compiles jsr166e sources">
# Line 1016 | Line 1141 | As of 2013-02, the very latest lambda 8
1141             debug="${build.debug}"
1142             debuglevel="${build.debuglevel}"
1143             deprecation="${build.deprecation}"
1144 <           source="7"
1144 >           source="${build.jsr166e.java.version}"
1145 >           target="${build.jsr166e.java.version}"
1146             classpath=""
1147             includeAntRuntime="false"
1148             includeJavaRuntime="false"
1149 <           executable="${javac7}"
1149 >           executable="${build.jsr166e.javac}"
1150             fork="true">
1151  
1152        <include name="jsr166e/**/*.java"/>
1153        <compilerarg value="-XDignore.symbol.file=true"/>
1154        <compilerarg value="-Xlint:all"/>
1155 +      <compilerarg value="-Werror"/>
1156        <compilerarg line="${build.args}"/>
1157  
1158      </javac>
1159    </target>
1160  
1161 +  <!-- jsr166e: find doclint errors -->
1162 +  <target name="jsr166edoclint">
1163 +
1164 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1165 +
1166 +    <javac srcdir="${topsrc.dir}"
1167 +           destdir="${build.jsr166e.classes.dir}"
1168 +           debug="${build.debug}"
1169 +           debuglevel="${build.debuglevel}"
1170 +           deprecation="${build.deprecation}"
1171 +           source="${build.jsr166e.java.version}"
1172 +           target="${build.jsr166e.java.version}"
1173 +           classpath=""
1174 +           bootclasspath="${bootclasspath6}"
1175 +           includeAntRuntime="false"
1176 +           includeJavaRuntime="false"
1177 +           executable="${javac8}"
1178 +           fork="true">
1179 +
1180 +      <include name="jsr166e/**/*.java"/>
1181 +      <compilerarg value="-XDignore.symbol.file=true"/>
1182 +      <compilerarg value="-Xlint:all"/>
1183 +      <compilerarg value="-Werror"/>
1184 +      <compilerarg value="-Xdoclint:all/protected"/>
1185 +
1186 +    </javac>
1187 +  </target>
1188 +
1189  
1190    <target name="jsr166ejar"
1191            depends="jsr166ecompile"
# Line 1038 | Line 1193 | As of 2013-02, the very latest lambda 8
1193  
1194      <jar destfile="${jsr166e.jar}" index="true">
1195        <fileset dir="${build.jsr166e.classes.dir}"/>
1196 +      <manifest>
1197 +        <attribute name="Built-By" value="${user.name}"/>
1198 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1199 +      </manifest>
1200      </jar>
1201  
1202    </target>
# Line 1051 | Line 1210 | As of 2013-02, the very latest lambda 8
1210  
1211      <javadoc destdir="${jsr166edocs.dir}"
1212               packagenames="jsr166e.*"
1213 <             link="${jdkapidocs.url}"
1213 >             link="${java.api.url}"
1214               access="${build.javadoc.access}"
1215 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1216 <             source="7"
1215 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1216 >             source="${build.jsr166e.java.version}"
1217               executable="${javadoc7}">
1218 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1219        <arg value="-XDignore.symbol.file=true"/>
1220  
1221      </javadoc>
1222    </target>
1223  
1224  
1225 <  <target name="jsr166e-test-tck"
1226 <          depends="jsr166ejar"
1227 <          description="Runs tck tests for jsr166e">
1225 >  <target name="jsr166e-tck-one-java-version"
1226 >          depends="jsr166ejar">
1227 >
1228 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1229  
1230      <run-tck-tests
1231        tck.src.dir="${test.src.dir}/tck-jsr166e"
1232 <      source="7"
1072 <      target="8"
1232 >      target="${build.jsr166e.java.version}"
1233        workdir="${build.jsr166e.dir}"
1234        classes="${jsr166e.jar}"/>
1235    </target>
1236  
1237 +  <target name="jsr166e-tck"
1238 +          description="Runs tck tests for jsr166e for multiple java versions">
1239 +
1240 + <!--     <antcall target="clean"/> -->
1241 + <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1242 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1243 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1244 + <!--     </antcall> -->
1245 +
1246 +    <antcall target="clean"/>
1247 +    <antcall target="jsr166e-tck-one-java-version">
1248 +      <param name="build.jsr166e.java.version" value="7"/>
1249 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1250 +    </antcall>
1251 +
1252 +    <antcall target="clean"/>
1253 +    <antcall target="jsr166e-tck-one-java-version">
1254 +      <param name="build.jsr166e.java.version" value="6"/>
1255 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1256 +    </antcall>
1257 +  </target>
1258 +
1259 +
1260 +  <target name="jsr166e-test"
1261 +          depends="jsr166e-tck"
1262 +          description="Runs all tests for jsr166e">
1263 +  </target>
1264  
1265    <target name="jsr166edist"
1266            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1086 | Line 1273 | As of 2013-02, the very latest lambda 8
1273    </target>
1274  
1275  
1089  <target name="jsr166edist-clean"
1090          description="Removes all build and distribution products">
1091
1092  </target>
1093
1276    <target name="jsr166edist-jar"
1277            depends="jsr166eclean, jsr166ejar">
1278      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1106 | Line 1288 | As of 2013-02, the very latest lambda 8
1288  
1289    <target name="lint">
1290      <antcall target="dists">
1291 +      <param name="build.javadoc.access" value="public"/>
1292 +    </antcall>
1293 +  </target>
1294 +
1295 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1296 +  <target name="lint-private">
1297 +    <antcall target="dist">
1298        <param name="build.javadoc.access" value="private"/>
1299      </antcall>
1300    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines