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.134 by jsr166, Sun Feb 3 02:25:01 2013 UTC vs.
Revision 1.166 by jsr166, Mon Aug 10 06:32:23 2015 UTC

# Line 16 | Line 16
16    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8
19 +  $HOME/jdk/jdk9
20    where each of the above is a JDK or a symlink to same, and
21    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8
24 +  $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.
27 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
27 >
28 >  Alternatively, define ant variables thus:
29 >  ant -Djdk$N.home=...
30 >  for $N in 6 7 8 9 ...
31   ------------------------------------------------------------------------------
32    </description>
33  
34 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
34 >  <!-- Display main targets by running 'ant -projecthelp' -->
35 >  <target name="usage">
36      <java classname="org.apache.tools.ant.Main">
37        <arg value="-projecthelp" />
38      </java>
# Line 44 | Line 50 | As of 2013-02, the very latest lambda 8
50    <property name="build.deprecation"    value="false"/>
51    <property name="build.javadoc.access" value="protected"/>
52  
53 +  <!-- Tck options; see JSR166TestCase.java
54 +   To profile a single tck test class:
55 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56 +   To stress test a single tck test class:
57 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58 +  -->
59 +  <property name="jsr166.profileTests"     value="false"/>
60 +  <property name="jsr166.profileThreshold" value="100"/>
61 +  <property name="jsr166.runsPerTest"      value="1"/>
62 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63 +
64    <!-- Build locations -->
65    <property name="build.dir"                   location="build"/>
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 105 | Line 122 | As of 2013-02, the very latest lambda 8
122    <defjdklocations v="6"/>
123    <defjdklocations v="7"/>
124    <defjdklocations v="8"/>
125 +  <defjdklocations v="9"/>
126  
127    <!-- Source locations -->
128    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 145 | Line 163 | As of 2013-02, the very latest lambda 8
163    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165  
166 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
167 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
168 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
169 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
170 <
171 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
172 <  <!-- The below does not yet exist as of 2013-01 -->
173 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
166 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
172 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174 >  <!-- Default jdk doc location (latest stable release seems best) -->
175 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
176  
177 <  <!-- Default jdk api doc location (latest stable release seems best) -->
178 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
177 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
184  
185    <!-- Define the "jtreg" task -->
186    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 170 | Line 195 | As of 2013-02, the very latest lambda 8
195  
196    <macrodef name="run-tck-tests">
197      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173    <attribute name="source" default="6"/>
198      <attribute name="target"/>
199 +    <attribute name="compile-target" default="@{target}"/>
200      <attribute name="workdir"/>
201      <attribute name="classes"/>
202 <    <attribute name="jvmflags" default=""/>
202 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203      <element name="javac-elements" optional="true"/>
204      <sequential>
205  
# Line 185 | Line 210 | As of 2013-02, the very latest lambda 8
210             debug="${build.debug}"
211             debuglevel="${build.debuglevel}"
212             deprecation="${build.deprecation}"
213 <           source="@{source}"
213 >           source="@{compile-target}"
214 >           target="@{compile-target}"
215             classpath="${junit.jar}"
190           bootclasspath="@{classes}:${bootclasspath@{source}}"
216             includeAntRuntime="false"
217             includeJavaRuntime="false"
218 <           executable="${javac@{target}}"
218 >           executable="${javac@{compile-target}}"
219             fork="true">
220  
221        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>
226        <javac-elements/>
227  
228      </javac>
229  
230 <    <java classname="JSR166TestCase"
230 >    <java classname="${jsr166.tckTestClass}"
231            failonerror="true"
232            jvm="${java@{target}}"
233            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>
236 +
237 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240 +        </syspropertyset>
241 +
242 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245          <classpath>
246            <pathelement location="${junit.jar}"/>
247            <pathelement location="@{workdir}/tck-classes"/>
# Line 216 | Line 251 | As of 2013-02, the very latest lambda 8
251      </sequential>
252    </macrodef>
253  
254 +  <!-- Define jtreg test sets for different jdk versions -->
255 +  <fileset dir="${jtreg.src.dir}">
256 +    <patternset id="jdk9.jtreg.tests">
257 +      <include name="**/*.java"/>
258 +    </patternset>
259 +  </fileset>
260 +
261 +  <fileset dir="${jtreg.src.dir}">
262 +    <patternset id="jdk8.jtreg.tests">
263 +      <include name="**/*.java"/>
264 +      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265 +    </patternset>
266 +  </fileset>
267 +
268 +  <fileset dir="${jtreg.src.dir}">
269 +    <patternset id="jdk7.jtreg.tests">
270 +      <include name="**/*.java"/>
271 +      <exclude name="util/Collection/CollectionDefaults.java"/>
272 +      <exclude name="util/List/ListDefaults.java"/>
273 +      <exclude name="util/Spliterator/**/*.java"/>
274 +      <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275 +      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276 +      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277 +    </patternset>
278 +  </fileset>
279 +
280 +  <macrodef name="run-jtreg-tests">
281 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
283 +    <attribute name="source" default="7"/>
284 +    <attribute name="target"/>
285 +    <attribute name="workdir"/>
286 +    <attribute name="classes"/>
287 +    <attribute name="jtregflags" default=""/>
288 +    <sequential>
289 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
290 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
291 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
292 +    <mkdir dir="@{workdir}/JTreport"/>
293 +    <jtreg dir="@{jtreg.src.dir}"
294 +           jdk="${jdk@{target}.home}"
295 +           workDir="@{workdir}/JTwork"
296 +           reportDir="@{workdir}/JTreport">
297 +      <patternset refid="jdk@{target}.jtreg.tests"/>
298 +      <arg value="-Xbootclasspath/p:@{classes}"/>
299 +      <arg value="-agentvm"/>
300 +      <arg value="-v:nopass,fail"/>
301 +      <arg value="-vmoptions:-esa -ea"/>
302 +      <arg value="-automatic"/>
303 +      <arg value="-k:!ignore"/>
304 +      <arg line="@{jtregflags}"/>
305 +    </jtreg>
306 +    </sequential>
307 +  </macrodef>
308 +
309    <!-- ALoops classpath -->
310    <path id="loops.classpath">
311      <pathelement location="${build.loops.dir}"/>
# Line 227 | Line 317 | As of 2013-02, the very latest lambda 8
317  
318    <!-- Main targets -->
319  
320 +  <property name="build.main.java.version" value="9"/>
321 +  <property name="build.main.javac" value="${javac9}"/>
322 +
323    <target name="dists"
324            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
325            description="Builds all public jars and docs"/>
# Line 245 | Line 338 | As of 2013-02, the very latest lambda 8
338             classpath=""
339             includeAntRuntime="false"
340             includeJavaRuntime="false"
341 <           executable="${javac8}"
341 >           executable="${build.main.javac}"
342             fork="true">
343  
344        <include name="**/*.java"/>
345        <compilerarg value="-Xprefer:source"/>
346        <compilerarg value="-XDignore.symbol.file=true"/>
347        <compilerarg value="-Xlint:all"/>
348 +      <compilerarg value="-Werror"/>
349 +      <compilerarg value="-Xdoclint:all/protected"/>
350 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
352  
353      </javac>
# Line 268 | Line 364 | As of 2013-02, the very latest lambda 8
364    </target>
365  
366  
271  <target name="test"
272          depends="configure-tests, report-tests"
273          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
274
275
367    <target name="docs"
368            description="Builds javadocs for src/main to dist dir">
369  
# Line 284 | Line 375 | As of 2013-02, the very latest lambda 8
375  
376      <javadoc destdir="${docs.dir}"
377               packagenames="none"
378 <             link="${jdkapi8docs.url}"
378 >             link="${java9.api.url}"
379               overview="${src.dir}/intro.html"
380               access="${build.javadoc.access}"
381 <             sourcepath="${src.dir}:${jdk8src.dir}"
381 >             sourcepath="${src.dir}:${jdk9src.dir}"
382               classpath=""
383 <             executable="${javadoc8}">
383 >             executable="${javadoc9}">
384        <fileset dir="${src.dir}" defaultexcludes="yes">
385          <include name="**/*.java"/>
386        </fileset>
387 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
388 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
389        <arg value="-XDignore.symbol.file=true"/>
390        <arg value="-tag"/>
391        <arg value="${javadoc.jls.option}"/>
392 +      <arg value="-tag"/>
393 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
394 +      <arg value="-tag"/>
395 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
396 +      <arg value="-tag"/>
397 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
398      </javadoc>
399    </target>
400  
# Line 334 | Line 433 | As of 2013-02, the very latest lambda 8
433    <target name="dist-clean"
434            description="Removes all build and distribution products">
435  
436 +    <delete dir="${build.dir}"/>
437      <delete dir="${dist.dir}"/>
438  
439    </target>
440  
441  
342  <!-- Internal targets -->
343
344
442    <target name="dist-jar"
443            depends="clean, jar">
444      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 352 | Line 449 | As of 2013-02, the very latest lambda 8
449      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>
451  
452 <
356 <  <target name="compile-tests"
357 <          depends="jar">
358 <
359 <    <mkdir dir="${build.testcases.dir}"/>
360 <
361 <    <javac srcdir="${tck.src.dir}"
362 <           destdir="${build.testcases.dir}"
363 <           debug="${build.debug}"
364 <           debuglevel="${build.debuglevel}"
365 <           deprecation="${build.deprecation}"
366 <           source="6"
367 <           classpath="${junit.jar}"
368 <           bootclasspath="@{product.jar}:${bootclasspath6}"
369 <           includeAntRuntime="false"
370 <           includeJavaRuntime="false"
371 <           executable="${javac8}"
372 <           fork="true">
373 <
374 <      <include name="**/*.java"/>
375 <      <compilerarg value="-XDignore.symbol.file=true"/>
376 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
377 <      <compilerarg line="${build.args}"/>
378 <
379 <    </javac>
380 <
381 <    <javac srcdir="${test.src.dir}"
382 <           destdir="${build.testcases.dir}"
383 <           debug="${build.debug}"
384 <           debuglevel="${build.debuglevel}"
385 <           deprecation="${build.deprecation}"
386 <           source="6"
387 <           classpath=""
388 <           bootclasspath="@{product.jar}:${bootclasspath6}"
389 <           includeAntRuntime="false"
390 <           includeJavaRuntime="false"
391 <           executable="${javac8}"
392 <           fork="true">
393 <
394 <      <include name="jsr166/test/**/*.java"/>
395 <      <compilerarg value="-XDignore.symbol.file=true"/>
396 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
397 <      <compilerarg line="${build.args}"/>
398 <
399 <    </javac>
400 <
401 < <!--
402 <    <javac srcdir="${jtreg.src.dir}"
403 <          destdir="${build.testcases.dir}"
404 <            debug="${build.debug}"
405 <       debuglevel="${build.debuglevel}"
406 <      deprecation="${build.deprecation}"
407 <           source="${build.sourcelevel}"
408 <             fork="true">
409 <
410 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
411 <      <compilerarg value="-XDignore.symbol.file=true"/>
412 <      <compilerarg line="${build.args}"/>
413 <
414 <    </javac>
415 < -->
416 <
417 <  </target>
418 <
452 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
453    <target name="test-tck"
454            depends="jar"
455            description="Runs tck tests for main directly">
456  
457      <run-tck-tests
458 <      target="8"
458 >      target="${build.main.java.version}"
459        workdir="${build.dir}"
460        classes="${product.jar}"/>
461    </target>
462  
463 <  <target name="run-tests"
464 <          depends="compile-tests">
465 <
466 <    <!-- May be overridden by user.properties -->
467 <    <property name="testcase" value="*"/>
468 <
435 <    <mkdir dir="${build.reports.dir}"/>
436 <
437 <    <junit printsummary="true"
438 <             showoutput="true"
439 <          errorProperty="junit.failed"
440 <        failureProperty="junit.failed"
441 <                    dir="${build.reports.dir}"
442 <                    jvm="${java8}"
443 <                   fork="true">
444 <
445 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
446 <      <jvmarg value="-server"/>
447 <      <jvmarg value="-showversion"/>
448 <
449 <      <classpath refid="test.classpath"/>
450 <
451 <      <formatter type="xml"/>
452 <
453 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
454 <        <fileset dir="${tck.src.dir}">
455 <          <include name="**/${testcase}Test.java"/>
456 <        </fileset>
457 <      </batchtest>
458 <
459 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
460 <        <fileset dir="${test.src.dir}">
461 <          <include name="jsr166/test/**/${testcase}Test.java"/>
462 <        </fileset>
463 <      </batchtest>
464 <
465 < <!--
466 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
467 <        <fileset dir="${jtreg.src.dir}">
468 <          <include name="**/${testcase}Test.java"/>
469 <        </fileset>
470 <      </batchtest>
471 < -->
463 >  <target name="test-tck-parallelism-1"
464 >          description="Runs test-tck with given common pool parallelism">
465 >    <antcall target="test-tck">
466 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
467 >    </antcall>
468 >  </target>
469  
470 <    </junit>
470 >  <target name="test-tck-parallelism-0"
471 >          description="Runs test-tck with given common pool parallelism">
472 >    <antcall target="test-tck">
473 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
474 >    </antcall>
475 >  </target>
476  
477 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478 +  <target name="test-jtreg"
479 +          depends="jar"
480 +          description="Runs jtreg tests for main using the jtreg ant task">
481 +    <run-jtreg-tests
482 +       target="${build.main.java.version}"
483 +       workdir="${build.dir}"
484 +       classes="${product.jar}"/>
485    </target>
486  
487 +  <target name="test"
488 +          depends="test-tck, test-tck-parallelism-1, test-jtreg"
489 +          description="Runs tck and jtreg tests for main">
490 +  </target>
491  
492 <  <target name="report-tests"
493 <          depends="run-tests">
492 >  <target name="test89"
493 >          description="Runs tck and jtreg tests for main for multiple java versions">
494  
495 <    <!-- Sets junit.report.format to frames if redirection is present,
496 <         otherwise sets it to noframes. -->
497 <    <available property="junit.report.format"
498 <                  value="frames"
499 <              classname="org.apache.xalan.lib.Redirect"
500 <    />
487 <    <property name="junit.report.format" value="noframes"/>
488 <
489 <    <junitreport todir="${build.reports.dir}">
490 <      <fileset dir="${build.reports.dir}">
491 <        <include name="TEST-*.xml"/>
492 <      </fileset>
493 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
494 <      />
495 <    </junitreport>
495 >    <antcall target="clean"/>
496 >    <antcall target="test">
497 >      <param name="build.main.java.version" value="8"/>
498 >      <param name="build.main.javac" value="${javac8}"/>
499 >      <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500 >    </antcall>
501  
502 <    <fail message="Test Cases Failed" if="junit.failed"/>
502 >    <antcall target="clean"/>
503 >    <antcall target="test">
504 >      <param name="build.main.java.version" value="9"/>
505 >      <param name="build.main.javac" value="${javac9}"/>
506 >    </antcall>
507  
508    </target>
509  
510  
511 +
512    <target name="configure-compiler">
513  
514      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 516 | Line 526 | As of 2013-02, the very latest lambda 8
526    </target>
527  
528  
519  <target name="configure-tests"
520       depends="configure-compiler">
521
522    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
523    <available property="junit.available"
524               classname="junit.framework.Protectable"/>
525
526    <!-- Xalan -->
527    <available property="xalan.available"
528               classname="org.apache.xalan.Version"/>
529
530
531    <!-- Ant 1.6beta and later don't need or want this check -->
532    <!--
533    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
534          unless="junit.available"/>
535
536    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
537          unless="xalan.available"/>
538    -->
539
540  </target>
541
529  
530    <!-- Various demos and test programs -->
531  
# Line 569 | Line 556 | As of 2013-02, the very latest lambda 8
556    </target>
557  
558  
559 +  <target name="compile-test-loops" depends="jar"
560 +          description="compile all the perf tests in src/test/loops">
561 +
562 +    <mkdir dir="${build.dir}/test/loops"/>
563 +
564 +    <javac srcdir="${basedir}/src/test/loops"
565 +           destdir="${build.dir}/test/loops"
566 +           debug="${build.debug}"
567 +           debuglevel="${build.debuglevel}"
568 +           deprecation="${build.deprecation}"
569 +           includeAntRuntime="false"
570 +           includeJavaRuntime="false"
571 +           executable="${javac9}"
572 +           fork="true">
573 +
574 +      <include name="*.java"/>
575 +      <compilerarg value="-XDignore.symbol.file=true"/>
576 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
578 +      <compilerarg line="${build.args}"/>
579 +
580 +    </javac>
581 +
582 +  </target>
583 +
584 +
585    <!-- jsr166 4jdk7 -->
586  
587    <target name="4jdk7compile"
# Line 594 | Line 607 | As of 2013-02, the very latest lambda 8
607        <compilerarg value="-Xprefer:source"/>
608        <compilerarg value="-XDignore.symbol.file=true"/>
609        <compilerarg value="-Xlint:all"/>
610 +      <compilerarg value="-Werror"/>
611 +      <compilerarg line="${build.args}"/>
612 +
613 +    </javac>
614 +  </target>
615 +
616 +  <target name="4jdk7doclint"
617 +          depends="configure-compiler"
618 +          description="Finds doclint warnings">
619 +
620 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
621 +
622 +    <javac srcdir="${4jdk7src.dir}"
623 +           destdir="${build.4jdk7.classes.dir}"
624 +           debug="${build.debug}"
625 +           debuglevel="${build.debuglevel}"
626 +           deprecation="${build.deprecation}"
627 +           source="6"
628 +           classpath=""
629 +           bootclasspath="${bootclasspath7}"
630 +           includeAntRuntime="false"
631 +           includeJavaRuntime="false"
632 +           executable="${javac8}"
633 +           fork="true">
634 +
635 +      <include name="**/*.java"/>
636 +      <compilerarg value="-Xprefer:source"/>
637 +      <compilerarg value="-XDignore.symbol.file=true"/>
638 +      <compilerarg value="-Xlint:all"/>
639 +      <compilerarg value="-Xdoclint:all/protected"/>
640        <compilerarg line="${build.args}"/>
641  
642      </javac>
# Line 621 | Line 664 | As of 2013-02, the very latest lambda 8
664        classes="${4jdk7product.jar}">
665        <javac-elements>
666          <!-- JDK8+ test classes -->
667 +        <exclude name="*8Test.java"/>
668 +        <exclude name="*9Test.java"/>
669 +        <exclude name="DoubleAccumulatorTest.java"/>
670 +        <exclude name="DoubleAdderTest.java"/>
671 +        <exclude name="LongAccumulatorTest.java"/>
672 +        <exclude name="LongAdderTest.java"/>
673 +        <exclude name="CompletableFutureTest.java"/>
674 +        <exclude name="SplittableRandomTest.java"/>
675          <exclude name="StampedLockTest.java"/>
676        </javac-elements>
677      </run-tck-tests>
# Line 649 | Line 700 | As of 2013-02, the very latest lambda 8
700  
701        <formatter type="brief"/>
702  
703 <      <test name="JSR166TestCase" haltonfailure="no">
703 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
704        </test>
705  
706      </junit>
707    </target>
708  
709    <target name="4jdk7-test-jtreg"
710 <          depends="4jdk7compile"
710 >          depends="4jdk7jar"
711            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
712 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
713 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
714 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
715 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
665 <    <jtreg dir="${jtreg.src.dir}"
666 <           jdk="${jdk7.home}"
667 <           workDir="${build.4jdk7.dir}/JTwork"
668 <           reportDir="${build.4jdk7.dir}/JTreport">
669 <
670 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
671 <      <arg value="-agentvm"/>
672 <      <arg value="-v:nopass,fail"/>
673 <      <arg value="-vmoptions:-esa -ea"/>
674 <      <arg value="-automatic"/>
675 <      <arg value="-k:!ignore"/>
676 <    </jtreg>
712 >    <run-jtreg-tests
713 >       target="7"
714 >       workdir="${build.4jdk7.dir}"
715 >       classes="${4jdk7product.jar}"/>
716    </target>
717  
718  
# Line 691 | Line 730 | As of 2013-02, the very latest lambda 8
730  
731      <javadoc destdir="${4jdk7docs.dir}"
732               packagenames="none"
733 <             link="${jdkapi7docs.url}"
733 >             link="${java7.api.url}"
734               overview="${4jdk7src.dir}/intro.html"
735               access="${build.javadoc.access}"
736               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 700 | Line 739 | As of 2013-02, the very latest lambda 8
739        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
740          <include name="**/*.java"/>
741        </fileset>
742 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
743        <arg value="-XDignore.symbol.file=true"/>
744      </javadoc>
745    </target>
# Line 718 | Line 758 | As of 2013-02, the very latest lambda 8
758    </target>
759  
760  
721  <target name="4jdk7dist-clean"
722          description="Removes all build and distribution products">
723
724  </target>
725
761    <target name="4jdk7dist-jar"
762            depends="4jdk7clean, 4jdk7jar">
763      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 759 | Line 794 | As of 2013-02, the very latest lambda 8
794        <include name="jsr166x/**/*.java"/>
795        <compilerarg value="-XDignore.symbol.file=true"/>
796        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
797 +      <compilerarg value="-Werror"/>
798        <compilerarg line="${build.args}"/>
799  
800      </javac>
# Line 784 | Line 820 | As of 2013-02, the very latest lambda 8
820  
821      <javadoc destdir="${jsr166xdocs.dir}"
822               packagenames="jsr166x.*"
823 <             link="${jdkapidocs.url}"
823 >             link="${java.api.url}"
824               access="${build.javadoc.access}"
825               sourcepath="${topsrc.dir}:${jdk6src.dir}"
826               bootclasspath="${bootclasspath6}"
827               source="5"
828               executable="${javadoc7}">
829 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
830        <arg value="-XDignore.symbol.file=true"/>
831  
832      </javadoc>
# Line 809 | Line 846 | As of 2013-02, the very latest lambda 8
846    </target>
847  
848  
812  <target name="jsr166xdist-clean"
813          description="Removes all build and distribution products">
814
815  </target>
816
817
849    <target name="jsr166xdist-jar"
850            depends="jsr166xclean, jsr166xjar">
851      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 850 | Line 881 | As of 2013-02, the very latest lambda 8
881        <include name="jsr166y/**/*.java"/>
882        <compilerarg value="-XDignore.symbol.file=true"/>
883        <compilerarg value="-Xlint:all"/>
884 +      <compilerarg value="-Werror"/>
885        <compilerarg line="${build.args}"/>
886  
887      </javac>
# Line 875 | Line 907 | As of 2013-02, the very latest lambda 8
907  
908      <javadoc destdir="${jsr166ydocs.dir}"
909               packagenames="jsr166y.*"
910 <             link="${jdkapidocs.url}"
910 >             link="${java.api.url}"
911               access="${build.javadoc.access}"
912               sourcepath="${topsrc.dir}:${jdk6src.dir}"
913               bootclasspath="${bootclasspath6}"
914               source="6"
915               executable="${javadoc7}">
916 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
917        <arg value="-XDignore.symbol.file=true"/>
918  
919      </javadoc>
# Line 900 | Line 933 | As of 2013-02, the very latest lambda 8
933    </target>
934  
935  
903  <target name="jsr166ydist-clean"
904          description="Removes all build and distribution products">
905
906  </target>
907
936    <target name="jsr166ydist-jar"
937            depends="jsr166yclean, jsr166yjar">
938      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 941 | Line 969 | As of 2013-02, the very latest lambda 8
969        <include name="extra166y/**/*.java"/>
970        <compilerarg value="-XDignore.symbol.file=true"/>
971        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
972 +      <compilerarg value="-Werror"/>
973        <compilerarg line="${build.args}"/>
974  
975      </javac>
# Line 966 | Line 995 | As of 2013-02, the very latest lambda 8
995  
996      <javadoc destdir="${extra166ydocs.dir}"
997               packagenames="extra166y.*"
998 <             link="${jdkapidocs.url}"
998 >             link="${java.api.url}"
999               access="${build.javadoc.access}"
1000               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1001               bootclasspath="${bootclasspath6}"
1002               source="6"
1003               executable="${javadoc7}">
1004 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1005        <arg value="-XDignore.symbol.file=true"/>
1006  
1007      </javadoc>
# Line 991 | Line 1021 | As of 2013-02, the very latest lambda 8
1021    </target>
1022  
1023  
994  <target name="extra166ydist-clean"
995          description="Removes all build and distribution products">
996
997  </target>
998
1024    <target name="extra166ydist-jar"
1025            depends="extra166yclean, extra166yjar">
1026      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1008 | Line 1033 | As of 2013-02, the very latest lambda 8
1033  
1034    <!-- jsr166e -->
1035  
1036 +  <property name="build.jsr166e.java.version" value="6"/>
1037 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1038 +
1039    <target name="jsr166ecompile"
1040            depends="configure-compiler"
1041            description="Compiles jsr166e sources">
# Line 1019 | Line 1047 | As of 2013-02, the very latest lambda 8
1047             debug="${build.debug}"
1048             debuglevel="${build.debuglevel}"
1049             deprecation="${build.deprecation}"
1050 <           source="7"
1050 >           source="${build.jsr166e.java.version}"
1051             classpath=""
1052             includeAntRuntime="false"
1053             includeJavaRuntime="false"
1054 <           executable="${javac7}"
1054 >           executable="${build.jsr166e.javac}"
1055             fork="true">
1056  
1057        <include name="jsr166e/**/*.java"/>
1058        <compilerarg value="-XDignore.symbol.file=true"/>
1059        <compilerarg value="-Xlint:all"/>
1060 +      <compilerarg value="-Werror"/>
1061        <compilerarg line="${build.args}"/>
1062  
1063      </javac>
1064    </target>
1065  
1066 +  <!-- jsr166e: find doclint errors -->
1067 +  <target name="jsr166edoclint">
1068 +
1069 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1070 +
1071 +    <javac srcdir="${topsrc.dir}"
1072 +           destdir="${build.jsr166e.classes.dir}"
1073 +           debug="${build.debug}"
1074 +           debuglevel="${build.debuglevel}"
1075 +           deprecation="${build.deprecation}"
1076 +           source="${build.jsr166e.java.version}"
1077 +           classpath=""
1078 +           bootclasspath="${bootclasspath7}"
1079 +           includeAntRuntime="false"
1080 +           includeJavaRuntime="false"
1081 +           executable="${javac8}"
1082 +           fork="true">
1083 +
1084 +      <include name="jsr166e/**/*.java"/>
1085 +      <compilerarg value="-XDignore.symbol.file=true"/>
1086 +      <compilerarg value="-Xlint:all"/>
1087 +      <compilerarg value="-Werror"/>
1088 +      <compilerarg value="-Xdoclint:all/protected"/>
1089 +
1090 +    </javac>
1091 +  </target>
1092 +
1093  
1094    <target name="jsr166ejar"
1095            depends="jsr166ecompile"
# Line 1054 | Line 1110 | As of 2013-02, the very latest lambda 8
1110  
1111      <javadoc destdir="${jsr166edocs.dir}"
1112               packagenames="jsr166e.*"
1113 <             link="${jdkapidocs.url}"
1113 >             link="${java.api.url}"
1114               access="${build.javadoc.access}"
1115 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1116 <             source="7"
1115 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1116 >             source="${build.jsr166e.java.version}"
1117               executable="${javadoc7}">
1118 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119        <arg value="-XDignore.symbol.file=true"/>
1120  
1121      </javadoc>
1122    </target>
1123  
1124  
1125 <  <target name="jsr166e-test-tck"
1126 <          depends="jsr166ejar"
1127 <          description="Runs tck tests for jsr166e">
1125 >  <target name="jsr166e-test-tck-one-java-version"
1126 >          depends="jsr166ejar">
1127 >
1128 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1129  
1130      <run-tck-tests
1131        tck.src.dir="${test.src.dir}/tck-jsr166e"
1132 <      source="7"
1075 <      target="8"
1132 >      target="${build.jsr166e.java.version}"
1133        workdir="${build.jsr166e.dir}"
1134        classes="${jsr166e.jar}"/>
1135    </target>
1136  
1137 +  <target name="jsr166e-test-tck"
1138 +          description="Runs tck tests for jsr166e for multiple java versions">
1139 +
1140 + <!--     <antcall target="clean"/> -->
1141 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1142 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1143 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1144 + <!--     </antcall> -->
1145 +
1146 +    <antcall target="clean"/>
1147 +    <antcall target="jsr166e-test-tck-one-java-version">
1148 +      <param name="build.jsr166e.java.version" value="7"/>
1149 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1150 +    </antcall>
1151 +
1152 +    <antcall target="clean"/>
1153 +    <antcall target="jsr166e-test-tck-one-java-version">
1154 +      <param name="build.jsr166e.java.version" value="6"/>
1155 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1156 +    </antcall>
1157 +  </target>
1158 +
1159 +
1160 +  <target name="jsr166e-test"
1161 +          depends="jsr166e-test-tck"
1162 +          description="Runs all tests for jsr166e">
1163 +  </target>
1164  
1165    <target name="jsr166edist"
1166            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1089 | Line 1173 | As of 2013-02, the very latest lambda 8
1173    </target>
1174  
1175  
1092  <target name="jsr166edist-clean"
1093          description="Removes all build and distribution products">
1094
1095  </target>
1096
1176    <target name="jsr166edist-jar"
1177            depends="jsr166eclean, jsr166ejar">
1178      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1109 | Line 1188 | As of 2013-02, the very latest lambda 8
1188  
1189    <target name="lint">
1190      <antcall target="dists">
1191 +      <param name="build.javadoc.access" value="public"/>
1192 +    </antcall>
1193 +  </target>
1194 +
1195 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1196 +  <target name="lint-private">
1197 +    <antcall target="dist">
1198        <param name="build.javadoc.access" value="private"/>
1199      </antcall>
1200    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines