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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines