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.199 by jsr166, Fri Mar 25 03:36:15 2016 UTC vs.
Revision 1.324 by jsr166, Wed Sep 29 01:13:44 2021 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 7 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 14 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
25 <  $HOME/jdk/jdk9
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26 >  $HOME/jdk/jdk15
27 >  $HOME/jdk/jdk16
28 >  $HOME/jdk/jdk17
29 >  $HOME/jdk/jdk18
30    where each of the above is a JDK or a symlink to same, and
31 <  $HOME/jdk/src/jdk6
32 <  $HOME/jdk/src/jdk7
33 <  $HOME/jdk/src/jdk8
34 <  $HOME/jdk/src/jdk9
35 <  where each of the above is a complete JDK source tree
36 <  (e.g. mercurial forest) or a symlink to same.
31 >  $HOME/jdk/src/jdk11
32 >  $HOME/jdk/src/jdk12
33 >  $HOME/jdk/src/jdk13
34 >  $HOME/jdk/src/jdk14
35 >  $HOME/jdk/src/jdk15
36 >  $HOME/jdk/src/jdk16
37 >  $HOME/jdk/src/jdk17
38 >  $HOME/jdk/src/jdk18
39 >  where each of the above is a JDK source tree or a symlink to same.
40  
41    Alternatively, define ant variables thus:
42    ant -Djdk$N.home=... -Djdk$N.src.home=...
43 <  for $N in 6 7 8 9 ...
43 >  for $N in 11 .. 18 ...
44  
45 <  As of 2015-09, there is incomplete hacky support for jigsaw
46 <  Build for jigsaw using something like:
47 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
45 >  As of 2016-03, the sources in src/main are for jdk9+ only.
46 >  As of 2019-08, the sources in src/main are for jdk11+ only.
47 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
48   ------------------------------------------------------------------------------
49    </description>
50  
51 <  <!-- Display main targets by running 'ant -projecthelp' -->
51 >  <!-- Run 'ant -projecthelp' (default target) -->
52    <target name="usage">
53      <java classname="org.apache.tools.ant.Main">
54        <arg value="-projecthelp" />
# Line 51 | Line 62
62  
63  
64    <!-- Compilation options -->
54  <property name="build.sourcelevel"    value="6"/>
65    <property name="build.debug"          value="true"/>
66    <property name="build.debuglevel"     value="source,lines,vars"/>
67    <property name="build.deprecation"    value="false"/>
# Line 62 | Line 72
72    <property name="build.classes.dir"           location="${build.dir}/classes"/>
73    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
74    <property name="build.loops.dir"             location="${build.dir}/loops"/>
65  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
73  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
74  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
75  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
76
77  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
78  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
79  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
80  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
75  
76    <!-- JDK locations -->
77    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 90 | Line 84
84      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
85      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
86      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
87 <    <local name="have.java.base"/>
94 <    <available property="have.java.base"
95 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
96 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
97 <      if:set="have.java.base"/>
98 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
99 <      unless:set="have.java.base"/>
100 <    <local name="modules"/>
101 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
102 <    <local name="boot.jar.dir"/>
103 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
104 <    <path id="bootclasspath@{v}" unless:set="modules">
105 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
106 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
107 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
108 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
109 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
110 <    </path>
111 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
87 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
88      </sequential>
89    </macrodef>
90  
# Line 124 | Line 100
100      </sequential>
101    </macrodef>
102  
103 <  <defjdklocations v="6"/>
104 <  <defjdklocations v="7"/>
105 <  <defjdklocations v="8"/>
106 <  <defjdklocations v="9"/>
103 >  <defjdklocations v="11"/>
104 >  <defjdklocations v="12"/>
105 >  <defjdklocations v="13"/>
106 >  <defjdklocations v="14"/>
107 >  <defjdklocations v="15"/>
108 >  <defjdklocations v="16"/>
109 >  <defjdklocations v="17"/>
110 >  <defjdklocations v="18"/>
111  
112    <!-- Source locations -->
113    <property name="src.dir"              location="${basedir}/src/main"/>
114    <property name="test.src.dir"         location="${basedir}/src/test"/>
115    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
116    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
117 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
118 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
119 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
120 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
117 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
118 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
119 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
120 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
121 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
122 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
123 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
124 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
125 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
126    <property name="lib.dir"              location="${basedir}/lib"/>
127    <property name="dist.dir"             location="${basedir}/dist"/>
128    <property name="topsrc.dir"           location="${basedir}/src"/>
144  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
145  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
146  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
147  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
148  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
129  
130    <!-- Javadoc locations -->
131    <property name="docs.dir"          location="${build.dir}/docs"/>
132 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
153 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
154 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
155 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
156 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
157 <
158 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
159 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
160 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
161 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
162 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
163 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
132 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
133  
134    <!-- Jar locations -->
135    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
167  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
168  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
169  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
170  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
171  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
136    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
137  
138    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
139 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
140 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
141 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
142 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
143 <  <!-- The expected canonical location does not yet exist as of 2015-11 -->
144 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
145 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
146 <  <!-- Default jdk doc location (latest stable release seems best) -->
147 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
139 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
140 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
141 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
142 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
143 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
144 >  <!-- The location of jdk early access docs (RIP) -->
145 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
146 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
147 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
148 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
149 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
150 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
151 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
152 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
153 >  <property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/>
154 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
155 >  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
156 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
157 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
158  
159    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
160 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
161 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
162 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
163 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
164 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
160 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
161 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
162 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
163 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
164 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
165 >  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
166 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
167 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
168    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
169  
170    <!-- Define the "jtreg" task -->
# Line 195 | Line 172
172    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
173             classpath="${lib.dir}/jtreg.jar" />
174  
175 <  <!-- Tck options; see JSR166TestCase.java
175 >  <!-- Tck configuration options; see JSR166TestCase.java
176     To profile a single tck test class:
177     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
178     To stress test a single tck test class:
# Line 210 | Line 187
187      <attribute name="compile-target" default="@{target}"/>
188      <attribute name="workdir"/>
189      <attribute name="classes"/>
190 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
190 >    <!--
191 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
192 >    -->
193 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
194      <element name="javac-elements" optional="true"/>
195  
196      <sequential>
197  
218    <local name="modules"/>
219    <condition property="modules">
220      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
221    </condition>
222
198      <mkdir dir="@{workdir}/tck-classes"/>
199  
200      <javac srcdir="@{tck.src.dir}"
# Line 232 | Line 207
207             classpath="${junit.jar}"
208             includeAntRuntime="false"
209             includeJavaRuntime="false"
210 +           encoding="ASCII"
211             executable="${javac@{compile-target}}"
212             fork="true">
213  
214        <include name="*.java"/>
215        <compilerarg value="-XDignore.symbol.file=true"/>
216        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
217 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
218 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
217 >      <compilerarg value="-Xdoclint:reference/private"/>
218 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
219        <compilerarg line="${build.args}"/>
220        <javac-elements/>
221  
# Line 249 | Line 225
225            failonerror="true"
226            jvm="${java@{target}}"
227            fork="true">
228 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
229 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
230 <        <jvmarg line="@{jvmflags}"/>
228 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
229 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
230 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
231 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
232 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
233 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
234 >        <jvmarg line="@{jvmflags}"/>
235 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
236 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
237  
238          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
239 <        <syspropertyset id="system-properties-used-by-tck">
240 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
241 <          <propertyref prefix="jsr166."/>
242 <          <propertyref name="test.timeout.factor"/>
243 <        </syspropertyset>
244 <
245 <        <classpath>
246 <          <pathelement location="${junit.jar}"/>
247 <          <pathelement location="@{workdir}/tck-classes"/>
248 <        </classpath>
239 >        <syspropertyset id="system-properties-used-by-tck">
240 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
241 >          <propertyref prefix="jsr166."/>
242 >          <propertyref name="test.timeout.factor"/>
243 >        </syspropertyset>
244 >
245 >        <classpath>
246 >          <pathelement location="${junit.jar}"/>
247 >          <pathelement location="@{workdir}/tck-classes"/>
248 >        </classpath>
249      </java>
250  
251      </sequential>
252    </macrodef>
253  
254    <!-- Define jtreg test sets for different jdk versions -->
255 <  <fileset dir="${jtreg9.src.dir}">
256 <    <patternset id="jdk9.jtreg.tests">
257 <      <include name="**/*.java"/>
258 <    </patternset>
259 <  </fileset>
260 <
261 <  <fileset dir="${jtreg8.src.dir}">
262 <    <patternset id="jdk8.jtreg.tests">
263 <      <include name="**/*.java"/>
264 <      <exclude name="**/SpliteratorCharacteristics.java"/>
265 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266 <      <exclude name="**/GCDuringIteration.java"/>
267 <    </patternset>
286 <  </fileset>
255 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
256 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
257 >  <property name="jtreg.test.pattern" value="**/*.java"/>
258 >  <macrodef name="defjtregtests">
259 >    <attribute name="v"/>
260 >    <sequential>
261 >      <fileset dir="${jtreg@{v}.src.dir}">
262 >        <patternset id="jdk@{v}.jtreg.tests">
263 >          <include name="${jtreg.test.pattern}"/>
264 >        </patternset>
265 >      </fileset>
266 >    </sequential>
267 >  </macrodef>
268  
269 <  <fileset dir="${jtreg7.src.dir}">
270 <    <patternset id="jdk7.jtreg.tests">
271 <      <include name="**/*.java"/>
272 <    </patternset>
273 <  </fileset>
269 >  <defjtregtests v="18"/>
270 >  <defjtregtests v="17"/>
271 >  <defjtregtests v="16"/>
272 >  <defjtregtests v="15"/>
273 >  <defjtregtests v="14"/>
274 >  <defjtregtests v="13"/>
275 >  <defjtregtests v="12"/>
276 >  <defjtregtests v="11"/>
277  
278    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
279    <property name="jtreg.flags" value=""/>
280  
281    <macrodef name="run-jtreg-tests">
282 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
299 <    <attribute name="source" default="7"/>
282 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
283      <attribute name="target"/>
284      <attribute name="workdir"/>
285      <attribute name="classes"/>
286 +    <attribute name="verbose" default="${jtreg.verbose}"/>
287      <attribute name="jtregflags" default=""/>
288 +    <element name="jtreg-elements" optional="true"/>
289  
290      <sequential>
291  
292      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
293      <property name="jtreg.verbose" value="nopass,fail,error"/>
294  
295 <    <local name="modules"/>
296 <    <condition property="modules">
297 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
298 <    </condition>
295 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
296 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
297 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
298 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
299 >    <property name="jtreg.concurrency" value="3"/>
300  
301 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
316 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
317 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
318 <    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
319 <    <mkdir dir="@{workdir}/JTreport/html"/>
320 <    <mkdir dir="@{workdir}/JTreport/text"/>
301 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
302      <jtreg dir="${jtreg@{target}.src.dir}"
303             jdk="${jdk@{target}.home}"
304 <           workDir="@{workdir}/JTwork"
324 <           reportDir="@{workdir}/JTreport">
304 >           workDir="@{workdir}/JTwork">
305        <patternset refid="jdk@{target}.jtreg.tests"/>
306 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
307 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
308 <      <arg value="-agentvm"/>
309 <      <arg value="-verbose:${jtreg.verbose}"/>
306 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
307 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
308 >      <arg value="-vmoption:-Xmx256m"/>
309 >      <arg value="-concurrency:${jtreg.concurrency}"/>
310        <arg value="-vmoptions:-esa -ea"/>
311 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
312 +      <arg value="-agentvm"/>
313 +      <arg value="-noreport"/>
314 +      <arg value="-verbose:@{verbose}"/>
315        <arg value="-automatic"/>
316        <arg value="-k:!ignore"/>
317        <arg line="@{jtregflags}"/>
318        <arg line="${jtreg.flags}"/>
319 +      <jtreg-elements/>
320      </jtreg>
321      </sequential>
322    </macrodef>
# Line 342 | Line 327
327    </path>
328  
329    <!-- Support @jls tag, used in jdk8+ javadoc -->
330 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
331    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
332    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
333  
334    <!-- Main targets -->
335  
336 <  <property name="build.main.java.version" value="9"/>
337 <  <property name="build.main.javac" value="${javac9}"/>
336 >  <!-- Default values: may seem strange ... -->
337 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
338 >  <!-- But at build time, target jdk9, for maximal binary portability -->
339 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
340 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
341 >    o override-methods=summary
342 >    o {@systemProperty ...}
343 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
344 >    o 8202628: javadoc generates bad links in TestModules.java
345 >    -->
346 >  <property name="java.runtime.target" value="11"/>
347 >  <property name="build.main.java" value="${java11}"/>
348 >  <property name="build.main.javac" value="${javac11}"/>
349 >  <property name="build.main.javadoc" value="${javadoc12}"/>
350 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
351  
352    <target name="dists"
353 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
353 >          depends="dist"
354            description="Builds all public jars and docs"/>
355  
356    <target name="compile"
357            depends="configure-compiler"
358            description="Compiles src/main sources to build dir">
359  
361    <local name="modules"/>
362    <condition property="modules">
363      <and>
364        <available file="${jdk9.home}/jmods" type="dir"/>
365        <equals arg1="9" arg2="${build.main.java.version}"/>
366      </and>
367    </condition>
368
360      <local name="destdir"/>
361 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
371 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
361 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
362  
363      <mkdir dir="${destdir}"/>
364  
# Line 380 | Line 370
370             classpath=""
371             includeAntRuntime="false"
372             includeJavaRuntime="false"
373 +           encoding="ASCII"
374             executable="${build.main.javac}"
375             fork="true">
376  
377        <include name="**/*.java"/>
378 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
378 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
379        <compilerarg value="-Xprefer:source"/>
380        <compilerarg value="-XDignore.symbol.file=true"/>
381 <      <compilerarg value="-Xlint:all"/>
382 <      <compilerarg value="-Werror"/>
381 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
382 >      <compilerarg value="-Xlint:all,-removal"/>
383 >      <compilerarg line="--doclint-format html5"/>
384 > <!--  Temporarily disable doclint for private elements, due to -->
385 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
386 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
387 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
388        <compilerarg value="-Xdoclint:all/protected"/>
389 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
390 +      <compilerarg value="-Werror"/>
391        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
392        <compilerarg line="${build.args}"/>
393  
394      </javac>
397
398    <!-- We need jdk9's Contended annotation, but at compile time only -->
399    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
395    </target>
396  
397  
398    <target name="jar"
399            depends="compile"
400 <          description="Builds library jar from compiled sources">
401 <
400 >          description="Builds library jar for src/main from compiled sources">
401 >    <local name="subdir"/>
402 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
403      <jar destfile="${product.jar}">
404 <      <fileset dir="${build.classes.dir}"/>
404 >      <fileset dir="${build.classes.dir}${subdir}"/>
405        <manifest>
406          <attribute name="Built-By" value="${user.name}"/>
407          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 417 | Line 413
413    <target name="docs"
414            description="Builds javadocs for src/main to dist dir">
415  
416 <    <delete dir="${docs.dir}"/>
416 >    <delete dir="${docs.dir}" quiet="true"/>
417      <mkdir dir="${docs.dir}"/>
418  
419 +    <!-- old school frames via docs/index.html?overview-summary.html -->
420 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
421 +    <local name="use-frames"/>
422 +    <condition property="use-frames">
423 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
424 +    </condition>
425 +
426      <!-- the packagenames="none" hack below prevents scanning the -->
427      <!-- sourcepath for packages -->
428  
429 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
430 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
431 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
432 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
433 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
434      <javadoc destdir="${docs.dir}"
435               packagenames="none"
436 <             link="${java9.api.url}"
436 >             link="${java.api.url}"
437               overview="${src.dir}/intro.html"
438               access="${build.javadoc.access}"
439 <             sourcepath="${src.dir}:${jdk9.src.dir}"
439 >             sourcepath="${src.dir}"
440               classpath=""
441 <             executable="${javadoc9}">
441 >             source="${build.main.javadoc.source}"
442 >             executable="${build.main.javadoc}">
443 > <!-- TODO: JDK-8214571 failonerror = "true" -->
444        <fileset dir="${src.dir}" defaultexcludes="yes">
445 <        <include name="**/*.java"/>
445 >        <include name="java/**/*.java"/>
446        </fileset>
447 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
447 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
448        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449 +      <arg value="-quiet"/>
450        <arg value="-XDignore.symbol.file=true"/>
451 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
452 <      <arg value="-tag"/>
453 <      <arg value="${javadoc.jls.option}"/>
454 <      <arg value="-tag"/>
455 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
456 <      <arg value="-tag"/>
457 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
458 <      <arg value="-tag"/>
459 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
460 < <!-- tags added in jdk9 -->
461 <      <arg value="-tag"/>
462 <      <arg value="revised:X"/>
452 <      <arg value="-tag"/>
453 <      <arg value="spec:X"/>
451 >      <arg value="-html5"/>
452 >      <arg value="-Xdoclint:all,-missing"/>
453 >      <arg value="--patch-module=java.base=${src.dir}"/>
454 >      <arg value="--frames" if:set="use-frames"/>
455 >      <arg value="--override-methods=summary"/>
456 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
457 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
458 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
459 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
460 > <!-- tags added in jdk9: currently unused -->
461 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
462 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
463      </javadoc>
464    </target>
465  
# Line 460 | Line 469
469            description="Puts all distributable products in single hierarchy"/>
470  
471  
463  <target name="release"
464          depends="dist"
465          description="Puts entire CVS tree, plus distribution productions, in a jar">
466
467    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
468
469    <jar basedir="${basedir}" destfile="${release.jar}">
470      <!-- <exclude name="build/**"/> -->
471      <exclude name="${release.jar}"/>
472      <exclude name="user.properties"/>
473      <exclude name="etc/notes/**"/>
474      <exclude name="src/emulation/**"/>
475      <exclude name="**/SyntaxTest.java"/>
476      <exclude name="**/SuperfluousAbstract.java"/>
477      <manifest>
478        <attribute name="Built-By" value="${user.name}"/>
479        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
480      </manifest>
481    </jar>
482  </target>
483
484
472    <target name="clean"
473            description="Removes all build products">
487
474      <delete dir="${build.dir}"/>
489
475    </target>
476  
477  
478    <target name="dist-clean"
479            description="Removes all build and distribution products">
495
480      <delete dir="${build.dir}"/>
481      <delete dir="${dist.dir}"/>
498
482    </target>
483  
484  
# Line 510 | Line 493
493    </target>
494  
495    <target name="tck"
496 <          depends="jar"
497 <          description="Runs tck tests for main directly">
496 >          depends="jar"
497 >          description="Runs tck tests for src/main directly">
498  
499      <run-tck-tests
500 <      target="${build.main.java.version}"
500 >      target="${java.runtime.target}"
501        workdir="${build.dir}"
502 <      classes="${product.jar}"/>
502 >      classes="${product.jar}">
503 >      <javac-elements>
504 >        <compilerarg value="-Werror"/>
505 >      </javac-elements>
506 >    </run-tck-tests>
507    </target>
508  
509    <target name="tck-parallelism-1"
510 <          description="Runs tck with given common pool parallelism">
510 >          description="Runs tck with common pool parallelism 1">
511      <antcall target="tck">
512        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
513      </antcall>
514    </target>
515  
516    <target name="tck-parallelism-0"
517 <          description="Runs tck with given common pool parallelism">
517 >          description="Runs tck with common pool parallelism 0">
518      <antcall target="tck">
519        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
520      </antcall>
521    </target>
522  
523 +  <target name="tck-security-manager"
524 +          description="Runs tck with a security manager">
525 +    <antcall target="tck">
526 +      <param name="jsr166.useSecurityManager" value="true"/>
527 +    </antcall>
528 +  </target>
529 +
530    <target name="jtreg"
531 <          depends="jar"
532 <          description="Runs jtreg tests for main using the jtreg ant task">
531 >          depends="jar"
532 >          description="Runs jtreg tests for src/main using the jtreg ant task">
533      <run-jtreg-tests
534 <       target="${build.main.java.version}"
534 >       target="${java.runtime.target}"
535         workdir="${build.dir}"
536         classes="${product.jar}"/>
537    </target>
538  
539    <target name="test"
540 <          depends="tck, tck-parallelism-1, jtreg"
541 <          description="Runs tck and jtreg tests for main">
540 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
541 >          description="Runs tck and jtreg tests for src/main"/>
542 >
543 >  <target name="test-version-permutations"
544 >          depends="test11, test12, test13, test14, test15, test16,
545 >          test11-12, test11-13, test11-14, test11-15, test11-16,
546 >          clean, test, docs"
547 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
548 >
549 >  <target name="test11">
550 >    <antcall>
551 >      <param name="java.runtime.target" value="11"/>
552 >      <param name="build.main.javac" value="${javac11}"/>
553 >      <param name="build.main.javadoc" value="${javadoc12}"/>
554 >      <param name="build.main.javadoc.source" value="11"/>
555 >      <target name="clean"/>
556 >      <target name="test"/>
557 >      <target name="docs"/>
558 >    </antcall>
559 >  </target>
560 >
561 >  <target name="test12">
562 >    <antcall>
563 >      <param name="java.runtime.target" value="12"/>
564 >      <param name="build.main.javac" value="${javac12}"/>
565 >      <param name="build.main.javadoc" value="${javadoc12}"/>
566 >      <param name="build.main.javadoc.source" value="12"/>
567 >      <target name="clean"/>
568 >      <target name="test"/>
569 >      <target name="docs"/>
570 >    </antcall>
571    </target>
572  
573 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
573 >  <target name="test13">
574 >    <antcall>
575 >      <param name="java.runtime.target" value="13"/>
576 >      <param name="build.main.javac" value="${javac13}"/>
577 >      <param name="build.main.javadoc" value="${javadoc13}"/>
578 >      <param name="build.main.javadoc.source" value="13"/>
579 >      <target name="clean"/>
580 >      <target name="test"/>
581 >      <target name="docs"/>
582 >    </antcall>
583 >  </target>
584 >
585 >  <target name="test14">
586 >    <antcall>
587 >      <param name="java.runtime.target" value="14"/>
588 >      <param name="build.main.javac" value="${javac14}"/>
589 >      <param name="build.main.javadoc" value="${javadoc14}"/>
590 >      <param name="build.main.javadoc.source" value="14"/>
591 >      <target name="clean"/>
592 >      <target name="test"/>
593 >      <target name="docs"/>
594 >    </antcall>
595 >  </target>
596 >
597 >  <target name="test15">
598 >    <antcall>
599 >      <param name="java.runtime.target" value="15"/>
600 >      <param name="build.main.javac" value="${javac15}"/>
601 >      <param name="build.main.javadoc" value="${javadoc15}"/>
602 >      <param name="build.main.javadoc.source" value="15"/>
603 >      <target name="clean"/>
604 >      <target name="test"/>
605 >      <target name="docs"/>
606 >    </antcall>
607 >  </target>
608  
609 <    <antcall target="jtreg">
610 <      <param name="build.main.java.version" value="8"/>
611 <      <param name="build.main.javac" value="${javac8}"/>
609 >  <target name="test16">
610 >    <antcall>
611 >      <param name="java.runtime.target" value="16"/>
612 >      <param name="build.main.javac" value="${javac16}"/>
613 >      <param name="build.main.javadoc" value="${javadoc16}"/>
614 >      <param name="build.main.javadoc.source" value="16"/>
615 >      <target name="clean"/>
616 >      <target name="test"/>
617 >      <target name="docs"/>
618      </antcall>
619 +  </target>
620  
621 +  <target name="test11-12">
622 +    <antcall>
623 +      <param name="java.runtime.target" value="12"/>
624 +      <param name="build.main.javac" value="${javac11}"/>
625 +      <param name="build.main.javadoc" value="${javadoc12}"/>
626 +      <param name="build.main.javadoc.source" value="11"/>
627 +      <target name="clean"/>
628 +      <target name="test"/>
629 +      <target name="docs"/>
630 +    </antcall>
631    </target>
632  
633 <  <target name="test89"
634 <          description="Runs tck and jtreg tests for main for multiple java versions">
633 >  <target name="test11-13">
634 >    <antcall>
635 >      <param name="java.runtime.target" value="13"/>
636 >      <param name="build.main.javac" value="${javac11}"/>
637 >      <param name="build.main.javadoc" value="${javadoc13}"/>
638 >      <param name="build.main.javadoc.source" value="11"/>
639 >      <target name="clean"/>
640 >      <target name="test"/>
641 >      <target name="docs"/>
642 >    </antcall>
643 >  </target>
644  
645 <    <antcall target="clean"/>
646 <    <antcall target="test">
647 <      <param name="build.main.java.version" value="8"/>
648 <      <param name="build.main.javac" value="${javac8}"/>
645 >  <target name="test11-14">
646 >    <antcall>
647 >      <param name="java.runtime.target" value="14"/>
648 >      <param name="build.main.javac" value="${javac11}"/>
649 >      <param name="build.main.javadoc" value="${javadoc14}"/>
650 >      <param name="build.main.javadoc.source" value="11"/>
651 >      <target name="clean"/>
652 >      <target name="test"/>
653 >      <target name="docs"/>
654      </antcall>
655 +  </target>
656  
657 <    <antcall target="clean"/>
658 <    <antcall target="test">
659 <      <param name="build.main.java.version" value="9"/>
660 <      <param name="build.main.javac" value="${javac9}"/>
657 >  <target name="test11-15">
658 >    <antcall>
659 >      <param name="java.runtime.target" value="15"/>
660 >      <param name="build.main.javac" value="${javac11}"/>
661 >      <param name="build.main.javadoc" value="${javadoc15}"/>
662 >      <param name="build.main.javadoc.source" value="11"/>
663 >      <target name="clean"/>
664 >      <target name="test"/>
665 >      <target name="docs"/>
666      </antcall>
667 +  </target>
668  
669 +  <target name="test11-16">
670 +    <antcall>
671 +      <param name="java.runtime.target" value="16"/>
672 +      <param name="build.main.javac" value="${javac11}"/>
673 +      <param name="build.main.javadoc" value="${javadoc16}"/>
674 +      <param name="build.main.javadoc.source" value="11"/>
675 +      <target name="clean"/>
676 +      <target name="test"/>
677 +      <target name="docs"/>
678 +    </antcall>
679    </target>
680  
681 +  <target name="docs16">
682 +    <antcall>
683 +      <param name="java.runtime.target" value="16"/>
684 +      <param name="build.main.javac" value="${javac16}"/>
685 +      <param name="build.main.javadoc" value="${javadoc16}"/>
686 +      <param name="build.main.javadoc.source" value="16"/>
687 +      <target name="clean"/>
688 +      <target name="docs"/>
689 +    </antcall>
690 +  </target>
691  
692  
693    <target name="configure-compiler">
694      <fail message="ant version too old">
695 <      <condition>
581 <        <not> <antversion atleast="1.9.1"/> </not>
582 <      </condition>
695 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
696      </fail>
697  
698      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 597 | Line 710
710    </target>
711  
712  
600
601  <!-- Various demos and test programs -->
602
603
604  <target name="loops" depends="configure-compiler"
605          description="Benchmark from Doug Lea's AQS paper">
606
607    <mkdir dir="${build.loops.dir}"/>
608
609    <javac srcdir="${loops.src.dir}"
610          destdir="${build.loops.dir}"
611            debug="${build.debug}"
612       debuglevel="${build.debuglevel}"
613      deprecation="${build.deprecation}"
614           source="${build.sourcelevel}"
615           target="${build.sourcelevel}"
616             fork="true">
617
618      <compilerarg line="${build.args}"/>
619      <classpath refid="loops.classpath"/>
620      <compilerarg value="-XDignore.symbol.file=true"/>
621
622    </javac>
623
624    <java classname="ALoops" fork="true">
625      <classpath refid="loops.classpath"/>
626    </java>
627
628  </target>
629
630
713    <target name="compile-test-loops" depends="jar"
714 <          description="compile all the perf tests in src/test/loops">
714 >          description="Compiles all the perf tests in src/test/loops">
715  
716      <mkdir dir="${build.dir}/test/loops"/>
717  
# Line 640 | Line 722
722             deprecation="${build.deprecation}"
723             includeAntRuntime="false"
724             includeJavaRuntime="false"
725 <           executable="${javac9}"
725 >           encoding="ASCII"
726 >           executable="${build.main.javac}"
727             fork="true">
728  
729        <include name="*.java"/>
730        <compilerarg value="-XDignore.symbol.file=true"/>
731 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
732 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
731 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
732 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
733        <compilerarg line="${build.args}"/>
651
734      </javac>
653
735    </target>
736  
737  
738 <  <!-- jsr166 4jdk7 -->
739 <
740 <  <target name="4jdk7compile"
741 <          depends="configure-compiler"
742 <          description="Compiles src/jdk7 sources, targeting jdk7">
743 <
744 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
738 >  <!-- old branches no longer maintained.  build support deleted -->
739 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
740 >  <!-- jsr166 4jdk7 (no longer maintained) -->
741 >  <!-- jsr166x (no longer maintained) -->
742 >  <!-- jsr166y (no longer maintained) -->
743 >  <!-- extra166y (no longer maintained) -->
744 >  <!-- jsr166e (no longer maintained) -->
745  
746 <    <javac srcdir="${4jdk7src.dir}"
666 <           destdir="${build.4jdk7.classes.dir}"
667 <           debug="${build.debug}"
668 <           debuglevel="${build.debuglevel}"
669 <           deprecation="${build.deprecation}"
670 <           source="6"
671 <           target="6"
672 <           classpath=""
673 <           bootclasspath="${bootclasspath6}"
674 <           includeAntRuntime="false"
675 <           includeJavaRuntime="false"
676 <           executable="${javac7}"
677 <           fork="true">
746 > <!-- Find buglets that can be detected by static build tools -->
747  
748 <      <include name="**/*.java"/>
749 <      <compilerarg value="-Xprefer:source"/>
750 <      <compilerarg value="-XDignore.symbol.file=true"/>
751 <      <compilerarg value="-Xlint:all"/>
752 <      <compilerarg value="-Werror"/>
684 <      <compilerarg line="${build.args}"/>
748 > <!--   <target name="lint"> -->
749 > <!--     <antcall target="dists"> -->
750 > <!--       <param name="build.javadoc.access" value="protected"/> -->
751 > <!--     </antcall> -->
752 > <!--   </target> -->
753  
754 <    </javac>
754 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
755 >  <target name="doclint-private">
756 >    <antcall target="dist">
757 >      <param name="build.javadoc.access" value="private"/>
758 >    </antcall>
759    </target>
760  
689  <target name="4jdk7doclint"
690          depends="configure-compiler"
691          description="Finds doclint warnings">
761  
762 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
762 > <!-- ==============================================================
763 >  Experimental errorprone support
764 >  https://errorprone.info
765 >  https://errorprone.info/docs/installation
766 >  https://github.com/google/error-prone/issues/1143
767 > =================================================================== -->
768 >  <path id="errorprone.processorpath.path">
769 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
770 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
771 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
772 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
773 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
774 >  </path>
775 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
776 >  <property name="errorprone.jsr166.user.flags" value=""/>
777 >  <property name="errorprone.jsr166.flags"
778 >            value="-Xep:HashtableContains:OFF
779 >                   -Xep:PreferJavaTimeOverload:OFF
780 >                   -Xep:JdkObsolete:OFF
781 >                   -Xep:MissingOverride:OFF
782 >                   -Xep:MissingFail:OFF
783 >                   -Xep:ThreadPriorityCheck:OFF
784 >                   -Xep:MixedArrayDimensions:ERROR
785 >                   -Xep:RemoveUnusedImports:ERROR
786 >                   -Xep:EmptyIf:ERROR
787 >                   -Xep:MultipleTopLevelClasses:ERROR
788 >                   -Xep:ClassName:ERROR
789 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
790 >                   -Xep:RedundantThrows:ERROR
791 >                   -Xep:IdentityBinaryExpression:WARN
792 >                   -Xep:ConstructorInvokesOverridable:WARN
793 >                   -Xep:MethodCanBeStatic:WARN
794 >                   ${errorprone.jsr166.user.flags}"/>
795 >  <!-- -Xep:WildcardImport:ERROR -->
796 >  <property name="errorprone.jsr166.test.flags"
797 >            value="-Xep:StringSplitter:OFF
798 >                   -Xep:BoxedPrimitiveConstructor:OFF
799 >                   -Xep:UnnecessaryParentheses:OFF
800 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
801 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
802 >  <target name="errorprone"
803 >          depends="clean, configure-compiler"
804 >          description="Run errorprone over jsr166 source code (experimental)">
805 >
806 >    <local name="destdir"/>
807 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
808 >    <mkdir dir="${destdir}"/>
809  
810 <    <javac srcdir="${4jdk7src.dir}"
811 <           destdir="${build.4jdk7.classes.dir}"
810 >    <javac srcdir="${src.dir}"
811 >           destdir="${destdir}"
812             debug="${build.debug}"
813             debuglevel="${build.debuglevel}"
814             deprecation="${build.deprecation}"
700           source="6"
701           target="6"
815             classpath=""
703           bootclasspath="${bootclasspath6}"
816             includeAntRuntime="false"
817             includeJavaRuntime="false"
818 <           executable="${javac8}"
818 >           encoding="ASCII"
819 >           executable="${build.main.javac}"
820             fork="true">
821  
822        <include name="**/*.java"/>
823 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
824 +      <compilerarg value="-J--illegal-access=permit"/>
825 +      <compilerarg value="-XDcompilePolicy=simple"/>
826 +      <compilerarg value="-processorpath"/>
827 +      <compilerarg pathref="errorprone.processorpath.path"/>
828 +      <compilerarg value="-Xplugin:ErrorProne
829 +                          ${errorprone.jsr166.flags}"/>
830 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
831        <compilerarg value="-Xprefer:source"/>
832        <compilerarg value="-XDignore.symbol.file=true"/>
833        <compilerarg value="-Xlint:all"/>
834 <      <compilerarg value="-Xdoclint:all/protected"/>
834 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
835 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
836        <compilerarg line="${build.args}"/>
715
837      </javac>
717  </target>
718
838  
839 <  <target name="4jdk7jar"
840 <          depends="4jdk7compile"
722 <          description="Builds library jar from compiled sources">
723 <
724 <    <jar destfile="${4jdk7product.jar}">
725 <      <fileset dir="${build.4jdk7.classes.dir}"/>
726 <      <manifest>
727 <        <attribute name="Built-By" value="${user.name}"/>
728 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
729 <      </manifest>
839 >    <jar destfile="${product.jar}">
840 >      <fileset dir="${destdir}"/>
841      </jar>
842  
732  </target>
733
734
735  <target name="4jdk7-tck"
736          depends="4jdk7jar"
737          description="Runs tck tests for jsr166-4jdk7 directly">
738
843      <run-tck-tests
844 <      target="7"
845 <      workdir="${build.4jdk7.dir}"
846 <      classes="${4jdk7product.jar}">
844 >      target="${java.runtime.target}"
845 >      workdir="${build.dir}"
846 >      classes="${product.jar}">
847        <javac-elements>
848 <        <!-- JDK8+ test classes -->
849 <        <exclude name="*8Test.java"/>
850 <        <exclude name="*9Test.java"/>
851 <        <exclude name="*10Test.java"/>
852 <        <exclude name="DoubleAccumulatorTest.java"/>
853 <        <exclude name="DoubleAdderTest.java"/>
854 <        <exclude name="LongAccumulatorTest.java"/>
855 <        <exclude name="LongAdderTest.java"/>
752 <        <exclude name="CompletableFutureTest.java"/>
753 <        <exclude name="SplittableRandomTest.java"/>
754 <        <exclude name="StampedLockTest.java"/>
755 <        <exclude name="SubmissionPublisherTest.java"/>
848 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
849 >        <compilerarg value="-J--illegal-access=permit"/>
850 >        <compilerarg value="-XDcompilePolicy=simple"/>
851 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
852 >        <compilerarg value="-Xplugin:ErrorProne
853 >                            ${errorprone.jsr166.flags}
854 >                            ${errorprone.jsr166.test.flags}"/>
855 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
856        </javac-elements>
857      </run-tck-tests>
858    </target>
859  
860 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
861 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
862 +  <target name="errorprone-jtreg"
863 +          depends="jar"
864 +          description="Run errorprone over jtreg tests (experimental)">
865  
866 <  <target name="4jdk7-tck-junit"
867 <          depends="4jdk7compile"
868 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
869 <
870 <    <junit printsummary="true"
871 <           showoutput="true"
872 <           errorProperty="junit.failed"
873 <           failureProperty="junit.failed"
874 <           includeantruntime="true"
875 <           jvm="${java7}"
876 <           fork="true">
877 <
878 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
879 <      <jvmarg value="-server"/>
880 <
866 >    <run-jtreg-tests
867 >       target="${java.runtime.target}"
868 >       workdir="${build.dir}"
869 >       classes="${product.jar}"
870 >       verbose="all">
871 >      <jtreg-elements>
872 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
873 >        <arg value="-javacoption:-processorpath"/>
874 >        <arg value="-javacoption:${errorprone.processorpath}"/>
875 >        <arg value="-javacoption:-Xplugin:ErrorProne
876 >                            ${errorprone.jsr166.flags}
877 >                            ${errorprone.jsr166.test.flags}
878 >                            -Xep:MultipleTopLevelClasses:WARN
879 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
880 >      </jtreg-elements>
881 >    </run-jtreg-tests>
882 >  </target>
883 >
884 >
885 > <!-- ==============================================================
886 >  Running guava tests against jsr166 code
887 > =================================================================== -->
888 >
889 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
890 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
891 > <!-- <property name="guava.version" value="21.0"/> -->
892 >
893 > <!-- HOWTO debug print a path id -->
894 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
895 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
896 >
897 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
898 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
899 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
900 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
901 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
902 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
903 >
904 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
905 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
906 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
907 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
908 >
909 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
910 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
911 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
912 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
913 >
914 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
915 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
916 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
917 >
918 >  <target name="init-ivy">
919 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
920 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
921 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
922 >             classpath="${build.dir}/ivy.jar"/>
923 >  </target>
924 >
925 >  <target name="guava-tests" depends="jar, init-ivy"
926 >          description="Guava tests run against jsr166 collections">
927 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
928 >    <mkdir dir="${guava.dir}"/>
929 >    <ivy:retrieve pathid="guava.testlib.classpath"
930 >      type="jar,bundle" inline="true" conf="default,master"
931 >      pattern="${guava.dir}/[artifact].[ext]"
932 >      organisation="com.google.guava" module="guava-testlib"/>
933 >    <property name="guava.version" value="21.0"/>
934 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
935 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
936 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
937 >           jvm="${build.main.java}" fork="true">
938 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
939 >      <formatter type="brief"/>
940        <classpath>
941 <        <pathelement location="${junit.jar}"/>
942 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
941 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
942 >        <path refid="guava.testlib.classpath"/>
943        </classpath>
944  
945 <      <formatter type="brief"/>
946 <
783 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
784 <      </test>
785 <
945 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
946 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
947      </junit>
948    </target>
949  
789  <target name="4jdk7-jtreg"
790          depends="4jdk7jar"
791          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
792    <run-jtreg-tests
793       target="7"
794       workdir="${build.4jdk7.dir}"
795       classes="${4jdk7product.jar}"/>
796  </target>
797
798
799  <target name="4jdk7-test"
800          depends="4jdk7-tck, 4jdk7-jtreg"
801          description="Runs tck and jtreg tests for jsr166-4jdk7">
802  </target>
803
804
805  <target name="4jdk7docs"
806          description="Builds javadocs for src/jdk7 to dist dir">
807
808    <delete dir="${4jdk7docs.dir}"/>
809    <mkdir dir="${4jdk7docs.dir}"/>
810
811    <javadoc destdir="${4jdk7docs.dir}"
812             packagenames="none"
813             link="${java7.api.url}"
814             overview="${4jdk7src.dir}/intro.html"
815             access="${build.javadoc.access}"
816             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
817             classpath=""
818             executable="${javadoc7}">
819      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
820        <include name="**/*.java"/>
821      </fileset>
822      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
823      <arg value="-XDignore.symbol.file=true"/>
824    </javadoc>
825  </target>
826
827
828  <target name="4jdk7dist"
829          depends="4jdk7dist-jar, 4jdk7dist-docs"
830          description="Puts all distributable products in single hierarchy"/>
831
832
833  <target name="4jdk7clean"
834          description="Removes all 4jdk7 build products">
835
836    <delete dir="${build.4jdk7.dir}"/>
837
838  </target>
839
840
841  <target name="4jdk7dist-jar"
842          depends="4jdk7clean, 4jdk7jar">
843    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
844  </target>
845
846
847  <target name="4jdk7dist-docs"
848          depends="4jdk7clean, 4jdk7docs">
849    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
850  </target>
851
852
853  <!-- jsr166x -->
854
855  <target name="jsr166xcompile"
856          depends="configure-compiler"
857          description="Compiles jsr166x sources to build dir">
858
859    <mkdir dir="${build.jsr166x.classes.dir}"/>
860
861    <javac srcdir="${topsrc.dir}"
862           destdir="${build.jsr166x.classes.dir}"
863           debug="${build.debug}"
864           debuglevel="${build.debuglevel}"
865           deprecation="${build.deprecation}"
866           classpath=""
867           bootclasspath="${bootclasspath6}"
868           source="5"
869           target="5"
870           includeAntRuntime="false"
871           includeJavaRuntime="false"
872           executable="${javac7}"
873           fork="true">
874
875      <include name="jsr166x/**/*.java"/>
876      <compilerarg value="-XDignore.symbol.file=true"/>
877      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
878      <compilerarg value="-Werror"/>
879      <compilerarg line="${build.args}"/>
880
881    </javac>
882  </target>
883
884
885  <target name="jsr166xjar"
886          depends="jsr166xcompile"
887          description="Builds library jar from compiled sources">
888
889    <jar destfile="${jsr166x.jar}">
890      <fileset dir="${build.jsr166x.classes.dir}"/>
891      <manifest>
892        <attribute name="Built-By" value="${user.name}"/>
893        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
894      </manifest>
895    </jar>
896
897  </target>
898
899
900  <target name="jsr166xdocs"
901          description="Builds javadocs to dist dir">
902
903    <delete dir="${jsr166xdocs.dir}"/>
904    <mkdir dir="${jsr166xdocs.dir}"/>
905
906    <javadoc destdir="${jsr166xdocs.dir}"
907             packagenames="jsr166x.*"
908             link="${java.api.url}"
909             access="${build.javadoc.access}"
910             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
911             bootclasspath="${bootclasspath6}"
912             source="5"
913             executable="${javadoc7}">
914      <arg line="-Xdocrootparent ${java.docroot.url}"/>
915      <arg value="-XDignore.symbol.file=true"/>
916
917    </javadoc>
918  </target>
919
920
921  <target name="jsr166xdist"
922          depends="jsr166xdist-jar, jsr166xdist-docs"
923          description="Puts all distributable products in single hierarchy"/>
924
925
926  <target name="jsr166xclean"
927          description="Removes all jsr166x build products">
928
929    <delete dir="${build.jsr166x.dir}"/>
930
931  </target>
932
933
934  <target name="jsr166xdist-jar"
935          depends="jsr166xclean, jsr166xjar">
936    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
937  </target>
938
939  <target name="jsr166xdist-docs"
940          depends="jsr166xclean, jsr166xdocs">
941    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
942  </target>
943
944  <!-- jsr166y -->
945
946
947  <target name="jsr166ycompile"
948          depends="configure-compiler"
949          description="Compiles jsr166y sources">
950
951    <mkdir dir="${build.jsr166y.classes.dir}"/>
952
953    <javac srcdir="${topsrc.dir}"
954           destdir="${build.jsr166y.classes.dir}"
955           debug="${build.debug}"
956           debuglevel="${build.debuglevel}"
957           deprecation="${build.deprecation}"
958           source="6"
959           target="6"
960           classpath=""
961           bootclasspath="${bootclasspath6}"
962           includeAntRuntime="false"
963           includeJavaRuntime="false"
964           executable="${javac7}"
965           fork="true">
966
967      <include name="jsr166y/**/*.java"/>
968      <compilerarg value="-XDignore.symbol.file=true"/>
969      <compilerarg value="-Xlint:all"/>
970      <compilerarg value="-Werror"/>
971      <compilerarg line="${build.args}"/>
972
973    </javac>
974  </target>
975
976
977  <target name="jsr166yjar"
978          depends="jsr166ycompile"
979          description="Builds library jar from compiled sources">
980
981    <jar destfile="${jsr166y.jar}" index="true">
982      <fileset dir="${build.jsr166y.classes.dir}"/>
983      <manifest>
984        <attribute name="Built-By" value="${user.name}"/>
985        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
986      </manifest>
987    </jar>
988
989  </target>
990
991
992  <target name="jsr166ydocs"
993          description="Builds javadocs to dist dir">
994
995    <delete dir="${jsr166ydocs.dir}"/>
996    <mkdir dir="${jsr166ydocs.dir}"/>
997
998    <javadoc destdir="${jsr166ydocs.dir}"
999             packagenames="jsr166y.*"
1000             link="${java.api.url}"
1001             access="${build.javadoc.access}"
1002             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1003             bootclasspath="${bootclasspath6}"
1004             source="6"
1005             executable="${javadoc7}">
1006      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1007      <arg value="-XDignore.symbol.file=true"/>
1008
1009    </javadoc>
1010  </target>
1011
1012
1013  <target name="jsr166ydist"
1014          depends="jsr166ydist-jar, jsr166ydist-docs"
1015          description="Puts all distributable products in single hierarchy"/>
1016
1017
1018  <target name="jsr166yclean"
1019          description="Removes all jsr166y build products">
1020
1021    <delete dir="${build.jsr166y.dir}"/>
1022
1023  </target>
1024
1025
1026  <target name="jsr166ydist-jar"
1027          depends="jsr166yclean, jsr166yjar">
1028    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1029  </target>
1030
1031  <target name="jsr166ydist-docs"
1032          depends="jsr166yclean, jsr166ydocs">
1033    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1034  </target>
1035
1036
1037  <!-- extra166y -->
1038
1039
1040  <target name="extra166ycompile"
1041          depends="configure-compiler, jsr166yjar"
1042          description="Compiles extra166y sources">
1043
1044    <mkdir dir="${build.extra166y.classes.dir}"/>
1045
1046    <javac srcdir="${topsrc.dir}"
1047           destdir="${build.extra166y.classes.dir}"
1048           debug="${build.debug}"
1049           debuglevel="${build.debuglevel}"
1050           deprecation="${build.deprecation}"
1051           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1052           classpath=""
1053           source="6"
1054           target="6"
1055           includeAntRuntime="false"
1056           includeJavaRuntime="false"
1057           executable="${javac7}"
1058           fork="true">
1059
1060      <include name="extra166y/**/*.java"/>
1061      <compilerarg value="-XDignore.symbol.file=true"/>
1062      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1063      <compilerarg value="-Werror"/>
1064      <compilerarg line="${build.args}"/>
1065
1066    </javac>
1067  </target>
1068
1069
1070  <target name="extra166yjar"
1071          depends="extra166ycompile"
1072          description="Builds library jar from compiled sources">
1073
1074    <jar destfile="${extra166y.jar}" index="true">
1075      <fileset dir="${build.extra166y.classes.dir}"/>
1076      <manifest>
1077        <attribute name="Built-By" value="${user.name}"/>
1078        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1079      </manifest>
1080    </jar>
1081
1082  </target>
1083
1084
1085  <target name="extra166ydocs"
1086          description="Builds javadocs to build dir">
1087
1088    <delete dir="${extra166ydocs.dir}"/>
1089    <mkdir dir="${extra166ydocs.dir}"/>
1090
1091    <javadoc destdir="${extra166ydocs.dir}"
1092             packagenames="extra166y.*"
1093             link="${java.api.url}"
1094             access="${build.javadoc.access}"
1095             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1096             bootclasspath="${bootclasspath6}"
1097             source="6"
1098             executable="${javadoc7}">
1099      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1100      <arg value="-XDignore.symbol.file=true"/>
1101
1102    </javadoc>
1103  </target>
1104
1105
1106  <target name="extra166ydist"
1107          depends="extra166ydist-jar, extra166ydist-docs"
1108          description="Puts all distributable products in single hierarchy"/>
1109
1110
1111  <target name="extra166yclean"
1112          description="Removes all extra166y build products">
1113
1114    <delete dir="${build.extra166y.dir}"/>
1115
1116  </target>
1117
1118
1119  <target name="extra166ydist-jar"
1120          depends="extra166yclean, extra166yjar">
1121    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1122  </target>
1123
1124  <target name="extra166ydist-docs"
1125          depends="extra166yclean, extra166ydocs">
1126    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1127  </target>
1128
1129  <!-- jsr166e -->
1130
1131  <property name="build.jsr166e.java.version" value="6"/>
1132  <property name="build.jsr166e.javac" value="${javac6}"/>
1133
1134  <target name="jsr166ecompile"
1135          depends="configure-compiler"
1136          description="Compiles jsr166e sources">
1137
1138    <mkdir dir="${build.jsr166e.classes.dir}"/>
1139
1140    <javac srcdir="${topsrc.dir}"
1141           destdir="${build.jsr166e.classes.dir}"
1142           debug="${build.debug}"
1143           debuglevel="${build.debuglevel}"
1144           deprecation="${build.deprecation}"
1145           source="${build.jsr166e.java.version}"
1146           target="${build.jsr166e.java.version}"
1147           classpath=""
1148           includeAntRuntime="false"
1149           includeJavaRuntime="false"
1150           executable="${build.jsr166e.javac}"
1151           fork="true">
1152
1153      <include name="jsr166e/**/*.java"/>
1154      <compilerarg value="-XDignore.symbol.file=true"/>
1155      <compilerarg value="-Xlint:all"/>
1156      <compilerarg value="-Werror"/>
1157      <compilerarg line="${build.args}"/>
1158
1159    </javac>
1160  </target>
1161
1162  <!-- jsr166e: find doclint errors -->
1163  <target name="jsr166edoclint">
1164
1165    <mkdir dir="${build.jsr166e.classes.dir}"/>
1166
1167    <javac srcdir="${topsrc.dir}"
1168           destdir="${build.jsr166e.classes.dir}"
1169           debug="${build.debug}"
1170           debuglevel="${build.debuglevel}"
1171           deprecation="${build.deprecation}"
1172           source="${build.jsr166e.java.version}"
1173           target="${build.jsr166e.java.version}"
1174           classpath=""
1175           bootclasspath="${bootclasspath6}"
1176           includeAntRuntime="false"
1177           includeJavaRuntime="false"
1178           executable="${javac8}"
1179           fork="true">
1180
1181      <include name="jsr166e/**/*.java"/>
1182      <compilerarg value="-XDignore.symbol.file=true"/>
1183      <compilerarg value="-Xlint:all"/>
1184      <compilerarg value="-Werror"/>
1185      <compilerarg value="-Xdoclint:all/protected"/>
1186
1187    </javac>
1188  </target>
1189
1190
1191  <target name="jsr166ejar"
1192          depends="jsr166ecompile"
1193          description="Builds library jar from compiled sources">
1194
1195    <jar destfile="${jsr166e.jar}" index="true">
1196      <fileset dir="${build.jsr166e.classes.dir}"/>
1197      <manifest>
1198        <attribute name="Built-By" value="${user.name}"/>
1199        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200      </manifest>
1201    </jar>
1202
1203  </target>
1204
1205
1206  <target name="jsr166edocs"
1207          description="Builds javadocs to build dir">
1208
1209    <delete dir="${jsr166edocs.dir}"/>
1210    <mkdir dir="${jsr166edocs.dir}"/>
1211
1212    <javadoc destdir="${jsr166edocs.dir}"
1213             packagenames="jsr166e.*"
1214             link="${java.api.url}"
1215             access="${build.javadoc.access}"
1216             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217             source="${build.jsr166e.java.version}"
1218             executable="${javadoc7}">
1219      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1220      <arg value="-XDignore.symbol.file=true"/>
1221
1222    </javadoc>
1223  </target>
1224
1225
1226  <target name="jsr166e-tck-one-java-version"
1227          depends="jsr166ejar">
1228
1229    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1230
1231    <run-tck-tests
1232      tck.src.dir="${test.src.dir}/tck-jsr166e"
1233      target="${build.jsr166e.java.version}"
1234      workdir="${build.jsr166e.dir}"
1235      classes="${jsr166e.jar}"/>
1236  </target>
1237
1238  <target name="jsr166e-tck"
1239          description="Runs tck tests for jsr166e for multiple java versions">
1240
1241 <!--     <antcall target="clean"/> -->
1242 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1243 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1244 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1245 <!--     </antcall> -->
1246
1247    <antcall target="clean"/>
1248    <antcall target="jsr166e-tck-one-java-version">
1249      <param name="build.jsr166e.java.version" value="7"/>
1250      <param name="build.jsr166e.javac" value="${javac7}"/>
1251    </antcall>
1252
1253    <antcall target="clean"/>
1254    <antcall target="jsr166e-tck-one-java-version">
1255      <param name="build.jsr166e.java.version" value="6"/>
1256      <param name="build.jsr166e.javac" value="${javac6}"/>
1257    </antcall>
1258  </target>
1259
1260
1261  <target name="jsr166e-test"
1262          depends="jsr166e-tck"
1263          description="Runs all tests for jsr166e">
1264  </target>
1265
1266  <target name="jsr166edist"
1267          depends="jsr166edist-jar, jsr166edist-docs"
1268          description="Puts all distributable products in single hierarchy"/>
1269
1270
1271  <target name="jsr166eclean"
1272          description="Removes all jsr166e build products">
1273    <delete dir="${build.jsr166e.dir}"/>
1274  </target>
1275
1276
1277  <target name="jsr166edist-jar"
1278          depends="jsr166eclean, jsr166ejar">
1279    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1280  </target>
1281
1282  <target name="jsr166edist-docs"
1283          depends="jsr166eclean, jsr166edocs">
1284    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1285  </target>
1286
1287
1288 <!-- Find buglets that can be detected by static build tools -->
1289
1290  <target name="lint">
1291    <antcall target="dists">
1292      <param name="build.javadoc.access" value="public"/>
1293    </antcall>
1294  </target>
1295
1296 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1297  <target name="lint-private">
1298    <antcall target="dist">
1299      <param name="build.javadoc.access" value="private"/>
1300    </antcall>
1301  </target>
1302
1303
950   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines