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.140 by jsr166, Mon May 20 19:12:23 2013 UTC vs.
Revision 1.189 by jsr166, Thu Nov 5 15:02:34 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 44 | Line 57 | As of 2013-02, the very latest lambda 8
57    <property name="build.deprecation"    value="false"/>
58    <property name="build.javadoc.access" value="protected"/>
59  
47  <!-- Tck options; see JSR166TestCase.java -->
48  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49  <property name="jsr166.profileTests"     value="false"/>
50  <property name="jsr166.profileThreshold" value="100"/>
51  <property name="jsr166.runsPerTest"      value="1"/>
52  <!-- Allow running an individual tck test class -->
53  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
60    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>
62    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 85 | 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 114 | 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 154 | 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 197 | Line 229 | As of 2013-02, the very latest lambda 8
229             source="@{compile-target}"
230             target="@{compile-target}"
231             classpath="${junit.jar}"
200           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
232             includeAntRuntime="false"
233             includeJavaRuntime="false"
234             executable="${javac@{compile-target}}"
# Line 205 | 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  
# Line 215 | Line 248 | As of 2013-02, the very latest lambda 8
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 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
255 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
256 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
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 229 | 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 268 | 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 276 | 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 305 | 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  
312  <target name="test"
313          depends="configure-tests, report-tests"
314          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315
316
406    <target name="docs"
407            description="Builds javadocs for src/main to dist dir">
408  
# Line 325 | 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 360 | 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 375 | 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  
383  <!-- Internal targets -->
384
385
486    <target name="dist-jar"
487            depends="clean, jar">
488      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 393 | 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 <
397 <  <target name="compile-tests"
398 <          depends="jar">
399 <
400 <    <mkdir dir="${build.testcases.dir}"/>
401 <
402 <    <javac srcdir="${tck.src.dir}"
403 <           destdir="${build.testcases.dir}"
404 <           debug="${build.debug}"
405 <           debuglevel="${build.debuglevel}"
406 <           deprecation="${build.deprecation}"
407 <           source="6"
408 <           classpath="${junit.jar}"
409 <           bootclasspath="@{product.jar}:${bootclasspath6}"
410 <           includeAntRuntime="false"
411 <           includeJavaRuntime="false"
412 <           executable="${javac8}"
413 <           fork="true">
414 <
415 <      <include name="**/*.java"/>
416 <      <compilerarg value="-XDignore.symbol.file=true"/>
417 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418 <      <compilerarg line="${build.args}"/>
419 <
420 <    </javac>
421 <
422 <    <javac srcdir="${test.src.dir}"
423 <           destdir="${build.testcases.dir}"
424 <           debug="${build.debug}"
425 <           debuglevel="${build.debuglevel}"
426 <           deprecation="${build.deprecation}"
427 <           source="6"
428 <           classpath=""
429 <           bootclasspath="@{product.jar}:${bootclasspath6}"
430 <           includeAntRuntime="false"
431 <           includeJavaRuntime="false"
432 <           executable="${javac8}"
433 <           fork="true">
434 <
435 <      <include name="jsr166/test/**/*.java"/>
436 <      <compilerarg value="-XDignore.symbol.file=true"/>
437 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438 <      <compilerarg line="${build.args}"/>
439 <
440 <    </javac>
441 <
442 < <!--
443 <    <javac srcdir="${jtreg.src.dir}"
444 <          destdir="${build.testcases.dir}"
445 <            debug="${build.debug}"
446 <       debuglevel="${build.debuglevel}"
447 <      deprecation="${build.deprecation}"
448 <           source="${build.sourcelevel}"
449 <             fork="true">
450 <
451 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452 <      <compilerarg value="-XDignore.symbol.file=true"/>
453 <      <compilerarg line="${build.args}"/>
454 <
455 <    </javac>
456 < -->
457 <
458 <  </target>
459 <
460 <  <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"
485 <          depends="compile-tests">
486 <
487 <    <!-- May be overridden by user.properties -->
488 <    <property name="testcase" value="*"/>
489 <
490 <    <mkdir dir="${build.reports.dir}"/>
534 >  <target name="jtreg8" description="Runs jtreg tests with jdk8">
535  
536 <    <junit printsummary="true"
537 <             showoutput="true"
538 <          errorProperty="junit.failed"
539 <        failureProperty="junit.failed"
496 <                    dir="${build.reports.dir}"
497 <                    jvm="${java8}"
498 <                   fork="true">
499 <
500 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501 <      <jvmarg value="-server"/>
502 <      <jvmarg value="-showversion"/>
503 <
504 <      <classpath refid="test.classpath"/>
505 <
506 <      <formatter type="xml"/>
507 <
508 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
509 <        <fileset dir="${tck.src.dir}">
510 <          <include name="**/${testcase}Test.java"/>
511 <        </fileset>
512 <      </batchtest>
513 <
514 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
515 <        <fileset dir="${test.src.dir}">
516 <          <include name="jsr166/test/**/${testcase}Test.java"/>
517 <        </fileset>
518 <      </batchtest>
519 <
520 < <!--
521 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
522 <        <fileset dir="${jtreg.src.dir}">
523 <          <include name="**/${testcase}Test.java"/>
524 <        </fileset>
525 <      </batchtest>
526 < -->
527 <
528 <    </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. -->
538 <    <available property="junit.report.format"
539 <                  value="frames"
540 <              classname="org.apache.xalan.lib.Redirect"
541 <    />
542 <    <property name="junit.report.format" value="noframes"/>
543 <
544 <    <junitreport todir="${build.reports.dir}">
545 <      <fileset dir="${build.reports.dir}">
546 <        <include name="TEST-*.xml"/>
547 <      </fileset>
548 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
549 <      />
550 <    </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 571 | Line 581 | As of 2013-02, the very latest lambda 8
581    </target>
582  
583  
574  <target name="configure-tests"
575       depends="configure-compiler">
576
577    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
578    <available property="junit.available"
579               classname="junit.framework.Protectable"/>
580
581    <!-- Xalan -->
582    <available property="xalan.available"
583               classname="org.apache.xalan.Version"/>
584
585
586    <!-- Ant 1.6beta and later don't need or want this check -->
587    <!--
588    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
589          unless="junit.available"/>
590
591    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
592          unless="xalan.available"/>
593    -->
594
595  </target>
596
584  
585    <!-- Various demos and test programs -->
586  
# Line 624 | 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 649 | Line 662 | As of 2013-02, the very latest lambda 8
662        <compilerarg value="-Xprefer:source"/>
663        <compilerarg value="-XDignore.symbol.file=true"/>
664        <compilerarg value="-Xlint:all"/>
665 +      <compilerarg value="-Werror"/>
666 +      <compilerarg line="${build.args}"/>
667 +
668 +    </javac>
669 +  </target>
670 +
671 +  <target name="4jdk7doclint"
672 +          depends="configure-compiler"
673 +          description="Finds doclint warnings">
674 +
675 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
676 +
677 +    <javac srcdir="${4jdk7src.dir}"
678 +           destdir="${build.4jdk7.classes.dir}"
679 +           debug="${build.debug}"
680 +           debuglevel="${build.debuglevel}"
681 +           deprecation="${build.deprecation}"
682 +           source="6"
683 +           classpath=""
684 +           bootclasspath="${bootclasspath7}"
685 +           includeAntRuntime="false"
686 +           includeJavaRuntime="false"
687 +           executable="${javac8}"
688 +           fork="true">
689 +
690 +      <include name="**/*.java"/>
691 +      <compilerarg value="-Xprefer:source"/>
692 +      <compilerarg value="-XDignore.symbol.file=true"/>
693 +      <compilerarg value="-Xlint:all"/>
694 +      <compilerarg value="-Xdoclint:all/protected"/>
695        <compilerarg line="${build.args}"/>
696  
697      </javac>
# Line 661 | Line 704 | As of 2013-02, the very latest lambda 8
704  
705      <jar destfile="${4jdk7product.jar}">
706        <fileset dir="${build.4jdk7.classes.dir}"/>
707 +      <manifest>
708 +        <attribute name="Built-By" value="${user.name}"/>
709 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
710 +      </manifest>
711      </jar>
712  
713    </target>
714  
715  
716 <  <target name="4jdk7-test-tck"
716 >  <target name="4jdk7-tck"
717            depends="4jdk7jar"
718            description="Runs tck tests for jsr166-4jdk7 directly">
719  
# Line 677 | Line 724 | As of 2013-02, the very latest lambda 8
724        <javac-elements>
725          <!-- JDK8+ test classes -->
726          <exclude name="*8Test.java"/>
727 +        <exclude name="*9Test.java"/>
728 +        <exclude name="*10Test.java"/>
729          <exclude name="DoubleAccumulatorTest.java"/>
730          <exclude name="DoubleAdderTest.java"/>
731          <exclude name="LongAccumulatorTest.java"/>
732          <exclude name="LongAdderTest.java"/>
733          <exclude name="CompletableFutureTest.java"/>
734 +        <exclude name="SplittableRandomTest.java"/>
735          <exclude name="StampedLockTest.java"/>
736 +        <exclude name="SubmissionPublisherTest.java"/>
737        </javac-elements>
738      </run-tck-tests>
739    </target>
740  
741  
742 <  <target name="4jdk7-test-tck-junit"
742 >  <target name="4jdk7-tck-junit"
743            depends="4jdk7compile"
744            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
745  
# Line 716 | Line 767 | As of 2013-02, the very latest lambda 8
767      </junit>
768    </target>
769  
770 <  <target name="4jdk7-test-jtreg"
770 >  <target name="4jdk7-jtreg"
771            depends="4jdk7jar"
772            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
773      <run-jtreg-tests
# Line 727 | Line 778 | As of 2013-02, the very latest lambda 8
778  
779  
780    <target name="4jdk7-test"
781 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
781 >          depends="4jdk7-tck, 4jdk7-jtreg"
782            description="Runs tck and jtreg tests for jsr166-4jdk7">
783    </target>
784  
# Line 740 | Line 791 | As of 2013-02, the very latest lambda 8
791  
792      <javadoc destdir="${4jdk7docs.dir}"
793               packagenames="none"
794 <             link="${jdkapi7docs.url}"
794 >             link="${java7.api.url}"
795               overview="${4jdk7src.dir}/intro.html"
796               access="${build.javadoc.access}"
797               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 749 | Line 800 | As of 2013-02, the very latest lambda 8
800        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
801          <include name="**/*.java"/>
802        </fileset>
803 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
804        <arg value="-XDignore.symbol.file=true"/>
805      </javadoc>
806    </target>
# Line 767 | Line 819 | As of 2013-02, the very latest lambda 8
819    </target>
820  
821  
770  <target name="4jdk7dist-clean"
771          description="Removes all build and distribution products">
772
773  </target>
774
822    <target name="4jdk7dist-jar"
823            depends="4jdk7clean, 4jdk7jar">
824      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 808 | Line 855 | As of 2013-02, the very latest lambda 8
855        <include name="jsr166x/**/*.java"/>
856        <compilerarg value="-XDignore.symbol.file=true"/>
857        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
858 +      <compilerarg value="-Werror"/>
859        <compilerarg line="${build.args}"/>
860  
861      </javac>
# Line 820 | Line 868 | As of 2013-02, the very latest lambda 8
868  
869      <jar destfile="${jsr166x.jar}">
870        <fileset dir="${build.jsr166x.classes.dir}"/>
871 +      <manifest>
872 +        <attribute name="Built-By" value="${user.name}"/>
873 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
874 +      </manifest>
875      </jar>
876  
877    </target>
# Line 833 | Line 885 | As of 2013-02, the very latest lambda 8
885  
886      <javadoc destdir="${jsr166xdocs.dir}"
887               packagenames="jsr166x.*"
888 <             link="${jdkapidocs.url}"
888 >             link="${java.api.url}"
889               access="${build.javadoc.access}"
890               sourcepath="${topsrc.dir}:${jdk6src.dir}"
891               bootclasspath="${bootclasspath6}"
892               source="5"
893               executable="${javadoc7}">
894 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
895        <arg value="-XDignore.symbol.file=true"/>
896  
897      </javadoc>
# Line 858 | Line 911 | As of 2013-02, the very latest lambda 8
911    </target>
912  
913  
861  <target name="jsr166xdist-clean"
862          description="Removes all build and distribution products">
863
864  </target>
865
866
914    <target name="jsr166xdist-jar"
915            depends="jsr166xclean, jsr166xjar">
916      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 889 | Line 936 | As of 2013-02, the very latest lambda 8
936             debuglevel="${build.debuglevel}"
937             deprecation="${build.deprecation}"
938             source="6"
939 +           target="6"
940             classpath=""
941             bootclasspath="${bootclasspath6}"
942             includeAntRuntime="false"
# Line 899 | Line 947 | As of 2013-02, the very latest lambda 8
947        <include name="jsr166y/**/*.java"/>
948        <compilerarg value="-XDignore.symbol.file=true"/>
949        <compilerarg value="-Xlint:all"/>
950 +      <compilerarg value="-Werror"/>
951        <compilerarg line="${build.args}"/>
952  
953      </javac>
# Line 911 | Line 960 | As of 2013-02, the very latest lambda 8
960  
961      <jar destfile="${jsr166y.jar}" index="true">
962        <fileset dir="${build.jsr166y.classes.dir}"/>
963 +      <manifest>
964 +        <attribute name="Built-By" value="${user.name}"/>
965 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
966 +      </manifest>
967      </jar>
968  
969    </target>
# Line 924 | Line 977 | As of 2013-02, the very latest lambda 8
977  
978      <javadoc destdir="${jsr166ydocs.dir}"
979               packagenames="jsr166y.*"
980 <             link="${jdkapidocs.url}"
980 >             link="${java.api.url}"
981               access="${build.javadoc.access}"
982               sourcepath="${topsrc.dir}:${jdk6src.dir}"
983               bootclasspath="${bootclasspath6}"
984               source="6"
985               executable="${javadoc7}">
986 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
987        <arg value="-XDignore.symbol.file=true"/>
988  
989      </javadoc>
# Line 949 | Line 1003 | As of 2013-02, the very latest lambda 8
1003    </target>
1004  
1005  
952  <target name="jsr166ydist-clean"
953          description="Removes all build and distribution products">
954
955  </target>
956
1006    <target name="jsr166ydist-jar"
1007            depends="jsr166yclean, jsr166yjar">
1008      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 990 | Line 1039 | As of 2013-02, the very latest lambda 8
1039        <include name="extra166y/**/*.java"/>
1040        <compilerarg value="-XDignore.symbol.file=true"/>
1041        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1042 +      <compilerarg value="-Werror"/>
1043        <compilerarg line="${build.args}"/>
1044  
1045      </javac>
# Line 1002 | Line 1052 | As of 2013-02, the very latest lambda 8
1052  
1053      <jar destfile="${extra166y.jar}" index="true">
1054        <fileset dir="${build.extra166y.classes.dir}"/>
1055 +      <manifest>
1056 +        <attribute name="Built-By" value="${user.name}"/>
1057 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1058 +      </manifest>
1059      </jar>
1060  
1061    </target>
# Line 1015 | Line 1069 | As of 2013-02, the very latest lambda 8
1069  
1070      <javadoc destdir="${extra166ydocs.dir}"
1071               packagenames="extra166y.*"
1072 <             link="${jdkapidocs.url}"
1072 >             link="${java.api.url}"
1073               access="${build.javadoc.access}"
1074               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1075               bootclasspath="${bootclasspath6}"
1076               source="6"
1077               executable="${javadoc7}">
1078 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1079        <arg value="-XDignore.symbol.file=true"/>
1080  
1081      </javadoc>
# Line 1040 | Line 1095 | As of 2013-02, the very latest lambda 8
1095    </target>
1096  
1097  
1043  <target name="extra166ydist-clean"
1044          description="Removes all build and distribution products">
1045
1046  </target>
1047
1098    <target name="extra166ydist-jar"
1099            depends="extra166yclean, extra166yjar">
1100      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1057 | Line 1107 | As of 2013-02, the very latest lambda 8
1107  
1108    <!-- jsr166e -->
1109  
1110 +  <property name="build.jsr166e.java.version" value="6"/>
1111 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1112 +
1113    <target name="jsr166ecompile"
1114            depends="configure-compiler"
1115            description="Compiles jsr166e sources">
# Line 1068 | Line 1121 | As of 2013-02, the very latest lambda 8
1121             debug="${build.debug}"
1122             debuglevel="${build.debuglevel}"
1123             deprecation="${build.deprecation}"
1124 <           source="7"
1124 >           source="${build.jsr166e.java.version}"
1125             classpath=""
1126             includeAntRuntime="false"
1127             includeJavaRuntime="false"
1128 <           executable="${javac7}"
1128 >           executable="${build.jsr166e.javac}"
1129             fork="true">
1130  
1131        <include name="jsr166e/**/*.java"/>
1132        <compilerarg value="-XDignore.symbol.file=true"/>
1133        <compilerarg value="-Xlint:all"/>
1134 +      <compilerarg value="-Werror"/>
1135        <compilerarg line="${build.args}"/>
1136  
1137      </javac>
1138    </target>
1139  
1140 +  <!-- jsr166e: find doclint errors -->
1141 +  <target name="jsr166edoclint">
1142 +
1143 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1144 +
1145 +    <javac srcdir="${topsrc.dir}"
1146 +           destdir="${build.jsr166e.classes.dir}"
1147 +           debug="${build.debug}"
1148 +           debuglevel="${build.debuglevel}"
1149 +           deprecation="${build.deprecation}"
1150 +           source="${build.jsr166e.java.version}"
1151 +           classpath=""
1152 +           bootclasspath="${bootclasspath7}"
1153 +           includeAntRuntime="false"
1154 +           includeJavaRuntime="false"
1155 +           executable="${javac8}"
1156 +           fork="true">
1157 +
1158 +      <include name="jsr166e/**/*.java"/>
1159 +      <compilerarg value="-XDignore.symbol.file=true"/>
1160 +      <compilerarg value="-Xlint:all"/>
1161 +      <compilerarg value="-Werror"/>
1162 +      <compilerarg value="-Xdoclint:all/protected"/>
1163 +
1164 +    </javac>
1165 +  </target>
1166 +
1167  
1168    <target name="jsr166ejar"
1169            depends="jsr166ecompile"
# Line 1090 | Line 1171 | As of 2013-02, the very latest lambda 8
1171  
1172      <jar destfile="${jsr166e.jar}" index="true">
1173        <fileset dir="${build.jsr166e.classes.dir}"/>
1174 +      <manifest>
1175 +        <attribute name="Built-By" value="${user.name}"/>
1176 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1177 +      </manifest>
1178      </jar>
1179  
1180    </target>
# Line 1103 | Line 1188 | As of 2013-02, the very latest lambda 8
1188  
1189      <javadoc destdir="${jsr166edocs.dir}"
1190               packagenames="jsr166e.*"
1191 <             link="${jdkapidocs.url}"
1191 >             link="${java.api.url}"
1192               access="${build.javadoc.access}"
1193 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1194 <             source="7"
1193 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1194 >             source="${build.jsr166e.java.version}"
1195               executable="${javadoc7}">
1196 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1197        <arg value="-XDignore.symbol.file=true"/>
1198  
1199      </javadoc>
1200    </target>
1201  
1202  
1203 <  <target name="jsr166e-test-tck"
1204 <          depends="jsr166ejar"
1205 <          description="Runs tck tests for jsr166e">
1203 >  <target name="jsr166e-tck-one-java-version"
1204 >          depends="jsr166ejar">
1205 >
1206 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1207  
1208      <run-tck-tests
1209        tck.src.dir="${test.src.dir}/tck-jsr166e"
1210 <      target="7"
1210 >      target="${build.jsr166e.java.version}"
1211        workdir="${build.jsr166e.dir}"
1212        classes="${jsr166e.jar}"/>
1213    </target>
1214  
1215 +  <target name="jsr166e-tck"
1216 +          description="Runs tck tests for jsr166e for multiple java versions">
1217 +
1218 + <!--     <antcall target="clean"/> -->
1219 + <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1220 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1221 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1222 + <!--     </antcall> -->
1223 +
1224 +    <antcall target="clean"/>
1225 +    <antcall target="jsr166e-tck-one-java-version">
1226 +      <param name="build.jsr166e.java.version" value="7"/>
1227 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1228 +    </antcall>
1229 +
1230 +    <antcall target="clean"/>
1231 +    <antcall target="jsr166e-tck-one-java-version">
1232 +      <param name="build.jsr166e.java.version" value="6"/>
1233 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1234 +    </antcall>
1235 +  </target>
1236 +
1237 +
1238 +  <target name="jsr166e-test"
1239 +          depends="jsr166e-tck"
1240 +          description="Runs all tests for jsr166e">
1241 +  </target>
1242  
1243    <target name="jsr166edist"
1244            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1137 | Line 1251 | As of 2013-02, the very latest lambda 8
1251    </target>
1252  
1253  
1140  <target name="jsr166edist-clean"
1141          description="Removes all build and distribution products">
1142
1143  </target>
1144
1254    <target name="jsr166edist-jar"
1255            depends="jsr166eclean, jsr166ejar">
1256      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1157 | Line 1266 | As of 2013-02, the very latest lambda 8
1266  
1267    <target name="lint">
1268      <antcall target="dists">
1269 +      <param name="build.javadoc.access" value="public"/>
1270 +    </antcall>
1271 +  </target>
1272 +
1273 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1274 +  <target name="lint-private">
1275 +    <antcall target="dist">
1276        <param name="build.javadoc.access" value="private"/>
1277      </antcall>
1278    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines