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.127 by jsr166, Wed Jan 23 06:57:08 2013 UTC vs.
Revision 1.182 by jsr166, Sun Sep 13 17:46:07 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 +  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="Advises user to run with -projecthelp">
41 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
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 39 | Line 55
55    <property name="build.debug"          value="true"/>
56    <property name="build.debuglevel"     value="source,lines,vars"/>
57    <property name="build.deprecation"    value="false"/>
58 +  <property name="build.javadoc.access" value="protected"/>
59 +
60 +  <!-- Tck options; see JSR166TestCase.java
61 +   To profile a single tck test class:
62 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
63 +   To stress test a single tck test class:
64 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
65 +  -->
66 +  <property name="jsr166.profileTests"     value="false"/>
67 +  <property name="jsr166.profileThreshold" value="100"/>
68 +  <property name="jsr166.runsPerTest"      value="1"/>
69 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
70  
71    <!-- Build locations -->
72    <property name="build.dir"                   location="build"/>
# Line 72 | Line 100
100      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
101      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
102      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
103 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
103 >    <local name="have.java.base"/>
104 >    <available property="have.java.base"
105 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
106 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
107 >      if:set="have.java.base"/>
108 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
109 >      unless:set="have.java.base"/>
110 >    <local name="modules"/>
111 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
112      <local name="boot.jar.dir"/>
113 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
114 <    <path id="bootclasspath@{v}">
113 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
114 >    <path id="bootclasspath@{v}" unless:set="modules">
115        <pathelement path="${boot.jar.dir}/resources.jar"/>
116        <pathelement path="${boot.jar.dir}/rt.jar"/>
117        <pathelement path="${boot.jar.dir}/jsse.jar"/>
118        <pathelement path="${boot.jar.dir}/jce.jar"/>
119        <pathelement path="${boot.jar.dir}/charsets.jar"/>
120      </path>
121 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
121 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
122      </sequential>
123    </macrodef>
124  
# Line 101 | Line 137
137    <defjdklocations v="6"/>
138    <defjdklocations v="7"/>
139    <defjdklocations v="8"/>
140 +  <defjdklocations v="9"/>
141  
142    <!-- Source locations -->
143    <property name="src.dir"              location="${basedir}/src/main"/>
144    <property name="test.src.dir"         location="${basedir}/src/test"/>
145    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
146    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
147 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
147 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
148 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
149 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151    <property name="lib.dir"              location="${basedir}/lib"/>
152    <property name="dist.dir"             location="${basedir}/dist"/>
153    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 141 | Line 181
181    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
182    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
183  
184 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
185 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
186 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
187 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
188 <
189 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
190 <  <!-- The below does not yet exist as of 2013-01 -->
191 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
184 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
185 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
186 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
190 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
192 >  <!-- Default jdk doc location (latest stable release seems best) -->
193 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194  
195 <  <!-- Default jdk api doc location (latest stable release seems best) -->
196 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
195 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
196 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
197 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
198 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
199 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
200 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
201 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
202  
203    <!-- Define the "jtreg" task -->
204    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 166 | Line 213
213  
214    <macrodef name="run-tck-tests">
215      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
169    <attribute name="source" default="6"/>
216      <attribute name="target"/>
217 +    <attribute name="compile-target" default="@{target}"/>
218      <attribute name="workdir"/>
219      <attribute name="classes"/>
220 <    <attribute name="jvmflags" default=""/>
220 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
221 >    <element name="javac-elements" optional="true"/>
222 >
223      <sequential>
224  
225 +    <local name="modules"/>
226 +    <condition property="modules">
227 +      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
228 +    </condition>
229 +
230      <mkdir dir="@{workdir}/tck-classes"/>
231  
232      <javac srcdir="@{tck.src.dir}"
# Line 180 | Line 234
234             debug="${build.debug}"
235             debuglevel="${build.debuglevel}"
236             deprecation="${build.deprecation}"
237 <           source="@{source}"
237 >           source="@{compile-target}"
238 >           target="@{compile-target}"
239             classpath="${junit.jar}"
185           bootclasspath="@{classes}:${bootclasspath@{source}}"
240             includeAntRuntime="false"
241             includeJavaRuntime="false"
242 <           executable="${javac@{target}}"
242 >           executable="${javac@{compile-target}}"
243             fork="true">
244  
245        <include name="*.java"/>
246        <compilerarg value="-XDignore.symbol.file=true"/>
247        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
248 +      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
249 +      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
250        <compilerarg line="${build.args}"/>
251 +      <javac-elements/>
252  
253      </javac>
254  
255 <    <java classname="JSR166TestCase"
255 >    <java classname="${jsr166.tckTestClass}"
256            failonerror="true"
257            jvm="${java@{target}}"
258            fork="true">
259 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
259 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
260 >        <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
261          <jvmarg line="@{jvmflags}"/>
262 +
263 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
264 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
265 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
266 +        </syspropertyset>
267 +
268 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
269 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
270 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
271          <classpath>
272            <pathelement location="${junit.jar}"/>
273            <pathelement location="@{workdir}/tck-classes"/>
# Line 210 | Line 277
277      </sequential>
278    </macrodef>
279  
280 +  <!-- Define jtreg test sets for different jdk versions -->
281 +  <fileset dir="${jtreg9.src.dir}">
282 +    <patternset id="jdk9.jtreg.tests">
283 +      <include name="**/*.java"/>
284 +    </patternset>
285 +  </fileset>
286 +
287 +  <fileset dir="${jtreg8.src.dir}">
288 +    <patternset id="jdk8.jtreg.tests">
289 +      <include name="**/*.java"/>
290 +      <exclude name="**/SpliteratorCharacteristics.java"/>
291 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
292 +      <exclude name="**/GCDuringIteration.java"/>
293 +    </patternset>
294 +  </fileset>
295 +
296 +  <fileset dir="${jtreg7.src.dir}">
297 +    <patternset id="jdk7.jtreg.tests">
298 +      <include name="**/*.java"/>
299 +    </patternset>
300 +  </fileset>
301 +
302 +  <macrodef name="run-jtreg-tests">
303 +    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
304 +    <attribute name="source" default="7"/>
305 +    <attribute name="target"/>
306 +    <attribute name="workdir"/>
307 +    <attribute name="classes"/>
308 +    <attribute name="jtregflags" default=""/>
309 +
310 +    <sequential>
311 +
312 +    <local name="modules"/>
313 +    <condition property="modules">
314 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
315 +    </condition>
316 +
317 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
318 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
319 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
320 +    <mkdir dir="@{workdir}/JTreport"/>
321 +    <jtreg dir="${jtreg@{target}.src.dir}"
322 +           jdk="${jdk@{target}.home}"
323 +           workDir="@{workdir}/JTwork"
324 +           reportDir="@{workdir}/JTreport">
325 +      <patternset refid="jdk@{target}.jtreg.tests"/>
326 +      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
327 +      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
328 +      <arg value="-agentvm"/>
329 +      <arg value="-v:nopass,fail"/>
330 +      <arg value="-vmoptions:-esa -ea"/>
331 +      <arg value="-automatic"/>
332 +      <arg value="-k:!ignore"/>
333 +      <arg line="@{jtregflags}"/>
334 +    </jtreg>
335 +    </sequential>
336 +  </macrodef>
337 +
338    <!-- ALoops classpath -->
339    <path id="loops.classpath">
340      <pathelement location="${build.loops.dir}"/>
# Line 221 | Line 346
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 229 | Line 357
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>
# Line 257 | Line 402
402  
403      <jar destfile="${product.jar}">
404        <fileset dir="${build.classes.dir}"/>
405 +      <manifest>
406 +        <attribute name="Built-By" value="${user.name}"/>
407 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
408 +      </manifest>
409      </jar>
410    </target>
411  
412  
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
413    <target name="docs"
414            description="Builds javadocs for src/main to dist dir">
415  
# Line 277 | Line 421
421  
422      <javadoc destdir="${docs.dir}"
423               packagenames="none"
424 <             link="${jdkapi8docs.url}"
424 >             link="${java9.api.url}"
425               overview="${src.dir}/intro.html"
426 <             sourcepath="${src.dir}:${jdk8src.dir}"
426 >             access="${build.javadoc.access}"
427 >             sourcepath="${src.dir}:${jdk9src.dir}"
428               classpath=""
429 <             executable="${javadoc8}">
429 >             executable="${javadoc9}">
430        <fileset dir="${src.dir}" defaultexcludes="yes">
431          <include name="**/*.java"/>
432        </fileset>
433 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
434 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
435        <arg value="-XDignore.symbol.file=true"/>
436 + <!--  TODO     <arg value="-Xmodule:java.base"/> -->
437        <arg value="-tag"/>
438        <arg value="${javadoc.jls.option}"/>
439 +      <arg value="-tag"/>
440 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
441 +      <arg value="-tag"/>
442 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
443 +      <arg value="-tag"/>
444 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
445      </javadoc>
446    </target>
447  
# Line 311 | Line 465
465        <exclude name="src/emulation/**"/>
466        <exclude name="**/SyntaxTest.java"/>
467        <exclude name="**/SuperfluousAbstract.java"/>
468 +      <manifest>
469 +        <attribute name="Built-By" value="${user.name}"/>
470 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
471 +      </manifest>
472      </jar>
473    </target>
474  
# Line 326 | Line 484
484    <target name="dist-clean"
485            description="Removes all build and distribution products">
486  
487 +    <delete dir="${build.dir}"/>
488      <delete dir="${dist.dir}"/>
489  
490    </target>
491  
492  
334  <!-- Internal targets -->
335
336
493    <target name="dist-jar"
494            depends="clean, jar">
495      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 344 | Line 500
500      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
501    </target>
502  
503 +  <target name="tck"
504 +          depends="jar"
505 +          description="Runs tck tests for main directly">
506  
507 <  <target name="compile-tests"
508 <          depends="jar">
509 <
510 <    <mkdir dir="${build.testcases.dir}"/>
511 <
512 <    <javac srcdir="${tck.src.dir}"
513 <           destdir="${build.testcases.dir}"
514 <           debug="${build.debug}"
515 <           debuglevel="${build.debuglevel}"
516 <           deprecation="${build.deprecation}"
517 <           source="6"
518 <           classpath="${junit.jar}"
519 <           bootclasspath="@{product.jar}:${bootclasspath6}"
520 <           includeAntRuntime="false"
521 <           includeJavaRuntime="false"
522 <           executable="${javac8}"
523 <           fork="true">
524 <
525 <      <include name="**/*.java"/>
526 <      <compilerarg value="-XDignore.symbol.file=true"/>
527 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
528 <      <compilerarg line="${build.args}"/>
529 <
530 <    </javac>
531 <
532 <    <javac srcdir="${test.src.dir}"
533 <           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 <
507 >    <run-tck-tests
508 >      target="${build.main.java.version}"
509 >      workdir="${build.dir}"
510 >      classes="${product.jar}"/>
511 >  </target>
512 >
513 >  <target name="tck-parallelism-1"
514 >          description="Runs tck with given common pool parallelism">
515 >    <antcall target="tck">
516 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
517 >    </antcall>
518 >  </target>
519 >
520 >  <target name="tck-parallelism-0"
521 >          description="Runs tck with given common pool parallelism">
522 >    <antcall target="tck">
523 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
524 >    </antcall>
525 >  </target>
526 >
527 >  <target name="jtreg"
528 >          depends="jar"
529 >          description="Runs jtreg tests for main using the jtreg ant task">
530 >    <run-jtreg-tests
531 >       target="${build.main.java.version}"
532 >       workdir="${build.dir}"
533 >       classes="${product.jar}"/>
534    </target>
535  
536 +  <target name="test"
537 +          depends="tck, tck-parallelism-1, jtreg"
538 +          description="Runs tck and jtreg tests for main">
539 +  </target>
540  
541 <  <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"/>
541 >  <target name="jtreg8" description="Runs jtreg tests with jdk8">
542  
543 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
544 <        <fileset dir="${tck.src.dir}">
545 <          <include name="**/${testcase}Test.java"/>
546 <        </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 < -->
455 <
456 <    </junit>
543 >    <antcall target="jtreg">
544 >      <param name="build.main.java.version" value="8"/>
545 >      <param name="build.main.javac" value="${javac8}"/>
546 >    </antcall>
547  
548    </target>
549  
550 +  <target name="test89"
551 +          description="Runs tck and jtreg tests for main for multiple java versions">
552  
553 <  <target name="report-tests"
554 <          depends="run-tests">
555 <
556 <    <!-- Sets junit.report.format to frames if redirection is present,
557 <         otherwise sets it to noframes. -->
466 <    <available property="junit.report.format"
467 <                  value="frames"
468 <              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>
553 >    <antcall target="clean"/>
554 >    <antcall target="test">
555 >      <param name="build.main.java.version" value="8"/>
556 >      <param name="build.main.javac" value="${javac8}"/>
557 >    </antcall>
558  
559 <    <fail message="Test Cases Failed" if="junit.failed"/>
559 >    <antcall target="clean"/>
560 >    <antcall target="test">
561 >      <param name="build.main.java.version" value="9"/>
562 >      <param name="build.main.javac" value="${javac9}"/>
563 >    </antcall>
564  
565    </target>
566  
567  
568 +
569    <target name="configure-compiler">
570 +    <fail message="ant version too old">
571 +      <condition>
572 +        <not> <antversion atleast="1.9.1"/> </not>
573 +      </condition>
574 +    </fail>
575  
576      <property name="unchecked.option" value="-Xlint:unchecked"/>
577  
# Line 499 | Line 588
588    </target>
589  
590  
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
591  
592    <!-- Various demos and test programs -->
593  
# Line 552 | Line 618
618    </target>
619  
620  
621 +  <target name="compile-test-loops" depends="jar"
622 +          description="compile all the perf tests in src/test/loops">
623 +
624 +    <mkdir dir="${build.dir}/test/loops"/>
625 +
626 +    <javac srcdir="${basedir}/src/test/loops"
627 +           destdir="${build.dir}/test/loops"
628 +           debug="${build.debug}"
629 +           debuglevel="${build.debuglevel}"
630 +           deprecation="${build.deprecation}"
631 +           includeAntRuntime="false"
632 +           includeJavaRuntime="false"
633 +           executable="${javac9}"
634 +           fork="true">
635 +
636 +      <include name="*.java"/>
637 +      <compilerarg value="-XDignore.symbol.file=true"/>
638 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
639 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
640 +      <compilerarg line="${build.args}"/>
641 +
642 +    </javac>
643 +
644 +  </target>
645 +
646 +
647    <!-- jsr166 4jdk7 -->
648  
649    <target name="4jdk7compile"
# Line 574 | Line 666
666             fork="true">
667  
668        <include name="**/*.java"/>
669 +      <compilerarg value="-Xprefer:source"/>
670 +      <compilerarg value="-XDignore.symbol.file=true"/>
671 +      <compilerarg value="-Xlint:all"/>
672 +      <compilerarg value="-Werror"/>
673 +      <compilerarg line="${build.args}"/>
674 +
675 +    </javac>
676 +  </target>
677 +
678 +  <target name="4jdk7doclint"
679 +          depends="configure-compiler"
680 +          description="Finds doclint warnings">
681 +
682 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
683 +
684 +    <javac srcdir="${4jdk7src.dir}"
685 +           destdir="${build.4jdk7.classes.dir}"
686 +           debug="${build.debug}"
687 +           debuglevel="${build.debuglevel}"
688 +           deprecation="${build.deprecation}"
689 +           source="6"
690 +           classpath=""
691 +           bootclasspath="${bootclasspath7}"
692 +           includeAntRuntime="false"
693 +           includeJavaRuntime="false"
694 +           executable="${javac8}"
695 +           fork="true">
696 +
697 +      <include name="**/*.java"/>
698 +      <compilerarg value="-Xprefer:source"/>
699        <compilerarg value="-XDignore.symbol.file=true"/>
700        <compilerarg value="-Xlint:all"/>
701 +      <compilerarg value="-Xdoclint:all/protected"/>
702        <compilerarg line="${build.args}"/>
703  
704      </javac>
705    </target>
706  
707  
708 <  <target name="4jdk7-jar"
708 >  <target name="4jdk7jar"
709            depends="4jdk7compile"
710            description="Builds library jar from compiled sources">
711  
712      <jar destfile="${4jdk7product.jar}">
713        <fileset dir="${build.4jdk7.classes.dir}"/>
714 +      <manifest>
715 +        <attribute name="Built-By" value="${user.name}"/>
716 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
717 +      </manifest>
718      </jar>
719  
720    </target>
721  
722  
723 <  <target name="4jdk7-test-tck"
724 <          depends="4jdk7-jar"
723 >  <target name="4jdk7-tck"
724 >          depends="4jdk7jar"
725            description="Runs tck tests for jsr166-4jdk7 directly">
726  
727      <run-tck-tests
728        target="7"
729        workdir="${build.4jdk7.dir}"
730 <      classes="${4jdk7product.jar}"/>
730 >      classes="${4jdk7product.jar}">
731 >      <javac-elements>
732 >        <!-- JDK8+ test classes -->
733 >        <exclude name="*8Test.java"/>
734 >        <exclude name="*9Test.java"/>
735 >        <exclude name="*10Test.java"/>
736 >        <exclude name="DoubleAccumulatorTest.java"/>
737 >        <exclude name="DoubleAdderTest.java"/>
738 >        <exclude name="LongAccumulatorTest.java"/>
739 >        <exclude name="LongAdderTest.java"/>
740 >        <exclude name="CompletableFutureTest.java"/>
741 >        <exclude name="SplittableRandomTest.java"/>
742 >        <exclude name="StampedLockTest.java"/>
743 >        <exclude name="SubmissionPublisherTest.java"/>
744 >      </javac-elements>
745 >    </run-tck-tests>
746    </target>
747  
748  
749 <  <target name="4jdk7-test-tck-junit"
749 >  <target name="4jdk7-tck-junit"
750            depends="4jdk7compile"
751            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
752  
# Line 626 | Line 768
768  
769        <formatter type="brief"/>
770  
771 <      <test name="JSR166TestCase" haltonfailure="no">
771 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
772        </test>
773  
774      </junit>
775    </target>
776  
777 <  <target name="4jdk7-test-jtreg"
778 <          depends="4jdk7compile"
777 >  <target name="4jdk7-jtreg"
778 >          depends="4jdk7jar"
779            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
780 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
781 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
782 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
783 <    <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>
780 >    <run-jtreg-tests
781 >       target="7"
782 >       workdir="${build.4jdk7.dir}"
783 >       classes="${4jdk7product.jar}"/>
784    </target>
785  
786  
787    <target name="4jdk7-test"
788 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
788 >          depends="4jdk7-tck, 4jdk7-jtreg"
789            description="Runs tck and jtreg tests for jsr166-4jdk7">
790    </target>
791  
# Line 668 | Line 798
798  
799      <javadoc destdir="${4jdk7docs.dir}"
800               packagenames="none"
801 <             link="${jdkapi7docs.url}"
801 >             link="${java7.api.url}"
802               overview="${4jdk7src.dir}/intro.html"
803 +             access="${build.javadoc.access}"
804               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
805               classpath=""
806               executable="${javadoc7}">
807        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
808          <include name="**/*.java"/>
809        </fileset>
810 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
811        <arg value="-XDignore.symbol.file=true"/>
812      </javadoc>
813    </target>
# Line 694 | Line 826
826    </target>
827  
828  
697  <target name="4jdk7dist-clean"
698          description="Removes all build and distribution products">
699
700  </target>
701
829    <target name="4jdk7dist-jar"
830 <          depends="4jdk7clean, 4jdk7-jar">
830 >          depends="4jdk7clean, 4jdk7jar">
831      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
832    </target>
833  
# Line 735 | Line 862
862        <include name="jsr166x/**/*.java"/>
863        <compilerarg value="-XDignore.symbol.file=true"/>
864        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
865 +      <compilerarg value="-Werror"/>
866        <compilerarg line="${build.args}"/>
867  
868      </javac>
869    </target>
870  
871  
872 <  <target name="jsr166x-jar"
872 >  <target name="jsr166xjar"
873            depends="jsr166xcompile"
874            description="Builds library jar from compiled sources">
875  
876      <jar destfile="${jsr166x.jar}">
877        <fileset dir="${build.jsr166x.classes.dir}"/>
878 +      <manifest>
879 +        <attribute name="Built-By" value="${user.name}"/>
880 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
881 +      </manifest>
882      </jar>
883  
884    </target>
# Line 760 | Line 892
892  
893      <javadoc destdir="${jsr166xdocs.dir}"
894               packagenames="jsr166x.*"
895 <             link="${jdkapidocs.url}"
895 >             link="${java.api.url}"
896 >             access="${build.javadoc.access}"
897               sourcepath="${topsrc.dir}:${jdk6src.dir}"
898               bootclasspath="${bootclasspath6}"
899               source="5"
900               executable="${javadoc7}">
901 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
902        <arg value="-XDignore.symbol.file=true"/>
903  
904      </javadoc>
# Line 784 | Line 918
918    </target>
919  
920  
787  <target name="jsr166xdist-clean"
788          description="Removes all build and distribution products">
789
790  </target>
791
792
921    <target name="jsr166xdist-jar"
922 <          depends="jsr166xclean, jsr166x-jar">
922 >          depends="jsr166xclean, jsr166xjar">
923      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
924    </target>
925  
# Line 825 | Line 953
953        <include name="jsr166y/**/*.java"/>
954        <compilerarg value="-XDignore.symbol.file=true"/>
955        <compilerarg value="-Xlint:all"/>
956 +      <compilerarg value="-Werror"/>
957        <compilerarg line="${build.args}"/>
958  
959      </javac>
960    </target>
961  
962  
963 <  <target name="jsr166y-jar"
963 >  <target name="jsr166yjar"
964            depends="jsr166ycompile"
965            description="Builds library jar from compiled sources">
966  
967      <jar destfile="${jsr166y.jar}" index="true">
968        <fileset dir="${build.jsr166y.classes.dir}"/>
969 +      <manifest>
970 +        <attribute name="Built-By" value="${user.name}"/>
971 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
972 +      </manifest>
973      </jar>
974  
975    </target>
# Line 850 | Line 983
983  
984      <javadoc destdir="${jsr166ydocs.dir}"
985               packagenames="jsr166y.*"
986 <             link="${jdkapidocs.url}"
986 >             link="${java.api.url}"
987 >             access="${build.javadoc.access}"
988               sourcepath="${topsrc.dir}:${jdk6src.dir}"
989               bootclasspath="${bootclasspath6}"
990               source="6"
991               executable="${javadoc7}">
992 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
993        <arg value="-XDignore.symbol.file=true"/>
994  
995      </javadoc>
# Line 874 | Line 1009
1009    </target>
1010  
1011  
877  <target name="jsr166ydist-clean"
878          description="Removes all build and distribution products">
879
880  </target>
881
1012    <target name="jsr166ydist-jar"
1013 <          depends="jsr166yclean, jsr166y-jar">
1013 >          depends="jsr166yclean, jsr166yjar">
1014      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1015    </target>
1016  
# Line 894 | Line 1024
1024  
1025  
1026    <target name="extra166ycompile"
1027 <          depends="configure-compiler, jsr166y-jar"
1027 >          depends="configure-compiler, jsr166yjar"
1028            description="Compiles extra166y sources">
1029  
1030      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 915 | Line 1045
1045        <include name="extra166y/**/*.java"/>
1046        <compilerarg value="-XDignore.symbol.file=true"/>
1047        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1048 +      <compilerarg value="-Werror"/>
1049        <compilerarg line="${build.args}"/>
1050  
1051      </javac>
1052    </target>
1053  
1054  
1055 <  <target name="extra166y-jar"
1055 >  <target name="extra166yjar"
1056            depends="extra166ycompile"
1057            description="Builds library jar from compiled sources">
1058  
1059      <jar destfile="${extra166y.jar}" index="true">
1060        <fileset dir="${build.extra166y.classes.dir}"/>
1061 +      <manifest>
1062 +        <attribute name="Built-By" value="${user.name}"/>
1063 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1064 +      </manifest>
1065      </jar>
1066  
1067    </target>
# Line 940 | Line 1075
1075  
1076      <javadoc destdir="${extra166ydocs.dir}"
1077               packagenames="extra166y.*"
1078 <             link="${jdkapidocs.url}"
1078 >             link="${java.api.url}"
1079 >             access="${build.javadoc.access}"
1080               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1081               bootclasspath="${bootclasspath6}"
1082               source="6"
1083               executable="${javadoc7}">
1084 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1085        <arg value="-XDignore.symbol.file=true"/>
1086  
1087      </javadoc>
# Line 964 | Line 1101
1101    </target>
1102  
1103  
967  <target name="extra166ydist-clean"
968          description="Removes all build and distribution products">
969
970  </target>
971
1104    <target name="extra166ydist-jar"
1105 <          depends="extra166yclean, extra166y-jar">
1105 >          depends="extra166yclean, extra166yjar">
1106      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1107    </target>
1108  
# Line 981 | Line 1113
1113  
1114    <!-- jsr166e -->
1115  
1116 +  <property name="build.jsr166e.java.version" value="6"/>
1117 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1118 +
1119    <target name="jsr166ecompile"
1120            depends="configure-compiler"
1121            description="Compiles jsr166e sources">
# Line 992 | Line 1127
1127             debug="${build.debug}"
1128             debuglevel="${build.debuglevel}"
1129             deprecation="${build.deprecation}"
1130 <           source="7"
1130 >           source="${build.jsr166e.java.version}"
1131             classpath=""
1132             includeAntRuntime="false"
1133             includeJavaRuntime="false"
1134 <           executable="${javac7}"
1134 >           executable="${build.jsr166e.javac}"
1135             fork="true">
1136  
1137        <include name="jsr166e/**/*.java"/>
1138        <compilerarg value="-XDignore.symbol.file=true"/>
1139        <compilerarg value="-Xlint:all"/>
1140 +      <compilerarg value="-Werror"/>
1141        <compilerarg line="${build.args}"/>
1142  
1143      </javac>
1144    </target>
1145  
1146 +  <!-- jsr166e: find doclint errors -->
1147 +  <target name="jsr166edoclint">
1148 +
1149 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1150  
1151 <  <target name="jsr166e-jar"
1151 >    <javac srcdir="${topsrc.dir}"
1152 >           destdir="${build.jsr166e.classes.dir}"
1153 >           debug="${build.debug}"
1154 >           debuglevel="${build.debuglevel}"
1155 >           deprecation="${build.deprecation}"
1156 >           source="${build.jsr166e.java.version}"
1157 >           classpath=""
1158 >           bootclasspath="${bootclasspath7}"
1159 >           includeAntRuntime="false"
1160 >           includeJavaRuntime="false"
1161 >           executable="${javac8}"
1162 >           fork="true">
1163 >
1164 >      <include name="jsr166e/**/*.java"/>
1165 >      <compilerarg value="-XDignore.symbol.file=true"/>
1166 >      <compilerarg value="-Xlint:all"/>
1167 >      <compilerarg value="-Werror"/>
1168 >      <compilerarg value="-Xdoclint:all/protected"/>
1169 >
1170 >    </javac>
1171 >  </target>
1172 >
1173 >
1174 >  <target name="jsr166ejar"
1175            depends="jsr166ecompile"
1176            description="Builds library jar from compiled sources">
1177  
1178      <jar destfile="${jsr166e.jar}" index="true">
1179        <fileset dir="${build.jsr166e.classes.dir}"/>
1180 +      <manifest>
1181 +        <attribute name="Built-By" value="${user.name}"/>
1182 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1183 +      </manifest>
1184      </jar>
1185  
1186    </target>
# Line 1027 | Line 1194
1194  
1195      <javadoc destdir="${jsr166edocs.dir}"
1196               packagenames="jsr166e.*"
1197 <             link="${jdkapidocs.url}"
1198 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1199 <             source="7"
1197 >             link="${java.api.url}"
1198 >             access="${build.javadoc.access}"
1199 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1200 >             source="${build.jsr166e.java.version}"
1201               executable="${javadoc7}">
1202 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1203        <arg value="-XDignore.symbol.file=true"/>
1204  
1205      </javadoc>
1206    </target>
1207  
1208  
1209 <  <target name="jsr166e-test-tck"
1210 <          depends="jsr166e-jar"
1211 <          description="Runs tck tests for jsr166e">
1209 >  <target name="jsr166e-tck-one-java-version"
1210 >          depends="jsr166ejar">
1211 >
1212 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1213  
1214      <run-tck-tests
1215        tck.src.dir="${test.src.dir}/tck-jsr166e"
1216 <      source="7"
1047 <      target="8"
1216 >      target="${build.jsr166e.java.version}"
1217        workdir="${build.jsr166e.dir}"
1218        classes="${jsr166e.jar}"/>
1219    </target>
1220  
1221 +  <target name="jsr166e-tck"
1222 +          description="Runs tck tests for jsr166e for multiple java versions">
1223 +
1224 + <!--     <antcall target="clean"/> -->
1225 + <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1226 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1227 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1228 + <!--     </antcall> -->
1229 +
1230 +    <antcall target="clean"/>
1231 +    <antcall target="jsr166e-tck-one-java-version">
1232 +      <param name="build.jsr166e.java.version" value="7"/>
1233 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1234 +    </antcall>
1235 +
1236 +    <antcall target="clean"/>
1237 +    <antcall target="jsr166e-tck-one-java-version">
1238 +      <param name="build.jsr166e.java.version" value="6"/>
1239 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1240 +    </antcall>
1241 +  </target>
1242 +
1243 +
1244 +  <target name="jsr166e-test"
1245 +          depends="jsr166e-tck"
1246 +          description="Runs all tests for jsr166e">
1247 +  </target>
1248  
1249    <target name="jsr166edist"
1250            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1061 | Line 1257
1257    </target>
1258  
1259  
1064  <target name="jsr166edist-clean"
1065          description="Removes all build and distribution products">
1066
1067  </target>
1068
1260    <target name="jsr166edist-jar"
1261 <          depends="jsr166eclean, jsr166e-jar">
1261 >          depends="jsr166eclean, jsr166ejar">
1262      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1263    </target>
1264  
# Line 1076 | Line 1267
1267      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1268    </target>
1269  
1270 +
1271 + <!-- Find buglets that can be detected by static build tools -->
1272 +
1273 +  <target name="lint">
1274 +    <antcall target="dists">
1275 +      <param name="build.javadoc.access" value="public"/>
1276 +    </antcall>
1277 +  </target>
1278 +
1279 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1280 +  <target name="lint-private">
1281 +    <antcall target="dist">
1282 +      <param name="build.javadoc.access" value="private"/>
1283 +    </antcall>
1284 +  </target>
1285 +
1286 +
1287   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines