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.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC vs.
Revision 1.151 by jsr166, Sun Feb 16 14:25:46 2014 UTC

# Line 16 | Line 16
16    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8
19 +  $HOME/jdk/jdk9
20    where each of the above is a JDK or a symlink to same, and
21    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8
24 +  $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.
27   ------------------------------------------------------------------------------
28    </description>
29  
30 <  <target name="usage" description="Advises user to run with -projecthelp">
31 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
30 >  <!-- Display main targets by running 'ant -projecthelp' -->
31 >  <target name="usage">
32 >    <java classname="org.apache.tools.ant.Main">
33 >      <arg value="-projecthelp" />
34 >    </java>
35    </target>
36  
37  
# Line 39 | Line 44
44    <property name="build.debug"          value="true"/>
45    <property name="build.debuglevel"     value="source,lines,vars"/>
46    <property name="build.deprecation"    value="false"/>
47 +  <property name="build.javadoc.access" value="protected"/>
48 +
49 +  <!-- Tck options; see JSR166TestCase.java -->
50 +  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51 +  <property name="jsr166.profileTests"     value="false"/>
52 +  <property name="jsr166.profileThreshold" value="100"/>
53 +  <property name="jsr166.runsPerTest"      value="1"/>
54 +  <!-- Allow running an individual tck test class -->
55 +  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57  
58    <!-- Build locations -->
59    <property name="build.dir"                   location="build"/>
# Line 57 | Line 72
72    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
73    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
74  
75 <  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
76 <  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
77 <  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
78 <  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
75 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
76 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
77 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
78 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
79  
80 <  <!-- JDK binary locations -->
80 >  <!-- JDK locations -->
81    <property name="jdks.home"  location="${user.home}/jdk"/>
82  
83    <macrodef name="defjdklocations">
# Line 72 | Line 87
87      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
88      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
89      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
90      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
91 <    <property name="bootclasspath@{v}"
92 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
91 >    <local name="boot.jar.dir"/>
92 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
93 >    <path id="bootclasspath@{v}">
94 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
95 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
96 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
97 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
98 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
99 >    </path>
100 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
101      </sequential>
102    </macrodef>
103  
104 <  <defjdklocations v="6"/>
105 <  <defjdklocations v="7"/>
106 <  <defjdklocations v="8"/>
85 <
86 <  <macrodef name="run-tck-tests">
87 <    <attribute name="target"/>
88 <    <attribute name="workdir"/>
89 <    <attribute name="product.jar" default="${product.jar}"/>
90 <    <attribute name="jvmflags" default=""/>
104 >  <macrodef name="mirror-dir">
105 >    <attribute name="src"/>
106 >    <attribute name="dst"/>
107      <sequential>
108 <
109 <    <mkdir dir="@{workdir}/tck-classes"/>
110 <
111 <    <javac srcdir="${tck.src.dir}"
112 <           destdir="@{workdir}/tck-classes"
97 <           debug="${build.debug}"
98 <           debuglevel="${build.debuglevel}"
99 <           deprecation="${build.deprecation}"
100 <           source="6"
101 <           classpath="${junit.jar}"
102 <           bootclasspath="@{product.jar}:${bootclasspath6}"
103 <           includeAntRuntime="false"
104 <           includeJavaRuntime="false"
105 <           executable="${javac@{target}}"
106 <           fork="true">
107 <
108 <      <include name="**/*.java"/>
109 <      <compilerarg value="-XDignore.symbol.file=true"/>
110 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111 <      <compilerarg line="${build.args}"/>
112 <    </javac>
113 <
114 <    <java classname="JSR166TestCase"
115 <          failonerror="true"
116 <          jvm="${java@{target}}"
117 <          fork="true">
118 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
119 <        <jvmarg line="@{jvmflags}"/>
120 <        <classpath>
121 <          <pathelement location="${junit.jar}"/>
122 <          <pathelement location="@{workdir}/tck-classes"/>
123 <        </classpath>
124 <    </java>
125 <
108 >    <delete dir="@{dst}"/>
109 >    <mkdir dir="@{dst}"/>
110 >    <copy todir="@{dst}" preservelastmodified="true">
111 >      <fileset dir="@{src}"/>
112 >    </copy>
113      </sequential>
114    </macrodef>
115  
116 +  <defjdklocations v="6"/>
117 +  <defjdklocations v="7"/>
118 +  <defjdklocations v="8"/>
119 +  <defjdklocations v="9"/>
120 +
121    <!-- Source locations -->
122    <property name="src.dir"              location="${basedir}/src/main"/>
123    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 141 | Line 133
133    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
134    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
135  
136 <  <!-- Distribution locations -->
137 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
138 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
139 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
140 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
141 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
142 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
136 >  <!-- Javadoc locations -->
137 >  <property name="docs.dir"          location="${build.dir}/docs"/>
138 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
139 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
140 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
141 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
142 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
143 >
144 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
145 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
146 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
147 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
148 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
149 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
150  
151    <!-- Jar locations -->
152    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 158 | Line 157
157    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
158    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
159  
161  <!-- Bootclasspath argument -->
162  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
163
160    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
161    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
162    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
163    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
164  
165    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
166 <  <!-- The below does not yet exist as of 2012-11 -->
166 >  <!-- The expected canonical location does not yet exist as of 2014-02 -->
167    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
168  
169 +  <property name="jdkapi9docs.url"      value="${jdkapi8docs.url}"/>
170 +  <!-- No published jdk9 docs exist as of 2014-02 -->
171 +  <!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> -->
172 +
173    <!-- Default jdk api doc location (latest stable release seems best) -->
174    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
175  
# Line 184 | Line 184
184      <pathelement location="${junit.jar}"/>
185    </path>
186  
187 +  <macrodef name="run-tck-tests">
188 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
189 +    <attribute name="target"/>
190 +    <attribute name="compile-target" default="@{target}"/>
191 +    <attribute name="workdir"/>
192 +    <attribute name="classes"/>
193 +    <attribute name="jvmflags" default=""/>
194 +    <element name="javac-elements" optional="true"/>
195 +    <sequential>
196 +
197 +    <mkdir dir="@{workdir}/tck-classes"/>
198 +
199 +    <javac srcdir="@{tck.src.dir}"
200 +           destdir="@{workdir}/tck-classes"
201 +           debug="${build.debug}"
202 +           debuglevel="${build.debuglevel}"
203 +           deprecation="${build.deprecation}"
204 +           source="@{compile-target}"
205 +           target="@{compile-target}"
206 +           classpath="${junit.jar}"
207 +           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
208 +           includeAntRuntime="false"
209 +           includeJavaRuntime="false"
210 +           executable="${javac@{compile-target}}"
211 +           fork="true">
212 +
213 +      <include name="*.java"/>
214 +      <compilerarg value="-XDignore.symbol.file=true"/>
215 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
216 +      <compilerarg line="${build.args}"/>
217 +      <javac-elements/>
218 +
219 +    </javac>
220 +
221 +    <java classname="${jsr166.tckTestClass}"
222 +          failonerror="true"
223 +          jvm="${java@{target}}"
224 +          fork="true">
225 +        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
226 +        <jvmarg line="@{jvmflags}"/>
227 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
228 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
229 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
230 +        <classpath>
231 +          <pathelement location="${junit.jar}"/>
232 +          <pathelement location="@{workdir}/tck-classes"/>
233 +        </classpath>
234 +    </java>
235 +
236 +    </sequential>
237 +  </macrodef>
238 +
239 +  <macrodef name="run-jtreg-tests">
240 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
241 +    <attribute name="source" default="7"/>
242 +    <attribute name="target"/>
243 +    <attribute name="workdir"/>
244 +    <attribute name="classes"/>
245 +    <attribute name="jtregflags" default=""/>
246 +    <sequential>
247 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
248 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
249 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
250 +    <mkdir dir="@{workdir}/JTreport"/>
251 +    <jtreg dir="@{jtreg.src.dir}"
252 +           jdk="${jdk@{target}.home}"
253 +           workDir="@{workdir}/JTwork"
254 +           reportDir="@{workdir}/JTreport">
255 +
256 +      <arg value="-Xbootclasspath/p:@{classes}"/>
257 +      <arg value="-agentvm"/>
258 +      <arg value="-v:nopass,fail"/>
259 +      <arg value="-vmoptions:-esa -ea"/>
260 +      <arg value="-automatic"/>
261 +      <arg value="-k:!ignore"/>
262 +      <arg line="@{jtregflags}"/>
263 +    </jtreg>
264 +    </sequential>
265 +  </macrodef>
266 +
267    <!-- ALoops classpath -->
268    <path id="loops.classpath">
269      <pathelement location="${build.loops.dir}"/>
270    </path>
271  
272    <!-- Support @jls tag, used in jdk8+ javadoc -->
273 <  <!-- TODO: How do we get &trade to work? -->
194 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
195 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
196 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
273 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
274    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
275  
276    <!-- Main targets -->
277  
278 +  <property name="build.main.java.version" value="9"/>
279 +  <property name="build.main.javac" value="${javac9}"/>
280 +
281    <target name="dists"
282            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
283            description="Builds all public jars and docs"/>
# Line 216 | Line 296
296             classpath=""
297             includeAntRuntime="false"
298             includeJavaRuntime="false"
299 <           executable="${javac8}"
299 >           executable="${build.main.javac}"
300             fork="true">
301  
302        <include name="**/*.java"/>
303 <      <compilerarg line="${build.args}"/>
303 >      <compilerarg value="-Xprefer:source"/>
304        <compilerarg value="-XDignore.symbol.file=true"/>
305        <compilerarg value="-Xlint:all"/>
306 <
307 < <!--
228 <      <exclude name="java/lang/**"/>
306 >      <compilerarg value="-Xdoclint:all/protected"/>
307 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
308        <compilerarg line="${build.args}"/>
230      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
231 -->
309  
310      </javac>
234
311    </target>
312  
313  
238
314    <target name="jar"
315            depends="compile"
316            description="Builds library jar from compiled sources">
# Line 243 | Line 318
318      <jar destfile="${product.jar}">
319        <fileset dir="${build.classes.dir}"/>
320      </jar>
246
321    </target>
322  
323  
250
251  <target name="test"
252          depends="configure-tests, report-tests"
253          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
254
255
256
324    <target name="docs"
325            description="Builds javadocs for src/main to dist dir">
326  
327 <    <delete dir="${dist.javadocs.dir}"/>
328 <    <mkdir dir="${dist.javadocs.dir}"/>
327 >    <delete dir="${docs.dir}"/>
328 >    <mkdir dir="${docs.dir}"/>
329  
330      <!-- the packagenames="none" hack below prevents scanning the -->
331      <!-- sourcepath for packages -->
332  
333 <    <javadoc destdir="${dist.javadocs.dir}"
333 >    <javadoc destdir="${docs.dir}"
334               packagenames="none"
335 <             link="${jdkapi8docs.url}"
335 >             link="${jdkapi9docs.url}"
336               overview="${src.dir}/intro.html"
337 <             sourcepath="${src.dir}:${jdk8src.dir}"
337 >             access="${build.javadoc.access}"
338 >             sourcepath="${src.dir}:${jdk9src.dir}"
339               classpath=""
340 <             executable="${javadoc8}">
273 <      <arg value="-XDignore.symbol.file=true"/>
274 <      <arg value="-tag"/>
275 <      <arg value="${javadoc.jls.option}"/>
340 >             executable="${javadoc9}">
341        <fileset dir="${src.dir}" defaultexcludes="yes">
342          <include name="**/*.java"/>
343        </fileset>
344 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
345 +      <arg value="-XDignore.symbol.file=true"/>
346 +      <arg value="-tag"/>
347 +      <arg value="${javadoc.jls.option}"/>
348 +      <arg value="-tag"/>
349 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
350 +      <arg value="-tag"/>
351 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
352 +      <arg value="-tag"/>
353 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
354      </javadoc>
280
355    </target>
356  
357  
284
358    <target name="dist"
359 <          depends="dist-clean, dist-jar, docs"
359 >          depends="dist-clean, dist-jar, dist-docs"
360            description="Puts all distributable products in single hierarchy"/>
361  
362  
# Line 302 | Line 375
375        <exclude name="**/SyntaxTest.java"/>
376        <exclude name="**/SuperfluousAbstract.java"/>
377      </jar>
305
378    </target>
379  
380  
309
381    <target name="clean"
382            description="Removes all build products">
383  
# Line 315 | Line 386
386    </target>
387  
388  
318
389    <target name="dist-clean"
390            description="Removes all build and distribution products">
391  
392 +    <delete dir="${build.dir}"/>
393      <delete dir="${dist.dir}"/>
394  
395    </target>
396  
397  
327
328  <!-- Internal targets -->
329
330
398    <target name="dist-jar"
399            depends="clean, jar">
333
400      <copy file="${product.jar}" todir="${dist.dir}"/>
335
401    </target>
402  
403 <
404 <  <target name="compile-tests"
405 <          depends="jar">
341 <
342 <    <mkdir dir="${build.testcases.dir}"/>
343 <
344 <    <javac srcdir="${tck.src.dir}"
345 <           destdir="${build.testcases.dir}"
346 <           debug="${build.debug}"
347 <           debuglevel="${build.debuglevel}"
348 <           deprecation="${build.deprecation}"
349 <           source="6"
350 <           classpath="${junit.jar}"
351 <           bootclasspath="${product.jar}:${bootclasspath6}"
352 <           includeAntRuntime="false"
353 <           includeJavaRuntime="false"
354 <           executable="${javac8}"
355 <           fork="true">
356 <
357 <      <include name="**/*.java"/>
358 <      <compilerarg line="${build.args}"/>
359 <      <compilerarg value="-XDignore.symbol.file=true"/>
360 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
361 <
362 <    </javac>
363 <
364 <    <javac srcdir="${test.src.dir}"
365 <           destdir="${build.testcases.dir}"
366 <           debug="${build.debug}"
367 <           debuglevel="${build.debuglevel}"
368 <           deprecation="${build.deprecation}"
369 <           source="6"
370 <           classpath=""
371 <           bootclasspath="${product.jar}:${bootclasspath6}"
372 <           includeAntRuntime="false"
373 <           includeJavaRuntime="false"
374 <           executable="${javac8}"
375 <           fork="true">
376 <
377 <      <include name="jsr166/test/**/*.java"/>
378 <
379 <      <compilerarg line="${build.args}"/>
380 <      <compilerarg value="-XDignore.symbol.file=true"/>
381 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
382 <
383 <    </javac>
384 <
385 < <!--
386 <    <javac srcdir="${jtreg.src.dir}"
387 <          destdir="${build.testcases.dir}"
388 <            debug="${build.debug}"
389 <       debuglevel="${build.debuglevel}"
390 <      deprecation="${build.deprecation}"
391 <           source="${build.sourcelevel}"
392 <             fork="true">
393 <
394 <      <compilerarg value="${bootclasspath.args}"/>
395 <      <compilerarg line="${build.args}"/>
396 <      <compilerarg value="-XDignore.symbol.file=true"/>
397 <
398 <    </javac>
399 < -->
400 <
403 >  <target name="dist-docs"
404 >          depends="clean, docs">
405 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
406    </target>
407  
408  
409 <  <target name="run-tests"
410 <          depends="compile-tests">
411 <
407 <    <!-- May be overridden by user.properties -->
408 <    <property name="testcase" value="*"/>
409 <
410 <    <mkdir dir="${build.reports.dir}"/>
411 <
412 <    <junit printsummary="true"
413 <             showoutput="true"
414 <          errorProperty="junit.failed"
415 <        failureProperty="junit.failed"
416 <                    dir="${build.reports.dir}"
417 <                    jvm="${java8}"
418 <                   fork="true">
419 <
420 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
421 <      <jvmarg value="-server"/>
422 <      <jvmarg value="-showversion"/>
423 <
424 <      <classpath refid="test.classpath"/>
425 <
426 <      <formatter type="xml"/>
427 <
428 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
429 <        <fileset dir="${tck.src.dir}">
430 <          <include name="**/${testcase}Test.java"/>
431 <        </fileset>
432 <      </batchtest>
433 <
434 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
435 <        <fileset dir="${test.src.dir}">
436 <          <include name="jsr166/test/**/${testcase}Test.java"/>
437 <        </fileset>
438 <      </batchtest>
439 <
440 < <!--
441 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
442 <        <fileset dir="${jtreg.src.dir}">
443 <          <include name="**/${testcase}Test.java"/>
444 <        </fileset>
445 <      </batchtest>
446 < -->
447 <
448 <    </junit>
409 >  <target name="test-tck"
410 >          depends="jar"
411 >          description="Runs tck tests for main directly">
412  
413 +    <run-tck-tests
414 +      target="${build.main.java.version}"
415 +      workdir="${build.dir}"
416 +      classes="${product.jar}"/>
417    </target>
418  
419 +  <target name="test-jtreg"
420 +          depends="jar"
421 +          description="Runs jtreg tests for main using the jtreg ant task">
422 +    <run-jtreg-tests
423 +       target="${build.main.java.version}"
424 +       workdir="${build.dir}"
425 +       classes="${product.jar}"/>
426 +  </target>
427  
428 <  <target name="report-tests"
429 <          depends="run-tests">
428 >  <target name="test"
429 >          depends="test-tck, test-jtreg"
430 >          description="Runs tck and jtreg tests for main">
431 >  </target>
432  
433 <    <!-- Sets junit.report.format to frames if redirection is present,
434 <         otherwise sets it to noframes. -->
458 <    <available property="junit.report.format"
459 <                  value="frames"
460 <              classname="org.apache.xalan.lib.Redirect"
461 <    />
462 <    <property name="junit.report.format" value="noframes"/>
463 <
464 <    <junitreport todir="${build.reports.dir}">
465 <      <fileset dir="${build.reports.dir}">
466 <        <include name="TEST-*.xml"/>
467 <      </fileset>
468 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
469 <      />
470 <    </junitreport>
433 >  <target name="test89"
434 >          description="Runs tck and jtreg tests for main for multiple java versions">
435  
436 <    <fail message="Test Cases Failed" if="junit.failed"/>
436 >    <antcall target="clean"/>
437 >    <antcall target="test">
438 >      <param name="build.main.java.version" value="8"/>
439 >      <param name="build.main.javac" value="${javac8}"/>
440 >    </antcall>
441 >
442 >    <antcall target="clean"/>
443 >    <antcall target="test">
444 >      <param name="build.main.java.version" value="9"/>
445 >      <param name="build.main.javac" value="${javac9}"/>
446 >    </antcall>
447  
448    </target>
449  
450  
451 +
452    <target name="configure-compiler">
453  
454      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 491 | Line 466
466    </target>
467  
468  
494  <target name="configure-tests"
495       depends="configure-compiler">
496
497    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
498    <available property="junit.available"
499               classname="junit.framework.Protectable"/>
500
501    <!-- Xalan -->
502    <available property="xalan.available"
503               classname="org.apache.xalan.Version"/>
504
505
506    <!-- Ant 1.6beta and later don't need or want this check -->
507    <!--
508    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
509          unless="junit.available"/>
510
511    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
512          unless="xalan.available"/>
513    -->
514
515  </target>
516
469  
470    <!-- Various demos and test programs -->
471  
# Line 546 | Line 498
498  
499    <!-- jsr166 4jdk7 -->
500  
549
501    <target name="4jdk7compile"
502            depends="configure-compiler"
503            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 567 | Line 518
518             fork="true">
519  
520        <include name="**/*.java"/>
521 <      <compilerarg line="${build.args}"/>
521 >      <compilerarg value="-Xprefer:source"/>
522        <compilerarg value="-XDignore.symbol.file=true"/>
523        <compilerarg value="-Xlint:all"/>
524 +      <compilerarg line="${build.args}"/>
525  
526      </javac>
527 +  </target>
528 +
529 +  <target name="4jdk7doclint"
530 +          depends="configure-compiler"
531 +          description="Finds doclint warnings">
532 +
533 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
534 +
535 +    <javac srcdir="${4jdk7src.dir}"
536 +           destdir="${build.4jdk7.classes.dir}"
537 +           debug="${build.debug}"
538 +           debuglevel="${build.debuglevel}"
539 +           deprecation="${build.deprecation}"
540 +           source="6"
541 +           classpath=""
542 +           bootclasspath="${bootclasspath7}"
543 +           includeAntRuntime="false"
544 +           includeJavaRuntime="false"
545 +           executable="${javac8}"
546 +           fork="true">
547 +
548 +      <include name="**/*.java"/>
549 +      <compilerarg value="-Xprefer:source"/>
550 +      <compilerarg value="-XDignore.symbol.file=true"/>
551 +      <compilerarg value="-Xlint:all"/>
552 +      <compilerarg value="-Xdoclint:all/protected"/>
553 +      <compilerarg line="${build.args}"/>
554  
555 +    </javac>
556    </target>
557  
558 <  <target name="4jdk7-jar"
558 >
559 >  <target name="4jdk7jar"
560            depends="4jdk7compile"
561            description="Builds library jar from compiled sources">
562  
# Line 587 | Line 568
568  
569  
570    <target name="4jdk7-test-tck"
571 <          depends="4jdk7-jar"
571 >          depends="4jdk7jar"
572            description="Runs tck tests for jsr166-4jdk7 directly">
573  
574      <run-tck-tests
575        target="7"
576        workdir="${build.4jdk7.dir}"
577 <      product.jar="${4jdk7product.jar}"/>
577 >      classes="${4jdk7product.jar}">
578 >      <javac-elements>
579 >        <!-- JDK8+ test classes -->
580 >        <exclude name="*8Test.java"/>
581 >        <exclude name="*9Test.java"/>
582 >        <exclude name="DoubleAccumulatorTest.java"/>
583 >        <exclude name="DoubleAdderTest.java"/>
584 >        <exclude name="LongAccumulatorTest.java"/>
585 >        <exclude name="LongAdderTest.java"/>
586 >        <exclude name="CompletableFutureTest.java"/>
587 >        <exclude name="SplittableRandomTest.java"/>
588 >        <exclude name="StampedLockTest.java"/>
589 >      </javac-elements>
590 >    </run-tck-tests>
591    </target>
592  
593  
# Line 619 | Line 613
613  
614        <formatter type="brief"/>
615  
616 <      <test name="JSR166TestCase" haltonfailure="no">
616 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
617        </test>
618  
619      </junit>
620    </target>
621  
622    <target name="4jdk7-test-jtreg"
623 <          depends="4jdk7compile"
623 >          depends="4jdk7jar"
624            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
625 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
626 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
627 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
628 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
629 <    <jtreg dir="${jtreg.src.dir}"
636 <           jdk="${jdk7.home}"
637 <           workDir="${build.4jdk7.dir}/JTwork"
638 <           reportDir="${build.4jdk7.dir}/JTreport">
639 <
640 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641 <      <arg value="-agentvm"/>
642 <      <arg value="-v:nopass,fail"/>
643 <      <arg value="-vmoptions:-esa -ea"/>
644 <      <arg value="-automatic"/>
645 <      <arg value="-k:!ignore"/>
646 <    </jtreg>
625 >    <run-jtreg-tests
626 >       target="7"
627 >       workdir="${build.4jdk7.dir}"
628 >       classes="${4jdk7product.jar}"
629 >       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
630    </target>
631  
632  
# Line 656 | Line 639
639    <target name="4jdk7docs"
640            description="Builds javadocs for src/jdk7 to dist dir">
641  
642 <    <delete dir="${dist.4jdk7.docs.dir}"/>
643 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
642 >    <delete dir="${4jdk7docs.dir}"/>
643 >    <mkdir dir="${4jdk7docs.dir}"/>
644  
645 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
645 >    <javadoc destdir="${4jdk7docs.dir}"
646               packagenames="none"
647               link="${jdkapi7docs.url}"
648               overview="${4jdk7src.dir}/intro.html"
649 +             access="${build.javadoc.access}"
650               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
651               classpath=""
652               executable="${javadoc7}">
669      <arg value="-XDignore.symbol.file=true"/>
653        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
654          <include name="**/*.java"/>
655        </fileset>
656 +      <arg value="-XDignore.symbol.file=true"/>
657      </javadoc>
674
658    </target>
659  
660  
661    <target name="4jdk7dist"
662 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
662 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
663            description="Puts all distributable products in single hierarchy"/>
664  
665  
683
666    <target name="4jdk7clean"
667            description="Removes all 4jdk7 build products">
668  
# Line 689 | Line 671
671    </target>
672  
673  
692
693  <target name="4jdk7dist-clean"
694          description="Removes all build and distribution products">
695
696  </target>
697
674    <target name="4jdk7dist-jar"
675 <          depends="4jdk7clean, 4jdk7compile">
700 <
675 >          depends="4jdk7clean, 4jdk7jar">
676      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
677 +  </target>
678  
679 +
680 +  <target name="4jdk7dist-docs"
681 +          depends="4jdk7clean, 4jdk7docs">
682 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
683    </target>
684  
685  
# Line 717 | Line 697
697             debuglevel="${build.debuglevel}"
698             deprecation="${build.deprecation}"
699             classpath=""
720           source="5"
700             bootclasspath="${bootclasspath6}"
701 +           source="5"
702             includeAntRuntime="false"
703             includeJavaRuntime="false"
704             executable="${javac7}"
705             fork="true">
706  
707        <include name="jsr166x/**/*.java"/>
728      <compilerarg line="${build.args}"/>
708        <compilerarg value="-XDignore.symbol.file=true"/>
709        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
710 +      <compilerarg line="${build.args}"/>
711  
712      </javac>
733
713    </target>
714  
715  
737
716    <target name="jsr166xjar"
717            depends="jsr166xcompile"
718            description="Builds library jar from compiled sources">
# Line 746 | Line 724
724    </target>
725  
726  
749
727    <target name="jsr166xdocs"
728            description="Builds javadocs to dist dir">
729  
730 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
731 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
730 >    <delete dir="${jsr166xdocs.dir}"/>
731 >    <mkdir dir="${jsr166xdocs.dir}"/>
732  
733 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
733 >    <javadoc destdir="${jsr166xdocs.dir}"
734               packagenames="jsr166x.*"
735               link="${jdkapidocs.url}"
736 <             source="5"
760 <             bootclasspath="${bootclasspath6}"
736 >             access="${build.javadoc.access}"
737               sourcepath="${topsrc.dir}:${jdk6src.dir}"
738 <             executable="${javadoc7}"
739 <             additionalparam="-XDignore.symbol.file=true"/>
738 >             bootclasspath="${bootclasspath6}"
739 >             source="5"
740 >             executable="${javadoc7}">
741 >      <arg value="-XDignore.symbol.file=true"/>
742  
743 +    </javadoc>
744    </target>
745  
746  
747    <target name="jsr166xdist"
748 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
748 >          depends="jsr166xdist-jar, jsr166xdist-docs"
749            description="Puts all distributable products in single hierarchy"/>
750  
751  
773
752    <target name="jsr166xclean"
753            description="Removes all jsr166x build products">
754  
# Line 779 | Line 757
757    </target>
758  
759  
782
783  <target name="jsr166xdist-clean"
784          description="Removes all build and distribution products">
785
786  </target>
787
788
760    <target name="jsr166xdist-jar"
761            depends="jsr166xclean, jsr166xjar">
791
762      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
763 +  </target>
764  
765 +  <target name="jsr166xdist-docs"
766 +          depends="jsr166xclean, jsr166xdocs">
767 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
768    </target>
769  
770    <!-- jsr166y -->
# Line 816 | Line 790
790             fork="true">
791  
792        <include name="jsr166y/**/*.java"/>
819      <compilerarg line="${build.args}"/>
793        <compilerarg value="-XDignore.symbol.file=true"/>
794        <compilerarg value="-Xlint:all"/>
795 +      <compilerarg line="${build.args}"/>
796 +
797      </javac>
798    </target>
799  
# Line 834 | Line 809
809    </target>
810  
811  
837
812    <target name="jsr166ydocs"
813            description="Builds javadocs to dist dir">
814  
815 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
816 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
815 >    <delete dir="${jsr166ydocs.dir}"/>
816 >    <mkdir dir="${jsr166ydocs.dir}"/>
817  
818 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
818 >    <javadoc destdir="${jsr166ydocs.dir}"
819               packagenames="jsr166y.*"
820               link="${jdkapidocs.url}"
821 <             source="6"
848 <             bootclasspath="${bootclasspath6}"
821 >             access="${build.javadoc.access}"
822               sourcepath="${topsrc.dir}:${jdk6src.dir}"
823 <             executable="${javadoc7}"
824 <             additionalparam="-XDignore.symbol.file=true"/>
823 >             bootclasspath="${bootclasspath6}"
824 >             source="6"
825 >             executable="${javadoc7}">
826 >      <arg value="-XDignore.symbol.file=true"/>
827  
828 +    </javadoc>
829    </target>
830  
831  
832    <target name="jsr166ydist"
833 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
833 >          depends="jsr166ydist-jar, jsr166ydist-docs"
834            description="Puts all distributable products in single hierarchy"/>
835  
836  
861
837    <target name="jsr166yclean"
838            description="Removes all jsr166y build products">
839  
# Line 867 | Line 842
842    </target>
843  
844  
870
871  <target name="jsr166ydist-clean"
872          description="Removes all build and distribution products">
873
874  </target>
875
845    <target name="jsr166ydist-jar"
846            depends="jsr166yclean, jsr166yjar">
878
847      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
848 +  </target>
849  
850 +  <target name="jsr166ydist-docs"
851 +          depends="jsr166yclean, jsr166ydocs">
852 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
853    </target>
854  
855  
# Line 895 | Line 867
867             debug="${build.debug}"
868             debuglevel="${build.debuglevel}"
869             deprecation="${build.deprecation}"
870 +           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
871             classpath=""
872             source="6"
900           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
873             includeAntRuntime="false"
874             includeJavaRuntime="false"
875             executable="${javac7}"
876             fork="true">
877  
878        <include name="extra166y/**/*.java"/>
907      <compilerarg line="${build.args}"/>
879        <compilerarg value="-XDignore.symbol.file=true"/>
880        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
881 +      <compilerarg line="${build.args}"/>
882  
883      </javac>
912
884    </target>
885  
886  
916
887    <target name="extra166yjar"
888            depends="extra166ycompile"
889            description="Builds library jar from compiled sources">
# Line 925 | Line 895
895    </target>
896  
897  
928
898    <target name="extra166ydocs"
899            description="Builds javadocs to build dir">
900  
901 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
902 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
901 >    <delete dir="${extra166ydocs.dir}"/>
902 >    <mkdir dir="${extra166ydocs.dir}"/>
903  
904 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
904 >    <javadoc destdir="${extra166ydocs.dir}"
905               packagenames="extra166y.*"
906               link="${jdkapidocs.url}"
907 <             source="6"
939 <             bootclasspath="${bootclasspath6}"
907 >             access="${build.javadoc.access}"
908               sourcepath="${topsrc.dir}:${jdk6src.dir}"
909 <             executable="${javadoc7}"
910 <             additionalparam="-XDignore.symbol.file=true"/>
909 >             bootclasspath="${bootclasspath6}"
910 >             source="6"
911 >             executable="${javadoc7}">
912 >      <arg value="-XDignore.symbol.file=true"/>
913  
914 +    </javadoc>
915    </target>
916  
917  
918    <target name="extra166ydist"
919 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
919 >          depends="extra166ydist-jar, extra166ydist-docs"
920            description="Puts all distributable products in single hierarchy"/>
921  
922  
952
923    <target name="extra166yclean"
924            description="Removes all extra166y build products">
925  
# Line 958 | Line 928
928    </target>
929  
930  
961
962  <target name="extra166ydist-clean"
963          description="Removes all build and distribution products">
964
965  </target>
966
931    <target name="extra166ydist-jar"
932            depends="extra166yclean, extra166yjar">
969
933      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
934 +  </target>
935  
936 +  <target name="extra166ydist-docs"
937 +          depends="extra166yclean, extra166ydocs">
938 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
939    </target>
940  
941    <!-- jsr166e -->
942  
943 +  <property name="build.jsr166e.java.version" value="6"/>
944 +  <property name="build.jsr166e.javac" value="${javac6}"/>
945 +
946    <target name="jsr166ecompile"
947            depends="configure-compiler"
948            description="Compiles jsr166e sources">
# Line 984 | Line 954
954             debug="${build.debug}"
955             debuglevel="${build.debuglevel}"
956             deprecation="${build.deprecation}"
957 <           source="7"
957 >           source="${build.jsr166e.java.version}"
958             classpath=""
959             includeAntRuntime="false"
960             includeJavaRuntime="false"
961 <           executable="${javac7}"
961 >           executable="${build.jsr166e.javac}"
962             fork="true">
963  
964        <include name="jsr166e/**/*.java"/>
995      <compilerarg line="${build.args}"/>
965        <compilerarg value="-XDignore.symbol.file=true"/>
966        <compilerarg value="-Xlint:all"/>
967 +      <compilerarg line="${build.args}"/>
968  
969      </javac>
1000
970    </target>
971  
972 +  <!-- jsr166e: find doclint errors -->
973 +  <target name="jsr166edoclint">
974 +
975 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
976 +
977 +    <javac srcdir="${topsrc.dir}"
978 +           destdir="${build.jsr166e.classes.dir}"
979 +           debug="${build.debug}"
980 +           debuglevel="${build.debuglevel}"
981 +           deprecation="${build.deprecation}"
982 +           source="${build.jsr166e.java.version}"
983 +           classpath=""
984 +           bootclasspath="${bootclasspath7}"
985 +           includeAntRuntime="false"
986 +           includeJavaRuntime="false"
987 +           executable="${javac8}"
988 +           fork="true">
989 +
990 +      <include name="jsr166e/**/*.java"/>
991 +      <compilerarg value="-XDignore.symbol.file=true"/>
992 +      <compilerarg value="-Xlint:all"/>
993 +      <compilerarg value="-Xdoclint:all/protected"/>
994 +
995 +    </javac>
996 +  </target>
997  
998  
999    <target name="jsr166ejar"
# Line 1013 | Line 1007
1007    </target>
1008  
1009  
1016
1010    <target name="jsr166edocs"
1011            description="Builds javadocs to build dir">
1012  
1013 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1014 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1013 >    <delete dir="${jsr166edocs.dir}"/>
1014 >    <mkdir dir="${jsr166edocs.dir}"/>
1015  
1016 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1016 >    <javadoc destdir="${jsr166edocs.dir}"
1017               packagenames="jsr166e.*"
1018               link="${jdkapidocs.url}"
1019 <             source="7"
1020 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1021 <             executable="${javadoc7}"
1022 <             additionalparam="-XDignore.symbol.file=true" >
1019 >             access="${build.javadoc.access}"
1020 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1021 >             source="${build.jsr166e.java.version}"
1022 >             executable="${javadoc7}">
1023 >      <arg value="-XDignore.symbol.file=true"/>
1024 >
1025      </javadoc>
1026 +  </target>
1027 +
1028 +
1029 +  <target name="jsr166e-test-tck-one-java-version"
1030 +          depends="jsr166ejar">
1031  
1032 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1033 +
1034 +    <run-tck-tests
1035 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1036 +      target="${build.jsr166e.java.version}"
1037 +      workdir="${build.jsr166e.dir}"
1038 +      classes="${jsr166e.jar}"/>
1039 +  </target>
1040 +
1041 +  <target name="jsr166e-test-tck"
1042 +          description="Runs tck tests for jsr166e for multiple java versions">
1043 +
1044 + <!--     <antcall target="clean"/> -->
1045 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1046 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1047 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1048 + <!--     </antcall> -->
1049 +
1050 +    <antcall target="clean"/>
1051 +    <antcall target="jsr166e-test-tck-one-java-version">
1052 +      <param name="build.jsr166e.java.version" value="7"/>
1053 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1054 +    </antcall>
1055 +
1056 +    <antcall target="clean"/>
1057 +    <antcall target="jsr166e-test-tck-one-java-version">
1058 +      <param name="build.jsr166e.java.version" value="6"/>
1059 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1060 +    </antcall>
1061    </target>
1062  
1063  
1064 +  <target name="jsr166e-test"
1065 +          depends="jsr166e-test-tck"
1066 +          description="Runs all tests for jsr166e">
1067 +  </target>
1068 +
1069    <target name="jsr166edist"
1070 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1070 >          depends="jsr166edist-jar, jsr166edist-docs"
1071            description="Puts all distributable products in single hierarchy"/>
1072  
1073  
1040
1074    <target name="jsr166eclean"
1075            description="Removes all jsr166e build products">
1043
1076      <delete dir="${build.jsr166e.dir}"/>
1045
1077    </target>
1078  
1079  
1080 <  <target name="jsr166edist-clean"
1081 <          description="Removes all build and distribution products">
1080 >  <target name="jsr166edist-jar"
1081 >          depends="jsr166eclean, jsr166ejar">
1082 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1083 >  </target>
1084  
1085 +  <target name="jsr166edist-docs"
1086 +          depends="jsr166eclean, jsr166edocs">
1087 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1088    </target>
1089  
1054  <target name="jsr166edist-jar"
1055          depends="jsr166eclean, jsr166ejar">
1090  
1091 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1091 > <!-- Find buglets that can be detected by static build tools -->
1092  
1093 +  <target name="lint">
1094 +    <antcall target="dists">
1095 +      <param name="build.javadoc.access" value="private"/>
1096 +    </antcall>
1097    </target>
1098  
1099 +
1100   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines