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.138 by jsr166, Fri Mar 22 18:04:56 2013 UTC vs.
Revision 1.190 by jsr166, Thu Nov 5 17:18:53 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 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
28 >
29 >  Alternatively, define ant variables thus:
30 >  ant -Djdk$N.home=...
31 >  for $N in 6 7 8 9 ...
32 >
33 >  As of 2015-09, there is incomplete hacky support for jigsaw
34 >  Build for jigsaw using something like:
35 >  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 >  "docs" target is still broken.
37   ------------------------------------------------------------------------------
38    </description>
39  
40 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
40 >  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <target name="usage">
42      <java classname="org.apache.tools.ant.Main">
43        <arg value="-projecthelp" />
44      </java>
45    </target>
46  
47 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48  
49    <!-- User-specific settings -->
50    <property file="user.properties"/>
# Line 76 | Line 89 | As of 2013-02, the very latest lambda 8
89      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
92 >    <local name="have.java.base"/>
93 >    <available property="have.java.base"
94 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96 >      if:set="have.java.base"/>
97 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98 >      unless:set="have.java.base"/>
99 >    <local name="modules"/>
100 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101      <local name="boot.jar.dir"/>
102 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
103 <    <path id="bootclasspath@{v}">
102 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103 >    <path id="bootclasspath@{v}" unless:set="modules">
104        <pathelement path="${boot.jar.dir}/resources.jar"/>
105        <pathelement path="${boot.jar.dir}/rt.jar"/>
106        <pathelement path="${boot.jar.dir}/jsse.jar"/>
107        <pathelement path="${boot.jar.dir}/jce.jar"/>
108        <pathelement path="${boot.jar.dir}/charsets.jar"/>
109      </path>
110 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
110 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111      </sequential>
112    </macrodef>
113  
# Line 105 | Line 126 | As of 2013-02, the very latest lambda 8
126    <defjdklocations v="6"/>
127    <defjdklocations v="7"/>
128    <defjdklocations v="8"/>
129 +  <defjdklocations v="9"/>
130  
131    <!-- Source locations -->
132    <property name="src.dir"              location="${basedir}/src/main"/>
133    <property name="test.src.dir"         location="${basedir}/src/test"/>
134    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
135    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
136 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
136 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
137 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
138 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
139 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
140    <property name="lib.dir"              location="${basedir}/lib"/>
141    <property name="dist.dir"             location="${basedir}/dist"/>
142    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 145 | Line 170 | As of 2013-02, the very latest lambda 8
170    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
171    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
172  
173 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
174 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
175 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
176 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
177 <
178 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
179 <  <!-- The below does not yet exist as of 2013-01 -->
180 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
173 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
174 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
175 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
177 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
179 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181 >  <!-- Default jdk doc location (latest stable release seems best) -->
182 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
183  
184 <  <!-- Default jdk api doc location (latest stable release seems best) -->
185 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
184 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
185 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
186 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
187 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
188 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
189 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
190 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
191  
192    <!-- Define the "jtreg" task -->
193    <!-- See the docs in "jtreg -onlineHelp" -->
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />
196  
197 <  <!-- Test classpath -->
198 <  <path id="test.classpath">
199 <    <pathelement location="${build.testcases.dir}"/>
200 <    <pathelement location="${junit.jar}"/>
201 <  </path>
202 <
197 >  <!-- Tck options; see JSR166TestCase.java
198 >   To profile a single tck test class:
199 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200 >   To stress test a single tck test class:
201 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202 >   To stress test a single tck test method:
203 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204 >  -->
205 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206    <macrodef name="run-tck-tests">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
208      <attribute name="target"/>
209      <attribute name="compile-target" default="@{target}"/>
210      <attribute name="workdir"/>
211      <attribute name="classes"/>
212 <    <attribute name="jvmflags" default=""/>
212 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213      <element name="javac-elements" optional="true"/>
214 +
215      <sequential>
216  
217 +    <local name="modules"/>
218 +    <condition property="modules">
219 +      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220 +    </condition>
221 +
222      <mkdir dir="@{workdir}/tck-classes"/>
223  
224      <javac srcdir="@{tck.src.dir}"
# Line 188 | Line 229 | As of 2013-02, the very latest lambda 8
229             source="@{compile-target}"
230             target="@{compile-target}"
231             classpath="${junit.jar}"
191           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
232             includeAntRuntime="false"
233             includeJavaRuntime="false"
234             executable="${javac@{compile-target}}"
# Line 196 | Line 236 | As of 2013-02, the very latest lambda 8
236  
237        <include name="*.java"/>
238        <compilerarg value="-XDignore.symbol.file=true"/>
239 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
239 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241 >      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>
243        <javac-elements/>
244  
245      </javac>
246  
247 <    <java classname="JSR166TestCase"
247 >    <java classname="${jsr166.tckTestClass}"
248            failonerror="true"
249            jvm="${java@{target}}"
250            fork="true">
251 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
251 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252 >        <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
253          <jvmarg line="@{jvmflags}"/>
254 +
255 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256 +        <syspropertyset id="system-properties-used-by-tck">
257 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258 +          <propertyref prefix="jsr166."/>
259 +        </syspropertyset>
260 +
261          <classpath>
262            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>
# Line 217 | Line 267 | As of 2013-02, the very latest lambda 8
267      </sequential>
268    </macrodef>
269  
270 +  <!-- Define jtreg test sets for different jdk versions -->
271 +  <fileset dir="${jtreg9.src.dir}">
272 +    <patternset id="jdk9.jtreg.tests">
273 +      <include name="**/*.java"/>
274 +    </patternset>
275 +  </fileset>
276 +
277 +  <fileset dir="${jtreg8.src.dir}">
278 +    <patternset id="jdk8.jtreg.tests">
279 +      <include name="**/*.java"/>
280 +      <exclude name="**/SpliteratorCharacteristics.java"/>
281 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282 +      <exclude name="**/GCDuringIteration.java"/>
283 +    </patternset>
284 +  </fileset>
285 +
286 +  <fileset dir="${jtreg7.src.dir}">
287 +    <patternset id="jdk7.jtreg.tests">
288 +      <include name="**/*.java"/>
289 +    </patternset>
290 +  </fileset>
291 +
292    <macrodef name="run-jtreg-tests">
293 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
293 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
294      <attribute name="source" default="7"/>
295      <attribute name="target"/>
296      <attribute name="workdir"/>
297      <attribute name="classes"/>
298      <attribute name="jtregflags" default=""/>
299 +
300      <sequential>
301 +
302 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
304 +
305 +    <local name="modules"/>
306 +    <condition property="modules">
307 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
308 +    </condition>
309 +
310      <delete dir="@{workdir}/JTwork"   quiet="true"/>
311      <delete dir="@{workdir}/JTreport" quiet="true"/>
312      <mkdir dir="@{workdir}/JTwork/scratch"/>
313      <mkdir dir="@{workdir}/JTreport"/>
314 <    <jtreg dir="@{jtreg.src.dir}"
314 >    <jtreg dir="${jtreg@{target}.src.dir}"
315             jdk="${jdk@{target}.home}"
316             workDir="@{workdir}/JTwork"
317             reportDir="@{workdir}/JTreport">
318 <
319 <      <arg value="-Xbootclasspath/p:@{classes}"/>
318 >      <patternset refid="jdk@{target}.jtreg.tests"/>
319 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320 >      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321        <arg value="-agentvm"/>
322 <      <arg value="-v:nopass,fail"/>
322 >      <arg value="-verbose:${jtreg.verbose}"/>
323        <arg value="-vmoptions:-esa -ea"/>
324        <arg value="-automatic"/>
325        <arg value="-k:!ignore"/>
# Line 256 | Line 339 | As of 2013-02, the very latest lambda 8
339  
340    <!-- Main targets -->
341  
342 +  <property name="build.main.java.version" value="9"/>
343 +  <property name="build.main.javac" value="${javac9}"/>
344 +
345    <target name="dists"
346            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
347            description="Builds all public jars and docs"/>
# Line 264 | Line 350 | As of 2013-02, the very latest lambda 8
350            depends="configure-compiler"
351            description="Compiles src/main sources to build dir">
352  
353 <    <mkdir dir="${build.classes.dir}"/>
353 >    <local name="modules"/>
354 >    <condition property="modules">
355 >      <and>
356 >        <available file="${jdk9.home}/jmods" type="dir"/>
357 >        <equals arg1="9" arg2="${build.main.java.version}"/>
358 >      </and>
359 >    </condition>
360 >
361 >    <local name="destdir"/>
362 >    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
363 >    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
364 >
365 >    <mkdir dir="${destdir}"/>
366  
367      <javac srcdir="${src.dir}"
368 <           destdir="${build.classes.dir}"
368 >           destdir="${destdir}"
369             debug="${build.debug}"
370             debuglevel="${build.debuglevel}"
371             deprecation="${build.deprecation}"
372             classpath=""
373             includeAntRuntime="false"
374             includeJavaRuntime="false"
375 <           executable="${javac8}"
375 >           executable="${build.main.javac}"
376             fork="true">
377  
378        <include name="**/*.java"/>
379 +      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
380        <compilerarg value="-Xprefer:source"/>
381        <compilerarg value="-XDignore.symbol.file=true"/>
382        <compilerarg value="-Xlint:all"/>
383 +      <compilerarg value="-Werror"/>
384 +      <compilerarg value="-Xdoclint:all/protected"/>
385 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
386        <compilerarg line="${build.args}"/>
387  
388      </javac>
# Line 293 | Line 395 | As of 2013-02, the very latest lambda 8
395  
396      <jar destfile="${product.jar}">
397        <fileset dir="${build.classes.dir}"/>
398 +      <manifest>
399 +        <attribute name="Built-By" value="${user.name}"/>
400 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
401 +      </manifest>
402      </jar>
403    </target>
404  
405  
300  <target name="test"
301          depends="configure-tests, report-tests"
302          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
303
304
406    <target name="docs"
407            description="Builds javadocs for src/main to dist dir">
408  
# Line 313 | Line 414 | As of 2013-02, the very latest lambda 8
414  
415      <javadoc destdir="${docs.dir}"
416               packagenames="none"
417 <             link="${jdkapi8docs.url}"
417 >             link="${java9.api.url}"
418               overview="${src.dir}/intro.html"
419               access="${build.javadoc.access}"
420 <             sourcepath="${src.dir}:${jdk8src.dir}"
420 >             sourcepath="${src.dir}:${jdk9src.dir}"
421               classpath=""
422 <             executable="${javadoc8}">
422 >             executable="${javadoc9}">
423        <fileset dir="${src.dir}" defaultexcludes="yes">
424          <include name="**/*.java"/>
425        </fileset>
426 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
427 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
428        <arg value="-XDignore.symbol.file=true"/>
429 + <!--  TODO     <arg value="-Xmodule:java.base"/> -->
430        <arg value="-tag"/>
431        <arg value="${javadoc.jls.option}"/>
432 +      <arg value="-tag"/>
433 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
434 +      <arg value="-tag"/>
435 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
436 +      <arg value="-tag"/>
437 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
438      </javadoc>
439    </target>
440  
# Line 348 | Line 458 | As of 2013-02, the very latest lambda 8
458        <exclude name="src/emulation/**"/>
459        <exclude name="**/SyntaxTest.java"/>
460        <exclude name="**/SuperfluousAbstract.java"/>
461 +      <manifest>
462 +        <attribute name="Built-By" value="${user.name}"/>
463 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
464 +      </manifest>
465      </jar>
466    </target>
467  
# Line 363 | Line 477 | As of 2013-02, the very latest lambda 8
477    <target name="dist-clean"
478            description="Removes all build and distribution products">
479  
480 +    <delete dir="${build.dir}"/>
481      <delete dir="${dist.dir}"/>
482  
483    </target>
484  
485  
371  <!-- Internal targets -->
372
373
486    <target name="dist-jar"
487            depends="clean, jar">
488      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 381 | Line 493 | As of 2013-02, the very latest lambda 8
493      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
494    </target>
495  
496 <
385 <  <target name="compile-tests"
386 <          depends="jar">
387 <
388 <    <mkdir dir="${build.testcases.dir}"/>
389 <
390 <    <javac srcdir="${tck.src.dir}"
391 <           destdir="${build.testcases.dir}"
392 <           debug="${build.debug}"
393 <           debuglevel="${build.debuglevel}"
394 <           deprecation="${build.deprecation}"
395 <           source="6"
396 <           classpath="${junit.jar}"
397 <           bootclasspath="@{product.jar}:${bootclasspath6}"
398 <           includeAntRuntime="false"
399 <           includeJavaRuntime="false"
400 <           executable="${javac8}"
401 <           fork="true">
402 <
403 <      <include name="**/*.java"/>
404 <      <compilerarg value="-XDignore.symbol.file=true"/>
405 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
406 <      <compilerarg line="${build.args}"/>
407 <
408 <    </javac>
409 <
410 <    <javac srcdir="${test.src.dir}"
411 <           destdir="${build.testcases.dir}"
412 <           debug="${build.debug}"
413 <           debuglevel="${build.debuglevel}"
414 <           deprecation="${build.deprecation}"
415 <           source="6"
416 <           classpath=""
417 <           bootclasspath="@{product.jar}:${bootclasspath6}"
418 <           includeAntRuntime="false"
419 <           includeJavaRuntime="false"
420 <           executable="${javac8}"
421 <           fork="true">
422 <
423 <      <include name="jsr166/test/**/*.java"/>
424 <      <compilerarg value="-XDignore.symbol.file=true"/>
425 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
426 <      <compilerarg line="${build.args}"/>
427 <
428 <    </javac>
429 <
430 < <!--
431 <    <javac srcdir="${jtreg.src.dir}"
432 <          destdir="${build.testcases.dir}"
433 <            debug="${build.debug}"
434 <       debuglevel="${build.debuglevel}"
435 <      deprecation="${build.deprecation}"
436 <           source="${build.sourcelevel}"
437 <             fork="true">
438 <
439 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
440 <      <compilerarg value="-XDignore.symbol.file=true"/>
441 <      <compilerarg line="${build.args}"/>
442 <
443 <    </javac>
444 < -->
445 <
446 <  </target>
447 <
448 <  <target name="test-tck"
496 >  <target name="tck"
497            depends="jar"
498            description="Runs tck tests for main directly">
499  
500      <run-tck-tests
501 <      target="8"
501 >      target="${build.main.java.version}"
502        workdir="${build.dir}"
503        classes="${product.jar}"/>
504    </target>
505  
506 <  <target name="test-jtreg"
506 >  <target name="tck-parallelism-1"
507 >          description="Runs tck with given common pool parallelism">
508 >    <antcall target="tck">
509 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
510 >    </antcall>
511 >  </target>
512 >
513 >  <target name="tck-parallelism-0"
514 >          description="Runs tck with given common pool parallelism">
515 >    <antcall target="tck">
516 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
517 >    </antcall>
518 >  </target>
519 >
520 >  <target name="jtreg"
521            depends="jar"
522            description="Runs jtreg tests for main using the jtreg ant task">
523      <run-jtreg-tests
524 <       target="8"
524 >       target="${build.main.java.version}"
525         workdir="${build.dir}"
526         classes="${product.jar}"/>
527    </target>
528  
529 <  <target name="test-ng"
530 <          depends="test-tck, test-jtreg"
529 >  <target name="test"
530 >          depends="tck, tck-parallelism-1, jtreg"
531            description="Runs tck and jtreg tests for main">
532    </target>
533  
534 <  <target name="run-tests"
473 <          depends="compile-tests">
474 <
475 <    <!-- May be overridden by user.properties -->
476 <    <property name="testcase" value="*"/>
477 <
478 <    <mkdir dir="${build.reports.dir}"/>
479 <
480 <    <junit printsummary="true"
481 <             showoutput="true"
482 <          errorProperty="junit.failed"
483 <        failureProperty="junit.failed"
484 <                    dir="${build.reports.dir}"
485 <                    jvm="${java8}"
486 <                   fork="true">
534 >  <target name="jtreg8" description="Runs jtreg tests with jdk8">
535  
536 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
537 <      <jvmarg value="-server"/>
538 <      <jvmarg value="-showversion"/>
539 <
492 <      <classpath refid="test.classpath"/>
493 <
494 <      <formatter type="xml"/>
495 <
496 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
497 <        <fileset dir="${tck.src.dir}">
498 <          <include name="**/${testcase}Test.java"/>
499 <        </fileset>
500 <      </batchtest>
501 <
502 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
503 <        <fileset dir="${test.src.dir}">
504 <          <include name="jsr166/test/**/${testcase}Test.java"/>
505 <        </fileset>
506 <      </batchtest>
507 <
508 < <!--
509 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
510 <        <fileset dir="${jtreg.src.dir}">
511 <          <include name="**/${testcase}Test.java"/>
512 <        </fileset>
513 <      </batchtest>
514 < -->
515 <
516 <    </junit>
536 >    <antcall target="jtreg">
537 >      <param name="build.main.java.version" value="8"/>
538 >      <param name="build.main.javac" value="${javac8}"/>
539 >    </antcall>
540  
541    </target>
542  
543 +  <target name="test89"
544 +          description="Runs tck and jtreg tests for main for multiple java versions">
545  
546 <  <target name="report-tests"
547 <          depends="run-tests">
548 <
549 <    <!-- Sets junit.report.format to frames if redirection is present,
550 <         otherwise sets it to noframes. -->
526 <    <available property="junit.report.format"
527 <                  value="frames"
528 <              classname="org.apache.xalan.lib.Redirect"
529 <    />
530 <    <property name="junit.report.format" value="noframes"/>
531 <
532 <    <junitreport todir="${build.reports.dir}">
533 <      <fileset dir="${build.reports.dir}">
534 <        <include name="TEST-*.xml"/>
535 <      </fileset>
536 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
537 <      />
538 <    </junitreport>
546 >    <antcall target="clean"/>
547 >    <antcall target="test">
548 >      <param name="build.main.java.version" value="8"/>
549 >      <param name="build.main.javac" value="${javac8}"/>
550 >    </antcall>
551  
552 <    <fail message="Test Cases Failed" if="junit.failed"/>
552 >    <antcall target="clean"/>
553 >    <antcall target="test">
554 >      <param name="build.main.java.version" value="9"/>
555 >      <param name="build.main.javac" value="${javac9}"/>
556 >    </antcall>
557  
558    </target>
559  
560  
561 +
562    <target name="configure-compiler">
563 +    <fail message="ant version too old">
564 +      <condition>
565 +        <not> <antversion atleast="1.9.1"/> </not>
566 +      </condition>
567 +    </fail>
568  
569      <property name="unchecked.option" value="-Xlint:unchecked"/>
570  
# Line 559 | Line 581 | As of 2013-02, the very latest lambda 8
581    </target>
582  
583  
562  <target name="configure-tests"
563       depends="configure-compiler">
564
565    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
566    <available property="junit.available"
567               classname="junit.framework.Protectable"/>
568
569    <!-- Xalan -->
570    <available property="xalan.available"
571               classname="org.apache.xalan.Version"/>
572
573
574    <!-- Ant 1.6beta and later don't need or want this check -->
575    <!--
576    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
577          unless="junit.available"/>
578
579    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
580          unless="xalan.available"/>
581    -->
582
583  </target>
584
584  
585    <!-- Various demos and test programs -->
586  
# Line 612 | Line 611 | As of 2013-02, the very latest lambda 8
611    </target>
612  
613  
614 +  <target name="compile-test-loops" depends="jar"
615 +          description="compile all the perf tests in src/test/loops">
616 +
617 +    <mkdir dir="${build.dir}/test/loops"/>
618 +
619 +    <javac srcdir="${basedir}/src/test/loops"
620 +           destdir="${build.dir}/test/loops"
621 +           debug="${build.debug}"
622 +           debuglevel="${build.debuglevel}"
623 +           deprecation="${build.deprecation}"
624 +           includeAntRuntime="false"
625 +           includeJavaRuntime="false"
626 +           executable="${javac9}"
627 +           fork="true">
628 +
629 +      <include name="*.java"/>
630 +      <compilerarg value="-XDignore.symbol.file=true"/>
631 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
632 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
633 +      <compilerarg line="${build.args}"/>
634 +
635 +    </javac>
636 +
637 +  </target>
638 +
639 +
640    <!-- jsr166 4jdk7 -->
641  
642    <target name="4jdk7compile"
# Line 626 | Line 651 | As of 2013-02, the very latest lambda 8
651             debuglevel="${build.debuglevel}"
652             deprecation="${build.deprecation}"
653             source="6"
654 +           target="6"
655             classpath=""
656             bootclasspath="${bootclasspath6}"
657             includeAntRuntime="false"
# Line 637 | Line 663 | As of 2013-02, the very latest lambda 8
663        <compilerarg value="-Xprefer:source"/>
664        <compilerarg value="-XDignore.symbol.file=true"/>
665        <compilerarg value="-Xlint:all"/>
666 +      <compilerarg value="-Werror"/>
667 +      <compilerarg line="${build.args}"/>
668 +
669 +    </javac>
670 +  </target>
671 +
672 +  <target name="4jdk7doclint"
673 +          depends="configure-compiler"
674 +          description="Finds doclint warnings">
675 +
676 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
677 +
678 +    <javac srcdir="${4jdk7src.dir}"
679 +           destdir="${build.4jdk7.classes.dir}"
680 +           debug="${build.debug}"
681 +           debuglevel="${build.debuglevel}"
682 +           deprecation="${build.deprecation}"
683 +           source="6"
684 +           target="6"
685 +           classpath=""
686 +           bootclasspath="${bootclasspath6}"
687 +           includeAntRuntime="false"
688 +           includeJavaRuntime="false"
689 +           executable="${javac8}"
690 +           fork="true">
691 +
692 +      <include name="**/*.java"/>
693 +      <compilerarg value="-Xprefer:source"/>
694 +      <compilerarg value="-XDignore.symbol.file=true"/>
695 +      <compilerarg value="-Xlint:all"/>
696 +      <compilerarg value="-Xdoclint:all/protected"/>
697        <compilerarg line="${build.args}"/>
698  
699      </javac>
# Line 649 | Line 706 | As of 2013-02, the very latest lambda 8
706  
707      <jar destfile="${4jdk7product.jar}">
708        <fileset dir="${build.4jdk7.classes.dir}"/>
709 +      <manifest>
710 +        <attribute name="Built-By" value="${user.name}"/>
711 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
712 +      </manifest>
713      </jar>
714  
715    </target>
716  
717  
718 <  <target name="4jdk7-test-tck"
718 >  <target name="4jdk7-tck"
719            depends="4jdk7jar"
720            description="Runs tck tests for jsr166-4jdk7 directly">
721  
# Line 665 | Line 726 | As of 2013-02, the very latest lambda 8
726        <javac-elements>
727          <!-- JDK8+ test classes -->
728          <exclude name="*8Test.java"/>
729 +        <exclude name="*9Test.java"/>
730 +        <exclude name="*10Test.java"/>
731          <exclude name="DoubleAccumulatorTest.java"/>
732          <exclude name="DoubleAdderTest.java"/>
733          <exclude name="LongAccumulatorTest.java"/>
734          <exclude name="LongAdderTest.java"/>
735          <exclude name="CompletableFutureTest.java"/>
736 +        <exclude name="SplittableRandomTest.java"/>
737          <exclude name="StampedLockTest.java"/>
738 +        <exclude name="SubmissionPublisherTest.java"/>
739        </javac-elements>
740      </run-tck-tests>
741    </target>
742  
743  
744 <  <target name="4jdk7-test-tck-junit"
744 >  <target name="4jdk7-tck-junit"
745            depends="4jdk7compile"
746            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
747  
# Line 698 | Line 763 | As of 2013-02, the very latest lambda 8
763  
764        <formatter type="brief"/>
765  
766 <      <test name="JSR166TestCase" haltonfailure="no">
766 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
767        </test>
768  
769      </junit>
770    </target>
771  
772 <  <target name="4jdk7-test-jtreg"
772 >  <target name="4jdk7-jtreg"
773            depends="4jdk7jar"
774            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
775      <run-jtreg-tests
# Line 715 | Line 780 | As of 2013-02, the very latest lambda 8
780  
781  
782    <target name="4jdk7-test"
783 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
783 >          depends="4jdk7-tck, 4jdk7-jtreg"
784            description="Runs tck and jtreg tests for jsr166-4jdk7">
785    </target>
786  
# Line 728 | Line 793 | As of 2013-02, the very latest lambda 8
793  
794      <javadoc destdir="${4jdk7docs.dir}"
795               packagenames="none"
796 <             link="${jdkapi7docs.url}"
796 >             link="${java7.api.url}"
797               overview="${4jdk7src.dir}/intro.html"
798               access="${build.javadoc.access}"
799               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 737 | Line 802 | As of 2013-02, the very latest lambda 8
802        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
803          <include name="**/*.java"/>
804        </fileset>
805 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
806        <arg value="-XDignore.symbol.file=true"/>
807      </javadoc>
808    </target>
# Line 755 | Line 821 | As of 2013-02, the very latest lambda 8
821    </target>
822  
823  
758  <target name="4jdk7dist-clean"
759          description="Removes all build and distribution products">
760
761  </target>
762
824    <target name="4jdk7dist-jar"
825            depends="4jdk7clean, 4jdk7jar">
826      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 788 | Line 849 | As of 2013-02, the very latest lambda 8
849             classpath=""
850             bootclasspath="${bootclasspath6}"
851             source="5"
852 +           target="5"
853             includeAntRuntime="false"
854             includeJavaRuntime="false"
855             executable="${javac7}"
# Line 796 | Line 858 | As of 2013-02, the very latest lambda 8
858        <include name="jsr166x/**/*.java"/>
859        <compilerarg value="-XDignore.symbol.file=true"/>
860        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
861 +      <compilerarg value="-Werror"/>
862        <compilerarg line="${build.args}"/>
863  
864      </javac>
# Line 808 | Line 871 | As of 2013-02, the very latest lambda 8
871  
872      <jar destfile="${jsr166x.jar}">
873        <fileset dir="${build.jsr166x.classes.dir}"/>
874 +      <manifest>
875 +        <attribute name="Built-By" value="${user.name}"/>
876 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
877 +      </manifest>
878      </jar>
879  
880    </target>
# Line 821 | Line 888 | As of 2013-02, the very latest lambda 8
888  
889      <javadoc destdir="${jsr166xdocs.dir}"
890               packagenames="jsr166x.*"
891 <             link="${jdkapidocs.url}"
891 >             link="${java.api.url}"
892               access="${build.javadoc.access}"
893               sourcepath="${topsrc.dir}:${jdk6src.dir}"
894               bootclasspath="${bootclasspath6}"
895               source="5"
896               executable="${javadoc7}">
897 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
898        <arg value="-XDignore.symbol.file=true"/>
899  
900      </javadoc>
# Line 846 | Line 914 | As of 2013-02, the very latest lambda 8
914    </target>
915  
916  
849  <target name="jsr166xdist-clean"
850          description="Removes all build and distribution products">
851
852  </target>
853
854
917    <target name="jsr166xdist-jar"
918            depends="jsr166xclean, jsr166xjar">
919      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 877 | Line 939 | As of 2013-02, the very latest lambda 8
939             debuglevel="${build.debuglevel}"
940             deprecation="${build.deprecation}"
941             source="6"
942 +           target="6"
943             classpath=""
944             bootclasspath="${bootclasspath6}"
945             includeAntRuntime="false"
# Line 887 | Line 950 | As of 2013-02, the very latest lambda 8
950        <include name="jsr166y/**/*.java"/>
951        <compilerarg value="-XDignore.symbol.file=true"/>
952        <compilerarg value="-Xlint:all"/>
953 +      <compilerarg value="-Werror"/>
954        <compilerarg line="${build.args}"/>
955  
956      </javac>
# Line 899 | Line 963 | As of 2013-02, the very latest lambda 8
963  
964      <jar destfile="${jsr166y.jar}" index="true">
965        <fileset dir="${build.jsr166y.classes.dir}"/>
966 +      <manifest>
967 +        <attribute name="Built-By" value="${user.name}"/>
968 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
969 +      </manifest>
970      </jar>
971  
972    </target>
# Line 912 | Line 980 | As of 2013-02, the very latest lambda 8
980  
981      <javadoc destdir="${jsr166ydocs.dir}"
982               packagenames="jsr166y.*"
983 <             link="${jdkapidocs.url}"
983 >             link="${java.api.url}"
984               access="${build.javadoc.access}"
985               sourcepath="${topsrc.dir}:${jdk6src.dir}"
986               bootclasspath="${bootclasspath6}"
987               source="6"
988               executable="${javadoc7}">
989 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
990        <arg value="-XDignore.symbol.file=true"/>
991  
992      </javadoc>
# Line 937 | Line 1006 | As of 2013-02, the very latest lambda 8
1006    </target>
1007  
1008  
940  <target name="jsr166ydist-clean"
941          description="Removes all build and distribution products">
942
943  </target>
944
1009    <target name="jsr166ydist-jar"
1010            depends="jsr166yclean, jsr166yjar">
1011      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 970 | Line 1034 | As of 2013-02, the very latest lambda 8
1034             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1035             classpath=""
1036             source="6"
1037 +           target="6"
1038             includeAntRuntime="false"
1039             includeJavaRuntime="false"
1040             executable="${javac7}"
# Line 978 | Line 1043 | As of 2013-02, the very latest lambda 8
1043        <include name="extra166y/**/*.java"/>
1044        <compilerarg value="-XDignore.symbol.file=true"/>
1045        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1046 +      <compilerarg value="-Werror"/>
1047        <compilerarg line="${build.args}"/>
1048  
1049      </javac>
# Line 990 | Line 1056 | As of 2013-02, the very latest lambda 8
1056  
1057      <jar destfile="${extra166y.jar}" index="true">
1058        <fileset dir="${build.extra166y.classes.dir}"/>
1059 +      <manifest>
1060 +        <attribute name="Built-By" value="${user.name}"/>
1061 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1062 +      </manifest>
1063      </jar>
1064  
1065    </target>
# Line 1003 | Line 1073 | As of 2013-02, the very latest lambda 8
1073  
1074      <javadoc destdir="${extra166ydocs.dir}"
1075               packagenames="extra166y.*"
1076 <             link="${jdkapidocs.url}"
1076 >             link="${java.api.url}"
1077               access="${build.javadoc.access}"
1078               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1079               bootclasspath="${bootclasspath6}"
1080               source="6"
1081               executable="${javadoc7}">
1082 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1083        <arg value="-XDignore.symbol.file=true"/>
1084  
1085      </javadoc>
# Line 1028 | Line 1099 | As of 2013-02, the very latest lambda 8
1099    </target>
1100  
1101  
1031  <target name="extra166ydist-clean"
1032          description="Removes all build and distribution products">
1033
1034  </target>
1035
1102    <target name="extra166ydist-jar"
1103            depends="extra166yclean, extra166yjar">
1104      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1045 | Line 1111 | As of 2013-02, the very latest lambda 8
1111  
1112    <!-- jsr166e -->
1113  
1114 +  <property name="build.jsr166e.java.version" value="6"/>
1115 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1116 +
1117    <target name="jsr166ecompile"
1118            depends="configure-compiler"
1119            description="Compiles jsr166e sources">
# Line 1056 | Line 1125 | As of 2013-02, the very latest lambda 8
1125             debug="${build.debug}"
1126             debuglevel="${build.debuglevel}"
1127             deprecation="${build.deprecation}"
1128 <           source="7"
1128 >           source="${build.jsr166e.java.version}"
1129 >           target="${build.jsr166e.java.version}"
1130             classpath=""
1131             includeAntRuntime="false"
1132             includeJavaRuntime="false"
1133 <           executable="${javac7}"
1133 >           executable="${build.jsr166e.javac}"
1134             fork="true">
1135  
1136        <include name="jsr166e/**/*.java"/>
1137        <compilerarg value="-XDignore.symbol.file=true"/>
1138        <compilerarg value="-Xlint:all"/>
1139 +      <compilerarg value="-Werror"/>
1140        <compilerarg line="${build.args}"/>
1141  
1142      </javac>
1143    </target>
1144  
1145 +  <!-- jsr166e: find doclint errors -->
1146 +  <target name="jsr166edoclint">
1147 +
1148 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1149 +
1150 +    <javac srcdir="${topsrc.dir}"
1151 +           destdir="${build.jsr166e.classes.dir}"
1152 +           debug="${build.debug}"
1153 +           debuglevel="${build.debuglevel}"
1154 +           deprecation="${build.deprecation}"
1155 +           source="${build.jsr166e.java.version}"
1156 +           target="${build.jsr166e.java.version}"
1157 +           classpath=""
1158 +           bootclasspath="${bootclasspath6}"
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"
# Line 1078 | Line 1177 | As of 2013-02, the very latest lambda 8
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 1091 | Line 1194 | As of 2013-02, the very latest lambda 8
1194  
1195      <javadoc destdir="${jsr166edocs.dir}"
1196               packagenames="jsr166e.*"
1197 <             link="${jdkapidocs.url}"
1197 >             link="${java.api.url}"
1198               access="${build.javadoc.access}"
1199 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1200 <             source="7"
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="jsr166ejar"
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 <      target="7"
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 1125 | Line 1257 | As of 2013-02, the very latest lambda 8
1257    </target>
1258  
1259  
1128  <target name="jsr166edist-clean"
1129          description="Removes all build and distribution products">
1130
1131  </target>
1132
1260    <target name="jsr166edist-jar"
1261            depends="jsr166eclean, jsr166ejar">
1262      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1145 | Line 1272 | As of 2013-02, the very latest lambda 8
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>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines