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.202 by jsr166, Sat Mar 26 15:10:14 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 17 | 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 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
46 <  target is currently 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 52 | Line 62
62  
63  
64    <!-- Compilation options -->
55  <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 63 | 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"/>
66  <property name="build.reports.dir"           location="${build.dir}/reports"/>
67
68  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
70  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72
73  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77
78  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
81  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
82
83  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
84  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
85  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
86  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
75  
76    <!-- JDK locations -->
77    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 96 | 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"/>
100 <    <available property="have.java.base"
101 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103 <      if:set="have.java.base"/>
104 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105 <      unless:set="have.java.base"/>
106 <    <local name="modules"/>
107 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108 <    <local name="boot.jar.dir"/>
109 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110 <    <path id="bootclasspath@{v}" unless:set="modules">
111 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
112 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
114 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
115 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
116 <    </path>
117 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
87 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
88      </sequential>
89    </macrodef>
90  
# Line 130 | 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-jdk8"/>
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"/>
150  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
155  <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"/>
160 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
164 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
165 <
166 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
172 <  <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"/>
176  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
181  <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 2016-03 -->
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 205 | 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 228 | Line 195
195  
196      <sequential>
197  
231    <local name="modules"/>
232    <condition property="modules">
233      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234    </condition>
235
198      <mkdir dir="@{workdir}/tck-classes"/>
199  
200      <javac srcdir="@{tck.src.dir}"
# Line 245 | 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 262 | 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>
299 <  </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 -->
312 <    <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"/>
329 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
330 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
331 <    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332 <    <mkdir dir="@{workdir}/JTreport/html"/>
333 <    <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"
337 <           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 355 | 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, 4jdk8dist, 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  
374    <local name="modules"/>
375    <condition property="modules">
376      <and>
377        <available file="${jdk9.home}/jmods" type="dir"/>
378        <equals arg1="9" arg2="${build.main.java.version}"/>
379      </and>
380    </condition>
381
360      <local name="destdir"/>
361 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384 <    <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 393 | 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>
410
411    <!-- We need jdk9's Contended annotation, but at compile time only -->
412    <!--
413        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414    -->
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 432 | 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"/>
467 <      <arg value="-tag"/>
468 <      <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 475 | Line 469
469            description="Puts all distributable products in single hierarchy"/>
470  
471  
478  <target name="release"
479          depends="dist"
480          description="Puts entire CVS tree, plus distribution productions, in a jar">
481
482    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
483
484    <jar basedir="${basedir}" destfile="${release.jar}">
485      <!-- <exclude name="build/**"/> -->
486      <exclude name="${release.jar}"/>
487      <exclude name="user.properties"/>
488      <exclude name="etc/notes/**"/>
489      <exclude name="src/emulation/**"/>
490      <exclude name="**/SyntaxTest.java"/>
491      <exclude name="**/SuperfluousAbstract.java"/>
492      <manifest>
493        <attribute name="Built-By" value="${user.name}"/>
494        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
495      </manifest>
496    </jar>
497  </target>
498
499
472    <target name="clean"
473            description="Removes all build products">
502
474      <delete dir="${build.dir}"/>
504
475    </target>
476  
477  
478    <target name="dist-clean"
479            description="Removes all build and distribution products">
510
480      <delete dir="${build.dir}"/>
481      <delete dir="${dist.dir}"/>
513
482    </target>
483  
484  
# Line 525 | 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="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="jtreg8" description="Runs jtreg tests with jdk8">
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>
596 <        <not> <antversion atleast="1.9.1"/> </not>
597 <      </condition>
695 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
696      </fail>
697  
698      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 612 | Line 710
710    </target>
711  
712  
615
616  <!-- Various demos and test programs -->
617
618
619  <target name="loops" depends="configure-compiler"
620          description="Benchmark from Doug Lea's AQS paper">
621
622    <mkdir dir="${build.loops.dir}"/>
623
624    <javac srcdir="${loops.src.dir}"
625          destdir="${build.loops.dir}"
626            debug="${build.debug}"
627       debuglevel="${build.debuglevel}"
628      deprecation="${build.deprecation}"
629           source="${build.sourcelevel}"
630           target="${build.sourcelevel}"
631             fork="true">
632
633      <compilerarg line="${build.args}"/>
634      <classpath refid="loops.classpath"/>
635      <compilerarg value="-XDignore.symbol.file=true"/>
636
637    </javac>
638
639    <java classname="ALoops" fork="true">
640      <classpath refid="loops.classpath"/>
641    </java>
642
643  </target>
644
645
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 655 | 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}"/>
666
734      </javac>
668
735    </target>
736  
737  
738 <  <!-- jsr166 4jdk8 -->
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 <  <target name="4jdk8compile"
675 <          depends="configure-compiler"
676 <          description="Compiles src/jdk8 sources, targeting jdk8">
677 <
678 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
679 <
680 <    <javac srcdir="${4jdk8src.dir}"
681 <           destdir="${build.4jdk8.classes.dir}"
682 <           debug="${build.debug}"
683 <           debuglevel="${build.debuglevel}"
684 <           deprecation="${build.deprecation}"
685 <           source="8"
686 <           target="8"
687 <           classpath=""
688 <           bootclasspath="${bootclasspath8}"
689 <           includeAntRuntime="false"
690 <           includeJavaRuntime="false"
691 <           executable="${javac8}"
692 <           fork="true">
693 <
694 <      <include name="**/*.java"/>
695 <      <compilerarg value="-Xprefer:source"/>
696 <      <compilerarg value="-XDignore.symbol.file=true"/>
697 <      <compilerarg value="-Xlint:all"/>
698 <      <compilerarg value="-Werror"/>
699 <      <compilerarg line="${build.args}"/>
700 <
701 <    </javac>
702 <  </target>
703 <
704 <  <target name="4jdk8doclint"
705 <          depends="configure-compiler"
706 <          description="Finds doclint warnings">
707 <
708 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
709 <
710 <    <javac srcdir="${4jdk8src.dir}"
711 <           destdir="${build.4jdk8.classes.dir}"
712 <           debug="${build.debug}"
713 <           debuglevel="${build.debuglevel}"
714 <           deprecation="${build.deprecation}"
715 <           source="8"
716 <           target="8"
717 <           classpath=""
718 <           bootclasspath="${bootclasspath8}"
719 <           includeAntRuntime="false"
720 <           includeJavaRuntime="false"
721 <           executable="${javac8}"
722 <           fork="true">
723 <
724 <      <include name="**/*.java"/>
725 <      <compilerarg value="-Xprefer:source"/>
726 <      <compilerarg value="-XDignore.symbol.file=true"/>
727 <      <compilerarg value="-Xlint:all"/>
728 <      <compilerarg value="-Xdoclint:all/protected"/>
729 <      <compilerarg line="${build.args}"/>
730 <
731 <    </javac>
732 <  </target>
733 <
734 <
735 <  <target name="4jdk8jar"
736 <          depends="4jdk8compile"
737 <          description="Builds library jar from compiled sources">
738 <
739 <    <jar destfile="${4jdk8product.jar}">
740 <      <fileset dir="${build.4jdk8.classes.dir}"/>
741 <      <manifest>
742 <        <attribute name="Built-By" value="${user.name}"/>
743 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
744 <      </manifest>
745 <    </jar>
746 <
747 <  </target>
748 <
749 <
750 <  <target name="4jdk8-tck"
751 <          depends="4jdk8jar"
752 <          description="Runs tck tests for jsr166-4jdk8 directly">
753 <
754 <    <run-tck-tests
755 <      target="8"
756 <      workdir="${build.4jdk8.dir}"
757 <      classes="${4jdk8product.jar}">
758 <      <javac-elements>
759 <        <!-- JDK9+ test classes -->
760 <        <exclude name="*9Test.java"/>
761 <        <exclude name="*10Test.java"/>
762 <      </javac-elements>
763 <    </run-tck-tests>
764 <  </target>
765 <
766 <
767 <  <target name="4jdk8-jtreg"
768 <          depends="4jdk8jar"
769 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
770 <    <run-jtreg-tests
771 <       target="8"
772 <       workdir="${build.4jdk8.dir}"
773 <       classes="${4jdk8product.jar}"/>
774 <  </target>
775 <
776 <
777 <  <target name="4jdk8-test"
778 <          depends="4jdk8-tck, 4jdk8-jtreg"
779 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
780 <  </target>
781 <
782 <
783 <  <target name="4jdk8docs"
784 <          description="Builds javadocs for src/jdk8 to dist dir">
785 <
786 <    <delete dir="${4jdk8docs.dir}"/>
787 <    <mkdir dir="${4jdk8docs.dir}"/>
788 <
789 <    <javadoc destdir="${4jdk8docs.dir}"
790 <             packagenames="none"
791 <             link="${java8.api.url}"
792 <             overview="${4jdk8src.dir}/intro.html"
793 <             access="${build.javadoc.access}"
794 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
795 <             classpath=""
796 <             executable="${javadoc8}">
797 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
798 <        <include name="**/*.java"/>
799 <      </fileset>
800 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
801 <      <arg value="-XDignore.symbol.file=true"/>
802 <      <arg value="-tag"/>
803 <      <arg value="${javadoc.jls.option}"/>
804 <      <arg value="-tag"/>
805 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
806 <      <arg value="-tag"/>
807 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808 <      <arg value="-tag"/>
809 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
810 <    </javadoc>
811 <  </target>
812 <
813 <
814 <  <target name="4jdk8dist"
815 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
816 <          description="Puts all distributable products in single hierarchy"/>
817 <
818 <
819 <  <target name="4jdk8clean"
820 <          description="Removes all 4jdk8 build products">
821 <
822 <    <delete dir="${build.4jdk8.dir}"/>
823 <
824 <  </target>
825 <
826 <
827 <  <target name="4jdk8dist-jar"
828 <          depends="4jdk8clean, 4jdk8jar">
829 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
830 <  </target>
746 > <!-- Find buglets that can be detected by static build tools -->
747  
748 + <!--   <target name="lint"> -->
749 + <!--     <antcall target="dists"> -->
750 + <!--       <param name="build.javadoc.access" value="protected"/> -->
751 + <!--     </antcall> -->
752 + <!--   </target> -->
753  
754 <  <target name="4jdk8dist-docs"
755 <          depends="4jdk8clean, 4jdk8docs">
756 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
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  
761  
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 <  <!-- jsr166 4jdk7 -->
807 <
808 <  <target name="4jdk7compile"
843 <          depends="configure-compiler"
844 <          description="Compiles src/jdk7 sources, targeting jdk7">
845 <
846 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
847 <
848 <    <javac srcdir="${4jdk7src.dir}"
849 <           destdir="${build.4jdk7.classes.dir}"
850 <           debug="${build.debug}"
851 <           debuglevel="${build.debuglevel}"
852 <           deprecation="${build.deprecation}"
853 <           source="6"
854 <           target="6"
855 <           classpath=""
856 <           bootclasspath="${bootclasspath6}"
857 <           includeAntRuntime="false"
858 <           includeJavaRuntime="false"
859 <           executable="${javac7}"
860 <           fork="true">
861 <
862 <      <include name="**/*.java"/>
863 <      <compilerarg value="-Xprefer:source"/>
864 <      <compilerarg value="-XDignore.symbol.file=true"/>
865 <      <compilerarg value="-Xlint:all"/>
866 <      <compilerarg value="-Werror"/>
867 <      <compilerarg line="${build.args}"/>
868 <
869 <    </javac>
870 <  </target>
871 <
872 <  <target name="4jdk7doclint"
873 <          depends="configure-compiler"
874 <          description="Finds doclint warnings">
875 <
876 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
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}"
883           source="6"
884           target="6"
815             classpath=""
886           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}"/>
898
837      </javac>
900  </target>
901
902
903  <target name="4jdk7jar"
904          depends="4jdk7compile"
905          description="Builds library jar from compiled sources">
838  
839 <    <jar destfile="${4jdk7product.jar}">
840 <      <fileset dir="${build.4jdk7.classes.dir}"/>
909 <      <manifest>
910 <        <attribute name="Built-By" value="${user.name}"/>
911 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
912 <      </manifest>
839 >    <jar destfile="${product.jar}">
840 >      <fileset dir="${destdir}"/>
841      </jar>
842  
915  </target>
916
917
918  <target name="4jdk7-tck"
919          depends="4jdk7jar"
920          description="Runs tck tests for jsr166-4jdk7 directly">
921
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"/>
935 <        <exclude name="CompletableFutureTest.java"/>
936 <        <exclude name="SplittableRandomTest.java"/>
937 <        <exclude name="StampedLockTest.java"/>
938 <        <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 <
966 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
967 <      </test>
968 <
945 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
946 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
947      </junit>
948    </target>
949  
972  <target name="4jdk7-jtreg"
973          depends="4jdk7jar"
974          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
975    <run-jtreg-tests
976       target="7"
977       workdir="${build.4jdk7.dir}"
978       classes="${4jdk7product.jar}"/>
979  </target>
980
981
982  <target name="4jdk7-test"
983          depends="4jdk7-tck, 4jdk7-jtreg"
984          description="Runs tck and jtreg tests for jsr166-4jdk7">
985  </target>
986
987
988  <target name="4jdk7docs"
989          description="Builds javadocs for src/jdk7 to dist dir">
990
991    <delete dir="${4jdk7docs.dir}"/>
992    <mkdir dir="${4jdk7docs.dir}"/>
993
994    <javadoc destdir="${4jdk7docs.dir}"
995             packagenames="none"
996             link="${java7.api.url}"
997             overview="${4jdk7src.dir}/intro.html"
998             access="${build.javadoc.access}"
999             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1000             classpath=""
1001             executable="${javadoc7}">
1002      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1003        <include name="**/*.java"/>
1004      </fileset>
1005      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1006      <arg value="-XDignore.symbol.file=true"/>
1007    </javadoc>
1008  </target>
1009
1010
1011  <target name="4jdk7dist"
1012          depends="4jdk7dist-jar, 4jdk7dist-docs"
1013          description="Puts all distributable products in single hierarchy"/>
1014
1015
1016  <target name="4jdk7clean"
1017          description="Removes all 4jdk7 build products">
1018
1019    <delete dir="${build.4jdk7.dir}"/>
1020
1021  </target>
1022
1023
1024  <target name="4jdk7dist-jar"
1025          depends="4jdk7clean, 4jdk7jar">
1026    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1027  </target>
1028
1029
1030  <target name="4jdk7dist-docs"
1031          depends="4jdk7clean, 4jdk7docs">
1032    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1033  </target>
1034
1035
1036  <!-- jsr166x -->
1037
1038  <target name="jsr166xcompile"
1039          depends="configure-compiler"
1040          description="Compiles jsr166x sources to build dir">
1041
1042    <mkdir dir="${build.jsr166x.classes.dir}"/>
1043
1044    <javac srcdir="${topsrc.dir}"
1045           destdir="${build.jsr166x.classes.dir}"
1046           debug="${build.debug}"
1047           debuglevel="${build.debuglevel}"
1048           deprecation="${build.deprecation}"
1049           classpath=""
1050           bootclasspath="${bootclasspath6}"
1051           source="5"
1052           target="5"
1053           includeAntRuntime="false"
1054           includeJavaRuntime="false"
1055           executable="${javac7}"
1056           fork="true">
1057
1058      <include name="jsr166x/**/*.java"/>
1059      <compilerarg value="-XDignore.symbol.file=true"/>
1060      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1061      <compilerarg value="-Werror"/>
1062      <compilerarg line="${build.args}"/>
1063
1064    </javac>
1065  </target>
1066
1067
1068  <target name="jsr166xjar"
1069          depends="jsr166xcompile"
1070          description="Builds library jar from compiled sources">
1071
1072    <jar destfile="${jsr166x.jar}">
1073      <fileset dir="${build.jsr166x.classes.dir}"/>
1074      <manifest>
1075        <attribute name="Built-By" value="${user.name}"/>
1076        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077      </manifest>
1078    </jar>
1079
1080  </target>
1081
1082
1083  <target name="jsr166xdocs"
1084          description="Builds javadocs to dist dir">
1085
1086    <delete dir="${jsr166xdocs.dir}"/>
1087    <mkdir dir="${jsr166xdocs.dir}"/>
1088
1089    <javadoc destdir="${jsr166xdocs.dir}"
1090             packagenames="jsr166x.*"
1091             link="${java.api.url}"
1092             access="${build.javadoc.access}"
1093             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1094             bootclasspath="${bootclasspath6}"
1095             source="5"
1096             executable="${javadoc7}">
1097      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1098      <arg value="-XDignore.symbol.file=true"/>
1099
1100    </javadoc>
1101  </target>
1102
1103
1104  <target name="jsr166xdist"
1105          depends="jsr166xdist-jar, jsr166xdist-docs"
1106          description="Puts all distributable products in single hierarchy"/>
1107
1108
1109  <target name="jsr166xclean"
1110          description="Removes all jsr166x build products">
1111
1112    <delete dir="${build.jsr166x.dir}"/>
1113
1114  </target>
1115
1116
1117  <target name="jsr166xdist-jar"
1118          depends="jsr166xclean, jsr166xjar">
1119    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1120  </target>
1121
1122  <target name="jsr166xdist-docs"
1123          depends="jsr166xclean, jsr166xdocs">
1124    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1125  </target>
1126
1127  <!-- jsr166y -->
1128
1129
1130  <target name="jsr166ycompile"
1131          depends="configure-compiler"
1132          description="Compiles jsr166y sources">
1133
1134    <mkdir dir="${build.jsr166y.classes.dir}"/>
1135
1136    <javac srcdir="${topsrc.dir}"
1137           destdir="${build.jsr166y.classes.dir}"
1138           debug="${build.debug}"
1139           debuglevel="${build.debuglevel}"
1140           deprecation="${build.deprecation}"
1141           source="6"
1142           target="6"
1143           classpath=""
1144           bootclasspath="${bootclasspath6}"
1145           includeAntRuntime="false"
1146           includeJavaRuntime="false"
1147           executable="${javac7}"
1148           fork="true">
1149
1150      <include name="jsr166y/**/*.java"/>
1151      <compilerarg value="-XDignore.symbol.file=true"/>
1152      <compilerarg value="-Xlint:all"/>
1153      <compilerarg value="-Werror"/>
1154      <compilerarg line="${build.args}"/>
1155
1156    </javac>
1157  </target>
1158
1159
1160  <target name="jsr166yjar"
1161          depends="jsr166ycompile"
1162          description="Builds library jar from compiled sources">
1163
1164    <jar destfile="${jsr166y.jar}" index="true">
1165      <fileset dir="${build.jsr166y.classes.dir}"/>
1166      <manifest>
1167        <attribute name="Built-By" value="${user.name}"/>
1168        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1169      </manifest>
1170    </jar>
1171
1172  </target>
1173
1174
1175  <target name="jsr166ydocs"
1176          description="Builds javadocs to dist dir">
1177
1178    <delete dir="${jsr166ydocs.dir}"/>
1179    <mkdir dir="${jsr166ydocs.dir}"/>
1180
1181    <javadoc destdir="${jsr166ydocs.dir}"
1182             packagenames="jsr166y.*"
1183             link="${java.api.url}"
1184             access="${build.javadoc.access}"
1185             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1186             bootclasspath="${bootclasspath6}"
1187             source="6"
1188             executable="${javadoc7}">
1189      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1190      <arg value="-XDignore.symbol.file=true"/>
1191
1192    </javadoc>
1193  </target>
1194
1195
1196  <target name="jsr166ydist"
1197          depends="jsr166ydist-jar, jsr166ydist-docs"
1198          description="Puts all distributable products in single hierarchy"/>
1199
1200
1201  <target name="jsr166yclean"
1202          description="Removes all jsr166y build products">
1203
1204    <delete dir="${build.jsr166y.dir}"/>
1205
1206  </target>
1207
1208
1209  <target name="jsr166ydist-jar"
1210          depends="jsr166yclean, jsr166yjar">
1211    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1212  </target>
1213
1214  <target name="jsr166ydist-docs"
1215          depends="jsr166yclean, jsr166ydocs">
1216    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1217  </target>
1218
1219
1220  <!-- extra166y -->
1221
1222
1223  <target name="extra166ycompile"
1224          depends="configure-compiler, jsr166yjar"
1225          description="Compiles extra166y sources">
1226
1227    <mkdir dir="${build.extra166y.classes.dir}"/>
1228
1229    <javac srcdir="${topsrc.dir}"
1230           destdir="${build.extra166y.classes.dir}"
1231           debug="${build.debug}"
1232           debuglevel="${build.debuglevel}"
1233           deprecation="${build.deprecation}"
1234           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1235           classpath=""
1236           source="6"
1237           target="6"
1238           includeAntRuntime="false"
1239           includeJavaRuntime="false"
1240           executable="${javac7}"
1241           fork="true">
1242
1243      <include name="extra166y/**/*.java"/>
1244      <compilerarg value="-XDignore.symbol.file=true"/>
1245      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1246      <compilerarg value="-Werror"/>
1247      <compilerarg line="${build.args}"/>
1248
1249    </javac>
1250  </target>
1251
1252
1253  <target name="extra166yjar"
1254          depends="extra166ycompile"
1255          description="Builds library jar from compiled sources">
1256
1257    <jar destfile="${extra166y.jar}" index="true">
1258      <fileset dir="${build.extra166y.classes.dir}"/>
1259      <manifest>
1260        <attribute name="Built-By" value="${user.name}"/>
1261        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1262      </manifest>
1263    </jar>
1264
1265  </target>
1266
1267
1268  <target name="extra166ydocs"
1269          description="Builds javadocs to build dir">
1270
1271    <delete dir="${extra166ydocs.dir}"/>
1272    <mkdir dir="${extra166ydocs.dir}"/>
1273
1274    <javadoc destdir="${extra166ydocs.dir}"
1275             packagenames="extra166y.*"
1276             link="${java.api.url}"
1277             access="${build.javadoc.access}"
1278             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1279             bootclasspath="${bootclasspath6}"
1280             source="6"
1281             executable="${javadoc7}">
1282      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1283      <arg value="-XDignore.symbol.file=true"/>
1284
1285    </javadoc>
1286  </target>
1287
1288
1289  <target name="extra166ydist"
1290          depends="extra166ydist-jar, extra166ydist-docs"
1291          description="Puts all distributable products in single hierarchy"/>
1292
1293
1294  <target name="extra166yclean"
1295          description="Removes all extra166y build products">
1296
1297    <delete dir="${build.extra166y.dir}"/>
1298
1299  </target>
1300
1301
1302  <target name="extra166ydist-jar"
1303          depends="extra166yclean, extra166yjar">
1304    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1305  </target>
1306
1307  <target name="extra166ydist-docs"
1308          depends="extra166yclean, extra166ydocs">
1309    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1310  </target>
1311
1312  <!-- jsr166e -->
1313
1314  <property name="build.jsr166e.java.version" value="6"/>
1315  <property name="build.jsr166e.javac" value="${javac6}"/>
1316
1317  <target name="jsr166ecompile"
1318          depends="configure-compiler"
1319          description="Compiles jsr166e sources">
1320
1321    <mkdir dir="${build.jsr166e.classes.dir}"/>
1322
1323    <javac srcdir="${topsrc.dir}"
1324           destdir="${build.jsr166e.classes.dir}"
1325           debug="${build.debug}"
1326           debuglevel="${build.debuglevel}"
1327           deprecation="${build.deprecation}"
1328           source="${build.jsr166e.java.version}"
1329           target="${build.jsr166e.java.version}"
1330           classpath=""
1331           includeAntRuntime="false"
1332           includeJavaRuntime="false"
1333           executable="${build.jsr166e.javac}"
1334           fork="true">
1335
1336      <include name="jsr166e/**/*.java"/>
1337      <compilerarg value="-XDignore.symbol.file=true"/>
1338      <compilerarg value="-Xlint:all"/>
1339      <compilerarg value="-Werror"/>
1340      <compilerarg line="${build.args}"/>
1341
1342    </javac>
1343  </target>
1344
1345  <!-- jsr166e: find doclint errors -->
1346  <target name="jsr166edoclint">
1347
1348    <mkdir dir="${build.jsr166e.classes.dir}"/>
1349
1350    <javac srcdir="${topsrc.dir}"
1351           destdir="${build.jsr166e.classes.dir}"
1352           debug="${build.debug}"
1353           debuglevel="${build.debuglevel}"
1354           deprecation="${build.deprecation}"
1355           source="${build.jsr166e.java.version}"
1356           target="${build.jsr166e.java.version}"
1357           classpath=""
1358           bootclasspath="${bootclasspath6}"
1359           includeAntRuntime="false"
1360           includeJavaRuntime="false"
1361           executable="${javac8}"
1362           fork="true">
1363
1364      <include name="jsr166e/**/*.java"/>
1365      <compilerarg value="-XDignore.symbol.file=true"/>
1366      <compilerarg value="-Xlint:all"/>
1367      <compilerarg value="-Werror"/>
1368      <compilerarg value="-Xdoclint:all/protected"/>
1369
1370    </javac>
1371  </target>
1372
1373
1374  <target name="jsr166ejar"
1375          depends="jsr166ecompile"
1376          description="Builds library jar from compiled sources">
1377
1378    <jar destfile="${jsr166e.jar}" index="true">
1379      <fileset dir="${build.jsr166e.classes.dir}"/>
1380      <manifest>
1381        <attribute name="Built-By" value="${user.name}"/>
1382        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1383      </manifest>
1384    </jar>
1385
1386  </target>
1387
1388
1389  <target name="jsr166edocs"
1390          description="Builds javadocs to build dir">
1391
1392    <delete dir="${jsr166edocs.dir}"/>
1393    <mkdir dir="${jsr166edocs.dir}"/>
1394
1395    <javadoc destdir="${jsr166edocs.dir}"
1396             packagenames="jsr166e.*"
1397             link="${java.api.url}"
1398             access="${build.javadoc.access}"
1399             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1400             source="${build.jsr166e.java.version}"
1401             executable="${javadoc7}">
1402      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1403      <arg value="-XDignore.symbol.file=true"/>
1404
1405    </javadoc>
1406  </target>
1407
1408
1409  <target name="jsr166e-tck-one-java-version"
1410          depends="jsr166ejar">
1411
1412    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1413
1414    <run-tck-tests
1415      tck.src.dir="${test.src.dir}/tck-jsr166e"
1416      target="${build.jsr166e.java.version}"
1417      workdir="${build.jsr166e.dir}"
1418      classes="${jsr166e.jar}"/>
1419  </target>
1420
1421  <target name="jsr166e-tck"
1422          description="Runs tck tests for jsr166e for multiple java versions">
1423
1424 <!--     <antcall target="clean"/> -->
1425 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1426 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1427 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1428 <!--     </antcall> -->
1429
1430    <antcall target="clean"/>
1431    <antcall target="jsr166e-tck-one-java-version">
1432      <param name="build.jsr166e.java.version" value="7"/>
1433      <param name="build.jsr166e.javac" value="${javac7}"/>
1434    </antcall>
1435
1436    <antcall target="clean"/>
1437    <antcall target="jsr166e-tck-one-java-version">
1438      <param name="build.jsr166e.java.version" value="6"/>
1439      <param name="build.jsr166e.javac" value="${javac6}"/>
1440    </antcall>
1441  </target>
1442
1443
1444  <target name="jsr166e-test"
1445          depends="jsr166e-tck"
1446          description="Runs all tests for jsr166e">
1447  </target>
1448
1449  <target name="jsr166edist"
1450          depends="jsr166edist-jar, jsr166edist-docs"
1451          description="Puts all distributable products in single hierarchy"/>
1452
1453
1454  <target name="jsr166eclean"
1455          description="Removes all jsr166e build products">
1456    <delete dir="${build.jsr166e.dir}"/>
1457  </target>
1458
1459
1460  <target name="jsr166edist-jar"
1461          depends="jsr166eclean, jsr166ejar">
1462    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1463  </target>
1464
1465  <target name="jsr166edist-docs"
1466          depends="jsr166eclean, jsr166edocs">
1467    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1468  </target>
1469
1470
1471 <!-- Find buglets that can be detected by static build tools -->
1472
1473  <target name="lint">
1474    <antcall target="dists">
1475      <param name="build.javadoc.access" value="public"/>
1476    </antcall>
1477  </target>
1478
1479 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1480  <target name="lint-private">
1481    <antcall target="dist">
1482      <param name="build.javadoc.access" value="private"/>
1483    </antcall>
1484  </target>
1485
1486
950   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines