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.56 by tim, Mon Sep 1 04:21:55 2003 UTC vs.
Revision 1.179 by jsr166, Sun Sep 13 03:22:29 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines