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.47 by tim, Fri Aug 1 19:34:05 2003 UTC vs.
Revision 1.268 by jsr166, Wed Mar 21 20:19:24 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines