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.100 by jsr166, Sat Jan 19 17:15:44 2013 UTC vs.
Revision 1.309 by jsr166, Mon Dec 16 22:12:32 2019 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 13 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26    where each of the above is a JDK or a symlink to same, and
27 <  $HOME/jdk/src/jdk6
28 <  $HOME/jdk/src/jdk7
29 <  $HOME/jdk/src/jdk8
30 <  where each of the above is a complete JDK source tree
31 <  (e.g. mercurial forest) or a symlink to same.
27 >  $HOME/jdk/src/jdk11
28 >  $HOME/jdk/src/jdk12
29 >  $HOME/jdk/src/jdk13
30 >  $HOME/jdk/src/jdk14
31 >  where each of the above is a JDK source tree 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 11 .. 14 ...
36 >
37 >  As of 2016-03, the sources in src/main are for jdk9+ only.
38 >  As of 2019-08, the sources in src/main are for jdk11+ only.
39 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
40   ------------------------------------------------------------------------------
41    </description>
42  
43 <  <target name="usage" description="Advises user to run with -projecthelp">
44 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
43 >  <!-- Run 'ant -projecthelp' (default target) -->
44 >  <target name="usage">
45 >    <java classname="org.apache.tools.ant.Main">
46 >      <arg value="-projecthelp" />
47 >    </java>
48    </target>
49  
50 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
51  
52    <!-- User-specific settings -->
53    <property file="user.properties"/>
54  
55  
56    <!-- Compilation options -->
38  <property name="build.sourcelevel"    value="1.6"/>
57    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>
60 +  <property name="build.javadoc.access" value="protected"/>
61  
62    <!-- Build locations -->
63    <property name="build.dir"                   location="build"/>
64    <property name="build.classes.dir"           location="${build.dir}/classes"/>
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>
48  <property name="build.lib.dir"               location="${build.dir}/lib"/>
49  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50  <property name="build.reports.dir"           location="${build.dir}/reports"/>
51
52  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57
58  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61
62  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65
66  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69
70  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
67  
68 <  <!-- JDK binary locations -->
68 >  <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
70  
71    <macrodef name="defjdklocations">
72      <attribute name="v"/>
73      <sequential>
74 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
75 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
76 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
77 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
78 <    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
79 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86 <    <property name="bootclasspath@{v}"
87 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
74 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
75 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
76 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
77 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
78 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
79 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80      </sequential>
81    </macrodef>
82  
83 <  <defjdklocations v="6"/>
84 <  <defjdklocations v="7"/>
85 <  <defjdklocations v="8"/>
94 <
95 <  <macrodef name="run-tck-tests">
96 <    <attribute name="jvm"/>
97 <    <attribute name="tck.classes"/>
98 <    <attribute name="product.jar" default="${product.jar}"/>
99 <    <attribute name="jvmflags" default=""/>
83 >  <macrodef name="mirror-dir">
84 >    <attribute name="src"/>
85 >    <attribute name="dst"/>
86      <sequential>
87 <    <java classname="JSR166TestCase"
88 <          jvm="@{jvm}" fork="true">
89 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
90 <        <jvmarg line="@{jvmflags}"/>
91 <        <classpath>
106 <          <pathelement location="${junit.jar}"/>
107 <          <pathelement location="@{tck.classes}"/>
108 <        </classpath>
109 <    </java>
87 >    <delete dir="@{dst}"/>
88 >    <mkdir dir="@{dst}"/>
89 >    <copy todir="@{dst}" preservelastmodified="true">
90 >      <fileset dir="@{src}"/>
91 >    </copy>
92      </sequential>
93    </macrodef>
94  
95 +  <defjdklocations v="11"/>
96 +  <defjdklocations v="12"/>
97 +  <defjdklocations v="13"/>
98 +  <defjdklocations v="14"/>
99 +
100    <!-- Source locations -->
101    <property name="src.dir"              location="${basedir}/src/main"/>
102    <property name="test.src.dir"         location="${basedir}/src/test"/>
103    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
104    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
105 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
110    <property name="lib.dir"              location="${basedir}/lib"/>
111    <property name="dist.dir"             location="${basedir}/dist"/>
112    <property name="topsrc.dir"           location="${basedir}/src"/>
113 <  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
114 <  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
115 <  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
116 <  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126 <  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127 <  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128 <
129 <  <!-- Distribution locations -->
130 <  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131 <  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134 <  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135 <  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
113 >
114 >  <!-- Javadoc locations -->
115 >  <property name="docs.dir"          location="${build.dir}/docs"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117  
118    <!-- Jar locations -->
119 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
120 <  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141 <  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142 <  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143 <  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
119 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
120 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121  
122 <  <!-- Bootclasspath argument -->
123 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
122 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128 >  <!-- The location of jdk early access docs (RIP) -->
129 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
137 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138  
139    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
140 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
141 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
142 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
143 <
144 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
145 <  <!-- The below does not yet exist as of 2012-11 -->
146 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
147 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
148 <
149 <  <!-- Test classpath -->
150 <  <path id="test.classpath">
151 <    <pathelement location="${build.testcases.dir}"/>
152 <    <pathelement location="${junit.jar}"/>
153 <  </path>
140 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
144 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
145 >
146 >  <!-- Define the "jtreg" task -->
147 >  <!-- See the docs in "jtreg -onlineHelp" -->
148 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149 >           classpath="${lib.dir}/jtreg.jar" />
150 >
151 >  <!-- Tck configuration options; see JSR166TestCase.java
152 >   To profile a single tck test class:
153 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
154 >   To stress test a single tck test class:
155 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
156 >   To stress test a single tck test method:
157 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
158 >  -->
159 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
160 >  <macrodef name="run-tck-tests">
161 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
162 >    <attribute name="target"/>
163 >    <attribute name="compile-target" default="@{target}"/>
164 >    <attribute name="workdir"/>
165 >    <attribute name="classes"/>
166 >    <!--
167 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
168 >    -->
169 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
170 >    <element name="javac-elements" optional="true"/>
171 >
172 >    <sequential>
173 >
174 >    <mkdir dir="@{workdir}/tck-classes"/>
175 >
176 >    <javac srcdir="@{tck.src.dir}"
177 >           destdir="@{workdir}/tck-classes"
178 >           debug="${build.debug}"
179 >           debuglevel="${build.debuglevel}"
180 >           deprecation="${build.deprecation}"
181 >           source="@{compile-target}"
182 >           target="@{compile-target}"
183 >           classpath="${junit.jar}"
184 >           includeAntRuntime="false"
185 >           includeJavaRuntime="false"
186 >           encoding="ASCII"
187 >           executable="${javac@{compile-target}}"
188 >           fork="true">
189 >
190 >      <include name="*.java"/>
191 >      <compilerarg value="-XDignore.symbol.file=true"/>
192 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195 >      <compilerarg line="${build.args}"/>
196 >      <javac-elements/>
197 >
198 >    </javac>
199 >
200 >    <java classname="${jsr166.tckTestClass}"
201 >          failonerror="true"
202 >          jvm="${java@{target}}"
203 >          fork="true">
204 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
205 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
206 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
207 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
208 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
209 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
210 >        <jvmarg line="@{jvmflags}"/>
211 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
212 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
213 >
214 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
215 >        <syspropertyset id="system-properties-used-by-tck">
216 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 >          <propertyref prefix="jsr166."/>
218 >          <propertyref name="test.timeout.factor"/>
219 >        </syspropertyset>
220 >
221 >        <classpath>
222 >          <pathelement location="${junit.jar}"/>
223 >          <pathelement location="@{workdir}/tck-classes"/>
224 >        </classpath>
225 >    </java>
226 >
227 >    </sequential>
228 >  </macrodef>
229 >
230 >  <!-- Define jtreg test sets for different jdk versions -->
231 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
232 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
233 >  <property name="jtreg.test.pattern" value="**/*.java"/>
234 >  <macrodef name="defjtregtests">
235 >    <attribute name="v"/>
236 >    <sequential>
237 >      <fileset dir="${jtreg@{v}.src.dir}">
238 >        <patternset id="jdk@{v}.jtreg.tests">
239 >          <include name="${jtreg.test.pattern}"/>
240 >        </patternset>
241 >      </fileset>
242 >    </sequential>
243 >  </macrodef>
244 >
245 >  <defjtregtests v="14"/>
246 >  <defjtregtests v="13"/>
247 >  <defjtregtests v="12"/>
248 >  <defjtregtests v="11"/>
249 >
250 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251 >  <property name="jtreg.flags" value=""/>
252 >
253 >  <macrodef name="run-jtreg-tests">
254 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255 >    <attribute name="target"/>
256 >    <attribute name="workdir"/>
257 >    <attribute name="classes"/>
258 >    <attribute name="verbose" default="${jtreg.verbose}"/>
259 >    <attribute name="jtregflags" default=""/>
260 >    <element name="jtreg-elements" optional="true"/>
261 >
262 >    <sequential>
263 >
264 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
266 >
267 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
268 >    <jtreg dir="${jtreg@{target}.src.dir}"
269 >           jdk="${jdk@{target}.home}"
270 >           workDir="@{workdir}/JTwork">
271 >      <patternset refid="jdk@{target}.jtreg.tests"/>
272 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
274 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
275 >      <arg value="-agentvm"/>
276 >      <arg value="-noreport"/>
277 >      <arg value="-verbose:@{verbose}"/>
278 >      <arg value="-vmoptions:-esa -ea"/>
279 >      <arg value="-automatic"/>
280 >      <arg value="-k:!ignore"/>
281 >      <arg line="@{jtregflags}"/>
282 >      <arg line="${jtreg.flags}"/>
283 >      <jtreg-elements/>
284 >    </jtreg>
285 >    </sequential>
286 >  </macrodef>
287  
288    <!-- ALoops classpath -->
289    <path id="loops.classpath">
# Line 168 | Line 291
291    </path>
292  
293    <!-- Support @jls tag, used in jdk8+ javadoc -->
294 <  <!-- TODO: How do we get &trade to work? -->
295 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
173 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
294 >  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
295 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
296    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
297  
298    <!-- Main targets -->
299  
300 +  <!-- Default values: may seem strange ... -->
301 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
302 +  <!-- But at build time, target jdk9, for maximal binary portability -->
303 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
304 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305 +    o override-methods=summary
306 +    o {@systemProperty ...}
307 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
308 +    o 8202628: javadoc generates bad links in TestModules.java
309 +    -->
310 +  <property name="java.runtime.target" value="11"/>
311 +  <property name="build.main.java" value="${java11}"/>
312 +  <property name="build.main.javac" value="${javac11}"/>
313 +  <property name="build.main.javadoc" value="${javadoc12}"/>
314 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
315 +
316    <target name="dists"
317 <          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
317 >          depends="dist"
318            description="Builds all public jars and docs"/>
319  
320    <target name="compile"
321            depends="configure-compiler"
322 <          description="Compiles src/main sources to build folder">
322 >          description="Compiles src/main sources to build dir">
323 >
324 >    <local name="destdir"/>
325 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
326  
327 <    <mkdir dir="${build.classes.dir}"/>
327 >    <mkdir dir="${destdir}"/>
328  
329      <javac srcdir="${src.dir}"
330 <           destdir="${build.classes.dir}"
330 >           destdir="${destdir}"
331             debug="${build.debug}"
332             debuglevel="${build.debuglevel}"
333             deprecation="${build.deprecation}"
334             classpath=""
335             includeAntRuntime="false"
336             includeJavaRuntime="false"
337 <           executable="${javac8}"
337 >           encoding="ASCII"
338 >           executable="${build.main.javac}"
339             fork="true">
340  
341        <include name="**/*.java"/>
342 <      <compilerarg line="${build.args}"/>
342 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
343 >      <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>
345 <      <compilerarg value="-Xlint:all"/>
346 <
347 < <!--
348 <      <exclude name="java/lang/**"/>
345 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
346 >      <compilerarg value="-Xlint:all,-removal"/>
347 >      <compilerarg line="--doclint-format html5"/>
348 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
349 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
350 >      <compilerarg value="-Werror"/>
351 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352        <compilerarg line="${build.args}"/>
207      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
208 -->
353  
354      </javac>
211
355    </target>
356  
357  
215
358    <target name="jar"
359            depends="compile"
360 <          description="Builds library jar from compiled sources">
361 <
362 <    <mkdir dir="${build.lib.dir}"/>
221 <
360 >          description="Builds library jar for src/main from compiled sources">
361 >    <local name="subdir"/>
362 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
363      <jar destfile="${product.jar}">
364 <      <fileset dir="${build.classes.dir}"/>
364 >      <fileset dir="${build.classes.dir}${subdir}"/>
365 >      <manifest>
366 >        <attribute name="Built-By" value="${user.name}"/>
367 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
368 >      </manifest>
369      </jar>
225
370    </target>
371  
372  
229
230  <target name="test"
231          depends="init, configure-tests, report-tests"
232          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
233
234
235
373    <target name="docs"
374 <          description="Builds javadocs for src/main">
374 >          description="Builds javadocs for src/main to dist dir">
375 >
376 >    <delete dir="${docs.dir}" quiet="true"/>
377 >    <mkdir dir="${docs.dir}"/>
378  
379 <    <delete dir="${dist.javadocs.dir}"/>
380 <    <mkdir dir="${dist.javadocs.dir}"/>
379 >    <!-- old school frames via docs/index.html?overview-summary.html -->
380 >    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
381 >    <local name="use-frames"/>
382 >    <condition property="use-frames">
383 >      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
384 >    </condition>
385  
386      <!-- the packagenames="none" hack below prevents scanning the -->
387      <!-- sourcepath for packages -->
388  
389 <    <javadoc destdir="${dist.javadocs.dir}"
389 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
390 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
391 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
392 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
393 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
394 >    <javadoc destdir="${docs.dir}"
395               packagenames="none"
396 <             link="${jdkapi8docs.url}"
396 >             link="${java.api.url}"
397               overview="${src.dir}/intro.html"
398 <             sourcepath="${src.dir}:${jdk8src.dir}"
398 >             access="${build.javadoc.access}"
399 >             sourcepath="${src.dir}"
400               classpath=""
401 <             executable="${javadoc8}">
402 <      <arg value="-XDignore.symbol.file=true"/>
403 <      <arg value="-tag"/>
254 <      <arg value="${javadoc.jls.option}"/>
401 >             source="${build.main.javadoc.source}"
402 >             executable="${build.main.javadoc}">
403 > <!-- TODO: JDK-8214571 failonerror = "true" -->
404        <fileset dir="${src.dir}" defaultexcludes="yes">
405          <include name="**/*.java"/>
406        </fileset>
407 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
408 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
409 +      <arg value="-quiet"/>
410 +      <arg value="-XDignore.symbol.file=true"/>
411 +      <arg value="-html5"/>
412 +      <arg value="--patch-module=java.base=${src.dir}"/>
413 +      <arg value="--frames" if:set="use-frames"/>
414 +      <arg value="--override-methods=summary"/>
415 +      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
416 +      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
417 +      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
418 +      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
419 + <!-- tags added in jdk9: currently unused -->
420 + <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
421 + <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
422      </javadoc>
259
423    </target>
424  
425  
263
426    <target name="dist"
427 <          depends="init, dist-clean, dist-jar, docs"
427 >          depends="dist-clean, dist-jar, dist-docs"
428            description="Puts all distributable products in single hierarchy"/>
429  
430  
269  <target name="release"
270          depends="dist"
271          description="Puts entire CVS tree, plus distribution productions, in a jar">
272
273    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
274
275    <jar basedir="${basedir}" destfile="${release.jar}">
276      <!-- <exclude name="build/**"/> -->
277      <exclude name="${release.jar}"/>
278      <exclude name="user.properties"/>
279      <exclude name="etc/notes/**"/>
280      <exclude name="src/emulation/**"/>
281      <exclude name="**/SyntaxTest.java"/>
282      <exclude name="**/SuperfluousAbstract.java"/>
283    </jar>
284
285  </target>
286
287
288
431    <target name="clean"
432            description="Removes all build products">
291
433      <delete dir="${build.dir}"/>
293    <delete dir="${build.classes.dir}"/>
294    <delete dir="${build.lib.dir}"/>
295
434    </target>
435  
436  
299
437    <target name="dist-clean"
438            description="Removes all build and distribution products">
439 <
439 >    <delete dir="${build.dir}"/>
440      <delete dir="${dist.dir}"/>
304
305  </target>
306
307
308
309  <!-- Internal targets -->
310
311
312  <target name="init">
313
314    <!-- Version is kept in a separate file -->
315    <loadfile property="version" srcFile="version.properties"/>
316    <echo>Building JSR-166 version ${version}</echo>
317    <echo>java.home is ${java.home}</echo>
318
441    </target>
442  
443  
444    <target name="dist-jar"
445            depends="clean, jar">
324
446      <copy file="${product.jar}" todir="${dist.dir}"/>
326
447    </target>
448  
449 <
450 <  <target name="compile-tests"
451 <          depends="jar">
332 <
333 <    <mkdir dir="${build.testcases.dir}"/>
334 <
335 <    <javac srcdir="${tck.src.dir}"
336 <          destdir="${build.testcases.dir}"
337 <            debug="${build.debug}"
338 <       debuglevel="${build.debuglevel}"
339 <      deprecation="${build.deprecation}"
340 <           source="${build.sourcelevel}"
341 <             fork="true">
342 <
343 <      <compilerarg value="${bootclasspath.args}"/>
344 <      <compilerarg line="${build.args}"/>
345 <      <compilerarg value="-XDignore.symbol.file=true"/>
346 <
347 <      <classpath refid="test.classpath"/>
348 <
349 <    </javac>
350 <
351 <    <javac srcdir="${test.src.dir}"
352 <          destdir="${build.testcases.dir}"
353 <            debug="${build.debug}"
354 <       debuglevel="${build.debuglevel}"
355 <      deprecation="${build.deprecation}"
356 <           source="${build.sourcelevel}"
357 <             fork="true">
358 <
359 <      <include name="jsr166/test/**"/>
360 <
361 <      <compilerarg value="${bootclasspath.args}"/>
362 <      <compilerarg line="${build.args}"/>
363 <      <compilerarg value="-XDignore.symbol.file=true"/>
364 <
365 <      <classpath refid="test.classpath"/>
366 <
367 <    </javac>
368 <
369 < <!--
370 <    <javac srcdir="${jtreg.src.dir}"
371 <          destdir="${build.testcases.dir}"
372 <            debug="${build.debug}"
373 <       debuglevel="${build.debuglevel}"
374 <      deprecation="${build.deprecation}"
375 <           source="${build.sourcelevel}"
376 <             fork="true">
377 <
378 <      <compilerarg value="${bootclasspath.args}"/>
379 <      <compilerarg line="${build.args}"/>
380 <      <compilerarg value="-XDignore.symbol.file=true"/>
381 <
382 <      <classpath refid="test.classpath"/>
383 <
384 <    </javac>
385 < -->
386 <
449 >  <target name="dist-docs"
450 >          depends="clean, docs">
451 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
452    </target>
453  
454 +  <target name="tck"
455 +          depends="jar"
456 +          description="Runs tck tests for src/main directly">
457  
458 <  <target name="run-tests"
459 <          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}">
428 <          <include name="**/${testcase}Test.java"/>
429 <        </fileset>
430 <      </batchtest>
431 < -->
432 <
433 <    </junit>
434 <
458 >    <run-tck-tests
459 >      target="${java.runtime.target}"
460 >      workdir="${build.dir}"
461 >      classes="${product.jar}">
462 >      <javac-elements>
463 >        <compilerarg value="-Werror"/>
464 >      </javac-elements>
465 >    </run-tck-tests>
466 >  </target>
467 >
468 >  <target name="tck-parallelism-1"
469 >          description="Runs tck with common pool parallelism 1">
470 >    <antcall target="tck">
471 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
472 >    </antcall>
473 >  </target>
474 >
475 >  <target name="tck-parallelism-0"
476 >          description="Runs tck with common pool parallelism 0">
477 >    <antcall target="tck">
478 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
479 >    </antcall>
480 >  </target>
481 >
482 >  <target name="tck-security-manager"
483 >          description="Runs tck with a security manager">
484 >    <antcall target="tck">
485 >      <param name="jsr166.useSecurityManager" value="true"/>
486 >    </antcall>
487 >  </target>
488 >
489 >  <target name="jtreg"
490 >          depends="jar"
491 >          description="Runs jtreg tests for src/main using the jtreg ant task">
492 >    <run-jtreg-tests
493 >       target="${java.runtime.target}"
494 >       workdir="${build.dir}"
495 >       classes="${product.jar}"/>
496    </target>
497  
498 +  <target name="test"
499 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
500 +          description="Runs tck and jtreg tests for src/main"/>
501  
502 <  <target name="report-tests"
503 <          depends="run-tests">
504 <
441 <    <!-- Sets junit.report.format to frames if redirection is present,
442 <         otherwise sets it to noframes. -->
443 <    <available property="junit.report.format"
444 <                  value="frames"
445 <              classname="org.apache.xalan.lib.Redirect"
446 <    />
447 <    <property name="junit.report.format" value="noframes"/>
448 <
449 <    <junitreport todir="${build.reports.dir}">
450 <      <fileset dir="${build.reports.dir}">
451 <        <include name="TEST-*.xml"/>
452 <      </fileset>
453 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
454 <      />
455 <    </junitreport>
456 <
457 <    <fail message="Test Cases Failed" if="junit.failed"/>
502 >  <target name="test-version-permutations"
503 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
504 >  </target>
505  
506 +  <target name="test11">
507 +    <antcall>
508 +      <param name="java.runtime.target" value="11"/>
509 +      <param name="build.main.javac" value="${javac11}"/>
510 +      <param name="build.main.javadoc" value="${javadoc12}"/>
511 +      <param name="build.main.javadoc.source" value="11"/>
512 +      <target name="clean"/>
513 +      <target name="test"/>
514 +      <target name="docs"/>
515 +    </antcall>
516 +  </target>
517 +
518 +  <target name="test12">
519 +    <antcall>
520 +      <param name="java.runtime.target" value="12"/>
521 +      <param name="build.main.javac" value="${javac12}"/>
522 +      <param name="build.main.javadoc" value="${javadoc12}"/>
523 +      <param name="build.main.javadoc.source" value="12"/>
524 +      <target name="clean"/>
525 +      <target name="test"/>
526 +      <target name="docs"/>
527 +    </antcall>
528 +  </target>
529 +
530 +  <target name="test13">
531 +    <antcall>
532 +      <param name="java.runtime.target" value="13"/>
533 +      <param name="build.main.javac" value="${javac13}"/>
534 +      <param name="build.main.javadoc" value="${javadoc13}"/>
535 +      <param name="build.main.javadoc.source" value="13"/>
536 +      <target name="clean"/>
537 +      <target name="test"/>
538 +      <target name="docs"/>
539 +    </antcall>
540 +  </target>
541 +
542 +  <target name="test14">
543 +    <antcall>
544 +      <param name="java.runtime.target" value="14"/>
545 +      <param name="build.main.javac" value="${javac14}"/>
546 +      <param name="build.main.javadoc" value="${javadoc14}"/>
547 +      <param name="build.main.javadoc.source" value="14"/>
548 +      <target name="clean"/>
549 +      <target name="test"/>
550 +      <target name="docs"/>
551 +    </antcall>
552 +  </target>
553 +
554 +  <target name="test11-12">
555 +    <antcall>
556 +      <param name="java.runtime.target" value="12"/>
557 +      <param name="build.main.javac" value="${javac11}"/>
558 +      <param name="build.main.javadoc" value="${javadoc12}"/>
559 +      <param name="build.main.javadoc.source" value="11"/>
560 +      <target name="clean"/>
561 +      <target name="test"/>
562 +      <target name="docs"/>
563 +    </antcall>
564 +  </target>
565 +
566 +  <target name="test11-13">
567 +    <antcall>
568 +      <param name="java.runtime.target" value="13"/>
569 +      <param name="build.main.javac" value="${javac11}"/>
570 +      <param name="build.main.javadoc" value="${javadoc13}"/>
571 +      <param name="build.main.javadoc.source" value="11"/>
572 +      <target name="clean"/>
573 +      <target name="test"/>
574 +      <target name="docs"/>
575 +    </antcall>
576 +  </target>
577 +
578 +  <target name="test11-14">
579 +    <antcall>
580 +      <param name="java.runtime.target" value="14"/>
581 +      <param name="build.main.javac" value="${javac11}"/>
582 +      <param name="build.main.javadoc" value="${javadoc14}"/>
583 +      <param name="build.main.javadoc.source" value="11"/>
584 +      <target name="clean"/>
585 +      <target name="test"/>
586 +      <target name="docs"/>
587 +    </antcall>
588    </target>
589  
590  
591    <target name="configure-compiler">
592 +    <fail message="ant version too old">
593 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
594 +    </fail>
595  
596      <property name="unchecked.option" value="-Xlint:unchecked"/>
597  
# Line 476 | Line 608
608    </target>
609  
610  
611 <  <target name="configure-tests"
612 <       depends="configure-compiler">
481 <
482 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
483 <    <available property="junit.available"
484 <               classname="junit.framework.Protectable"/>
485 <
486 <    <!-- Xalan -->
487 <    <available property="xalan.available"
488 <               classname="org.apache.xalan.Version"/>
489 <
490 <
491 <    <!-- Ant 1.6beta and later don't need or want this check -->
492 <    <!--
493 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
494 <          unless="junit.available"/>
495 <
496 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
497 <          unless="xalan.available"/>
498 <    -->
499 <
500 <  </target>
501 <
502 <
503 <  <!-- Various demos and test programs -->
504 <
505 <
506 <  <target name="loops" depends="init, configure-compiler"
507 <          description="Benchmark from Doug Lea's AQS paper">
508 <
509 <    <mkdir dir="${build.loops.dir}"/>
510 <
511 <    <javac srcdir="${loops.src.dir}"
512 <          destdir="${build.loops.dir}"
513 <            debug="${build.debug}"
514 <       debuglevel="${build.debuglevel}"
515 <      deprecation="${build.deprecation}"
516 <           source="${build.sourcelevel}"
517 <             fork="true">
518 <
519 <      <compilerarg line="${build.args}"/>
520 <      <classpath refid="loops.classpath"/>
521 <      <compilerarg value="-XDignore.symbol.file=true"/>
522 <
523 <    </javac>
524 <
525 <    <java classname="ALoops" fork="true">
526 <      <classpath refid="loops.classpath"/>
527 <    </java>
528 <
529 <  </target>
530 <
531 <
532 <  <!-- jsr166 4jdk7 -->
533 <
534 <
535 <  <target name="4jdk7compile"
536 <          depends="configure-compiler"
537 <          description="Compiles src/jdk7 sources, targeting jdk7">
538 <
539 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
540 <
541 <    <javac srcdir="${4jdk7src.dir}"
542 <           destdir="${build.4jdk7.classes.dir}"
543 <           debug="${build.debug}"
544 <           debuglevel="${build.debuglevel}"
545 <           deprecation="${build.deprecation}"
546 <           source="1.6"
547 <           classpath=""
548 <           bootclasspath="${bootclasspath6}"
549 <           includeAntRuntime="false"
550 <           includeJavaRuntime="false"
551 <           executable="${javac7}"
552 <           fork="true">
553 <
554 <      <include name="**/*.java"/>
555 <      <compilerarg line="${build.args}"/>
556 <      <compilerarg value="-XDignore.symbol.file=true"/>
557 <      <compilerarg value="-Xlint:all"/>
558 <
559 <    </javac>
611 >  <target name="compile-test-loops" depends="jar"
612 >          description="Compiles all the perf tests in src/test/loops">
613  
614 <    <mkdir dir="${build.4jdk7.lib.dir}"/>
614 >    <mkdir dir="${build.dir}/test/loops"/>
615  
616 <    <jar destfile="${4jdk7product.jar}" index="true">
617 <      <fileset dir="${build.4jdk7.classes.dir}"/>
565 <    </jar>
566 <
567 <    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
568 <
569 <    <javac srcdir="${tck.src.dir}"
570 <           destdir="${build.4jdk7.tck.classes.dir}"
616 >    <javac srcdir="${basedir}/src/test/loops"
617 >           destdir="${build.dir}/test/loops"
618             debug="${build.debug}"
619             debuglevel="${build.debuglevel}"
620             deprecation="${build.deprecation}"
574           source="1.6"
575           classpath="${junit.jar}"
576           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
621             includeAntRuntime="false"
622             includeJavaRuntime="false"
623 <           executable="${javac7}"
623 >           encoding="ASCII"
624 >           executable="${build.main.javac}"
625             fork="true">
626  
627 <      <include name="**/*.java"/>
583 <      <compilerarg line="${build.args}"/>
627 >      <include name="*.java"/>
628        <compilerarg value="-XDignore.symbol.file=true"/>
629        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
630 <
587 <    </javac>
588 <
589 <  </target>
590 <
591 <
592 <  <target name="4jdk7-test-tck"
593 <          depends="4jdk7compile"
594 <          description="Runs tck tests for jsr166-4jdk7 directly">
595 <    <run-tck-tests
596 <      jvm="${java7}"
597 <      tck.classes="${build.4jdk7.tck.classes.dir}"
598 <      product.jar="${4jdk7product.jar}"/>
599 <  </target>
600 <
601 <
602 <  <target name="4jdk7-test-tck-junit"
603 <          depends="4jdk7compile"
604 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
605 <
606 <    <junit printsummary="true"
607 <           showoutput="true"
608 <           errorProperty="junit.failed"
609 <           failureProperty="junit.failed"
610 <           includeantruntime="true"
611 <           jvm="${java7}"
612 <           fork="true">
613 <
614 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
615 <      <jvmarg value="-server"/>
616 <
617 <      <classpath>
618 <        <pathelement location="${junit.jar}"/>
619 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
620 <      </classpath>
621 <
622 <      <formatter type="brief"/>
623 <
624 <      <test name="JSR166TestCase" haltonfailure="no">
625 <      </test>
626 <
627 <    </junit>
628 <  </target>
629 <
630 <
631 <  <target name="4jdk7docs"
632 <          description="Builds javadocs with custom tags to build folder">
633 <
634 <    <delete dir="${build.4jdk7.docs.dir}"/>
635 <    <mkdir dir="${build.4jdk7.docs.dir}"/>
636 <
637 <    <javadoc destdir="${build.4jdk7.docs.dir}"
638 <             packagenames="none"
639 <             link="${jdkapi7docs.url}"
640 <             overview="${4jdk7src.dir}/intro.html"
641 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
642 <             classpath=""
643 <             executable="${javadoc7}">
644 <      <arg value="-XDignore.symbol.file=true"/>
645 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
646 <        <include name="**/*.java"/>
647 <      </fileset>
648 <    </javadoc>
649 <
650 <  </target>
651 <
652 <
653 <  <target name="4jdk7dist"
654 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
655 <          description="Puts all distributable products in single hierarchy"/>
656 <
657 <
658 <
659 <  <target name="4jdk7clean"
660 <          description="Removes all build products">
661 <
662 <    <delete dir="${build.4jdk7.dir}"/>
663 <
664 <  </target>
665 <
666 <
667 <
668 <  <target name="4jdk7dist-clean"
669 <          description="Removes all build and distribution products">
670 <
671 <  </target>
672 <
673 <  <target name="4jdk7dist-docs"
674 <          description="Builds javadocs without custom tags to dist folder">
675 <
676 <    <delete dir="${dist.4jdk7.docs.dir}"/>
677 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
678 <
679 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
680 <             packagenames="none"
681 <             link="${jdkapi7docs.url}"
682 <             overview="${4jdk7src.dir}/intro.html"
683 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
684 <             classpath=""
685 <             executable="${javadoc7}">
686 <      <arg value="-XDignore.symbol.file=true"/>
687 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
688 <        <include name="**/*.java"/>
689 <      </fileset>
690 <    </javadoc>
691 <
692 <  </target>
693 <
694 <  <target name="4jdk7dist-jar"
695 <          depends="4jdk7clean, 4jdk7compile">
696 <
697 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
698 <
699 <  </target>
700 <
701 <  <!-- jsr166x -->
702 <
703 <
704 <  <target name="jsr166xcompile"
705 <          depends="init, configure-compiler"
706 <          description="Compiles jsr166x sources">
707 <
708 <    <mkdir dir="${build.jsr166x.dir}"/>
709 <
710 <    <javac srcdir="${jsr166xsrc.dir}"
711 <          destdir="${build.jsr166x.dir}"
712 <            debug="${build.debug}"
713 <       debuglevel="${build.debuglevel}"
714 <      deprecation="${build.deprecation}"
715 <           source="${build.sourcelevel}"
716 <             fork="true">
717 <
718 <      <include name="**/*.java"/>
630 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
631        <compilerarg line="${build.args}"/>
720      <compilerarg value="-XDignore.symbol.file=true"/>
721
632      </javac>
723
633    </target>
634  
635  
636 +  <!-- old branches no longer maintained.  build support deleted -->
637 +  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
638 +  <!-- jsr166 4jdk7 (no longer maintained) -->
639 +  <!-- jsr166x (no longer maintained) -->
640 +  <!-- jsr166y (no longer maintained) -->
641 +  <!-- extra166y (no longer maintained) -->
642 +  <!-- jsr166e (no longer maintained) -->
643  
644 <  <target name="jsr166xjar"
729 <          depends="jsr166xcompile"
730 <          description="Builds library jar from compiled sources">
644 > <!-- Find buglets that can be detected by static build tools -->
645  
646 <    <mkdir dir="${build.jsr166xlib.dir}"/>
647 <
648 <    <jar destfile="${jsr166xproduct.jar}">
649 <      <fileset dir="${build.jsr166x.dir}"/>
650 <    </jar>
646 > <!--   <target name="lint"> -->
647 > <!--     <antcall target="dists"> -->
648 > <!--       <param name="build.javadoc.access" value="protected"/> -->
649 > <!--     </antcall> -->
650 > <!--   </target> -->
651  
652 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
653 +  <target name="doclint-private">
654 +    <antcall target="dist">
655 +      <param name="build.javadoc.access" value="private"/>
656 +    </antcall>
657    </target>
658  
659  
660 + <!-- ==============================================================
661 +  Experimental errorprone support
662 +  https://errorprone.info
663 +  https://errorprone.info/docs/installation
664 +  https://github.com/google/error-prone/issues/1143
665 + =================================================================== -->
666 +  <path id="errorprone.processorpath.path">
667 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
668 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
669 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
670 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
671 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
672 +  </path>
673 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
674 +  <property name="errorprone.jsr166.user.flags" value=""/>
675 +  <property name="errorprone.jsr166.flags"
676 +            value="-Xep:HashtableContains:OFF
677 +                   -Xep:JdkObsolete:OFF
678 +                   -Xep:MissingOverride:OFF
679 +                   -Xep:MissingFail:OFF
680 +                   -Xep:ThreadPriorityCheck:OFF
681 +                   -Xep:MixedArrayDimensions:ERROR
682 +                   -Xep:RemoveUnusedImports:ERROR
683 +                   -Xep:EmptyIf:ERROR
684 +                   -Xep:MultipleTopLevelClasses:ERROR
685 +                   -Xep:ClassName:ERROR
686 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
687 +                   -Xep:RedundantThrows:ERROR
688 +                   -Xep:IdentityBinaryExpression:WARN
689 +                   -Xep:ConstructorInvokesOverridable:WARN
690 +                   -Xep:MethodCanBeStatic:WARN
691 +                   ${errorprone.jsr166.user.flags}"/>
692 +  <!-- -Xep:WildcardImport:ERROR -->
693 +  <property name="errorprone.jsr166.test.flags"
694 +            value="-Xep:StringSplitter:OFF
695 +                   -Xep:BoxedPrimitiveConstructor:OFF
696 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
697 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
698 +  <target name="errorprone"
699 +          depends="clean, configure-compiler"
700 +          description="Run errorprone over jsr166 source code (experimental)">
701 +
702 +    <local name="destdir"/>
703 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
704 +    <mkdir dir="${destdir}"/>
705  
706 <  <target name="jsr166xdocs"
707 <          description="Builds javadocs with custom tags to build folder">
744 <
745 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
746 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
747 <
748 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
749 <             packagenames="jsr166x"
750 <             link="${jdkapidocs.url}"
751 <             source="${build.sourcelevel}"
752 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
753 <             additionalparam="-XDignore.symbol.file=true" />
754 <
755 <  </target>
756 <
757 <
758 <  <target name="jsr166xdist"
759 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
760 <          description="Puts all distributable products in single hierarchy"/>
761 <
762 <
763 <
764 <  <target name="jsr166xclean"
765 <          description="Removes all build products">
766 <
767 <    <delete dir="${build.jsr166x.dir}"/>
768 <    <delete dir="${build.jsr166xlib.dir}"/>
769 <
770 <  </target>
771 <
772 <
773 <
774 <  <target name="jsr166xdist-clean"
775 <          description="Removes all build and distribution products">
776 <
777 <  </target>
778 <
779 <
780 <
781 <  <target name="jsr166xdist-docs"
782 <          description="Builds javadocs without custom tags to dist folder">
783 <
784 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
785 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
786 <
787 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
788 <             packagenames="jsr166x"
789 <             link="${jdkapidocs.url}"
790 <             source="${build.sourcelevel}"
791 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
792 <             additionalparam="-XDignore.symbol.file=true" />
793 <
794 <  </target>
795 <
796 <  <target name="jsr166xdist-jar"
797 <          depends="jsr166xclean, jsr166xjar">
798 <
799 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
800 <
801 <  </target>
802 <
803 <  <!-- jsr166y -->
804 <
805 <
806 <  <target name="jsr166ycompile"
807 <          depends="init, configure-compiler"
808 <          description="Compiles jsr166y sources">
809 <
810 <    <mkdir dir="${build.jsr166y.dir}"/>
811 <
812 <    <javac srcdir="${jsr166ysrc.dir}"
813 <          destdir="${build.jsr166y.dir}"
814 <            debug="${build.debug}"
815 <       debuglevel="${build.debuglevel}"
816 <      deprecation="${build.deprecation}"
817 <           source="${build.sourcelevel}"
818 <             fork="true">
819 <
820 <      <include name="**/*.java"/>
821 <      <compilerarg line="${build.args}"/>
822 <      <compilerarg value="-XDignore.symbol.file=true"/>
823 <      <compilerarg value="${bootclasspath.args}"/>
824 <
825 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
826 <
827 <    </javac>
828 <
829 <  </target>
830 <
831 <
832 <
833 <  <target name="jsr166yjar"
834 <          depends="jsr166ycompile"
835 <          description="Builds library jar from compiled sources">
836 <
837 <    <mkdir dir="${build.jsr166ylib.dir}"/>
838 <
839 <    <jar destfile="${jsr166yproduct.jar}" index="true">
840 <      <fileset dir="${build.jsr166y.dir}"/>
841 <    </jar>
842 <
843 <  </target>
844 <
845 <
846 <
847 <  <target name="jsr166ydocs"
848 <          description="Builds javadocs with custom tags to build folder">
849 <
850 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
851 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
852 <
853 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
854 <             packagenames="jsr166y"
855 <             link="${jdkapidocs.url}"
856 <             source="${build.sourcelevel}"
857 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
858 <             additionalparam="-XDignore.symbol.file=true" />
859 <
860 <  </target>
861 <
862 <
863 <  <target name="jsr166ydist"
864 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
865 <          description="Puts all distributable products in single hierarchy"/>
866 <
867 <
868 <
869 <  <target name="jsr166yclean"
870 <          description="Removes all build products">
871 <
872 <    <delete dir="${build.jsr166y.dir}"/>
873 <    <delete dir="${build.jsr166ylib.dir}"/>
874 <
875 <  </target>
876 <
877 <
878 <
879 <  <target name="jsr166ydist-clean"
880 <          description="Removes all build and distribution products">
881 <
882 <  </target>
883 <
884 <  <target name="jsr166ydist-docs"
885 <          description="Builds javadocs without custom tags to dist folder">
886 <
887 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
888 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
889 <
890 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
891 <             packagenames="jsr166y"
892 <             link="${jdkapidocs.url}"
893 <             source="${build.sourcelevel}"
894 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
895 <             additionalparam="-XDignore.symbol.file=true" />
896 <
897 <  </target>
898 <
899 <  <target name="jsr166ydist-jar"
900 <          depends="jsr166yclean, jsr166yjar">
901 <
902 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
903 <
904 <  </target>
905 <
906 <
907 <  <!-- extra166y -->
908 <
909 <
910 <  <target name="extra166ycompile"
911 <          depends="init, configure-compiler, jsr166ycompile"
912 <          description="Compiles extra166y sources">
913 <
914 <    <mkdir dir="${build.extra166y.dir}"/>
915 <
916 <    <javac srcdir="${extra166ysrc.dir}"
917 <          destdir="${build.extra166y.dir}"
918 <            debug="${build.debug}"
919 <            classpath="${jsr166yproduct.jar}"
920 <       debuglevel="${build.debuglevel}"
921 <      deprecation="${build.deprecation}"
922 <           source="${build.sourcelevel}"
923 <             fork="true">
924 <
925 <      <include name="**/*.java"/>
926 <      <compilerarg line="${build.args}"/>
927 <      <compilerarg value="-XDignore.symbol.file=true"/>
928 <      <compilerarg value="${bootclasspath.args}"/>
929 <
930 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
931 <
932 <    </javac>
933 <
934 <  </target>
935 <
936 <
937 <
938 <  <target name="extra166yjar"
939 <          depends="extra166ycompile"
940 <          description="Builds library jar from compiled sources">
941 <
942 <    <mkdir dir="${build.extra166ylib.dir}"/>
943 <
944 <    <jar destfile="${extra166yproduct.jar}" index="true">
945 <      <fileset dir="${build.extra166y.dir}"/>
946 <    </jar>
947 <
948 <  </target>
949 <
950 <
951 <
952 <  <target name="extra166ydocs"
953 <          description="Builds javadocs with custom tags to build folder">
954 <
955 <    <delete dir="${build.extra166yjavadocs.dir}"/>
956 <    <mkdir dir="${build.extra166yjavadocs.dir}"/>
957 <
958 <    <javadoc destdir="${build.extra166yjavadocs.dir}"
959 <             packagenames="extra166y"
960 <             link="${jdkapidocs.url}"
961 <             source="${build.sourcelevel}"
962 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
963 <             additionalparam="-XDignore.symbol.file=true" />
964 <
965 <  </target>
966 <
967 <
968 <  <target name="extra166ydist"
969 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
970 <          description="Puts all distributable products in single hierarchy"/>
971 <
972 <
973 <
974 <  <target name="extra166yclean"
975 <          description="Removes all build products">
976 <
977 <    <delete dir="${build.extra166y.dir}"/>
978 <    <delete dir="${build.extra166ylib.dir}"/>
979 <
980 <  </target>
981 <
982 <
983 <
984 <  <target name="extra166ydist-clean"
985 <          description="Removes all build and distribution products">
986 <
987 <  </target>
988 <
989 <  <target name="extra166ydist-docs"
990 <          description="Builds javadocs without custom tags to dist folder">
991 <
992 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
993 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
994 <
995 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
996 <             packagenames="extra166y"
997 <             link="${jdkapidocs.url}"
998 <             source="${build.sourcelevel}"
999 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1000 <             additionalparam="-XDignore.symbol.file=true" />
1001 <
1002 <  </target>
1003 <
1004 <  <target name="extra166ydist-jar"
1005 <          depends="extra166yclean, extra166yjar">
1006 <
1007 <    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1008 <
1009 <  </target>
1010 <
1011 <  <!-- jsr166e -->
1012 <
1013 <  <target name="jsr166ecompile"
1014 <          depends="configure-compiler"
1015 <          description="Compiles jsr166e sources">
1016 <
1017 <    <mkdir dir="${build.jsr166e.dir}"/>
1018 <
1019 <    <javac srcdir="${topsrc.dir}"
1020 <           destdir="${build.jsr166e.dir}"
706 >    <javac srcdir="${src.dir}"
707 >           destdir="${destdir}"
708             debug="${build.debug}"
709             debuglevel="${build.debuglevel}"
710             deprecation="${build.deprecation}"
1024           source="1.7"
711             classpath=""
712             includeAntRuntime="false"
713             includeJavaRuntime="false"
714 <           executable="${javac7}"
714 >           encoding="ASCII"
715 >           executable="${build.main.javac}"
716             fork="true">
717  
718 <      <include name="jsr166e/**/*.java"/>
719 <      <compilerarg line="${build.args}"/>
718 >      <include name="**/*.java"/>
719 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
720 >      <compilerarg value="-J--illegal-access=permit"/>
721 >      <compilerarg value="-XDcompilePolicy=simple"/>
722 >      <compilerarg value="-processorpath"/>
723 >      <compilerarg pathref="errorprone.processorpath.path"/>
724 >      <compilerarg value="-Xplugin:ErrorProne
725 >                          ${errorprone.jsr166.flags}"/>
726 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
727 >      <compilerarg value="-Xprefer:source"/>
728        <compilerarg value="-XDignore.symbol.file=true"/>
729        <compilerarg value="-Xlint:all"/>
730 <
730 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
731 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
732 >      <compilerarg line="${build.args}"/>
733      </javac>
734  
735 <  </target>
736 <
1040 <
1041 <
1042 <  <target name="jsr166ejar"
1043 <          depends="jsr166ecompile"
1044 <          description="Builds library jar from compiled sources">
1045 <
1046 <    <mkdir dir="${build.jsr166elib.dir}"/>
1047 <
1048 <    <jar destfile="${jsr166eproduct.jar}" index="true">
1049 <      <fileset dir="${build.jsr166e.dir}"/>
735 >    <jar destfile="${product.jar}">
736 >      <fileset dir="${destdir}"/>
737      </jar>
738  
739 <  </target>
740 <
741 <
742 <
743 <  <target name="jsr166edocs"
744 <          description="Builds javadocs with custom tags to build folder">
745 <
746 <    <delete dir="${build.jsr166ejavadocs.dir}"/>
747 <    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
748 <
749 <    <javadoc destdir="${build.jsr166ejavadocs.dir}"
750 <             packagenames="jsr166e,jsr166e.extra"
751 <             link="${jdkapi7docs.url}"
752 <             source="1.7"
753 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
754 <             executable="${javadoc7}"
755 <             additionalparam="-XDignore.symbol.file=true" >
756 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
757 <        <include name="jsr166e/**/*.java"/>
758 <      </fileset>
759 <    </javadoc>
760 <
761 <  </target>
762 <
763 <
764 <  <target name="jsr166edist"
765 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
766 <          description="Puts all distributable products in single hierarchy"/>
767 <
768 <
769 <
770 <  <target name="jsr166eclean"
771 <          description="Removes all build products">
772 <
773 <    <delete dir="${build.jsr166e.dir}"/>
774 <    <delete dir="${build.jsr166elib.dir}"/>
775 <
776 <  </target>
777 <
778 <
779 <
780 <  <target name="jsr166edist-clean"
781 <          description="Removes all build and distribution products">
782 <
783 <  </target>
784 <
785 <  <target name="jsr166edist-docs"
786 <          description="Builds javadocs without custom tags to dist folder">
787 <
788 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
789 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
790 <
791 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
792 <             packagenames="jsr166e,jsr166e.extra"
793 <             link="${jdkapidocs.url}"
794 <             source="1.7"
795 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
796 <             additionalparam="-XDignore.symbol.file=true" />
797 <
798 <  </target>
799 <
800 <  <target name="jsr166edist-jar"
801 <          depends="jsr166eclean, jsr166ejar">
802 <
803 <    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
739 >    <run-tck-tests
740 >      target="${java.runtime.target}"
741 >      workdir="${build.dir}"
742 >      classes="${product.jar}">
743 >      <javac-elements>
744 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
745 >        <compilerarg value="-J--illegal-access=permit"/>
746 >        <compilerarg value="-XDcompilePolicy=simple"/>
747 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
748 >        <compilerarg value="-Xplugin:ErrorProne
749 >                            ${errorprone.jsr166.flags}
750 >                            ${errorprone.jsr166.test.flags}"/>
751 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
752 >      </javac-elements>
753 >    </run-tck-tests>
754 >  </target>
755 >
756 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
757 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
758 >  <target name="errorprone-jtreg"
759 >          depends="jar"
760 >          description="Run errorprone over jtreg tests (experimental)">
761 >
762 >    <run-jtreg-tests
763 >       target="${java.runtime.target}"
764 >       workdir="${build.dir}"
765 >       classes="${product.jar}"
766 >       verbose="all">
767 >      <jtreg-elements>
768 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
769 >        <arg value="-javacoption:-processorpath"/>
770 >        <arg value="-javacoption:${errorprone.processorpath}"/>
771 >        <arg value="-javacoption:-Xplugin:ErrorProne
772 >                            ${errorprone.jsr166.flags}
773 >                            ${errorprone.jsr166.test.flags}
774 >                            -Xep:MultipleTopLevelClasses:WARN
775 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
776 >      </jtreg-elements>
777 >    </run-jtreg-tests>
778 >  </target>
779 >
780 >
781 > <!-- ==============================================================
782 >  Running guava tests against jsr166 code
783 > =================================================================== -->
784 >
785 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
786 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
787 > <!-- <property name="guava.version" value="21.0"/> -->
788 >
789 > <!-- HOWTO debug print a path id -->
790 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
791 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
792 >
793 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
794 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
795 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
796 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
797 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
798 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
799 >
800 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
801 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
802 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
803 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
804 >
805 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
806 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
807 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
808 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
809 >
810 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
811 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
812 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
813 >
814 >  <target name="init-ivy">
815 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
816 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
817 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
818 >             classpath="${build.dir}/ivy.jar"/>
819 >  </target>
820 >
821 >  <target name="guava-tests" depends="jar, init-ivy"
822 >          description="Guava tests run against jsr166 collections">
823 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
824 >    <mkdir dir="${guava.dir}"/>
825 >    <ivy:retrieve pathid="guava.testlib.classpath"
826 >      type="jar,bundle" inline="true" conf="default,master"
827 >      pattern="${guava.dir}/[artifact].[ext]"
828 >      organisation="com.google.guava" module="guava-testlib"/>
829 >    <property name="guava.version" value="21.0"/>
830 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
831 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
832 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
833 >           jvm="${build.main.java}" fork="true">
834 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
835 >      <formatter type="brief"/>
836 >      <classpath>
837 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
838 >        <path refid="guava.testlib.classpath"/>
839 >      </classpath>
840  
841 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
842 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
843 +    </junit>
844    </target>
845  
846   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines