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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines