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.43 by tim, Thu Jun 26 11:54:26 2003 UTC vs.
Revision 1.198 by jsr166, Thu Mar 24 20:44:47 2016 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 8 | Line 9
9  
10    User-specific settings are read from user.properties.
11    See user.properties.sample for an explanation of some useful settings.
12 +
13 +  The repository contains all dependencies except for ant and the JDK
14 +  itself.  Because the JDK version matters and because different
15 +  targets require different JDKs, we assume that users have created a
16 +  hierarchy containing:
17 +  $HOME/jdk/jdk6
18 +  $HOME/jdk/jdk7
19 +  $HOME/jdk/jdk8
20 +  $HOME/jdk/jdk9
21 +  where each of the above is a JDK or a symlink to same, and
22 +  $HOME/jdk/src/jdk6
23 +  $HOME/jdk/src/jdk7
24 +  $HOME/jdk/src/jdk8
25 +  $HOME/jdk/src/jdk9
26 +  where each of the above is a complete JDK source tree
27 +  (e.g. mercurial forest) or a symlink to same.
28 +
29 +  Alternatively, define ant variables thus:
30 +  ant -Djdk$N.home=...
31 +  for $N in 6 7 8 9 ...
32 +
33 +  As of 2015-09, there is incomplete hacky support for jigsaw
34 +  Build for jigsaw using something like:
35 +  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 +  "docs" target is still broken.
37   ------------------------------------------------------------------------------
38    </description>
39  
40 <  <target name="usage" description="Advises user to run with -projecthelp">
41 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
40 >  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <target name="usage">
42 >    <java classname="org.apache.tools.ant.Main">
43 >      <arg value="-projecthelp" />
44 >    </java>
45    </target>
46  
47 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48  
49    <!-- User-specific settings -->
50    <property file="user.properties"/>
51  
52  
53    <!-- Compilation options -->
54 <  <property name="build.sourcelevel"    value="1.5"/>
25 <  <property name="build.docsourcelevel" value="1.4"/>
54 >  <property name="build.sourcelevel"    value="6"/>
55    <property name="build.debug"          value="true"/>
56    <property name="build.debuglevel"     value="source,lines,vars"/>
57    <property name="build.deprecation"    value="false"/>
58 +  <property name="build.javadoc.access" value="protected"/>
59  
60    <!-- Build locations -->
61 <  <property name="build.dir"            location="build"/>
62 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
63 <  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
64 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
65 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
66 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
67 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
68 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
69 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
70 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
71 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
61 >  <property name="build.dir"                   location="build"/>
62 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
63 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
64 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
65 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66 >
67 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71 >
72 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
73 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
74 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
75 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
76 >
77 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
78 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
79 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
80 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
81 >
82 >  <!-- JDK locations -->
83 >  <property name="jdks.home"  location="${user.home}/jdk"/>
84 >
85 >  <macrodef name="defjdklocations">
86 >    <attribute name="v"/>
87 >    <sequential>
88 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
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 >    <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" 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}}" unless:set="modules"/>
111 >    </sequential>
112 >  </macrodef>
113 >
114 >  <macrodef name="mirror-dir">
115 >    <attribute name="src"/>
116 >    <attribute name="dst"/>
117 >    <sequential>
118 >    <delete dir="@{dst}"/>
119 >    <mkdir dir="@{dst}"/>
120 >    <copy todir="@{dst}" preservelastmodified="true">
121 >      <fileset dir="@{src}"/>
122 >    </copy>
123 >    </sequential>
124 >  </macrodef>
125 >
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"/>
45  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
133    <property name="test.src.dir"         location="${basedir}/src/test"/>
134 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
135 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
134 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
135 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
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 <
143 <  <!-- Distribution locations -->
144 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
142 >  <property name="topsrc.dir"           location="${basedir}/src"/>
143 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
144 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
145 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
146 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
147 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
148 >
149 >  <!-- Javadoc locations -->
150 >  <property name="docs.dir"          location="${build.dir}/docs"/>
151 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
152 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
153 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
154 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
155 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
156 >
157 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
158 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
159 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
160 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
161 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
162 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
163  
164    <!-- Jar locations -->
165 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
166 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
167 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
168 <
169 <
170 <
171 <  <!-- Files excluded from dist-docs and emulation jar -->
172 <  <patternset id="unsafe.exclusion">
173 <    <exclude name="java/util/Random.*"/>
174 <    <exclude name="sun/misc/Unsafe.*"/>
175 <  </patternset>
176 <
177 <  <!-- Files excludes from emulation jar -->
178 <  <patternset id="atomic.exclusion">
179 <    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
180 <    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
181 <    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
182 <    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
183 <  </patternset>
184 <
185 <
186 <
187 <  <!-- Main targets -->
165 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
166 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
167 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
168 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
169 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
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 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 2015-11 -->
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 >  <!-- 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 >  <!-- 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="-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 <  <target name="compile"
81 <          depends="init, configure-compiler, prepare-src"
82 <          description="Compiles main sources to build folder">
222 >    <mkdir dir="@{workdir}/tck-classes"/>
223  
224 <    <property name="prepare.src.dir" value="${src.dir}"/>
224 >    <javac srcdir="@{tck.src.dir}"
225 >           destdir="@{workdir}/tck-classes"
226 >           debug="${build.debug}"
227 >           debuglevel="${build.debuglevel}"
228 >           deprecation="${build.deprecation}"
229 >           source="@{compile-target}"
230 >           target="@{compile-target}"
231 >           classpath="${junit.jar}"
232 >           includeAntRuntime="false"
233 >           includeJavaRuntime="false"
234 >           executable="${javac@{compile-target}}"
235 >           fork="true">
236 >
237 >      <include name="*.java"/>
238 >      <compilerarg value="-XDignore.symbol.file=true"/>
239 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241 >      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
242 >      <compilerarg line="${build.args}"/>
243 >      <javac-elements/>
244  
245 <    <mkdir dir="${build.classes.dir}"/>
245 >    </javac>
246  
247 < <!--
248 <    <echo>javac ${gjc.args}</echo>
249 <    <echo>bootclasspath=${compile.bootclasspath}</echo>
250 < -->
247 >    <java classname="${jsr166.tckTestClass}"
248 >          failonerror="true"
249 >          jvm="${java@{target}}"
250 >          fork="true">
251 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252 >        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
253 >        <jvmarg line="@{jvmflags}"/>
254 >
255 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256 >        <syspropertyset id="system-properties-used-by-tck">
257 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258 >          <propertyref prefix="jsr166."/>
259 >          <propertyref name="test.timeout.factor"/>
260 >        </syspropertyset>
261 >
262 >        <classpath>
263 >          <pathelement location="${junit.jar}"/>
264 >          <pathelement location="@{workdir}/tck-classes"/>
265 >        </classpath>
266 >    </java>
267  
268 <    <javac srcdir="${prepare.src.dir}"
269 <          destdir="${build.classes.dir}"
95 <            debug="${build.debug}"
96 <       debuglevel="${build.debuglevel}"
97 <      deprecation="${build.deprecation}"
98 <           source="${build.sourcelevel}"
99 <             fork="true">
268 >    </sequential>
269 >  </macrodef>
270  
271 <      <compilerarg    line="${gjc.args}"/>
272 <      <bootclasspath refid="compile.bootclasspath"/>
271 >  <!-- Define jtreg test sets for different jdk versions -->
272 >  <fileset dir="${jtreg9.src.dir}">
273 >    <patternset id="jdk9.jtreg.tests">
274 >      <include name="**/*.java"/>
275 >    </patternset>
276 >  </fileset>
277 >
278 >  <fileset dir="${jtreg8.src.dir}">
279 >    <patternset id="jdk8.jtreg.tests">
280 >      <include name="**/*.java"/>
281 >      <exclude name="**/SpliteratorCharacteristics.java"/>
282 >      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
283 >      <exclude name="**/GCDuringIteration.java"/>
284 >    </patternset>
285 >  </fileset>
286 >
287 >  <fileset dir="${jtreg7.src.dir}">
288 >    <patternset id="jdk7.jtreg.tests">
289 >      <include name="**/*.java"/>
290 >    </patternset>
291 >  </fileset>
292 >
293 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
294 >  <property name="jtreg.flags" value=""/>
295 >
296 >  <macrodef name="run-jtreg-tests">
297 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
298 >    <attribute name="source" default="7"/>
299 >    <attribute name="target"/>
300 >    <attribute name="workdir"/>
301 >    <attribute name="classes"/>
302 >    <attribute name="jtregflags" default=""/>
303 >
304 >    <sequential>
305 >
306 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
307 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
308 >
309 >    <local name="modules"/>
310 >    <condition property="modules">
311 >      <available file="${jdk@{target}.home}/jmods" type="dir"/>
312 >    </condition>
313  
314 <    </javac>
314 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
315 >    <delete dir="@{workdir}/JTreport" quiet="true"/>
316 >    <mkdir dir="@{workdir}/JTwork/scratch"/>
317 >    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
318 >    <mkdir dir="@{workdir}/JTreport/html"/>
319 >    <mkdir dir="@{workdir}/JTreport/text"/>
320 >    <jtreg dir="${jtreg@{target}.src.dir}"
321 >           jdk="${jdk@{target}.home}"
322 >           workDir="@{workdir}/JTwork"
323 >           reportDir="@{workdir}/JTreport">
324 >      <patternset refid="jdk@{target}.jtreg.tests"/>
325 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
326 >      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
327 >      <arg value="-agentvm"/>
328 >      <arg value="-verbose:${jtreg.verbose}"/>
329 >      <arg value="-vmoptions:-esa -ea"/>
330 >      <arg value="-automatic"/>
331 >      <arg value="-k:!ignore"/>
332 >      <arg line="@{jtregflags}"/>
333 >      <arg line="${jtreg.flags}"/>
334 >    </jtreg>
335 >    </sequential>
336 >  </macrodef>
337 >
338 >  <!-- ALoops classpath -->
339 >  <path id="loops.classpath">
340 >    <pathelement location="${build.loops.dir}"/>
341 >  </path>
342 >
343 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
344 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
345 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
346  
347 <  </target>
347 >  <!-- Main targets -->
348  
349 +  <property name="build.main.java.version" value="9"/>
350 +  <property name="build.main.javac" value="${javac9}"/>
351  
352 <  <target name="jar"
353 <          depends="configure-emulation, init-jar, native-jar, emulation-jar"
354 <          description="Builds library jar from compiled sources"/>
352 >  <target name="dists"
353 >          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
354 >          description="Builds all public jars and docs"/>
355  
356 +  <target name="compile"
357 +          depends="configure-compiler"
358 +          description="Compiles src/main sources to build dir">
359  
360 <  <target name="test"
361 <          depends="init, configure-tests, report-tests"
362 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
360 >    <local name="modules"/>
361 >    <condition property="modules">
362 >      <and>
363 >        <available file="${jdk9.home}/jmods" type="dir"/>
364 >        <equals arg1="9" arg2="${build.main.java.version}"/>
365 >      </and>
366 >    </condition>
367  
368 +    <local name="destdir"/>
369 +    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
370 +    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
371  
372 <  <target name="checkstyle"
120 <          depends="filter-src"
121 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
372 >    <mkdir dir="${destdir}"/>
373  
374 <    <taskdef resource="checkstyletask.properties"
375 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
374 >    <javac srcdir="${src.dir}"
375 >           destdir="${destdir}"
376 >           debug="${build.debug}"
377 >           debuglevel="${build.debuglevel}"
378 >           deprecation="${build.deprecation}"
379 >           classpath=""
380 >           includeAntRuntime="false"
381 >           includeJavaRuntime="false"
382 >           executable="${build.main.javac}"
383 >           fork="true">
384 >
385 >      <include name="**/*.java"/>
386 >      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
387 >      <compilerarg value="-Xprefer:source"/>
388 >      <compilerarg value="-XDignore.symbol.file=true"/>
389 >      <compilerarg value="-Xlint:all"/>
390 >      <compilerarg value="-Werror"/>
391 >      <compilerarg value="-Xdoclint:all/protected"/>
392 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
393 >      <compilerarg line="${build.args}"/>
394  
395 <    <checkstyle>
127 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
128 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
129 <    </checkstyle>
395 >    </javac>
396  
397 +    <!-- We need jdk9's Contended annotation, but at compile time only -->
398 +    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
399    </target>
400  
401  
402 <  <target name="doccheck"
403 <          depends="filter-src"
404 <          description="Reports on javadoc style errors (not working yet)">
137 <
138 <    <delete dir="${build.doccheck.dir}"/>
139 <    <mkdir dir="${build.doccheck.dir}"/>
140 <
141 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
142 <         docletpath="${lib.dir}/doccheck.jar"
143 <            destdir="${build.doccheck.dir}">
144 <      <packageset dir="${build.filter.src.dir}"/>
145 <    </javadoc>
402 >  <target name="jar"
403 >          depends="compile"
404 >          description="Builds library jar from compiled sources">
405  
406 +    <jar destfile="${product.jar}">
407 +      <fileset dir="${build.classes.dir}"/>
408 +      <manifest>
409 +        <attribute name="Built-By" value="${user.name}"/>
410 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
411 +      </manifest>
412 +    </jar>
413    </target>
414  
415  
416    <target name="docs"
417 <          depends="filter-src"
152 <          description="Builds javadocs with custom tags to build folder">
417 >          description="Builds javadocs for src/main to dist dir">
418  
419 <    <delete dir="${build.javadocs.dir}"/>
420 <    <mkdir dir="${build.javadocs.dir}"/>
419 >    <delete dir="${docs.dir}"/>
420 >    <mkdir dir="${docs.dir}"/>
421  
422 <    <javadoc destdir="${build.javadocs.dir}"
423 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
159 <            overview="${src.dir}/intro.html"
160 <              source="${build.docsourcelevel}">
161 <
162 <      <tag name="revised" description="Last revised:"/>
163 <      <tag name="spec"    description="Specified by:"/>
164 <      <tag name="editor"  description="Last edited by:"/>
165 <      <tag name="fixme"   description="FIX ME:"/>
166 <
167 <      <packageset dir="${build.filter.src.dir}"/>
422 >    <!-- the packagenames="none" hack below prevents scanning the -->
423 >    <!-- sourcepath for packages -->
424  
425 +    <javadoc destdir="${docs.dir}"
426 +             packagenames="none"
427 +             link="${java9.api.url}"
428 +             overview="${src.dir}/intro.html"
429 +             access="${build.javadoc.access}"
430 +             sourcepath="${src.dir}:${jdk9src.dir}"
431 +             classpath=""
432 +             executable="${javadoc9}">
433 +      <fileset dir="${src.dir}" defaultexcludes="yes">
434 +        <include name="**/*.java"/>
435 +      </fileset>
436 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
437 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438 +      <arg value="-XDignore.symbol.file=true"/>
439 + <!--  TODO     <arg value="-Xmodule:java.base"/> -->
440 +      <arg value="-tag"/>
441 +      <arg value="${javadoc.jls.option}"/>
442 +      <arg value="-tag"/>
443 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
444 +      <arg value="-tag"/>
445 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
446 +      <arg value="-tag"/>
447 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
448 + <!-- tags added in jdk9 -->
449 +      <arg value="-tag"/>
450 +      <arg value="revised:X"/>
451 +      <arg value="-tag"/>
452 +      <arg value="spec:X"/>
453      </javadoc>
170
171  </target>
172
173
174  <target name="strip"
175          depends="init, configure-compiler"
176          description="Strip generics from java source (not working yet)">
177
178    <mkdir dir="${build.stripped.dir}"/>
179
180    <!--
181     # javac -s doesn't reliably generate compilable code. It generates
182     # bridge methods (marked as "synthetic") that can have identical
183     # signatures to existing methods except for the return value.
184     -->
185    <javac srcdir="${src.dir}"
186          destdir="${build.stripped.dir}"
187            debug="${build.debug}"
188       debuglevel="${build.debuglevel}"
189      deprecation="${build.deprecation}"
190           source="${build.sourcelevel}"
191             fork="true">
192
193      <compilerarg    line="${gjc.args} -s"/>
194      <bootclasspath refid="compile.bootclasspath"/>
195
196    </javac>
197
454    </target>
455  
456  
457    <target name="dist"
458 <          depends="init, dist-clean, dist-jar, dist-docs"
458 >          depends="dist-clean, dist-jar, dist-docs"
459            description="Puts all distributable products in single hierarchy"/>
460  
461 +
462    <target name="release"
463            depends="dist"
464            description="Puts entire CVS tree, plus distribution productions, in a jar">
465  
209    <delete dir="${build.dir}"/>
210
466      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
467  
468      <jar basedir="${basedir}" destfile="${release.jar}">
469 +      <!-- <exclude name="build/**"/> -->
470        <exclude name="${release.jar}"/>
471        <exclude name="user.properties"/>
472        <exclude name="etc/notes/**"/>
473 <      <exclude name="lib/gjc/2.1/**"/>
473 >      <exclude name="src/emulation/**"/>
474 >      <exclude name="**/SyntaxTest.java"/>
475 >      <exclude name="**/SuperfluousAbstract.java"/>
476 >      <manifest>
477 >        <attribute name="Built-By" value="${user.name}"/>
478 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
479 >      </manifest>
480      </jar>
219
481    </target>
482  
483 +
484    <target name="clean"
485            description="Removes all build products">
486  
487      <delete dir="${build.dir}"/>
226    <delete dir="${build.classes.dir}"/>
227    <delete dir="${build.lib.dir}"/>
488  
489    </target>
490  
# Line 232 | Line 492
492    <target name="dist-clean"
493            description="Removes all build and distribution products">
494  
495 +    <delete dir="${build.dir}"/>
496      <delete dir="${dist.dir}"/>
497  
498    </target>
499  
500  
501 +  <target name="dist-jar"
502 +          depends="clean, jar">
503 +    <copy file="${product.jar}" todir="${dist.dir}"/>
504 +  </target>
505 +
506    <target name="dist-docs"
507 <          depends="filter-src"
508 <          description="Builds javadocs without custom tags to dist folder">
507 >          depends="clean, docs">
508 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
509 >  </target>
510  
511 <    <delete dir="${dist.javadocs.dir}"/>
512 <    <mkdir dir="${dist.javadocs.dir}"/>
511 >  <target name="tck"
512 >          depends="jar"
513 >          description="Runs tck tests for main directly">
514  
515 <    <javadoc destdir="${dist.javadocs.dir}"
516 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
517 <            overview="${src.dir}/intro.html"
518 <              source="${build.docsourcelevel}">
515 >    <run-tck-tests
516 >      target="${build.main.java.version}"
517 >      workdir="${build.dir}"
518 >      classes="${product.jar}"/>
519 >  </target>
520  
521 <      <packageset dir="${build.filter.src.dir}"/>
521 >  <target name="tck-parallelism-1"
522 >          description="Runs tck with given common pool parallelism">
523 >    <antcall target="tck">
524 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
525 >    </antcall>
526 >  </target>
527  
528 <    </javadoc>
528 >  <target name="tck-parallelism-0"
529 >          description="Runs tck with given common pool parallelism">
530 >    <antcall target="tck">
531 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
532 >    </antcall>
533 >  </target>
534  
535 +  <target name="jtreg"
536 +          depends="jar"
537 +          description="Runs jtreg tests for main using the jtreg ant task">
538 +    <run-jtreg-tests
539 +       target="${build.main.java.version}"
540 +       workdir="${build.dir}"
541 +       classes="${product.jar}"/>
542    </target>
543  
544 +  <target name="test"
545 +          depends="tck, tck-parallelism-1, jtreg"
546 +          description="Runs tck and jtreg tests for main">
547 +  </target>
548  
549 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
550  
551 <  <!-- Internal targets -->
551 >    <antcall target="jtreg">
552 >      <param name="build.main.java.version" value="8"/>
553 >      <param name="build.main.javac" value="${javac8}"/>
554 >    </antcall>
555  
556 +  </target>
557  
558 <  <target name="init">
558 >  <target name="test89"
559 >          description="Runs tck and jtreg tests for main for multiple java versions">
560  
561 <    <!-- Version is kept in a separate file -->
562 <    <loadfile property="version" srcFile="version.properties"/>
563 <    <echo>Building JSR-166 version ${version}</echo>
561 >    <antcall target="clean"/>
562 >    <antcall target="test">
563 >      <param name="build.main.java.version" value="8"/>
564 >      <param name="build.main.javac" value="${javac8}"/>
565 >    </antcall>
566 >
567 >    <antcall target="clean"/>
568 >    <antcall target="test">
569 >      <param name="build.main.java.version" value="9"/>
570 >      <param name="build.main.javac" value="${javac9}"/>
571 >    </antcall>
572  
573    </target>
574  
575  
272  <target name="init-jar">
576  
577 <    <mkdir dir="${build.lib.dir}"/>
577 >  <target name="configure-compiler">
578 >    <fail message="ant version too old">
579 >      <condition>
580 >        <not> <antversion atleast="1.9.1"/> </not>
581 >      </condition>
582 >    </fail>
583  
584 <  </target>
584 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
585  
586 +    <condition property="warnunchecked.arg" value="${unchecked.option}">
587 +      <istrue value="${build.warnunchecked}"/>
588 +    </condition>
589  
590 <  <target name="native-jar"
280 <          depends="compile"
281 <          unless="build.emulation.true">
590 >    <property name="warnunchecked.arg" value=""/>
591  
592 <    <jar destfile="${product.jar}">
593 <      <fileset dir="${build.classes.dir}"/>
594 <    </jar>
592 >
593 >    <!-- Common options in javac invocations -->
594 >    <property name="build.args" value="${warnunchecked.arg}"/>
595  
596    </target>
597  
598  
290  <target name="compile-emulation"
291          depends="init, configure-compiler"
292          if="build.emulation.true">
599  
600 <    <mkdir dir="${build.emulation.dir}"/>
600 >  <!-- Various demos and test programs -->
601 >
602  
603 <    <javac srcdir="${emulation.src.dir}"
604 <          destdir="${build.emulation.dir}"
603 >  <target name="loops" depends="configure-compiler"
604 >          description="Benchmark from Doug Lea's AQS paper">
605 >
606 >    <mkdir dir="${build.loops.dir}"/>
607 >
608 >    <javac srcdir="${loops.src.dir}"
609 >          destdir="${build.loops.dir}"
610              debug="${build.debug}"
611         debuglevel="${build.debuglevel}"
612        deprecation="${build.deprecation}"
613             source="${build.sourcelevel}"
614 +           target="${build.sourcelevel}"
615               fork="true">
616  
617 <      <compilerarg    line="${gjc.args}"/>
618 <      <bootclasspath refid="compile.bootclasspath"/>
617 >      <compilerarg line="${build.args}"/>
618 >      <classpath refid="loops.classpath"/>
619 >      <compilerarg value="-XDignore.symbol.file=true"/>
620 >
621 >    </javac>
622 >
623 >    <java classname="ALoops" fork="true">
624 >      <classpath refid="loops.classpath"/>
625 >    </java>
626 >
627 >  </target>
628 >
629 >
630 >  <target name="compile-test-loops" depends="jar"
631 >          description="compile all the perf tests in src/test/loops">
632 >
633 >    <mkdir dir="${build.dir}/test/loops"/>
634 >
635 >    <javac srcdir="${basedir}/src/test/loops"
636 >           destdir="${build.dir}/test/loops"
637 >           debug="${build.debug}"
638 >           debuglevel="${build.debuglevel}"
639 >           deprecation="${build.deprecation}"
640 >           includeAntRuntime="false"
641 >           includeJavaRuntime="false"
642 >           executable="${javac9}"
643 >           fork="true">
644 >
645 >      <include name="*.java"/>
646 >      <compilerarg value="-XDignore.symbol.file=true"/>
647 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
648 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
649 >      <compilerarg line="${build.args}"/>
650  
651      </javac>
652  
653    </target>
654  
655  
656 <  <target name="emulation-jar"
313 <          depends="compile-emulation"
314 <          if="build.emulation.true">
656 >  <!-- jsr166 4jdk7 -->
657  
658 +  <target name="4jdk7compile"
659 +          depends="configure-compiler"
660 +          description="Compiles src/jdk7 sources, targeting jdk7">
661  
662 <    <jar destfile="${product.jar}" duplicate="add">
318 <      <fileset dir="${build.classes.dir}">
319 <        <patternset refid="atomic.exclusion"/>
320 <        <patternset refid="unsafe.exclusion"/>
321 <      </fileset>
322 <      <fileset dir="${build.emulation.dir}"/>
323 <    </jar>
662 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
663  
664 +    <javac srcdir="${4jdk7src.dir}"
665 +           destdir="${build.4jdk7.classes.dir}"
666 +           debug="${build.debug}"
667 +           debuglevel="${build.debuglevel}"
668 +           deprecation="${build.deprecation}"
669 +           source="6"
670 +           target="6"
671 +           classpath=""
672 +           bootclasspath="${bootclasspath6}"
673 +           includeAntRuntime="false"
674 +           includeJavaRuntime="false"
675 +           executable="${javac7}"
676 +           fork="true">
677 +
678 +      <include name="**/*.java"/>
679 +      <compilerarg value="-Xprefer:source"/>
680 +      <compilerarg value="-XDignore.symbol.file=true"/>
681 +      <compilerarg value="-Xlint:all"/>
682 +      <compilerarg value="-Werror"/>
683 +      <compilerarg line="${build.args}"/>
684 +
685 +    </javac>
686    </target>
687  
688 +  <target name="4jdk7doclint"
689 +          depends="configure-compiler"
690 +          description="Finds doclint warnings">
691  
692 <  <target name="dist-jar"
329 <          depends="clean, jar">
692 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
693  
694 <    <copy file="${product.jar}" todir="${dist.dir}"/>
694 >    <javac srcdir="${4jdk7src.dir}"
695 >           destdir="${build.4jdk7.classes.dir}"
696 >           debug="${build.debug}"
697 >           debuglevel="${build.debuglevel}"
698 >           deprecation="${build.deprecation}"
699 >           source="6"
700 >           target="6"
701 >           classpath=""
702 >           bootclasspath="${bootclasspath6}"
703 >           includeAntRuntime="false"
704 >           includeJavaRuntime="false"
705 >           executable="${javac8}"
706 >           fork="true">
707 >
708 >      <include name="**/*.java"/>
709 >      <compilerarg value="-Xprefer:source"/>
710 >      <compilerarg value="-XDignore.symbol.file=true"/>
711 >      <compilerarg value="-Xlint:all"/>
712 >      <compilerarg value="-Xdoclint:all/protected"/>
713 >      <compilerarg line="${build.args}"/>
714  
715 +    </javac>
716    </target>
717  
718  
719 <  <target name="compile-ant-filter"
720 <          depends="init">
719 >  <target name="4jdk7jar"
720 >          depends="4jdk7compile"
721 >          description="Builds library jar from compiled sources">
722 >
723 >    <jar destfile="${4jdk7product.jar}">
724 >      <fileset dir="${build.4jdk7.classes.dir}"/>
725 >      <manifest>
726 >        <attribute name="Built-By" value="${user.name}"/>
727 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
728 >      </manifest>
729 >    </jar>
730  
731 <    <mkdir dir="${build.ant.dir}"/>
731 >  </target>
732  
341    <javac srcdir="${ant.src.dir}"
342          destdir="${build.ant.dir}"
343           source="1.4"
344    />
733  
734 +  <target name="4jdk7-tck"
735 +          depends="4jdk7jar"
736 +          description="Runs tck tests for jsr166-4jdk7 directly">
737 +
738 +    <run-tck-tests
739 +      target="7"
740 +      workdir="${build.4jdk7.dir}"
741 +      classes="${4jdk7product.jar}">
742 +      <javac-elements>
743 +        <!-- JDK8+ test classes -->
744 +        <exclude name="*8Test.java"/>
745 +        <exclude name="*9Test.java"/>
746 +        <exclude name="*10Test.java"/>
747 +        <exclude name="DoubleAccumulatorTest.java"/>
748 +        <exclude name="DoubleAdderTest.java"/>
749 +        <exclude name="LongAccumulatorTest.java"/>
750 +        <exclude name="LongAdderTest.java"/>
751 +        <exclude name="CompletableFutureTest.java"/>
752 +        <exclude name="SplittableRandomTest.java"/>
753 +        <exclude name="StampedLockTest.java"/>
754 +        <exclude name="SubmissionPublisherTest.java"/>
755 +      </javac-elements>
756 +    </run-tck-tests>
757    </target>
758  
759  
760 <  <target name="filter-src"
761 <          depends="compile-ant-filter">
760 >  <target name="4jdk7-tck-junit"
761 >          depends="4jdk7compile"
762 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
763  
764 <    <mkdir dir="${build.filter.src.dir}"/>
764 >    <junit printsummary="true"
765 >           showoutput="true"
766 >           errorProperty="junit.failed"
767 >           failureProperty="junit.failed"
768 >           includeantruntime="true"
769 >           jvm="${java7}"
770 >           fork="true">
771 >
772 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
773 >      <jvmarg value="-server"/>
774 >
775 >      <classpath>
776 >        <pathelement location="${junit.jar}"/>
777 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
778 >      </classpath>
779 >
780 >      <formatter type="brief"/>
781 >
782 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
783 >      </test>
784 >
785 >    </junit>
786 >  </target>
787 >
788 >  <target name="4jdk7-jtreg"
789 >          depends="4jdk7jar"
790 >          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
791 >    <run-jtreg-tests
792 >       target="7"
793 >       workdir="${build.4jdk7.dir}"
794 >       classes="${4jdk7product.jar}"/>
795 >  </target>
796  
354    <copy todir="${build.filter.src.dir}">
355      <fileset dir="${src.dir}">
356        <include name="**/*.html"/>
357      </fileset>
358    </copy>
797  
798 <    <!-- Not needed now, used for doccheck filtering:
799 <    <property name="generic.declarations"
800 <             value="public interface E {} public interface T {} public interface K {} public interface V {}"
801 <    />
802 <    -->
803 <
804 <    <copy todir="${build.filter.src.dir}">
805 <      <fileset dir="${src.dir}">
806 <        <exclude name="**/*.html"/>
807 <        <patternset refid="unsafe.exclusion"/>
798 >  <target name="4jdk7-test"
799 >          depends="4jdk7-tck, 4jdk7-jtreg"
800 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
801 >  </target>
802 >
803 >
804 >  <target name="4jdk7docs"
805 >          description="Builds javadocs for src/jdk7 to dist dir">
806 >
807 >    <delete dir="${4jdk7docs.dir}"/>
808 >    <mkdir dir="${4jdk7docs.dir}"/>
809 >
810 >    <javadoc destdir="${4jdk7docs.dir}"
811 >             packagenames="none"
812 >             link="${java7.api.url}"
813 >             overview="${4jdk7src.dir}/intro.html"
814 >             access="${build.javadoc.access}"
815 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
816 >             classpath=""
817 >             executable="${javadoc7}">
818 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
819 >        <include name="**/*.java"/>
820        </fileset>
821 <      <filterchain>
821 >      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
822 >      <arg value="-XDignore.symbol.file=true"/>
823 >    </javadoc>
824 >  </target>
825  
373        <!--
374         # This filter gets rid of angle-bracketed type parameters
375         # so that javadoc can run on the result. The following
376         # heuristic seems to work:
377         #
378         # For all lines not starting with space(s)-asterisk-space(s),
379         #   replace <something> with a space, where there may be more
380         #   than one right angle bracket at the end, and "something"
381         #   must not contain parens or pipes. (This may need some
382         #   tweaking.)
383         -->
384
385        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
386                      classpath="${build.ant.dir}">
387          <param name="notmatching" value="^\s+\*\s.*$"/>
388          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
389          <param name="replacement" value=" "/>
390        </filterreader>
391
392
393        <!--
394         # This filter uncomments lines beginning with "//@" so that
395         # javadoc can see imports that are needed to resolve links
396         # but that shouldn't be in the compiled code.
397         -->
398
399        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
400                      classpath="${build.ant.dir}">
401          <param name="matching"    value="^//@.*$"/>
402          <param name="pattern"     value="^//@"/>
403          <param name="replacement" value=""/>
404        </filterreader>
405
406
407        <!--
408         # The next two filters try to make the source look like
409         # something that doccheck can process. The first removes
410         # -source 1.4 assertions and the second adds in a bunch
411         # of single letter public nested marker interfaces so that
412         # the generic type parameters are recognized.
413         #
414         # Currently commented out because doccheck doesn't work. :-(
415         -->
416
417        <!--
418        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
419                      classpath="${build.ant.dir}">
420          <param name="matching"    value="^\s*assert[\s ].*$"/>
421          <param name="pattern"     value="assert"/>
422          <param name="replacement" value="//assert"/>
423        </filterreader>
424
425        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
426                      classpath="${build.ant.dir}">
427          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
428          <param name="pattern"     value="$"/>
429          <param name="replacement" value=" ${generic.declarations}"/>
430        </filterreader>
431        -->
826  
827 <      </filterchain>
828 <    </copy>
827 >  <target name="4jdk7dist"
828 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
829 >          description="Puts all distributable products in single hierarchy"/>
830 >
831 >
832 >  <target name="4jdk7clean"
833 >          description="Removes all 4jdk7 build products">
834 >
835 >    <delete dir="${build.4jdk7.dir}"/>
836  
837    </target>
838  
839  
840 <  <target name="compile-tests"
841 <          depends="jar">
840 >  <target name="4jdk7dist-jar"
841 >          depends="4jdk7clean, 4jdk7jar">
842 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
843 >  </target>
844  
442    <mkdir dir="${build.testcases.dir}"/>
845  
846 < <!--
847 <    <echo>javac ${gjc.args}</echo>
848 <    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
849 <    <echo>classpath="${test.classpath}"</echo>
448 < -->
846 >  <target name="4jdk7dist-docs"
847 >          depends="4jdk7clean, 4jdk7docs">
848 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
849 >  </target>
850  
450    <javac srcdir="${test.src.dir}"
451          destdir="${build.testcases.dir}"
452            debug="${build.debug}"
453       debuglevel="${build.debuglevel}"
454      deprecation="${build.deprecation}"
455           source="${build.sourcelevel}"
456             fork="true">
851  
852 <      <compilerarg    line="${gjc.args}"/>
853 <      <bootclasspath refid="test.compile.bootclasspath"/>
854 <      <classpath     refid="test.classpath"/>
852 >  <!-- jsr166x -->
853 >
854 >  <target name="jsr166xcompile"
855 >          depends="configure-compiler"
856 >          description="Compiles jsr166x sources to build dir">
857 >
858 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
859 >
860 >    <javac srcdir="${topsrc.dir}"
861 >           destdir="${build.jsr166x.classes.dir}"
862 >           debug="${build.debug}"
863 >           debuglevel="${build.debuglevel}"
864 >           deprecation="${build.deprecation}"
865 >           classpath=""
866 >           bootclasspath="${bootclasspath6}"
867 >           source="5"
868 >           target="5"
869 >           includeAntRuntime="false"
870 >           includeJavaRuntime="false"
871 >           executable="${javac7}"
872 >           fork="true">
873 >
874 >      <include name="jsr166x/**/*.java"/>
875 >      <compilerarg value="-XDignore.symbol.file=true"/>
876 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
877 >      <compilerarg value="-Werror"/>
878 >      <compilerarg line="${build.args}"/>
879  
880      </javac>
881 +  </target>
882 +
883 +
884 +  <target name="jsr166xjar"
885 +          depends="jsr166xcompile"
886 +          description="Builds library jar from compiled sources">
887 +
888 +    <jar destfile="${jsr166x.jar}">
889 +      <fileset dir="${build.jsr166x.classes.dir}"/>
890 +      <manifest>
891 +        <attribute name="Built-By" value="${user.name}"/>
892 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
893 +      </manifest>
894 +    </jar>
895  
896    </target>
897  
898  
899 <  <target name="run-tests"
900 <          depends="compile-tests">
899 >  <target name="jsr166xdocs"
900 >          description="Builds javadocs to dist dir">
901  
902 <    <!-- May be overridden by user.properties -->
903 <    <property name="testcase" value="*"/>
902 >    <delete dir="${jsr166xdocs.dir}"/>
903 >    <mkdir dir="${jsr166xdocs.dir}"/>
904  
905 <    <mkdir dir="${build.reports.dir}"/>
905 >    <javadoc destdir="${jsr166xdocs.dir}"
906 >             packagenames="jsr166x.*"
907 >             link="${java.api.url}"
908 >             access="${build.javadoc.access}"
909 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
910 >             bootclasspath="${bootclasspath6}"
911 >             source="5"
912 >             executable="${javadoc7}">
913 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
914 >      <arg value="-XDignore.symbol.file=true"/>
915  
916 <    <junit printsummary="true"
917 <             showoutput="true"
477 <          errorProperty="junit.failed"
478 <        failureProperty="junit.failed"
479 <                    dir="${build.reports.dir}"
480 <                   fork="true">
481 <
482 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
483 <
484 <      <formatter type="xml"/>
485 <
486 <      <batchtest todir="${build.reports.dir}">
487 <        <fileset dir="${test.src.dir}">
488 <          <include name="**/${testcase}Test.java"/>
489 <        </fileset>
490 <      </batchtest>
916 >    </javadoc>
917 >  </target>
918  
492    </junit>
919  
920 +  <target name="jsr166xdist"
921 +          depends="jsr166xdist-jar, jsr166xdist-docs"
922 +          description="Puts all distributable products in single hierarchy"/>
923 +
924 +
925 +  <target name="jsr166xclean"
926 +          description="Removes all jsr166x build products">
927 +
928 +    <delete dir="${build.jsr166x.dir}"/>
929 +
930 +  </target>
931 +
932 +
933 +  <target name="jsr166xdist-jar"
934 +          depends="jsr166xclean, jsr166xjar">
935 +    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
936    </target>
937  
938 +  <target name="jsr166xdist-docs"
939 +          depends="jsr166xclean, jsr166xdocs">
940 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
941 +  </target>
942  
943 <  <target name="report-tests"
498 <          depends="run-tests">
943 >  <!-- jsr166y -->
944  
500    <!-- Sets junit.report.format to frames if Xalan is present,
501         otherwise sets it to noframes. -->
502    <available property="junit.report.format"
503                  value="frames"
504              classname="org.apache.xalan.lib.Redirect"
505    />
506    <property name="junit.report.format" value="noframes"/>
507
508    <junitreport todir="${build.reports.dir}">
509      <fileset dir="${build.reports.dir}">
510        <include name="TEST-*.xml"/>
511      </fileset>
512      <report styledir="${stylesheet.dir}"
513                format="${junit.report.format}"
514                 todir="${build.reports.dir}"
515      />
516    </junitreport>
945  
946 <    <fail message="Test Cases Failed" if="junit.failed"/>
946 >  <target name="jsr166ycompile"
947 >          depends="configure-compiler"
948 >          description="Compiles jsr166y sources">
949 >
950 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
951  
952 +    <javac srcdir="${topsrc.dir}"
953 +           destdir="${build.jsr166y.classes.dir}"
954 +           debug="${build.debug}"
955 +           debuglevel="${build.debuglevel}"
956 +           deprecation="${build.deprecation}"
957 +           source="6"
958 +           target="6"
959 +           classpath=""
960 +           bootclasspath="${bootclasspath6}"
961 +           includeAntRuntime="false"
962 +           includeJavaRuntime="false"
963 +           executable="${javac7}"
964 +           fork="true">
965 +
966 +      <include name="jsr166y/**/*.java"/>
967 +      <compilerarg value="-XDignore.symbol.file=true"/>
968 +      <compilerarg value="-Xlint:all"/>
969 +      <compilerarg value="-Werror"/>
970 +      <compilerarg line="${build.args}"/>
971 +
972 +    </javac>
973    </target>
974  
975  
976 <  <target name="configure-compiler">
976 >  <target name="jsr166yjar"
977 >          depends="jsr166ycompile"
978 >          description="Builds library jar from compiled sources">
979 >
980 >    <jar destfile="${jsr166y.jar}" index="true">
981 >      <fileset dir="${build.jsr166y.classes.dir}"/>
982 >      <manifest>
983 >        <attribute name="Built-By" value="${user.name}"/>
984 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
985 >      </manifest>
986 >    </jar>
987  
988 <    <property name="gjc.version"
526 <             value="2.0"/>
988 >  </target>
989  
528    <condition property="novariance.arg" value="-novariance">
529      <and>
530        <equals arg1="${gjc.version}" arg2="2.0"/>
531        <or>
532          <not><isset property="gjc.novariance"/></not>
533          <istrue value="${gjc.novariance}"/>
534        </or>
535      </and>
536    </condition>
990  
991 <    <property name="novariance.arg"
992 <             value=""/>
991 >  <target name="jsr166ydocs"
992 >          description="Builds javadocs to dist dir">
993  
994 <    <property name="gjc.dir"
995 <             value="${lib.dir}/gjc"/>
994 >    <delete dir="${jsr166ydocs.dir}"/>
995 >    <mkdir dir="${jsr166ydocs.dir}"/>
996  
997 <    <property name="javac.jar"
998 <          location="${gjc.dir}/${gjc.version}/javac.jar"/>
997 >    <javadoc destdir="${jsr166ydocs.dir}"
998 >             packagenames="jsr166y.*"
999 >             link="${java.api.url}"
1000 >             access="${build.javadoc.access}"
1001 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002 >             bootclasspath="${bootclasspath6}"
1003 >             source="6"
1004 >             executable="${javadoc7}">
1005 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1006 >      <arg value="-XDignore.symbol.file=true"/>
1007  
1008 <    <property name="collect.jar"
1009 <          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
1008 >    </javadoc>
1009 >  </target>
1010  
1011  
1012 <    <condition property="warnunchecked.arg" value="-warnunchecked">
1013 <      <istrue value="${gjc.warnunchecked}"/>
1014 <    </condition>
1012 >  <target name="jsr166ydist"
1013 >          depends="jsr166ydist-jar, jsr166ydist-docs"
1014 >          description="Puts all distributable products in single hierarchy"/>
1015  
555    <property name="warnunchecked.arg" value=""/>
1016  
1017 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
1018 <      <istrue value="${build.nothreads}"/>
559 <    </condition>
1017 >  <target name="jsr166yclean"
1018 >          description="Removes all jsr166y build products">
1019  
1020 +    <delete dir="${build.jsr166y.dir}"/>
1021  
1022 <    <!--
563 <     ! Bootclasspath munging for source compilation.
564 <     -->
1022 >  </target>
1023  
566    <path id="pre.bootclasspath">
567      <pathelement location="${javac.jar}"/>
568    </path>
1024  
1025 <    <path id="compile.bootclasspath">
1026 <      <pathelement location="${build.classes.dir}"/>
1027 <      <pathelement location="${collect.jar}"/>
1028 <      <pathelement location="${rt.jar}"/>
574 <    </path>
1025 >  <target name="jsr166ydist-jar"
1026 >          depends="jsr166yclean, jsr166yjar">
1027 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1028 >  </target>
1029  
1030 <    <!-- Flatten paths into platform-appropriate strings -->
1031 <    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
1032 <    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
1030 >  <target name="jsr166ydist-docs"
1031 >          depends="jsr166yclean, jsr166ydocs">
1032 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1033 >  </target>
1034  
1035  
1036 <    <!-- Common options in javac invocations -->
1037 <    <property name="gjc.args"
1038 <             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
1039 <    />
1036 >  <!-- extra166y -->
1037 >
1038 >
1039 >  <target name="extra166ycompile"
1040 >          depends="configure-compiler, jsr166yjar"
1041 >          description="Compiles extra166y sources">
1042 >
1043 >    <mkdir dir="${build.extra166y.classes.dir}"/>
1044 >
1045 >    <javac srcdir="${topsrc.dir}"
1046 >           destdir="${build.extra166y.classes.dir}"
1047 >           debug="${build.debug}"
1048 >           debuglevel="${build.debuglevel}"
1049 >           deprecation="${build.deprecation}"
1050 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1051 >           classpath=""
1052 >           source="6"
1053 >           target="6"
1054 >           includeAntRuntime="false"
1055 >           includeJavaRuntime="false"
1056 >           executable="${javac7}"
1057 >           fork="true">
1058 >
1059 >      <include name="extra166y/**/*.java"/>
1060 >      <compilerarg value="-XDignore.symbol.file=true"/>
1061 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1062 >      <compilerarg value="-Werror"/>
1063 >      <compilerarg line="${build.args}"/>
1064 >
1065 >    </javac>
1066 >  </target>
1067 >
1068 >
1069 >  <target name="extra166yjar"
1070 >          depends="extra166ycompile"
1071 >          description="Builds library jar from compiled sources">
1072 >
1073 >    <jar destfile="${extra166y.jar}" index="true">
1074 >      <fileset dir="${build.extra166y.classes.dir}"/>
1075 >      <manifest>
1076 >        <attribute name="Built-By" value="${user.name}"/>
1077 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1078 >      </manifest>
1079 >    </jar>
1080  
1081    </target>
1082  
1083  
1084 <  <target name="prepare-src"
1084 >  <target name="extra166ydocs"
1085 >          description="Builds javadocs to build dir">
1086 >
1087 >    <delete dir="${extra166ydocs.dir}"/>
1088 >    <mkdir dir="${extra166ydocs.dir}"/>
1089 >
1090 >    <javadoc destdir="${extra166ydocs.dir}"
1091 >             packagenames="extra166y.*"
1092 >             link="${java.api.url}"
1093 >             access="${build.javadoc.access}"
1094 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1095 >             bootclasspath="${bootclasspath6}"
1096 >             source="6"
1097 >             executable="${javadoc7}">
1098 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1099 >      <arg value="-XDignore.symbol.file=true"/>
1100 >
1101 >    </javadoc>
1102 >  </target>
1103 >
1104 >
1105 >  <target name="extra166ydist"
1106 >          depends="extra166ydist-jar, extra166ydist-docs"
1107 >          description="Puts all distributable products in single hierarchy"/>
1108 >
1109 >
1110 >  <target name="extra166yclean"
1111 >          description="Removes all extra166y build products">
1112 >
1113 >    <delete dir="${build.extra166y.dir}"/>
1114 >
1115 >  </target>
1116 >
1117 >
1118 >  <target name="extra166ydist-jar"
1119 >          depends="extra166yclean, extra166yjar">
1120 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1121 >  </target>
1122 >
1123 >  <target name="extra166ydist-docs"
1124 >          depends="extra166yclean, extra166ydocs">
1125 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1126 >  </target>
1127 >
1128 >  <!-- jsr166e -->
1129 >
1130 >  <property name="build.jsr166e.java.version" value="6"/>
1131 >  <property name="build.jsr166e.javac" value="${javac6}"/>
1132 >
1133 >  <target name="jsr166ecompile"
1134            depends="configure-compiler"
1135 <          if="prepare.src.dir">
1135 >          description="Compiles jsr166e sources">
1136  
1137 <    <mkdir dir="${prepare.src.dir}"/>
594 <    <copy todir="${prepare.src.dir}">
595 <      <fileset dir="${src.dir}">
596 <        <exclude name="java/lang/**"/>
597 <      </fileset>
598 <    </copy>
1137 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1138  
1139 +    <javac srcdir="${topsrc.dir}"
1140 +           destdir="${build.jsr166e.classes.dir}"
1141 +           debug="${build.debug}"
1142 +           debuglevel="${build.debuglevel}"
1143 +           deprecation="${build.deprecation}"
1144 +           source="${build.jsr166e.java.version}"
1145 +           target="${build.jsr166e.java.version}"
1146 +           classpath=""
1147 +           includeAntRuntime="false"
1148 +           includeJavaRuntime="false"
1149 +           executable="${build.jsr166e.javac}"
1150 +           fork="true">
1151 +
1152 +      <include name="jsr166e/**/*.java"/>
1153 +      <compilerarg value="-XDignore.symbol.file=true"/>
1154 +      <compilerarg value="-Xlint:all"/>
1155 +      <compilerarg value="-Werror"/>
1156 +      <compilerarg line="${build.args}"/>
1157 +
1158 +    </javac>
1159    </target>
1160  
1161 +  <!-- jsr166e: find doclint errors -->
1162 +  <target name="jsr166edoclint">
1163  
1164 <  <target name="configure-emulation">
1164 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1165  
1166 <    <condition property="build.emulation.true">
1167 <      <or>
1168 <        <and>
1169 <          <os family="windows"/>
1170 <          <not>
1171 <            <isset property="build.emulation"/>
1172 <          </not>
1173 <        </and>
1174 <        <istrue value="${build.emulation}"/>
1175 <      </or>
1176 <    </condition>
1166 >    <javac srcdir="${topsrc.dir}"
1167 >           destdir="${build.jsr166e.classes.dir}"
1168 >           debug="${build.debug}"
1169 >           debuglevel="${build.debuglevel}"
1170 >           deprecation="${build.deprecation}"
1171 >           source="${build.jsr166e.java.version}"
1172 >           target="${build.jsr166e.java.version}"
1173 >           classpath=""
1174 >           bootclasspath="${bootclasspath6}"
1175 >           includeAntRuntime="false"
1176 >           includeJavaRuntime="false"
1177 >           executable="${javac8}"
1178 >           fork="true">
1179 >
1180 >      <include name="jsr166e/**/*.java"/>
1181 >      <compilerarg value="-XDignore.symbol.file=true"/>
1182 >      <compilerarg value="-Xlint:all"/>
1183 >      <compilerarg value="-Werror"/>
1184 >      <compilerarg value="-Xdoclint:all/protected"/>
1185  
1186 +    </javac>
1187    </target>
1188  
1189  
1190 <  <target name="configure-tests"
1191 <       depends="configure-compiler">
1190 >  <target name="jsr166ejar"
1191 >          depends="jsr166ecompile"
1192 >          description="Builds library jar from compiled sources">
1193 >
1194 >    <jar destfile="${jsr166e.jar}" index="true">
1195 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1196 >      <manifest>
1197 >        <attribute name="Built-By" value="${user.name}"/>
1198 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1199 >      </manifest>
1200 >    </jar>
1201  
1202 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
624 <    <available property="junit.available"
625 <               classname="junit.framework.Protectable"/>
626 <
627 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
628 <          unless="junit.available"/>
629 <
630 <
631 <    <!--
632 <     ! Bootclasspath munging for testing, so JUnit can test our local
633 <     ! modifications to java.*.
634 <     -->
635 <
636 <    <path id="test.classpath">
637 <      <pathelement location="${product.jar}"/>
638 <      <pathelement location="${build.testcases.dir}"/>
639 <      <pathelement location="${junit.jar}"/>
640 <    </path>
1202 >  </target>
1203  
642    <path id="test.compile.bootclasspath">
643      <pathelement location="${javac.jar}"/>
644      <pathelement location="${collect.jar}"/>
645      <pathelement location="${rt.jar}"/>
646    </path>
1204  
1205 <    <path id="test.run.bootclasspath">
1206 <      <pathelement location="${javac.jar}"/>
1207 <      <path refid="test.classpath"/>
1208 <    </path>
1205 >  <target name="jsr166edocs"
1206 >          description="Builds javadocs to build dir">
1207 >
1208 >    <delete dir="${jsr166edocs.dir}"/>
1209 >    <mkdir dir="${jsr166edocs.dir}"/>
1210  
1211 <    <!-- Flatten test classpaths into platform-appropriate strings -->
1212 <    <property name="test.classpath"             refid="test.classpath"/>
1213 <    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
1214 <    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
1211 >    <javadoc destdir="${jsr166edocs.dir}"
1212 >             packagenames="jsr166e.*"
1213 >             link="${java.api.url}"
1214 >             access="${build.javadoc.access}"
1215 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1216 >             source="${build.jsr166e.java.version}"
1217 >             executable="${javadoc7}">
1218 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1219 >      <arg value="-XDignore.symbol.file=true"/>
1220  
1221 +    </javadoc>
1222    </target>
1223  
1224  
1225 +  <target name="jsr166e-tck-one-java-version"
1226 +          depends="jsr166ejar">
1227  
1228 <  <!-- Anthill targets -->
1228 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1229  
1230 <  <target name="anthill-build"
1231 <          depends="jar, test, docs, dist-docs"/>
1230 >    <run-tck-tests
1231 >      tck.src.dir="${test.src.dir}/tck-jsr166e"
1232 >      target="${build.jsr166e.java.version}"
1233 >      workdir="${build.jsr166e.dir}"
1234 >      classes="${jsr166e.jar}"/>
1235 >  </target>
1236  
1237 <  <target name="anthill-publish">
1237 >  <target name="jsr166e-tck"
1238 >          description="Runs tck tests for jsr166e for multiple java versions">
1239  
1240 <    <copy todir="${deployDir}/docs/private">
1241 <      <fileset dir="${build.javadocs.dir}"/>
1242 <    </copy>
1240 > <!--     <antcall target="clean"/> -->
1241 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1242 > <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1243 > <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1244 > <!--     </antcall> -->
1245  
1246 <    <copy todir="${deployDir}/docs/public">
1247 <      <fileset dir="${dist.javadocs.dir}"/>
1248 <    </copy>
1246 >    <antcall target="clean"/>
1247 >    <antcall target="jsr166e-tck-one-java-version">
1248 >      <param name="build.jsr166e.java.version" value="7"/>
1249 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1250 >    </antcall>
1251  
1252 <    <copy tofile="${deployDir}/index.html"
1253 <          file="${basedir}/etc/anthill-index.html"/>
1252 >    <antcall target="clean"/>
1253 >    <antcall target="jsr166e-tck-one-java-version">
1254 >      <param name="build.jsr166e.java.version" value="6"/>
1255 >      <param name="build.jsr166e.javac" value="${javac6}"/>
1256 >    </antcall>
1257 >  </target>
1258  
680    <copy todir="${deployDir}/notes">
681      <fileset dir="${basedir}/etc/notes"/>
682    </copy>
1259  
1260 +  <target name="jsr166e-test"
1261 +          depends="jsr166e-tck"
1262 +          description="Runs all tests for jsr166e">
1263    </target>
1264  
1265 +  <target name="jsr166edist"
1266 +          depends="jsr166edist-jar, jsr166edist-docs"
1267 +          description="Puts all distributable products in single hierarchy"/>
1268 +
1269  
1270 <  <target name="ng" depends="test">
1271 <    <java classname="SuperfluousAbstract" fork="true">
1270 >  <target name="jsr166eclean"
1271 >          description="Removes all jsr166e build products">
1272 >    <delete dir="${build.jsr166e.dir}"/>
1273 >  </target>
1274  
690      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
1275  
1276 <    </java>
1276 >  <target name="jsr166edist-jar"
1277 >          depends="jsr166eclean, jsr166ejar">
1278 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1279 >  </target>
1280 >
1281 >  <target name="jsr166edist-docs"
1282 >          depends="jsr166eclean, jsr166edocs">
1283 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1284 >  </target>
1285 >
1286 >
1287 > <!-- Find buglets that can be detected by static build tools -->
1288 >
1289 >  <target name="lint">
1290 >    <antcall target="dists">
1291 >      <param name="build.javadoc.access" value="public"/>
1292 >    </antcall>
1293 >  </target>
1294 >
1295 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1296 >  <target name="lint-private">
1297 >    <antcall target="dist">
1298 >      <param name="build.javadoc.access" value="private"/>
1299 >    </antcall>
1300    </target>
1301  
1302  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines