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.72 by dl, Fri May 20 16:29:57 2005 UTC vs.
Revision 1.256 by jsr166, Sun Oct 22 03:57:51 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines