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.126 by jsr166, Wed Jan 23 06:46:27 2013 UTC vs.
Revision 1.181 by jsr166, Sun Sep 13 05:26:02 2015 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 +
29 +  Alternatively, define ant variables thus:
30 +  ant -Djdk$N.home=...
31 +  for $N in 6 7 8 9 ...
32   ------------------------------------------------------------------------------
33    </description>
34  
35 <  <target name="usage" description="Advises user to run with -projecthelp">
36 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
35 >  <!-- Display main targets by running 'ant -projecthelp' -->
36 >  <target name="usage">
37 >    <java classname="org.apache.tools.ant.Main">
38 >      <arg value="-projecthelp" />
39 >    </java>
40    </target>
41  
42 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43  
44    <!-- User-specific settings -->
45    <property file="user.properties"/>
# Line 39 | Line 50
50    <property name="build.debug"          value="true"/>
51    <property name="build.debuglevel"     value="source,lines,vars"/>
52    <property name="build.deprecation"    value="false"/>
53 +  <property name="build.javadoc.access" value="protected"/>
54 +
55 +  <!-- Tck options; see JSR166TestCase.java
56 +   To profile a single tck test class:
57 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58 +   To stress test a single tck test class:
59 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60 +  -->
61 +  <property name="jsr166.profileTests"     value="false"/>
62 +  <property name="jsr166.profileThreshold" value="100"/>
63 +  <property name="jsr166.runsPerTest"      value="1"/>
64 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65  
66    <!-- Build locations -->
67    <property name="build.dir"                   location="build"/>
# Line 72 | Line 95
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
98 >    <local name="have.java.base"/>
99 >    <available property="have.java.base"
100 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
101 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
102 >      if:set="have.java.base"/>
103 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
104 >      unless:set="have.java.base"/>
105      <local name="boot.jar.dir"/>
106      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
107      <path id="bootclasspath@{v}">
# Line 101 | Line 130
130    <defjdklocations v="6"/>
131    <defjdklocations v="7"/>
132    <defjdklocations v="8"/>
133 +  <defjdklocations v="9"/>
134  
135    <!-- Source locations -->
136    <property name="src.dir"              location="${basedir}/src/main"/>
137    <property name="test.src.dir"         location="${basedir}/src/test"/>
138    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
139    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
140 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
140 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
141 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
142 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
143 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
144    <property name="lib.dir"              location="${basedir}/lib"/>
145    <property name="dist.dir"             location="${basedir}/dist"/>
146    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 118 | Line 151
151    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
152  
153    <!-- Javadoc locations -->
154 <  <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
155 <  <property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
156 <  <property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
157 <  <property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
158 <  <property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
159 <  <property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
160 <
161 <  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
162 <  <property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
163 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
164 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
165 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
166 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
154 >  <property name="docs.dir"          location="${build.dir}/docs"/>
155 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
156 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
157 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
158 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
159 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
160 >
161 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
162 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
163 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
164 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
165 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
166 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
167  
168    <!-- Jar locations -->
169    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 141 | Line 174
174    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
175    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
176  
177 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
179 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
180 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
181 <
182 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
183 <  <!-- The below does not yet exist as of 2013-01 -->
184 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
177 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
178 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
179 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
180 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
181 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
182 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
183 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
184 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
185 >  <!-- Default jdk doc location (latest stable release seems best) -->
186 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
187  
188 <  <!-- Default jdk api doc location (latest stable release seems best) -->
189 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
188 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
189 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
190 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
191 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
192 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
193 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
194 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
195  
196    <!-- Define the "jtreg" task -->
197    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 166 | Line 206
206  
207    <macrodef name="run-tck-tests">
208      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
169    <attribute name="source" default="6"/>
209      <attribute name="target"/>
210 +    <attribute name="compile-target" default="@{target}"/>
211      <attribute name="workdir"/>
212      <attribute name="classes"/>
213 <    <attribute name="jvmflags" default=""/>
213 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
214 >    <element name="javac-elements" optional="true"/>
215      <sequential>
216  
217      <mkdir dir="@{workdir}/tck-classes"/>
# Line 180 | Line 221
221             debug="${build.debug}"
222             debuglevel="${build.debuglevel}"
223             deprecation="${build.deprecation}"
224 <           source="@{source}"
224 >           source="@{compile-target}"
225 >           target="@{compile-target}"
226             classpath="${junit.jar}"
185           bootclasspath="@{classes}:${bootclasspath@{source}}"
227             includeAntRuntime="false"
228             includeJavaRuntime="false"
229 <           executable="${javac@{target}}"
229 >           executable="${javac@{compile-target}}"
230             fork="true">
231  
232        <include name="*.java"/>
233        <compilerarg value="-XDignore.symbol.file=true"/>
234        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
235 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
236        <compilerarg line="${build.args}"/>
237 +      <javac-elements/>
238  
239      </javac>
240  
241 <    <java classname="JSR166TestCase"
241 >    <java classname="${jsr166.tckTestClass}"
242            failonerror="true"
243            jvm="${java@{target}}"
244            fork="true">
245          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
246          <jvmarg line="@{jvmflags}"/>
247 +
248 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
249 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
250 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
251 +        </syspropertyset>
252 +
253 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
254 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
255 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
256          <classpath>
257            <pathelement location="${junit.jar}"/>
258            <pathelement location="@{workdir}/tck-classes"/>
# Line 210 | Line 262
262      </sequential>
263    </macrodef>
264  
265 +  <!-- Define jtreg test sets for different jdk versions -->
266 +  <fileset dir="${jtreg9.src.dir}">
267 +    <patternset id="jdk9.jtreg.tests">
268 +      <include name="**/*.java"/>
269 +    </patternset>
270 +  </fileset>
271 +
272 +  <fileset dir="${jtreg8.src.dir}">
273 +    <patternset id="jdk8.jtreg.tests">
274 +      <include name="**/*.java"/>
275 +      <exclude name="**/SpliteratorCharacteristics.java"/>
276 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
277 +      <exclude name="**/GCDuringIteration.java"/>
278 +    </patternset>
279 +  </fileset>
280 +
281 +  <fileset dir="${jtreg7.src.dir}">
282 +    <patternset id="jdk7.jtreg.tests">
283 +      <include name="**/*.java"/>
284 +    </patternset>
285 +  </fileset>
286 +
287 +  <macrodef name="run-jtreg-tests">
288 +    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
289 +    <attribute name="source" default="7"/>
290 +    <attribute name="target"/>
291 +    <attribute name="workdir"/>
292 +    <attribute name="classes"/>
293 +    <attribute name="jtregflags" default=""/>
294 +    <sequential>
295 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
296 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
297 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
298 +    <mkdir dir="@{workdir}/JTreport"/>
299 +    <jtreg dir="${jtreg@{target}.src.dir}"
300 +           jdk="${jdk@{target}.home}"
301 +           workDir="@{workdir}/JTwork"
302 +           reportDir="@{workdir}/JTreport">
303 +      <patternset refid="jdk@{target}.jtreg.tests"/>
304 +      <arg value="-Xbootclasspath/p:@{classes}"/>
305 +      <arg value="-agentvm"/>
306 +      <arg value="-v:nopass,fail"/>
307 +      <arg value="-vmoptions:-esa -ea"/>
308 +      <arg value="-automatic"/>
309 +      <arg value="-k:!ignore"/>
310 +      <arg line="@{jtregflags}"/>
311 +    </jtreg>
312 +    </sequential>
313 +  </macrodef>
314 +
315    <!-- ALoops classpath -->
316    <path id="loops.classpath">
317      <pathelement location="${build.loops.dir}"/>
# Line 221 | Line 323
323  
324    <!-- Main targets -->
325  
326 +  <property name="build.main.java.version" value="9"/>
327 +  <property name="build.main.javac" value="${javac9}"/>
328 +
329    <target name="dists"
330            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
331            description="Builds all public jars and docs"/>
# Line 239 | Line 344
344             classpath=""
345             includeAntRuntime="false"
346             includeJavaRuntime="false"
347 <           executable="${javac8}"
347 >           executable="${build.main.javac}"
348             fork="true">
349  
350        <include name="**/*.java"/>
351 +      <compilerarg value="-Xprefer:source"/>
352        <compilerarg value="-XDignore.symbol.file=true"/>
353        <compilerarg value="-Xlint:all"/>
354 +      <compilerarg value="-Werror"/>
355 +      <compilerarg value="-Xdoclint:all/protected"/>
356 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
357        <compilerarg line="${build.args}"/>
358  
359      </javac>
# Line 257 | Line 366
366  
367      <jar destfile="${product.jar}">
368        <fileset dir="${build.classes.dir}"/>
369 +      <manifest>
370 +        <attribute name="Built-By" value="${user.name}"/>
371 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
372 +      </manifest>
373      </jar>
374    </target>
375  
376  
264  <target name="test"
265          depends="configure-tests, report-tests"
266          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
267
268
377    <target name="docs"
378            description="Builds javadocs for src/main to dist dir">
379  
380 <    <delete dir="${javadocs.dir}"/>
381 <    <mkdir dir="${javadocs.dir}"/>
380 >    <delete dir="${docs.dir}"/>
381 >    <mkdir dir="${docs.dir}"/>
382  
383      <!-- the packagenames="none" hack below prevents scanning the -->
384      <!-- sourcepath for packages -->
385  
386 <    <javadoc destdir="${javadocs.dir}"
386 >    <javadoc destdir="${docs.dir}"
387               packagenames="none"
388 <             link="${jdkapi8docs.url}"
388 >             link="${java9.api.url}"
389               overview="${src.dir}/intro.html"
390 <             sourcepath="${src.dir}:${jdk8src.dir}"
390 >             access="${build.javadoc.access}"
391 >             sourcepath="${src.dir}:${jdk9src.dir}"
392               classpath=""
393 <             executable="${javadoc8}">
393 >             executable="${javadoc9}">
394        <fileset dir="${src.dir}" defaultexcludes="yes">
395          <include name="**/*.java"/>
396        </fileset>
397 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
398 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
399        <arg value="-XDignore.symbol.file=true"/>
400        <arg value="-tag"/>
401        <arg value="${javadoc.jls.option}"/>
402 +      <arg value="-tag"/>
403 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
404 +      <arg value="-tag"/>
405 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
406 +      <arg value="-tag"/>
407 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
408      </javadoc>
409    </target>
410  
# Line 311 | Line 428
428        <exclude name="src/emulation/**"/>
429        <exclude name="**/SyntaxTest.java"/>
430        <exclude name="**/SuperfluousAbstract.java"/>
431 +      <manifest>
432 +        <attribute name="Built-By" value="${user.name}"/>
433 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
434 +      </manifest>
435      </jar>
436    </target>
437  
# Line 326 | Line 447
447    <target name="dist-clean"
448            description="Removes all build and distribution products">
449  
450 +    <delete dir="${build.dir}"/>
451      <delete dir="${dist.dir}"/>
452  
453    </target>
454  
455  
334  <!-- Internal targets -->
335
336
456    <target name="dist-jar"
457            depends="clean, jar">
458      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 341 | Line 460
460  
461    <target name="dist-docs"
462            depends="clean, docs">
463 <    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
463 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
464    </target>
465  
466 +  <target name="tck"
467 +          depends="jar"
468 +          description="Runs tck tests for main directly">
469  
470 <  <target name="compile-tests"
471 <          depends="jar">
472 <
473 <    <mkdir dir="${build.testcases.dir}"/>
474 <
475 <    <javac srcdir="${tck.src.dir}"
476 <           destdir="${build.testcases.dir}"
477 <           debug="${build.debug}"
478 <           debuglevel="${build.debuglevel}"
479 <           deprecation="${build.deprecation}"
480 <           source="6"
481 <           classpath="${junit.jar}"
482 <           bootclasspath="@{product.jar}:${bootclasspath6}"
483 <           includeAntRuntime="false"
484 <           includeJavaRuntime="false"
485 <           executable="${javac8}"
486 <           fork="true">
487 <
488 <      <include name="**/*.java"/>
489 <      <compilerarg value="-XDignore.symbol.file=true"/>
490 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
491 <      <compilerarg line="${build.args}"/>
492 <
493 <    </javac>
494 <
495 <    <javac srcdir="${test.src.dir}"
496 <           destdir="${build.testcases.dir}"
375 <           debug="${build.debug}"
376 <           debuglevel="${build.debuglevel}"
377 <           deprecation="${build.deprecation}"
378 <           source="6"
379 <           classpath=""
380 <           bootclasspath="@{product.jar}:${bootclasspath6}"
381 <           includeAntRuntime="false"
382 <           includeJavaRuntime="false"
383 <           executable="${javac8}"
384 <           fork="true">
385 <
386 <      <include name="jsr166/test/**/*.java"/>
387 <      <compilerarg value="-XDignore.symbol.file=true"/>
388 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
389 <      <compilerarg line="${build.args}"/>
390 <
391 <    </javac>
392 <
393 < <!--
394 <    <javac srcdir="${jtreg.src.dir}"
395 <          destdir="${build.testcases.dir}"
396 <            debug="${build.debug}"
397 <       debuglevel="${build.debuglevel}"
398 <      deprecation="${build.deprecation}"
399 <           source="${build.sourcelevel}"
400 <             fork="true">
401 <
402 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
403 <      <compilerarg value="-XDignore.symbol.file=true"/>
404 <      <compilerarg line="${build.args}"/>
405 <
406 <    </javac>
407 < -->
408 <
470 >    <run-tck-tests
471 >      target="${build.main.java.version}"
472 >      workdir="${build.dir}"
473 >      classes="${product.jar}"/>
474 >  </target>
475 >
476 >  <target name="tck-parallelism-1"
477 >          description="Runs tck with given common pool parallelism">
478 >    <antcall target="tck">
479 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
480 >    </antcall>
481 >  </target>
482 >
483 >  <target name="tck-parallelism-0"
484 >          description="Runs tck with given common pool parallelism">
485 >    <antcall target="tck">
486 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
487 >    </antcall>
488 >  </target>
489 >
490 >  <target name="jtreg"
491 >          depends="jar"
492 >          description="Runs jtreg tests for main using the jtreg ant task">
493 >    <run-jtreg-tests
494 >       target="${build.main.java.version}"
495 >       workdir="${build.dir}"
496 >       classes="${product.jar}"/>
497    </target>
498  
499 +  <target name="test"
500 +          depends="tck, tck-parallelism-1, jtreg"
501 +          description="Runs tck and jtreg tests for main">
502 +  </target>
503  
504 <  <target name="run-tests"
413 <          depends="compile-tests">
414 <
415 <    <!-- May be overridden by user.properties -->
416 <    <property name="testcase" value="*"/>
417 <
418 <    <mkdir dir="${build.reports.dir}"/>
419 <
420 <    <junit printsummary="true"
421 <             showoutput="true"
422 <          errorProperty="junit.failed"
423 <        failureProperty="junit.failed"
424 <                    dir="${build.reports.dir}"
425 <                    jvm="${java8}"
426 <                   fork="true">
427 <
428 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
429 <      <jvmarg value="-server"/>
430 <      <jvmarg value="-showversion"/>
431 <
432 <      <classpath refid="test.classpath"/>
433 <
434 <      <formatter type="xml"/>
435 <
436 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
437 <        <fileset dir="${tck.src.dir}">
438 <          <include name="**/${testcase}Test.java"/>
439 <        </fileset>
440 <      </batchtest>
441 <
442 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
443 <        <fileset dir="${test.src.dir}">
444 <          <include name="jsr166/test/**/${testcase}Test.java"/>
445 <        </fileset>
446 <      </batchtest>
447 <
448 < <!--
449 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
450 <        <fileset dir="${jtreg.src.dir}">
451 <          <include name="**/${testcase}Test.java"/>
452 <        </fileset>
453 <      </batchtest>
454 < -->
504 >  <target name="jtreg8" description="Runs jtreg tests with jdk8">
505  
506 <    </junit>
506 >    <antcall target="jtreg">
507 >      <param name="build.main.java.version" value="8"/>
508 >      <param name="build.main.javac" value="${javac8}"/>
509 >    </antcall>
510  
511    </target>
512  
513 +  <target name="test89"
514 +          description="Runs tck and jtreg tests for main for multiple java versions">
515  
516 <  <target name="report-tests"
517 <          depends="run-tests">
516 >    <antcall target="clean"/>
517 >    <antcall target="test">
518 >      <param name="build.main.java.version" value="8"/>
519 >      <param name="build.main.javac" value="${javac8}"/>
520 >    </antcall>
521  
522 <    <!-- Sets junit.report.format to frames if redirection is present,
523 <         otherwise sets it to noframes. -->
524 <    <available property="junit.report.format"
525 <                  value="frames"
526 <              classname="org.apache.xalan.lib.Redirect"
469 <    />
470 <    <property name="junit.report.format" value="noframes"/>
471 <
472 <    <junitreport todir="${build.reports.dir}">
473 <      <fileset dir="${build.reports.dir}">
474 <        <include name="TEST-*.xml"/>
475 <      </fileset>
476 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
477 <      />
478 <    </junitreport>
479 <
480 <    <fail message="Test Cases Failed" if="junit.failed"/>
522 >    <antcall target="clean"/>
523 >    <antcall target="test">
524 >      <param name="build.main.java.version" value="9"/>
525 >      <param name="build.main.javac" value="${javac9}"/>
526 >    </antcall>
527  
528    </target>
529  
530  
531 +
532    <target name="configure-compiler">
533 +    <fail message="ant version too old">
534 +      <condition>
535 +        <not> <antversion atleast="1.9.1"/> </not>
536 +      </condition>
537 +    </fail>
538  
539      <property name="unchecked.option" value="-Xlint:unchecked"/>
540  
# Line 499 | Line 551
551    </target>
552  
553  
502  <target name="configure-tests"
503       depends="configure-compiler">
504
505    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
506    <available property="junit.available"
507               classname="junit.framework.Protectable"/>
508
509    <!-- Xalan -->
510    <available property="xalan.available"
511               classname="org.apache.xalan.Version"/>
512
513
514    <!-- Ant 1.6beta and later don't need or want this check -->
515    <!--
516    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
517          unless="junit.available"/>
518
519    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
520          unless="xalan.available"/>
521    -->
522
523  </target>
524
554  
555    <!-- Various demos and test programs -->
556  
# Line 552 | Line 581
581    </target>
582  
583  
584 +  <target name="compile-test-loops" depends="jar"
585 +          description="compile all the perf tests in src/test/loops">
586 +
587 +    <mkdir dir="${build.dir}/test/loops"/>
588 +
589 +    <javac srcdir="${basedir}/src/test/loops"
590 +           destdir="${build.dir}/test/loops"
591 +           debug="${build.debug}"
592 +           debuglevel="${build.debuglevel}"
593 +           deprecation="${build.deprecation}"
594 +           includeAntRuntime="false"
595 +           includeJavaRuntime="false"
596 +           executable="${javac9}"
597 +           fork="true">
598 +
599 +      <include name="*.java"/>
600 +      <compilerarg value="-XDignore.symbol.file=true"/>
601 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
602 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
603 +      <compilerarg line="${build.args}"/>
604 +
605 +    </javac>
606 +
607 +  </target>
608 +
609 +
610    <!-- jsr166 4jdk7 -->
611  
612    <target name="4jdk7compile"
# Line 574 | Line 629
629             fork="true">
630  
631        <include name="**/*.java"/>
632 +      <compilerarg value="-Xprefer:source"/>
633        <compilerarg value="-XDignore.symbol.file=true"/>
634        <compilerarg value="-Xlint:all"/>
635 +      <compilerarg value="-Werror"/>
636        <compilerarg line="${build.args}"/>
637  
638      </javac>
639    </target>
640  
641 +  <target name="4jdk7doclint"
642 +          depends="configure-compiler"
643 +          description="Finds doclint warnings">
644  
645 <  <target name="4jdk7-jar"
645 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
646 >
647 >    <javac srcdir="${4jdk7src.dir}"
648 >           destdir="${build.4jdk7.classes.dir}"
649 >           debug="${build.debug}"
650 >           debuglevel="${build.debuglevel}"
651 >           deprecation="${build.deprecation}"
652 >           source="6"
653 >           classpath=""
654 >           bootclasspath="${bootclasspath7}"
655 >           includeAntRuntime="false"
656 >           includeJavaRuntime="false"
657 >           executable="${javac8}"
658 >           fork="true">
659 >
660 >      <include name="**/*.java"/>
661 >      <compilerarg value="-Xprefer:source"/>
662 >      <compilerarg value="-XDignore.symbol.file=true"/>
663 >      <compilerarg value="-Xlint:all"/>
664 >      <compilerarg value="-Xdoclint:all/protected"/>
665 >      <compilerarg line="${build.args}"/>
666 >
667 >    </javac>
668 >  </target>
669 >
670 >
671 >  <target name="4jdk7jar"
672            depends="4jdk7compile"
673            description="Builds library jar from compiled sources">
674  
675      <jar destfile="${4jdk7product.jar}">
676        <fileset dir="${build.4jdk7.classes.dir}"/>
677 +      <manifest>
678 +        <attribute name="Built-By" value="${user.name}"/>
679 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
680 +      </manifest>
681      </jar>
682  
683    </target>
684  
685  
686 <  <target name="4jdk7-test-tck"
687 <          depends="4jdk7-jar"
686 >  <target name="4jdk7-tck"
687 >          depends="4jdk7jar"
688            description="Runs tck tests for jsr166-4jdk7 directly">
689  
690      <run-tck-tests
691        target="7"
692        workdir="${build.4jdk7.dir}"
693 <      classes="${4jdk7product.jar}"/>
693 >      classes="${4jdk7product.jar}">
694 >      <javac-elements>
695 >        <!-- JDK8+ test classes -->
696 >        <exclude name="*8Test.java"/>
697 >        <exclude name="*9Test.java"/>
698 >        <exclude name="*10Test.java"/>
699 >        <exclude name="DoubleAccumulatorTest.java"/>
700 >        <exclude name="DoubleAdderTest.java"/>
701 >        <exclude name="LongAccumulatorTest.java"/>
702 >        <exclude name="LongAdderTest.java"/>
703 >        <exclude name="CompletableFutureTest.java"/>
704 >        <exclude name="SplittableRandomTest.java"/>
705 >        <exclude name="StampedLockTest.java"/>
706 >        <exclude name="SubmissionPublisherTest.java"/>
707 >      </javac-elements>
708 >    </run-tck-tests>
709    </target>
710  
711  
712 <  <target name="4jdk7-test-tck-junit"
712 >  <target name="4jdk7-tck-junit"
713            depends="4jdk7compile"
714            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
715  
# Line 626 | Line 731
731  
732        <formatter type="brief"/>
733  
734 <      <test name="JSR166TestCase" haltonfailure="no">
734 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
735        </test>
736  
737      </junit>
738    </target>
739  
740 <  <target name="4jdk7-test-jtreg"
741 <          depends="4jdk7compile"
740 >  <target name="4jdk7-jtreg"
741 >          depends="4jdk7jar"
742            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
743 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
744 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
745 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
746 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
642 <    <jtreg dir="${jtreg.src.dir}"
643 <           jdk="${jdk7.home}"
644 <           workDir="${build.4jdk7.dir}/JTwork"
645 <           reportDir="${build.4jdk7.dir}/JTreport">
646 <
647 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648 <      <arg value="-agentvm"/>
649 <      <arg value="-v:nopass,fail"/>
650 <      <arg value="-vmoptions:-esa -ea"/>
651 <      <arg value="-automatic"/>
652 <      <arg value="-k:!ignore"/>
653 <    </jtreg>
743 >    <run-jtreg-tests
744 >       target="7"
745 >       workdir="${build.4jdk7.dir}"
746 >       classes="${4jdk7product.jar}"/>
747    </target>
748  
749  
750    <target name="4jdk7-test"
751 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
751 >          depends="4jdk7-tck, 4jdk7-jtreg"
752            description="Runs tck and jtreg tests for jsr166-4jdk7">
753    </target>
754  
# Line 663 | Line 756
756    <target name="4jdk7docs"
757            description="Builds javadocs for src/jdk7 to dist dir">
758  
759 <    <delete dir="${4jdk7javadocs.dir}"/>
760 <    <mkdir dir="${4jdk7javadocs.dir}"/>
759 >    <delete dir="${4jdk7docs.dir}"/>
760 >    <mkdir dir="${4jdk7docs.dir}"/>
761  
762 <    <javadoc destdir="${4jdk7javadocs.dir}"
762 >    <javadoc destdir="${4jdk7docs.dir}"
763               packagenames="none"
764 <             link="${jdkapi7docs.url}"
764 >             link="${java7.api.url}"
765               overview="${4jdk7src.dir}/intro.html"
766 +             access="${build.javadoc.access}"
767               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
768               classpath=""
769               executable="${javadoc7}">
770        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
771          <include name="**/*.java"/>
772        </fileset>
773 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
774        <arg value="-XDignore.symbol.file=true"/>
775      </javadoc>
776    </target>
# Line 694 | Line 789
789    </target>
790  
791  
697  <target name="4jdk7dist-clean"
698          description="Removes all build and distribution products">
699
700  </target>
701
792    <target name="4jdk7dist-jar"
793 <          depends="4jdk7clean, 4jdk7-jar">
793 >          depends="4jdk7clean, 4jdk7jar">
794      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
795    </target>
796  
797  
798    <target name="4jdk7dist-docs"
799            depends="4jdk7clean, 4jdk7docs">
800 <    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
800 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
801    </target>
802  
803  
# Line 735 | Line 825
825        <include name="jsr166x/**/*.java"/>
826        <compilerarg value="-XDignore.symbol.file=true"/>
827        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
828 +      <compilerarg value="-Werror"/>
829        <compilerarg line="${build.args}"/>
830  
831      </javac>
832    </target>
833  
834  
835 <  <target name="jsr166x-jar"
835 >  <target name="jsr166xjar"
836            depends="jsr166xcompile"
837            description="Builds library jar from compiled sources">
838  
839      <jar destfile="${jsr166x.jar}">
840        <fileset dir="${build.jsr166x.classes.dir}"/>
841 +      <manifest>
842 +        <attribute name="Built-By" value="${user.name}"/>
843 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
844 +      </manifest>
845      </jar>
846  
847    </target>
# Line 755 | Line 850
850    <target name="jsr166xdocs"
851            description="Builds javadocs to dist dir">
852  
853 <    <delete dir="${jsr166xjavadocs.dir}"/>
854 <    <mkdir dir="${jsr166xjavadocs.dir}"/>
853 >    <delete dir="${jsr166xdocs.dir}"/>
854 >    <mkdir dir="${jsr166xdocs.dir}"/>
855  
856 <    <javadoc destdir="${jsr166xjavadocs.dir}"
856 >    <javadoc destdir="${jsr166xdocs.dir}"
857               packagenames="jsr166x.*"
858 <             link="${jdkapidocs.url}"
858 >             link="${java.api.url}"
859 >             access="${build.javadoc.access}"
860               sourcepath="${topsrc.dir}:${jdk6src.dir}"
861               bootclasspath="${bootclasspath6}"
862               source="5"
863               executable="${javadoc7}">
864 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
865        <arg value="-XDignore.symbol.file=true"/>
866  
867      </javadoc>
# Line 784 | Line 881
881    </target>
882  
883  
787  <target name="jsr166xdist-clean"
788          description="Removes all build and distribution products">
789
790  </target>
791
792
884    <target name="jsr166xdist-jar"
885 <          depends="jsr166xclean, jsr166x-jar">
885 >          depends="jsr166xclean, jsr166xjar">
886      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
887    </target>
888  
889    <target name="jsr166xdist-docs"
890            depends="jsr166xclean, jsr166xdocs">
891 <    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
891 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
892    </target>
893  
894    <!-- jsr166y -->
# Line 825 | Line 916
916        <include name="jsr166y/**/*.java"/>
917        <compilerarg value="-XDignore.symbol.file=true"/>
918        <compilerarg value="-Xlint:all"/>
919 +      <compilerarg value="-Werror"/>
920        <compilerarg line="${build.args}"/>
921  
922      </javac>
923    </target>
924  
925  
926 <  <target name="jsr166y-jar"
926 >  <target name="jsr166yjar"
927            depends="jsr166ycompile"
928            description="Builds library jar from compiled sources">
929  
930      <jar destfile="${jsr166y.jar}" index="true">
931        <fileset dir="${build.jsr166y.classes.dir}"/>
932 +      <manifest>
933 +        <attribute name="Built-By" value="${user.name}"/>
934 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
935 +      </manifest>
936      </jar>
937  
938    </target>
# Line 845 | Line 941
941    <target name="jsr166ydocs"
942            description="Builds javadocs to dist dir">
943  
944 <    <delete dir="${jsr166yjavadocs.dir}"/>
945 <    <mkdir dir="${jsr166yjavadocs.dir}"/>
944 >    <delete dir="${jsr166ydocs.dir}"/>
945 >    <mkdir dir="${jsr166ydocs.dir}"/>
946  
947 <    <javadoc destdir="${jsr166yjavadocs.dir}"
947 >    <javadoc destdir="${jsr166ydocs.dir}"
948               packagenames="jsr166y.*"
949 <             link="${jdkapidocs.url}"
949 >             link="${java.api.url}"
950 >             access="${build.javadoc.access}"
951               sourcepath="${topsrc.dir}:${jdk6src.dir}"
952               bootclasspath="${bootclasspath6}"
953               source="6"
954               executable="${javadoc7}">
955 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
956        <arg value="-XDignore.symbol.file=true"/>
957  
958      </javadoc>
# Line 874 | Line 972
972    </target>
973  
974  
877  <target name="jsr166ydist-clean"
878          description="Removes all build and distribution products">
879
880  </target>
881
975    <target name="jsr166ydist-jar"
976 <          depends="jsr166yclean, jsr166y-jar">
976 >          depends="jsr166yclean, jsr166yjar">
977      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
978    </target>
979  
980    <target name="jsr166ydist-docs"
981            depends="jsr166yclean, jsr166ydocs">
982 <    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
982 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
983    </target>
984  
985  
# Line 894 | Line 987
987  
988  
989    <target name="extra166ycompile"
990 <          depends="configure-compiler, jsr166y-jar"
990 >          depends="configure-compiler, jsr166yjar"
991            description="Compiles extra166y sources">
992  
993      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 915 | Line 1008
1008        <include name="extra166y/**/*.java"/>
1009        <compilerarg value="-XDignore.symbol.file=true"/>
1010        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1011 +      <compilerarg value="-Werror"/>
1012        <compilerarg line="${build.args}"/>
1013  
1014      </javac>
1015    </target>
1016  
1017  
1018 <  <target name="extra166y-jar"
1018 >  <target name="extra166yjar"
1019            depends="extra166ycompile"
1020            description="Builds library jar from compiled sources">
1021  
1022      <jar destfile="${extra166y.jar}" index="true">
1023        <fileset dir="${build.extra166y.classes.dir}"/>
1024 +      <manifest>
1025 +        <attribute name="Built-By" value="${user.name}"/>
1026 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1027 +      </manifest>
1028      </jar>
1029  
1030    </target>
# Line 935 | Line 1033
1033    <target name="extra166ydocs"
1034            description="Builds javadocs to build dir">
1035  
1036 <    <delete dir="${extra166yjavadocs.dir}"/>
1037 <    <mkdir dir="${extra166yjavadocs.dir}"/>
1036 >    <delete dir="${extra166ydocs.dir}"/>
1037 >    <mkdir dir="${extra166ydocs.dir}"/>
1038  
1039 <    <javadoc destdir="${extra166yjavadocs.dir}"
1039 >    <javadoc destdir="${extra166ydocs.dir}"
1040               packagenames="extra166y.*"
1041 <             link="${jdkapidocs.url}"
1041 >             link="${java.api.url}"
1042 >             access="${build.javadoc.access}"
1043               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1044               bootclasspath="${bootclasspath6}"
1045               source="6"
1046               executable="${javadoc7}">
1047 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1048        <arg value="-XDignore.symbol.file=true"/>
1049  
1050      </javadoc>
# Line 964 | Line 1064
1064    </target>
1065  
1066  
967  <target name="extra166ydist-clean"
968          description="Removes all build and distribution products">
969
970  </target>
971
1067    <target name="extra166ydist-jar"
1068 <          depends="extra166yclean, extra166y-jar">
1068 >          depends="extra166yclean, extra166yjar">
1069      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1070    </target>
1071  
1072    <target name="extra166ydist-docs"
1073            depends="extra166yclean, extra166ydocs">
1074 <    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
1074 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1075    </target>
1076  
1077    <!-- jsr166e -->
1078  
1079 +  <property name="build.jsr166e.java.version" value="6"/>
1080 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1081 +
1082    <target name="jsr166ecompile"
1083            depends="configure-compiler"
1084            description="Compiles jsr166e sources">
# Line 992 | Line 1090
1090             debug="${build.debug}"
1091             debuglevel="${build.debuglevel}"
1092             deprecation="${build.deprecation}"
1093 <           source="7"
1093 >           source="${build.jsr166e.java.version}"
1094             classpath=""
1095             includeAntRuntime="false"
1096             includeJavaRuntime="false"
1097 <           executable="${javac7}"
1097 >           executable="${build.jsr166e.javac}"
1098             fork="true">
1099  
1100        <include name="jsr166e/**/*.java"/>
1101        <compilerarg value="-XDignore.symbol.file=true"/>
1102        <compilerarg value="-Xlint:all"/>
1103 +      <compilerarg value="-Werror"/>
1104        <compilerarg line="${build.args}"/>
1105  
1106      </javac>
1107    </target>
1108  
1109 +  <!-- jsr166e: find doclint errors -->
1110 +  <target name="jsr166edoclint">
1111 +
1112 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1113 +
1114 +    <javac srcdir="${topsrc.dir}"
1115 +           destdir="${build.jsr166e.classes.dir}"
1116 +           debug="${build.debug}"
1117 +           debuglevel="${build.debuglevel}"
1118 +           deprecation="${build.deprecation}"
1119 +           source="${build.jsr166e.java.version}"
1120 +           classpath=""
1121 +           bootclasspath="${bootclasspath7}"
1122 +           includeAntRuntime="false"
1123 +           includeJavaRuntime="false"
1124 +           executable="${javac8}"
1125 +           fork="true">
1126  
1127 <  <target name="jsr166e-jar"
1127 >      <include name="jsr166e/**/*.java"/>
1128 >      <compilerarg value="-XDignore.symbol.file=true"/>
1129 >      <compilerarg value="-Xlint:all"/>
1130 >      <compilerarg value="-Werror"/>
1131 >      <compilerarg value="-Xdoclint:all/protected"/>
1132 >
1133 >    </javac>
1134 >  </target>
1135 >
1136 >
1137 >  <target name="jsr166ejar"
1138            depends="jsr166ecompile"
1139            description="Builds library jar from compiled sources">
1140  
1141      <jar destfile="${jsr166e.jar}" index="true">
1142        <fileset dir="${build.jsr166e.classes.dir}"/>
1143 +      <manifest>
1144 +        <attribute name="Built-By" value="${user.name}"/>
1145 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1146 +      </manifest>
1147      </jar>
1148  
1149    </target>
# Line 1022 | Line 1152
1152    <target name="jsr166edocs"
1153            description="Builds javadocs to build dir">
1154  
1155 <    <delete dir="${jsr166ejavadocs.dir}"/>
1156 <    <mkdir dir="${jsr166ejavadocs.dir}"/>
1155 >    <delete dir="${jsr166edocs.dir}"/>
1156 >    <mkdir dir="${jsr166edocs.dir}"/>
1157  
1158 <    <javadoc destdir="${jsr166ejavadocs.dir}"
1158 >    <javadoc destdir="${jsr166edocs.dir}"
1159               packagenames="jsr166e.*"
1160 <             link="${jdkapidocs.url}"
1161 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1162 <             source="7"
1160 >             link="${java.api.url}"
1161 >             access="${build.javadoc.access}"
1162 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1163 >             source="${build.jsr166e.java.version}"
1164               executable="${javadoc7}">
1165 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1166        <arg value="-XDignore.symbol.file=true"/>
1167  
1168      </javadoc>
1169    </target>
1170  
1171  
1172 <  <target name="jsr166e-test-tck"
1173 <          depends="jsr166e-jar"
1174 <          description="Runs tck tests for jsr166e">
1172 >  <target name="jsr166e-tck-one-java-version"
1173 >          depends="jsr166ejar">
1174 >
1175 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1176  
1177      <run-tck-tests
1178        tck.src.dir="${test.src.dir}/tck-jsr166e"
1179 <      source="7"
1047 <      target="8"
1179 >      target="${build.jsr166e.java.version}"
1180        workdir="${build.jsr166e.dir}"
1181        classes="${jsr166e.jar}"/>
1182    </target>
1183  
1184 +  <target name="jsr166e-tck"
1185 +          description="Runs tck tests for jsr166e for multiple java versions">
1186 +
1187 + <!--     <antcall target="clean"/> -->
1188 + <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1189 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1190 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1191 + <!--     </antcall> -->
1192 +
1193 +    <antcall target="clean"/>
1194 +    <antcall target="jsr166e-tck-one-java-version">
1195 +      <param name="build.jsr166e.java.version" value="7"/>
1196 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1197 +    </antcall>
1198 +
1199 +    <antcall target="clean"/>
1200 +    <antcall target="jsr166e-tck-one-java-version">
1201 +      <param name="build.jsr166e.java.version" value="6"/>
1202 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1203 +    </antcall>
1204 +  </target>
1205 +
1206 +
1207 +  <target name="jsr166e-test"
1208 +          depends="jsr166e-tck"
1209 +          description="Runs all tests for jsr166e">
1210 +  </target>
1211  
1212    <target name="jsr166edist"
1213            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1061 | Line 1220
1220    </target>
1221  
1222  
1064  <target name="jsr166edist-clean"
1065          description="Removes all build and distribution products">
1066
1067  </target>
1068
1223    <target name="jsr166edist-jar"
1224 <          depends="jsr166eclean, jsr166e-jar">
1224 >          depends="jsr166eclean, jsr166ejar">
1225      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1226    </target>
1227  
1228    <target name="jsr166edist-docs"
1229            depends="jsr166eclean, jsr166edocs">
1230 <    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1230 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1231    </target>
1232  
1233 +
1234 + <!-- Find buglets that can be detected by static build tools -->
1235 +
1236 +  <target name="lint">
1237 +    <antcall target="dists">
1238 +      <param name="build.javadoc.access" value="public"/>
1239 +    </antcall>
1240 +  </target>
1241 +
1242 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1243 +  <target name="lint-private">
1244 +    <antcall target="dist">
1245 +      <param name="build.javadoc.access" value="private"/>
1246 +    </antcall>
1247 +  </target>
1248 +
1249 +
1250   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines