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.170 by jsr166, Wed Sep 2 03:53:43 2015 UTC vs.
Revision 1.305 by jsr166, Sun Oct 6 17:51:03 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines