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.57 by tim, Mon Sep 15 14:07:36 2003 UTC vs.
Revision 1.266 by jsr166, Tue Feb 20 22:17:16 2018 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17 +
18 +  The repository contains all dependencies except for ant and the JDK
19 +  itself.  Because the JDK version matters and because different
20 +  targets require different JDKs, we assume that users have created a
21 +  hierarchy containing:
22 +  $HOME/jdk/jdk8
23 +  $HOME/jdk/jdk9
24 +  $HOME/jdk/jdk10
25 +  $HOME/jdk/jdk11
26 +  where each of the above is a JDK or a symlink to same, and
27 +  $HOME/jdk/src/jdk8
28 +  $HOME/jdk/src/jdk9
29 +  $HOME/jdk/src/jdk10
30 +  $HOME/jdk/src/jdk11
31 +  where each of the above is a complete JDK source tree
32 +  (e.g. mercurial forest) or a symlink to same.
33 +
34 +  Alternatively, define ant variables thus:
35 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
36 +  for $N in 8 9 10 ...
37 +
38 +  As of 2016-03, the sources in src/main are for jdk9+ only.
39   ------------------------------------------------------------------------------
40    </description>
41  
42 <  <target name="usage" description="Advises user to run with -projecthelp">
43 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
42 >  <!-- Run 'ant -projecthelp' (default target) -->
43 >  <target name="usage">
44 >    <java classname="org.apache.tools.ant.Main">
45 >      <arg value="-projecthelp" />
46 >    </java>
47    </target>
48  
49 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
50  
51    <!-- User-specific settings -->
52    <property file="user.properties"/>
53  
54  
55    <!-- Compilation options -->
56 <  <property name="build.sourcelevel"    value="1.5"/>
25 <  <property name="build.docsourcelevel" value="1.4"/>
56 >  <property name="build.sourcelevel"    value="6"/>
57    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>
60 +  <property name="build.javadoc.access" value="protected"/>
61  
62    <!-- Build locations -->
63 <  <property name="build.dir"            location="build"/>
64 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
65 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
66 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
67 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
68 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
69 <  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
70 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
71 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
72 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
73 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
74 <  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
63 >  <property name="build.dir"                   location="build"/>
64 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
65 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
67 >
68 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
70 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72 >
73 >  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74 >  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75 >  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76 >  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.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 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99 >    <local name="have.java.base"/>
100 >    <available property="have.java.base"
101 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103 >      if:set="have.java.base"/>
104 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105 >      unless:set="have.java.base"/>
106 >    <local name="modules"/>
107 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108 >    <local name="boot.jar.dir"/>
109 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110 >    <path id="bootclasspath@{v}" unless:set="modules">
111 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
112 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
113 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
114 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
115 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
116 >    </path>
117 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118 >    </sequential>
119 >  </macrodef>
120 >
121 >  <macrodef name="mirror-dir">
122 >    <attribute name="src"/>
123 >    <attribute name="dst"/>
124 >    <sequential>
125 >    <delete dir="@{dst}"/>
126 >    <mkdir dir="@{dst}"/>
127 >    <copy todir="@{dst}" preservelastmodified="true">
128 >      <fileset dir="@{src}"/>
129 >    </copy>
130 >    </sequential>
131 >  </macrodef>
132 >
133 >  <defjdklocations v="6"/>
134 >  <defjdklocations v="7"/>
135 >  <defjdklocations v="8"/>
136 >  <defjdklocations v="9"/>
137 >  <defjdklocations v="10"/>
138 >  <defjdklocations v="11"/>
139  
140    <!-- Source locations -->
141    <property name="src.dir"              location="${basedir}/src/main"/>
142    <property name="test.src.dir"         location="${basedir}/src/test"/>
143 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
144 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
143 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
144 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
145 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
146 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148 >  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
150 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151    <property name="lib.dir"              location="${basedir}/lib"/>
152    <property name="dist.dir"             location="${basedir}/dist"/>
153 <
154 <  <!-- Distribution locations -->
155 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
153 >  <property name="topsrc.dir"           location="${basedir}/src"/>
154 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
155 >  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
156 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
157 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
158 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
159 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
160 >
161 >  <!-- Javadoc locations -->
162 >  <property name="docs.dir"          location="${build.dir}/docs"/>
163 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
164 >  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
165 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
166 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
167 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
168 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
169 >
170 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
171 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
172 >  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
173 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
174 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
175 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
176 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
177  
178    <!-- Jar locations -->
179 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
180 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
181 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
182 <  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
183 <
184 <
185 <  <!-- Files excluded from dist-docs -->
186 <  <patternset id="docs.exclusion">
187 <    <exclude name="java/util/Random.*"/>
188 <    <exclude name="sun/misc/Unsafe.*"/>
189 <  </patternset>
190 <
191 <
192 <
193 <  <!-- Main targets -->
194 <
195 <  <target name="compile"
196 <          depends="init, configure-compiler, prepare-src"
197 <          description="Compiles main sources to build folder">
198 <
199 <    <property name="prepare.src.dir" value="${src.dir}"/>
200 <
201 <    <mkdir dir="${build.classes.dir}"/>
179 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
180 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
181 >  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
182 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
183 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
184 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
185 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
186 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
187 >
188 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
189 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
190 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
191 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
192 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
193 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
194 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195 >  <!-- The location of jdk9 early access docs (RIP) -->
196 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
197 >  <!-- Default jdk doc location (latest stable release seems best) -->
198 >  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
199 >  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
200 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
201 >
202 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
203 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
204 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
205 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
206 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
207 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
208 >  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
209 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
210 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
211 >
212 >  <!-- Define the "jtreg" task -->
213 >  <!-- See the docs in "jtreg -onlineHelp" -->
214 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
215 >           classpath="${lib.dir}/jtreg.jar" />
216 >
217 >  <!-- Tck options; see JSR166TestCase.java
218 >   To profile a single tck test class:
219 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
220 >   To stress test a single tck test class:
221 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
222 >   To stress test a single tck test method:
223 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
224 >  -->
225 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
226 >  <macrodef name="run-tck-tests">
227 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
228 >    <attribute name="target"/>
229 >    <attribute name="compile-target" default="@{target}"/>
230 >    <attribute name="workdir"/>
231 >    <attribute name="classes"/>
232 >    <!--
233 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
234 >    -->
235 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
236 >    <element name="javac-elements" optional="true"/>
237 >
238 >    <sequential>
239 >
240 >    <local name="modules"/>
241 >    <condition property="modules">
242 >      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
243 >    </condition>
244  
245 < <!--
246 <    <echo>javac ${build.args}</echo>
247 < -->
245 >    <local name="use-doclint"/>
246 >    <condition property="use-doclint">
247 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
248 >    </condition>
249  
250 <    <javac srcdir="${prepare.src.dir}"
85 <          destdir="${build.classes.dir}"
86 <            debug="${build.debug}"
87 <       debuglevel="${build.debuglevel}"
88 <      deprecation="${build.deprecation}"
89 <           source="${build.sourcelevel}"
90 <             fork="true">
250 >    <mkdir dir="@{workdir}/tck-classes"/>
251  
252 <      <compilerarg    line="${build.args}"/>
252 >    <javac srcdir="@{tck.src.dir}"
253 >           destdir="@{workdir}/tck-classes"
254 >           debug="${build.debug}"
255 >           debuglevel="${build.debuglevel}"
256 >           deprecation="${build.deprecation}"
257 >           source="@{compile-target}"
258 >           target="@{compile-target}"
259 >           classpath="${junit.jar}"
260 >           includeAntRuntime="false"
261 >           includeJavaRuntime="false"
262 >           encoding="ASCII"
263 >           executable="${javac@{compile-target}}"
264 >           fork="true">
265 >
266 >      <include name="*.java"/>
267 >      <compilerarg value="-XDignore.symbol.file=true"/>
268 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
269 >      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
270 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
271 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
272 >      <compilerarg line="${build.args}"/>
273 >      <javac-elements/>
274  
275      </javac>
276  
277 <  </target>
278 <
279 <
280 <  <target name="jar"
281 <          depends="init-jar, native-jar"
282 <          description="Builds library jar from compiled sources"/>
277 >    <java classname="${jsr166.tckTestClass}"
278 >          failonerror="true"
279 >          jvm="${java@{target}}"
280 >          fork="true">
281 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
282 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
283 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
284 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
285 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
286 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
287 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
288 >        <jvmarg line="@{jvmflags}"/>
289 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
290 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
291 >
292 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
293 >        <syspropertyset id="system-properties-used-by-tck">
294 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
295 >          <propertyref prefix="jsr166."/>
296 >          <propertyref name="test.timeout.factor"/>
297 >        </syspropertyset>
298 >
299 >        <classpath>
300 >          <pathelement location="${junit.jar}"/>
301 >          <pathelement location="@{workdir}/tck-classes"/>
302 >        </classpath>
303 >    </java>
304  
305 +    </sequential>
306 +  </macrodef>
307  
308 <  <target name="test"
309 <          depends="init, configure-tests, report-tests"
310 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
308 >  <!-- Define jtreg test sets for different jdk versions -->
309 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
310 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
311 >  <property name="jtreg.test.pattern" value="**/*.java"/>
312 >  <macrodef name="defjtregtests">
313 >    <attribute name="v"/>
314 >    <sequential>
315 >      <fileset dir="${jtreg@{v}.src.dir}">
316 >        <patternset id="jdk@{v}.jtreg.tests">
317 >          <include name="${jtreg.test.pattern}"/>
318 >        </patternset>
319 >      </fileset>
320 >    </sequential>
321 >  </macrodef>
322  
323 +  <defjtregtests v="11"/>
324 +  <defjtregtests v="10"/>
325 +  <defjtregtests v="9"/>
326 +  <defjtregtests v="8"/>
327 +  <defjtregtests v="7"/>
328 +
329 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
330 +  <property name="jtreg.flags" value=""/>
331 +
332 +  <macrodef name="run-jtreg-tests">
333 +    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
334 +    <attribute name="target"/>
335 +    <attribute name="workdir"/>
336 +    <attribute name="classes"/>
337 +    <attribute name="verbose" default="${jtreg.verbose}"/>
338 +    <attribute name="jtregflags" default=""/>
339 +    <element name="jtreg-elements" optional="true"/>
340 +
341 +    <sequential>
342 +
343 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
344 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
345 +
346 +    <local name="modules"/>
347 +    <condition property="modules">
348 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
349 +    </condition>
350  
351 <  <target name="checkstyle"
352 <          depends="filter-src"
353 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
351 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
352 >    <jtreg dir="${jtreg@{target}.src.dir}"
353 >           jdk="${jdk@{target}.home}"
354 >           workDir="@{workdir}/JTwork">
355 >      <patternset refid="jdk@{target}.jtreg.tests"/>
356 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
357 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
358 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359 >      <arg value="-agentvm"/>
360 >      <arg value="-noreport"/>
361 >      <arg value="-verbose:@{verbose}"/>
362 >      <arg value="-vmoptions:-esa -ea"/>
363 >      <arg value="-automatic"/>
364 >      <arg value="-k:!ignore"/>
365 >      <arg line="@{jtregflags}"/>
366 >      <arg line="${jtreg.flags}"/>
367 >      <jtreg-elements/>
368 >    </jtreg>
369 >    </sequential>
370 >  </macrodef>
371 >
372 >  <!-- ALoops classpath -->
373 >  <path id="loops.classpath">
374 >    <pathelement location="${build.loops.dir}"/>
375 >  </path>
376 >
377 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
378 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
379 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
380  
381 <    <taskdef resource="checkstyletask.properties"
114 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
381 >  <!-- Main targets -->
382  
383 <    <checkstyle>
384 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
385 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
386 <    </checkstyle>
383 >  <property name="build.main.java.version" value="9"/>
384 >  <!-- Workaround "no nested properties in ant" -->
385 >  <macrodef name="define-build-main-properties">
386 >    <attribute name="v"/>
387 >    <sequential>
388 >      <property name="build.main.java"    value="${java@{v}}"/>
389 >      <property name="build.main.javac"   value="${javac@{v}}"/>
390 >      <!-- Force javadoc version to be at least 10,
391 >           so we can use override-methods=summary -->
392 >      <condition property="build.main.javadoc"
393 >                 value="${javadoc10}"
394 >                 else="${javadoc@{v}}">
395 >        <equals arg1="@{v}" arg2="9"/>
396 >      </condition>
397 >    </sequential>
398 >  </macrodef>
399 >  <define-build-main-properties v="${build.main.java.version}"/>
400 >
401 >  <target name="dists"
402 >          depends="dist, 4jdk8dist"
403 >          description="Builds all public jars and docs"/>
404 >          <!--
405 >              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
406 >          -->
407  
408 <  </target>
408 >  <target name="compile"
409 >          depends="configure-compiler"
410 >          description="Compiles src/main sources to build dir">
411  
412 +    <local name="destdir"/>
413 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
414  
415 <  <target name="doccheck"
125 <          depends="filter-doccheck"
126 <          description="Reports on javadoc style errors">
415 >    <mkdir dir="${destdir}"/>
416  
417 <    <delete dir="${build.doccheck.dir}"/>
418 <    <mkdir dir="${build.doccheck.dir}"/>
417 >    <javac srcdir="${src.dir}"
418 >           destdir="${destdir}"
419 >           debug="${build.debug}"
420 >           debuglevel="${build.debuglevel}"
421 >           deprecation="${build.deprecation}"
422 >           classpath=""
423 >           includeAntRuntime="false"
424 >           includeJavaRuntime="false"
425 >           encoding="ASCII"
426 >           executable="${build.main.javac}"
427 >           fork="true">
428 >
429 >      <include name="**/*.java"/>
430 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
431 >      <compilerarg value="-Xprefer:source"/>
432 >      <compilerarg value="-XDignore.symbol.file=true"/>
433 >      <compilerarg value="-Xlint:all"/>
434 >      <compilerarg line="--doclint-format html5"/>
435 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
436 >      <compilerarg value="-Werror"/>
437 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438 >      <compilerarg line="${build.args}"/>
439  
440 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
441 <         docletpath="${lib.dir}/doccheck.jar"
133 <            destdir="${build.doccheck.dir}">
134 <      <packageset dir="${build.filter.doccheck.dir}"/>
135 <    </javadoc>
440 >    </javac>
441 >  </target>
442  
137    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
443  
444 +  <target name="jar"
445 +          depends="compile"
446 +          description="Builds library jar for src/main from compiled sources">
447 +    <local name="subdir"/>
448 +    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
449 +    <jar destfile="${product.jar}">
450 +      <fileset dir="${build.classes.dir}${subdir}"/>
451 +      <manifest>
452 +        <attribute name="Built-By" value="${user.name}"/>
453 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
454 +      </manifest>
455 +    </jar>
456    </target>
457  
458  
459    <target name="docs"
460 <          depends="filter-src"
144 <          description="Builds javadocs with custom tags to build folder">
145 <
146 <    <delete dir="${build.javadocs.dir}"/>
147 <    <mkdir dir="${build.javadocs.dir}"/>
460 >          description="Builds javadocs for src/main to dist dir">
461  
462 <    <javadoc destdir="${build.javadocs.dir}"
463 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
151 <            overview="${src.dir}/intro.html"
152 <              source="${build.docsourcelevel}">
153 <
154 <      <tag name="revised" description="Last revised:"/>
155 <      <tag name="spec"    description="Specified by:"/>
156 <      <tag name="editor"  description="Last edited by:"/>
157 <      <tag name="fixme"   description="FIX ME:"/>
462 >    <delete dir="${docs.dir}"/>
463 >    <mkdir dir="${docs.dir}"/>
464  
465 <      <packageset dir="${build.filter.src.dir}"/>
465 >    <!-- the packagenames="none" hack below prevents scanning the -->
466 >    <!-- sourcepath for packages -->
467  
468 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
469 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
470 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
471 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
472 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
473 +    <javadoc destdir="${docs.dir}"
474 +             packagenames="none"
475 +             link="${java9.api.url}"
476 +             overview="${src.dir}/intro.html"
477 +             access="${build.javadoc.access}"
478 +             sourcepath="${src.dir}"
479 +             classpath=""
480 +             source="9"
481 +             executable="${build.main.javadoc}">
482 +      <fileset dir="${src.dir}" defaultexcludes="yes">
483 +        <include name="**/*.java"/>
484 +      </fileset>
485 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
486 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
487 +      <arg value="-XDignore.symbol.file=true"/>
488 +      <arg value="-html5"/>
489 +      <arg value="--patch-module=java.base=${src.dir}"/>
490 +      <arg value="--override-methods=summary"/>
491 +      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492 +      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
493 +      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
494 + <!-- @apiNote tag currently unused -->
495 + <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
496 + <!-- tags added in jdk9: currently unused -->
497 + <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498 + <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
499      </javadoc>
162
163  </target>
164
165
166  <target name="sinjdocs"
167          depends="configure-tests"
168          description="Builds javadocs with custom tags to build folder">
169
170    <delete dir="${build.sinjdocs.dir}"/>
171    <mkdir dir="${build.sinjdocs.dir}"/>
172
173    <java classname="net.cscott.sinjdoc.Main" fork="true">
174
175      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176
177      <classpath>
178        <pathelement location="${sinjdoc.jar}"/>
179        <pathelement location="${lib.dir}/jutil.jar"/>
180        <pathelement location="${lib.dir}/cup.jar"/>
181        <path refid="test.classpath"/>
182      </classpath>
183
184      <!-- <arg value="-help"/> -->
185      <!-- <arg value="-verbose"/> -->
186      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187      
188      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
190      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192      
193      <arg value="java.lang"/>
194      <arg value="java.util"/>
195      <arg value="java.util.concurrent"/>
196      <arg value="java.util.concurrent.atomic"/>
197      <arg value="java.util.concurrent.locks"/>
198
199
200    </java>
201
202  </target>
203
204
205  <target name="strip"
206          depends="init, configure-compiler"
207          description="Strip generics from java source (not working yet)">
208
209    <mkdir dir="${build.stripped.dir}"/>
210
211    <!--
212     # javac -s doesn't reliably generate compilable code. It generates
213     # bridge methods (marked as "synthetic") that can have identical
214     # signatures to existing methods except for the return value.
215     -->
216    <javac srcdir="${src.dir}"
217          destdir="${build.stripped.dir}"
218            debug="${build.debug}"
219       debuglevel="${build.debuglevel}"
220      deprecation="${build.deprecation}"
221           source="${build.sourcelevel}"
222             fork="true">
223
224      <compilerarg    line="${build.args} -s"/>
225
226    </javac>
227
500    </target>
501  
502  
503    <target name="dist"
504 <          depends="init, dist-clean, dist-jar, dist-docs"
504 >          depends="dist-clean, dist-jar, dist-docs"
505            description="Puts all distributable products in single hierarchy"/>
506  
507 +
508    <target name="release"
509            depends="dist"
510            description="Puts entire CVS tree, plus distribution productions, in a jar">
511  
239 <!--
240    #keep build dir? - dl
241    <delete dir="${build.dir}"/>
242 -->
512      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
513  
514      <jar basedir="${basedir}" destfile="${release.jar}">
515 +      <!-- <exclude name="build/**"/> -->
516        <exclude name="${release.jar}"/>
517        <exclude name="user.properties"/>
518        <exclude name="etc/notes/**"/>
519 +      <exclude name="src/emulation/**"/>
520        <exclude name="**/SyntaxTest.java"/>
521 +      <exclude name="**/SuperfluousAbstract.java"/>
522 +      <manifest>
523 +        <attribute name="Built-By" value="${user.name}"/>
524 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
525 +      </manifest>
526      </jar>
251
527    </target>
528  
529 +
530    <target name="clean"
531            description="Removes all build products">
256
532      <delete dir="${build.dir}"/>
258    <delete dir="${build.classes.dir}"/>
259    <delete dir="${build.lib.dir}"/>
260
533    </target>
534  
535  
536    <target name="dist-clean"
537            description="Removes all build and distribution products">
538 <
538 >    <delete dir="${build.dir}"/>
539      <delete dir="${dist.dir}"/>
268
540    </target>
541  
542  
543 +  <target name="dist-jar"
544 +          depends="clean, jar">
545 +    <copy file="${product.jar}" todir="${dist.dir}"/>
546 +  </target>
547 +
548    <target name="dist-docs"
549 <          depends="filter-src"
550 <          description="Builds javadocs without custom tags to dist folder">
549 >          depends="clean, docs">
550 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
551 >  </target>
552  
553 <    <delete dir="${dist.javadocs.dir}"/>
554 <    <mkdir dir="${dist.javadocs.dir}"/>
553 >  <target name="tck"
554 >          depends="jar"
555 >          description="Runs tck tests for src/main directly">
556 >
557 >    <run-tck-tests
558 >      target="${build.main.java.version}"
559 >      workdir="${build.dir}"
560 >      classes="${product.jar}">
561 >      <javac-elements>
562 >        <compilerarg value="-Werror"/>
563 >      </javac-elements>
564 >    </run-tck-tests>
565 >  </target>
566 >
567 >  <target name="tck-parallelism-1"
568 >          description="Runs tck with common pool parallelism 1">
569 >    <antcall target="tck">
570 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
571 >    </antcall>
572 >  </target>
573 >
574 >  <target name="tck-parallelism-0"
575 >          description="Runs tck with common pool parallelism 0">
576 >    <antcall target="tck">
577 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
578 >    </antcall>
579 >  </target>
580 >
581 >  <target name="tck-security-manager"
582 >          description="Runs tck with a security manager">
583 >    <antcall target="tck">
584 >      <param name="jsr166.useSecurityManager" value="true"/>
585 >    </antcall>
586 >  </target>
587 >
588 >  <target name="jtreg"
589 >          depends="jar"
590 >          description="Runs jtreg tests for src/main using the jtreg ant task">
591 >    <run-jtreg-tests
592 >       target="${build.main.java.version}"
593 >       workdir="${build.dir}"
594 >       classes="${product.jar}"/>
595 >  </target>
596  
597 <    <javadoc destdir="${dist.javadocs.dir}"
598 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
599 <            overview="${src.dir}/intro.html"
282 <              source="${build.docsourcelevel}">
597 >  <target name="test"
598 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
599 >          description="Runs tck and jtreg tests for src/main"/>
600  
601 <      <packageset dir="${build.filter.src.dir}"/>
601 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
602  
603 <    </javadoc>
603 > <!--     <antcall target="jtreg"> -->
604 > <!--       <param name="build.main.java.version" value="8"/> -->
605 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
606 > <!--     </antcall> -->
607 >
608 > <!--   </target> -->
609 >
610 >  <target name="test91011"
611 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
612 >
613 >    <antcall target="clean"/>
614 >    <antcall target="test">
615 >      <param name="build.main.java.version" value="9"/>
616 >    </antcall>
617 >
618 >    <antcall target="clean"/>
619 >    <antcall target="test">
620 >      <param name="build.main.java.version" value="10"/>
621 >    </antcall>
622 >
623 >    <antcall target="clean"/>
624 >    <antcall target="test">
625 >      <param name="build.main.java.version" value="11"/>
626 >    </antcall>
627 >
628 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
629 >    <antcall target="clean"/>
630  
631    </target>
632  
633  
634  
635 <  <!-- Internal targets -->
635 >  <target name="configure-compiler">
636 >    <fail message="ant version too old">
637 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
638 >    </fail>
639 >
640 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
641 >
642 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
643 >      <istrue value="${build.warnunchecked}"/>
644 >    </condition>
645  
646 +    <property name="warnunchecked.arg" value=""/>
647  
295  <target name="init">
648  
649 <    <!-- Version is kept in a separate file -->
650 <    <loadfile property="version" srcFile="version.properties"/>
299 <    <echo>Building JSR-166 version ${version}</echo>
300 <    <echo>java.home is ${java.home}</echo>
649 >    <!-- Common options in javac invocations -->
650 >    <property name="build.args" value="${warnunchecked.arg}"/>
651  
652    </target>
653  
654  
305  <target name="init-jar">
655  
656 <    <mkdir dir="${build.lib.dir}"/>
656 >  <!-- Various demos and test programs -->
657  
309  </target>
658  
659 +  <!-- description="Benchmark from Doug Lea's AQS paper" -->
660 +  <target name="loops" depends="configure-compiler">
661  
662 <  <target name="native-jar"
313 <          depends="compile">
662 >    <mkdir dir="${build.loops.dir}"/>
663  
664 <    <jar destfile="${product.jar}">
665 <      <fileset dir="${build.classes.dir}"/>
666 <    </jar>
664 >    <javac srcdir="${loops.src.dir}"
665 >          destdir="${build.loops.dir}"
666 >            debug="${build.debug}"
667 >       debuglevel="${build.debuglevel}"
668 >      deprecation="${build.deprecation}"
669 >           source="${build.sourcelevel}"
670 >           target="${build.sourcelevel}"
671 >         encoding="ASCII"
672 >             fork="true">
673  
674 +      <compilerarg line="${build.args}"/>
675 +      <classpath refid="loops.classpath"/>
676 +      <compilerarg value="-XDignore.symbol.file=true"/>
677 +
678 +    </javac>
679 +
680 +    <java classname="ALoops" fork="true">
681 +      <classpath refid="loops.classpath"/>
682 +    </java>
683    </target>
684  
685  
686 <  <target name="dist-jar"
687 <          depends="clean, jar">
686 >  <target name="compile-test-loops" depends="jar"
687 >          description="Compiles all the perf tests in src/test/loops">
688  
689 <    <copy file="${product.jar}" todir="${dist.dir}"/>
689 >    <mkdir dir="${build.dir}/test/loops"/>
690  
691 +    <javac srcdir="${basedir}/src/test/loops"
692 +           destdir="${build.dir}/test/loops"
693 +           debug="${build.debug}"
694 +           debuglevel="${build.debuglevel}"
695 +           deprecation="${build.deprecation}"
696 +           includeAntRuntime="false"
697 +           includeJavaRuntime="false"
698 +           encoding="ASCII"
699 +           executable="${build.main.javac}"
700 +           fork="true">
701 +
702 +      <include name="*.java"/>
703 +      <compilerarg value="-XDignore.symbol.file=true"/>
704 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
705 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
706 +      <compilerarg line="${build.args}"/>
707 +    </javac>
708    </target>
709  
710  
711 <  <target name="compile-ant-filter"
331 <          depends="init">
711 >  <!-- jsr166 4jdk8 -->
712  
713 <    <mkdir dir="${build.ant.dir}"/>
713 >  <target name="4jdk8compile"
714 >          depends="configure-compiler"
715 >          description="Compiles src/jdk8 sources, targeting jdk8">
716  
717 <    <javac srcdir="${ant.src.dir}"
336 <          destdir="${build.ant.dir}"
337 <           source="1.4"
338 <    />
717 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
718  
719 +    <javac srcdir="${4jdk8src.dir}"
720 +           destdir="${build.4jdk8.classes.dir}"
721 +           debug="${build.debug}"
722 +           debuglevel="${build.debuglevel}"
723 +           deprecation="${build.deprecation}"
724 +           source="8"
725 +           target="8"
726 +           classpath=""
727 +           bootclasspath="${bootclasspath8}"
728 +           includeAntRuntime="false"
729 +           includeJavaRuntime="false"
730 +           encoding="ASCII"
731 +           executable="${javac8}"
732 +           fork="true">
733 +      <include name="**/*.java"/>
734 +      <compilerarg value="-Xprefer:source"/>
735 +      <compilerarg value="-XDignore.symbol.file=true"/>
736 +      <compilerarg value="-Xlint:all"/>
737 +      <compilerarg value="-Werror"/>
738 +      <compilerarg line="${build.args}"/>
739 +    </javac>
740    </target>
741  
742 +  <target name="4jdk8doclint"
743 +          depends="configure-compiler"
744 +          description="Finds doclint warnings">
745  
746 <  <target name="filter-src"
344 <          depends="compile-ant-filter">
345 <
346 <    <mkdir dir="${build.filter.src.dir}"/>
746 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
747  
748 <    <copy todir="${build.filter.src.dir}">
749 <      <fileset dir="${src.dir}">
750 <        <include name="**/*.html"/>
751 <      </fileset>
752 <    </copy>
748 >    <javac srcdir="${4jdk8src.dir}"
749 >           destdir="${build.4jdk8.classes.dir}"
750 >           debug="${build.debug}"
751 >           debuglevel="${build.debuglevel}"
752 >           deprecation="${build.deprecation}"
753 >           source="8"
754 >           target="8"
755 >           classpath=""
756 >           bootclasspath="${bootclasspath8}"
757 >           includeAntRuntime="false"
758 >           includeJavaRuntime="false"
759 >           encoding="ASCII"
760 >           executable="${javac8}"
761 >           fork="true">
762 >      <include name="**/*.java"/>
763 >      <compilerarg value="-Xprefer:source"/>
764 >      <compilerarg value="-XDignore.symbol.file=true"/>
765 >      <compilerarg value="-Xlint:all"/>
766 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
767 >      <compilerarg line="${build.args}"/>
768 >    </javac>
769 >  </target>
770  
354    <copy todir="${build.filter.src.dir}">
355      <fileset dir="${src.dir}">
356        <exclude name="**/*.html"/>
357        <patternset refid="docs.exclusion"/>
358      </fileset>
359      <filterchain>
771  
772 <        <!--
773 <         # This filter gets rid of angle-bracketed type parameters
774 <         # so that javadoc can run on the result. The following
775 <         # heuristic seems to work:
776 <         #
777 <         # For all lines not starting with space(s)-asterisk-space(s),
778 <         #   replace <something> with a space, where there may be more
779 <         #   than one right angle bracket at the end, and "something"
780 <         #   must not contain parens or pipes. (This may need some
781 <         #   tweaking.)
782 <         -->
783 <
373 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
374 <                      classpath="${build.ant.dir}">
375 <          <param name="notmatching" value="^\s+\*\s.*$"/>
376 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
377 <          <param name="replacement" value=" "/>
378 <        </filterreader>
772 >  <target name="4jdk8jar"
773 >          depends="4jdk8compile"
774 >          description="Builds library jar from compiled sources">
775 >
776 >    <jar destfile="${4jdk8product.jar}">
777 >      <fileset dir="${build.4jdk8.classes.dir}"/>
778 >      <manifest>
779 >        <attribute name="Built-By" value="${user.name}"/>
780 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
781 >      </manifest>
782 >    </jar>
783 >  </target>
784  
380      </filterchain>
381    </copy>
785  
786 +  <target name="4jdk8-tck"
787 +          depends="4jdk8jar"
788 +          description="Runs tck tests for jsr166-4jdk8 directly">
789 +
790 +    <run-tck-tests
791 +      target="8"
792 +      workdir="${build.4jdk8.dir}"
793 +      classes="${4jdk8product.jar}">
794 +      <javac-elements>
795 +        <!-- JDK9+ test classes -->
796 +        <exclude name="*9Test.java"/>
797 +        <exclude name="*10Test.java"/>
798 +        <compilerarg value="-Werror"/>
799 +      </javac-elements>
800 +    </run-tck-tests>
801    </target>
802  
803  
804 +  <target name="4jdk8-jtreg"
805 +          depends="4jdk8jar"
806 +          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
807 +    <run-jtreg-tests
808 +       target="8"
809 +       workdir="${build.4jdk8.dir}"
810 +       classes="${4jdk8product.jar}"/>
811 +  </target>
812  
813  
814 <  <target name="filter-doccheck"
815 <          depends="filter-src">
814 >  <target name="4jdk8-test"
815 >          depends="4jdk8-tck, 4jdk8-jtreg"
816 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
817 >
818 >
819 >  <target name="4jdk8docs"
820 >          description="Builds javadocs for src/jdk8 to dist dir">
821 >
822 >    <delete dir="${4jdk8docs.dir}"/>
823 >    <mkdir dir="${4jdk8docs.dir}"/>
824 >
825 >    <javadoc destdir="${4jdk8docs.dir}"
826 >             packagenames="none"
827 >             link="${java8.api.url}"
828 >             overview="${4jdk8src.dir}/intro.html"
829 >             access="${build.javadoc.access}"
830 >             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
831 >             classpath=""
832 >             source="8"
833 >             executable="${javadoc8}"
834 >             failonerror = "true">
835 >      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
836 >        <include name="**/*.java"/>
837 >      </fileset>
838 >      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
839 >      <arg value="-XDignore.symbol.file=true"/>
840 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
841 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
842 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
843 > <!-- @apiNote tag currently unused -->
844 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
845 >    </javadoc>
846 >  </target>
847  
391    <mkdir dir="${build.filter.doccheck.dir}"/>
848  
849 <    <copy todir="${build.filter.doccheck.dir}">
850 <      <fileset dir="${build.filter.src.dir}">
851 <        <include name="**/*.html"/>
396 <      </fileset>
397 <    </copy>
849 >  <target name="4jdk8dist"
850 >          depends="4jdk8dist-jar, 4jdk8dist-docs"
851 >          description="Puts all distributable products in single hierarchy"/>
852  
399    <property name="generic.declarations"
400             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 {}"
401    />
402
403    <copy todir="${build.filter.doccheck.dir}">
404      <fileset dir="${build.filter.src.dir}">
405        <exclude name="**/*.html"/>
406      </fileset>
407      <filterchain>
408        <!--
409         # These two filters try to make the source look like
410         # something that doccheck can process. The first removes
411         # -source 1.4 assertions and the second adds in a bunch
412         # of single letter public nested marker interfaces so that
413         # the generic type parameters are recognized.
414         -->
415
416        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
417                      classpath="${build.ant.dir}">
418          <param name="matching"    value="^\s*assert[\s ].*$"/>
419          <param name="pattern"     value="assert"/>
420          <param name="replacement" value="//assert"/>
421        </filterreader>
422
423        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
424                      classpath="${build.ant.dir}">
425          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426          <param name="pattern"     value="$"/>
427          <param name="replacement" value=" ${generic.declarations}"/>
428        </filterreader>
853  
854 <      </filterchain>
855 <    </copy>
854 >  <target name="4jdk8clean"
855 >          description="Removes all 4jdk8 build products">
856 >    <delete dir="${build.4jdk8.dir}"/>
857 >  </target>
858  
859 +
860 +  <target name="4jdk8dist-jar"
861 +          depends="4jdk8clean, 4jdk8jar">
862 +    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
863    </target>
864  
865  
866 <  <target name="compile-tests"
867 <          depends="jar">
866 >  <target name="4jdk8dist-docs"
867 >          depends="4jdk8clean, 4jdk8docs">
868 >    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
869 >  </target>
870  
439    <mkdir dir="${build.testcases.dir}"/>
871  
872 < <!--
442 <    <echo>javac ${build.args}</echo>
443 <    <echo>classpath="${test.classpath}"</echo>
444 < -->
872 >  <!-- jsr166 4jdk7 (no longer maintained) -->
873  
874 <    <javac srcdir="${test.src.dir}"
875 <          destdir="${build.testcases.dir}"
876 <            debug="${build.debug}"
877 <       debuglevel="${build.debuglevel}"
878 <      deprecation="${build.deprecation}"
879 <           source="${build.sourcelevel}"
880 <             fork="true">
874 >  <target name="4jdk7compile" depends="configure-compiler">
875 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
876 >
877 >    <javac srcdir="${4jdk7src.dir}"
878 >           destdir="${build.4jdk7.classes.dir}"
879 >           debug="${build.debug}"
880 >           debuglevel="${build.debuglevel}"
881 >           deprecation="${build.deprecation}"
882 >           source="6"
883 >           target="6"
884 >           classpath=""
885 >           bootclasspath="${bootclasspath6}"
886 >           includeAntRuntime="false"
887 >           includeJavaRuntime="false"
888 >           encoding="ASCII"
889 >           executable="${javac7}"
890 >           fork="true">
891  
892 +      <include name="**/*.java"/>
893 +      <compilerarg value="-Xprefer:source"/>
894 +      <compilerarg value="-XDignore.symbol.file=true"/>
895 +      <compilerarg value="-Xlint:all"/>
896 +      <compilerarg value="-Werror"/>
897        <compilerarg line="${build.args}"/>
898 <      <classpath refid="test.classpath"/>
899 <      
457 <      <include name="java/**"/>
458 <      <include name="jsr166/**"/>
898 >    </javac>
899 >  </target>
900  
901 +  <target name="4jdk7doclint" depends="configure-compiler">
902 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
903 +
904 +    <javac srcdir="${4jdk7src.dir}"
905 +           destdir="${build.4jdk7.classes.dir}"
906 +           debug="${build.debug}"
907 +           debuglevel="${build.debuglevel}"
908 +           deprecation="${build.deprecation}"
909 +           source="6"
910 +           target="6"
911 +           classpath=""
912 +           bootclasspath="${bootclasspath6}"
913 +           includeAntRuntime="false"
914 +           includeJavaRuntime="false"
915 +           encoding="ASCII"
916 +           executable="${javac8}"
917 +           fork="true">
918 +
919 +      <include name="**/*.java"/>
920 +      <compilerarg value="-Xprefer:source"/>
921 +      <compilerarg value="-XDignore.symbol.file=true"/>
922 +      <compilerarg value="-Xlint:all"/>
923 +      <compilerarg value="-Xdoclint:all/protected"/>
924 +      <compilerarg line="${build.args}"/>
925      </javac>
926 +  </target>
927 +
928 +  <target name="4jdk7jar" depends="4jdk7compile">
929 +    <jar destfile="${4jdk7product.jar}">
930 +      <fileset dir="${build.4jdk7.classes.dir}"/>
931 +      <manifest>
932 +        <attribute name="Built-By" value="${user.name}"/>
933 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934 +      </manifest>
935 +    </jar>
936 +  </target>
937  
938 +  <target name="4jdk7-tck" depends="4jdk7jar">
939 +    <run-tck-tests
940 +      target="7"
941 +      workdir="${build.4jdk7.dir}"
942 +      classes="${4jdk7product.jar}">
943 +      <javac-elements>
944 +        <!-- JDK8+ test classes -->
945 +        <exclude name="*8Test.java"/>
946 +        <exclude name="*9Test.java"/>
947 +        <exclude name="*10Test.java"/>
948 +        <exclude name="DoubleAccumulatorTest.java"/>
949 +        <exclude name="DoubleAdderTest.java"/>
950 +        <exclude name="LongAccumulatorTest.java"/>
951 +        <exclude name="LongAdderTest.java"/>
952 +        <exclude name="CompletableFutureTest.java"/>
953 +        <exclude name="SplittableRandomTest.java"/>
954 +        <exclude name="StampedLockTest.java"/>
955 +        <exclude name="SubmissionPublisherTest.java"/>
956 +        <compilerarg value="-Werror"/>
957 +      </javac-elements>
958 +    </run-tck-tests>
959    </target>
960  
961 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
962 +  <target name="4jdk7-tck-junit" depends="4jdk7compile">
963  
964 <  <target name="run-tests"
965 <          depends="compile-tests">
964 >    <junit printsummary="true"
965 >           showoutput="true"
966 >           errorProperty="junit.failed"
967 >           failureProperty="junit.failed"
968 >           includeantruntime="true"
969 >           jvm="${java7}"
970 >           fork="true">
971  
972 <    <!-- May be overridden by user.properties -->
973 <    <property name="testcase" value="*"/>
972 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
973 >      <jvmarg value="-server"/>
974  
975 <    <mkdir dir="${build.reports.dir}"/>
975 >      <classpath>
976 >        <pathelement location="${junit.jar}"/>
977 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
978 >      </classpath>
979  
980 <    <junit printsummary="true"
474 <             showoutput="true"
475 <          errorProperty="junit.failed"
476 <        failureProperty="junit.failed"
477 <                    dir="${build.reports.dir}"
478 <                   fork="true">
479 <
480 <      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
481 <
482 <      <formatter type="xml"/>
483 <
484 <      <batchtest todir="${build.reports.dir}">
485 <        <fileset dir="${test.src.dir}">
486 <          <include name="java/**/${testcase}Test.java"/>
487 <          <include name="jsr166/**/${testcase}Test.java"/>
488 <        </fileset>
489 <      </batchtest>
980 >      <formatter type="brief"/>
981  
982 +      <test name="${jsr166.tckTestClass}" haltonfailure="no">
983 +      </test>
984      </junit>
985 +  </target>
986  
987 +  <target name="4jdk7-jtreg" depends="4jdk7jar">
988 +    <run-jtreg-tests
989 +       target="7"
990 +       workdir="${build.4jdk7.dir}"
991 +       classes="${4jdk7product.jar}"/>
992 +  </target>
993 +
994 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
995 +
996 +  <target name="4jdk7docs">
997 +    <delete dir="${4jdk7docs.dir}"/>
998 +    <mkdir dir="${4jdk7docs.dir}"/>
999 +
1000 +    <javadoc destdir="${4jdk7docs.dir}"
1001 +             packagenames="none"
1002 +             link="${java7.api.url}"
1003 +             overview="${4jdk7src.dir}/intro.html"
1004 +             access="${build.javadoc.access}"
1005 +             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1006 +             classpath=""
1007 +             executable="${javadoc7}"
1008 +             failonerror = "true">
1009 +      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1010 +        <include name="**/*.java"/>
1011 +      </fileset>
1012 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1013 +      <arg value="-XDignore.symbol.file=true"/>
1014 +    </javadoc>
1015    </target>
1016  
1017 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1018  
1019 <  <target name="report-tests"
1020 <          depends="run-tests">
1019 >  <target name="4jdk7clean">
1020 >    <delete dir="${build.4jdk7.dir}"/>
1021 >  </target>
1022  
1023 <    <!-- Sets junit.report.format to frames if redirection is present,
1024 <         otherwise sets it to noframes. -->
1025 <    <available property="junit.report.format"
1026 <                  value="frames"
1027 <              classname="org.apache.xalan.lib.Redirect"
1028 <    />
1029 <    <property name="junit.report.format" value="noframes"/>
1030 <
1031 <    <junitreport todir="${build.reports.dir}">
1032 <      <fileset dir="${build.reports.dir}">
509 <        <include name="TEST-*.xml"/>
510 <      </fileset>
511 <      <report styledir="${stylesheet.dir}"
512 <                format="${junit.report.format}"
513 <                 todir="${build.reports.dir}"
514 <      />
515 <    </junitreport>
1023 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1024 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1025 >  </target>
1026 >
1027 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1028 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1029 >  </target>
1030 >
1031 >
1032 >  <!-- jsr166x (no longer maintained) -->
1033  
1034 <    <fail message="Test Cases Failed" if="junit.failed"/>
1034 >  <target name="jsr166xcompile" depends="configure-compiler">
1035 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
1036  
1037 +    <javac srcdir="${topsrc.dir}"
1038 +           destdir="${build.jsr166x.classes.dir}"
1039 +           debug="${build.debug}"
1040 +           debuglevel="${build.debuglevel}"
1041 +           deprecation="${build.deprecation}"
1042 +           classpath=""
1043 +           bootclasspath="${bootclasspath6}"
1044 +           source="5"
1045 +           target="5"
1046 +           includeAntRuntime="false"
1047 +           includeJavaRuntime="false"
1048 +           encoding="ASCII"
1049 +           executable="${javac7}"
1050 +           fork="true">
1051 +      <include name="jsr166x/**/*.java"/>
1052 +      <compilerarg value="-XDignore.symbol.file=true"/>
1053 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1054 +      <compilerarg value="-Werror"/>
1055 +      <compilerarg line="${build.args}"/>
1056 +    </javac>
1057    </target>
1058  
1059 +  <target name="jsr166xjar" depends="jsr166xcompile">
1060 +    <jar destfile="${jsr166x.jar}">
1061 +      <fileset dir="${build.jsr166x.classes.dir}"/>
1062 +      <manifest>
1063 +        <attribute name="Built-By" value="${user.name}"/>
1064 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1065 +      </manifest>
1066 +    </jar>
1067 +  </target>
1068  
1069 <  <target name="configure-compiler">
1069 >  <target name="jsr166xdocs">
1070 >    <delete dir="${jsr166xdocs.dir}"/>
1071 >    <mkdir dir="${jsr166xdocs.dir}"/>
1072 >
1073 >    <javadoc destdir="${jsr166xdocs.dir}"
1074 >             packagenames="jsr166x.*"
1075 >             link="${java.api.url}"
1076 >             access="${build.javadoc.access}"
1077 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1078 >             bootclasspath="${bootclasspath6}"
1079 >             source="5"
1080 >             executable="${javadoc7}"
1081 >             failonerror = "true">
1082 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1083 >      <arg value="-XDignore.symbol.file=true"/>
1084 >    </javadoc>
1085 >  </target>
1086  
1087 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
1087 >  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1088  
1089 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
1090 <      <istrue value="${build.warnunchecked}"/>
1091 <    </condition>
1089 >  <target name="jsr166xclean">
1090 >    <delete dir="${build.jsr166x.dir}"/>
1091 >  </target>
1092  
1093 <    <property name="warnunchecked.arg" value=""/>
1094 <    
1095 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533 <      <istrue value="${build.nothreads}"/>
534 <    </condition>
1093 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1094 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1095 >  </target>
1096  
1097 +  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1098 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1099 +  </target>
1100  
537    <!-- Common options in javac invocations -->
538    <property name="build.args" value="${warnunchecked.arg}"/>
1101  
1102 +  <!-- jsr166y (no longer maintained) -->
1103 +
1104 +  <target name="jsr166ycompile" depends="configure-compiler">
1105 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
1106 +
1107 +    <javac srcdir="${topsrc.dir}"
1108 +           destdir="${build.jsr166y.classes.dir}"
1109 +           debug="${build.debug}"
1110 +           debuglevel="${build.debuglevel}"
1111 +           deprecation="${build.deprecation}"
1112 +           source="6"
1113 +           target="6"
1114 +           classpath=""
1115 +           bootclasspath="${bootclasspath6}"
1116 +           includeAntRuntime="false"
1117 +           includeJavaRuntime="false"
1118 +           encoding="ASCII"
1119 +           executable="${javac7}"
1120 +           fork="true">
1121 +
1122 +      <include name="jsr166y/**/*.java"/>
1123 +      <compilerarg value="-XDignore.symbol.file=true"/>
1124 +      <compilerarg value="-Xlint:all"/>
1125 +      <compilerarg value="-Werror"/>
1126 +      <compilerarg line="${build.args}"/>
1127 +    </javac>
1128    </target>
1129  
1130 +  <target name="jsr166yjar" depends="jsr166ycompile">
1131 +    <jar destfile="${jsr166y.jar}" index="true">
1132 +      <fileset dir="${build.jsr166y.classes.dir}"/>
1133 +      <manifest>
1134 +        <attribute name="Built-By" value="${user.name}"/>
1135 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1136 +      </manifest>
1137 +    </jar>
1138 +  </target>
1139  
1140 <  <target name="prepare-src"
1141 <          depends="configure-compiler"
1142 <          if="prepare.src.dir">
1140 >  <target name="jsr166ydocs">
1141 >    <delete dir="${jsr166ydocs.dir}"/>
1142 >    <mkdir dir="${jsr166ydocs.dir}"/>
1143 >
1144 >    <javadoc destdir="${jsr166ydocs.dir}"
1145 >             packagenames="jsr166y.*"
1146 >             link="${java.api.url}"
1147 >             access="${build.javadoc.access}"
1148 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1149 >             bootclasspath="${bootclasspath6}"
1150 >             source="6"
1151 >             executable="${javadoc7}"
1152 >             failonerror = "true">
1153 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1154 >      <arg value="-XDignore.symbol.file=true"/>
1155 >    </javadoc>
1156 >  </target>
1157  
1158 <    <mkdir dir="${prepare.src.dir}"/>
548 <    <copy todir="${prepare.src.dir}">
549 <      <fileset dir="${src.dir}">
550 <        <exclude name="java/lang/**"/>
551 <      </fileset>
552 <    </copy>
1158 >  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1159  
1160 +  <target name="jsr166yclean">
1161 +    <delete dir="${build.jsr166y.dir}"/>
1162    </target>
1163  
1164 +  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1165 +    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1166 +  </target>
1167  
1168 <  <target name="configure-tests"
1169 <       depends="configure-compiler">
1168 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1169 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1170 >  </target>
1171  
560    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
561    <available property="junit.available"
562               classname="junit.framework.Protectable"/>
563
564    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565          unless="junit.available"/>
566
567    <!-- Xalan -->
568    <available property="xalan.available"
569               classname="org.apache.xalan.Version"/>
1172  
1173 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
572 <          unless="xalan.available"/>
1173 >  <!-- extra166y (no longer maintained) -->
1174  
1175 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1176 +    <mkdir dir="${build.extra166y.classes.dir}"/>
1177  
1178 <    <!--
1179 <     ! Bootclasspath munging for testing, so JUnit can test our local
1180 <     ! modifications to java.*.
1181 <     -->
1182 <
1183 <    <path id="test.classpath">
1184 <      <pathelement location="${product.jar}"/>
1185 <      <pathelement location="${rt.jar}"/>
1186 <      <pathelement location="${junit.jar}"/>
1187 <      <pathelement location="${build.testcases.dir}"/>
1188 <    </path>
1178 >    <javac srcdir="${topsrc.dir}"
1179 >           destdir="${build.extra166y.classes.dir}"
1180 >           debug="${build.debug}"
1181 >           debuglevel="${build.debuglevel}"
1182 >           deprecation="${build.deprecation}"
1183 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1184 >           classpath=""
1185 >           source="6"
1186 >           target="6"
1187 >           includeAntRuntime="false"
1188 >           includeJavaRuntime="false"
1189 >           encoding="ASCII"
1190 >           executable="${javac7}"
1191 >           fork="true">
1192  
1193 <    <path id="test.bootclasspath">
1194 <      <path refid="test.classpath"/>
1195 <    </path>
1193 >      <include name="extra166y/**/*.java"/>
1194 >      <compilerarg value="-XDignore.symbol.file=true"/>
1195 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1196 >      <compilerarg value="-Werror"/>
1197 >      <compilerarg line="${build.args}"/>
1198 >    </javac>
1199 >  </target>
1200  
1201 <    <!-- Flatten test classpaths into platform-appropriate strings -->
1202 <    <property name="test.classpath"         refid="test.classpath"/>
1203 <    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
1201 >  <target name="extra166yjar" depends="extra166ycompile">
1202 >    <jar destfile="${extra166y.jar}" index="true">
1203 >      <fileset dir="${build.extra166y.classes.dir}"/>
1204 >      <manifest>
1205 >        <attribute name="Built-By" value="${user.name}"/>
1206 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1207 >      </manifest>
1208 >    </jar>
1209 >  </target>
1210  
1211 +  <target name="extra166ydocs">
1212 +    <delete dir="${extra166ydocs.dir}"/>
1213 +    <mkdir dir="${extra166ydocs.dir}"/>
1214 +
1215 +    <javadoc destdir="${extra166ydocs.dir}"
1216 +             packagenames="extra166y.*"
1217 +             link="${java.api.url}"
1218 +             access="${build.javadoc.access}"
1219 +             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1220 +             bootclasspath="${bootclasspath6}"
1221 +             source="6"
1222 +             executable="${javadoc7}">
1223 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1224 +      <arg value="-XDignore.symbol.file=true"/>
1225 +    </javadoc>
1226    </target>
1227  
1228 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1229  
1230 +  <target name="extra166yclean">
1231 +    <delete dir="${build.extra166y.dir}"/>
1232 +  </target>
1233  
1234 <  <!-- Anthill targets -->
1235 <
1236 <  <target name="anthill-build">
602 <  
603 <    <!-- Override this in user.properties -->
604 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
605 <    
606 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607 <      <arg value="-Xmx256000000"/>
608 <      <!-- classpath of new JVM -->
609 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
610 <      <!-- location of Ant home directory -->
611 <      <arg value="-Dant.home=${ant.home}"/>
612 <      <!-- the Ant main class -->
613 <      <arg value="org.apache.tools.ant.Main"/>
614 <      <!-- The build file -->
615 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
616 <      <!-- the target to build on the new Ant instance -->
617 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
618 <      <arg value="do-anthill-build"/>
619 <    </exec>
620 <  </target>
621 <  
622 <  <target name="do-anthill-build"
623 <          depends="jar, test, docs, dist-docs"/>
1234 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1235 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1236 >  </target>
1237  
1238 <  <target name="anthill-publish">
1238 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1239 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1240 >  </target>
1241  
627    <copy todir="${deployDir}/docs/private">
628      <fileset dir="${build.javadocs.dir}"/>
629    </copy>
1242  
1243 <    <copy todir="${deployDir}/docs/public">
632 <      <fileset dir="${dist.javadocs.dir}"/>
633 <    </copy>
1243 >  <!-- jsr166e (no longer maintained) -->
1244  
1245 <    <copy tofile="${deployDir}/index.html"
1246 <          file="${basedir}/etc/anthill-index.html"/>
1245 >  <property name="build.jsr166e.java.version" value="6"/>
1246 >  <property name="build.jsr166e.javac" value="${javac6}"/>
1247  
1248 <    <copy todir="${deployDir}/notes">
1249 <      <fileset dir="${basedir}/etc/notes"/>
1250 <    </copy>
1248 >  <target name="jsr166ecompile" depends="configure-compiler">
1249 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1250 >
1251 >    <javac srcdir="${topsrc.dir}"
1252 >           destdir="${build.jsr166e.classes.dir}"
1253 >           debug="${build.debug}"
1254 >           debuglevel="${build.debuglevel}"
1255 >           deprecation="${build.deprecation}"
1256 >           source="${build.jsr166e.java.version}"
1257 >           target="${build.jsr166e.java.version}"
1258 >           classpath=""
1259 >           includeAntRuntime="false"
1260 >           includeJavaRuntime="false"
1261 >           executable="${build.jsr166e.javac}"
1262 >           fork="true">
1263  
1264 +      <include name="jsr166e/**/*.java"/>
1265 +      <compilerarg value="-XDignore.symbol.file=true"/>
1266 +      <compilerarg value="-Xlint:all"/>
1267 +      <compilerarg value="-Werror"/>
1268 +      <compilerarg line="${build.args}"/>
1269 +    </javac>
1270    </target>
1271  
1272 +  <target name="jsr166edoclint">
1273 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1274  
1275 <  <target name="ng" depends="test">
1276 <    <java classname="SuperfluousAbstract" fork="true">
1275 >    <javac srcdir="${topsrc.dir}"
1276 >           destdir="${build.jsr166e.classes.dir}"
1277 >           debug="${build.debug}"
1278 >           debuglevel="${build.debuglevel}"
1279 >           deprecation="${build.deprecation}"
1280 >           source="${build.jsr166e.java.version}"
1281 >           target="${build.jsr166e.java.version}"
1282 >           classpath=""
1283 >           bootclasspath="${bootclasspath6}"
1284 >           includeAntRuntime="false"
1285 >           includeJavaRuntime="false"
1286 >           executable="${javac8}"
1287 >           fork="true">
1288 >
1289 >      <include name="jsr166e/**/*.java"/>
1290 >      <compilerarg value="-XDignore.symbol.file=true"/>
1291 >      <compilerarg value="-Xlint:all"/>
1292 >      <compilerarg value="-Werror"/>
1293 >      <compilerarg value="-Xdoclint:all/protected"/>
1294 >    </javac>
1295 >  </target>
1296  
1297 <      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
1297 >  <target name="jsr166ejar" depends="jsr166ecompile">
1298 >    <jar destfile="${jsr166e.jar}" index="true">
1299 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1300 >      <manifest>
1301 >        <attribute name="Built-By" value="${user.name}"/>
1302 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1303 >      </manifest>
1304 >    </jar>
1305 >  </target>
1306  
1307 <    </java>
1307 >  <target name="jsr166edocs">
1308 >    <delete dir="${jsr166edocs.dir}"/>
1309 >    <mkdir dir="${jsr166edocs.dir}"/>
1310 >
1311 >    <javadoc destdir="${jsr166edocs.dir}"
1312 >             packagenames="jsr166e.*"
1313 >             link="${java.api.url}"
1314 >             access="${build.javadoc.access}"
1315 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1316 >             source="${build.jsr166e.java.version}"
1317 >             executable="${javadoc7}"
1318 >             failonerror = "true">
1319 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1320 >      <arg value="-XDignore.symbol.file=true"/>
1321 >    </javadoc>
1322    </target>
1323  
1324 +  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1325 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1326 +    <run-tck-tests
1327 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1328 +      target="${build.jsr166e.java.version}"
1329 +      workdir="${build.jsr166e.dir}"
1330 +      classes="${jsr166e.jar}"/>
1331 +  </target>
1332 +
1333 +  <target name="jsr166e-tck">
1334 +
1335 + <!--     <antcall target="clean"/> -->
1336 + <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1337 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1338 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1339 + <!--     </antcall> -->
1340 +
1341 +    <antcall target="clean"/>
1342 +    <antcall target="jsr166e-tck-one-java-version">
1343 +      <param name="build.jsr166e.java.version" value="7"/>
1344 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1345 +    </antcall>
1346 +
1347 +    <antcall target="clean"/>
1348 +    <antcall target="jsr166e-tck-one-java-version">
1349 +      <param name="build.jsr166e.java.version" value="6"/>
1350 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1351 +    </antcall>
1352 +  </target>
1353 +
1354 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1355 +
1356 +  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1357 +
1358 +  <target name="jsr166eclean">
1359 +    <delete dir="${build.jsr166e.dir}"/>
1360 +  </target>
1361 +
1362 +  <target name="jsr166edist-jar"
1363 +          depends="jsr166eclean, jsr166ejar">
1364 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1365 +  </target>
1366 +
1367 +  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1368 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1369 +  </target>
1370 +
1371 +
1372 + <!-- Find buglets that can be detected by static build tools -->
1373 +
1374 +  <target name="lint">
1375 +    <antcall target="dists">
1376 +      <param name="build.javadoc.access" value="public"/>
1377 +    </antcall>
1378 +  </target>
1379 +
1380 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1381 +  <target name="lint-private">
1382 +    <antcall target="dist">
1383 +      <param name="build.javadoc.access" value="private"/>
1384 +    </antcall>
1385 +  </target>
1386 +
1387 +
1388 + <!-- ==============================================================
1389 +  Experimental errorprone support - http://errorprone.info
1390 + =================================================================== -->
1391 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1392 +  <property name="errorprone.jsr166.flags"
1393 +            value="-Xep:HashtableContains:OFF
1394 +                   -Xep:JdkObsolete:OFF
1395 +                   -Xep:MissingOverride:OFF
1396 +                   -Xep:MissingFail:OFF
1397 +                   -Xep:MixedArrayDimensions:ERROR
1398 +                   -Xep:RemoveUnusedImports:ERROR
1399 +                   -Xep:EmptyIf:ERROR
1400 +                   -Xep:MultipleTopLevelClasses:ERROR
1401 +                   -Xep:ClassName:ERROR
1402 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1403 +                   -Xep:RedundantThrows:ERROR
1404 +                   -Xep:IdentityBinaryExpression:WARN
1405 +                   -Xep:MethodCanBeStatic:WARN"/>
1406 +  <!-- -Xep:WildcardImport:ERROR -->
1407 +  <property name="errorprone.jsr166.test.flags"
1408 +            value="-Xep:StringSplitter:OFF
1409 +                   -Xep:BoxedPrimitiveConstructor:OFF
1410 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1411 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1412 +  <target name="errorprone"
1413 +          depends="clean, configure-compiler"
1414 +          description="Run errorprone over jsr166 source code (experimental)">
1415 +
1416 +    <local name="destdir"/>
1417 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1418 +    <mkdir dir="${destdir}"/>
1419 +
1420 +    <javac srcdir="${src.dir}"
1421 +           destdir="${destdir}"
1422 +           debug="${build.debug}"
1423 +           debuglevel="${build.debuglevel}"
1424 +           deprecation="${build.deprecation}"
1425 +           classpath=""
1426 +           includeAntRuntime="false"
1427 +           includeJavaRuntime="false"
1428 +           encoding="ASCII"
1429 +           executable="${build.main.javac}"
1430 +           fork="true">
1431 +
1432 +      <include name="**/*.java"/>
1433 +      <compilerarg value="-XDcompilePolicy=simple"/>
1434 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1435 +      <compilerarg value="-Xplugin:ErrorProne
1436 +                          ${errorprone.jsr166.flags}"/>
1437 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1438 +      <compilerarg value="-Xprefer:source"/>
1439 +      <compilerarg value="-XDignore.symbol.file=true"/>
1440 +      <compilerarg value="-Xlint:all"/>
1441 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1442 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1443 +      <compilerarg line="${build.args}"/>
1444 +    </javac>
1445 +
1446 +    <jar destfile="${product.jar}">
1447 +      <fileset dir="${destdir}"/>
1448 +    </jar>
1449 +
1450 +    <run-tck-tests
1451 +      target="${build.main.java.version}"
1452 +      workdir="${build.dir}"
1453 +      classes="${product.jar}">
1454 +      <javac-elements>
1455 +        <compilerarg value="-XDcompilePolicy=simple"/>
1456 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1457 +        <compilerarg value="-Xplugin:ErrorProne
1458 +                            ${errorprone.jsr166.flags}
1459 +                            ${errorprone.jsr166.test.flags}"/>
1460 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1461 +      </javac-elements>
1462 +    </run-tck-tests>
1463 +  </target>
1464 +
1465 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1466 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1467 +  <target name="errorprone-jtreg"
1468 +          depends="jar"
1469 +          description="Run errorprone over jtreg tests (experimental)">
1470 +
1471 +    <run-jtreg-tests
1472 +       target="${build.main.java.version}"
1473 +       workdir="${build.dir}"
1474 +       classes="${product.jar}"
1475 +       verbose="all">
1476 +      <jtreg-elements>
1477 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1478 +        <arg value="-javacoption:-processorpath"/>
1479 +        <arg value="-javacoption:${errorprone.jar}"/>
1480 +        <arg value="-javacoption:-Xplugin:ErrorProne
1481 +                            ${errorprone.jsr166.flags}
1482 +                            ${errorprone.jsr166.test.flags}
1483 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1484 +      </jtreg-elements>
1485 +    </run-jtreg-tests>
1486 +  </target>
1487 +
1488 +
1489 + <!-- ==============================================================
1490 +  Running guava tests against jsr166 code
1491 + =================================================================== -->
1492 +
1493 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1494 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1495 + <!-- <property name="guava.version" value="21.0"/> -->
1496 +
1497 + <!-- HOWTO debug print a path id -->
1498 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1499 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1500 +
1501 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1502 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1503 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1504 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1505 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1506 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1507 +
1508 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1509 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1510 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1511 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1512 +
1513 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1514 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1515 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1516 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1517 +
1518 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1519 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1520 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1521 +
1522 +  <target name="init-ivy">
1523 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1524 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1525 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1526 +             classpath="${build.dir}/ivy.jar"/>
1527 +  </target>
1528 +
1529 +  <target name="guava-tests" depends="jar, init-ivy"
1530 +          description="Guava tests run against jsr166 collections">
1531 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1532 +    <mkdir dir="${guava.dir}"/>
1533 +    <ivy:retrieve pathid="guava.testlib.classpath"
1534 +      type="jar,bundle" inline="true" conf="default,master"
1535 +      pattern="${guava.dir}/[artifact].[ext]"
1536 +      organisation="com.google.guava" module="guava-testlib"/>
1537 +    <property name="guava.version" value="21.0"/>
1538 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1539 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1540 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1541 +           jvm="${build.main.java}" fork="true">
1542 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1543 +      <formatter type="brief"/>
1544 +      <classpath>
1545 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1546 +        <path refid="guava.testlib.classpath"/>
1547 +      </classpath>
1548 +
1549 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1550 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1551 +    </junit>
1552 +  </target>
1553  
1554   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines