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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines