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.175 by jsr166, Fri Sep 4 19:37:34 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=10 -Djsr166.tckTestClass=CompletableFutureTest tck
56   To stress test a single tck test class:
57   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 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="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
106 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
107 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
108 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
139  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
140  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
141  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
142  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
143  <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"/>
148 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
149 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
150 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
151 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
152 <
153 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
154 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
155 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
156 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
157 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
158 <  <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"/>
162  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
163  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
164  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
165  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
166  <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/"/>
185 <  <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 190 | 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 218 | 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 234 | Line 201
201            failonerror="true"
202            jvm="${java@{target}}"
203            fork="true">
204 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
205 <        <jvmarg line="@{jvmflags}"/>
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="java.util.concurrent.ForkJoinPool-properties">
216 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 <        </syspropertyset>
218 <
219 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
220 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
221 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
222 <        <classpath>
223 <          <pathelement location="${junit.jar}"/>
224 <          <pathelement location="@{workdir}/tck-classes"/>
251 <        </classpath>
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="${jtreg9.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="${jtreg8.src.dir}">
246 <    <patternset id="jdk8.jtreg.tests">
247 <      <include name="**/*.java"/>
248 <      <exclude name="**/SpliteratorCharacteristics.java"/>
268 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
269 <      <exclude name="**/GCDuringIteration.java"/>
270 <    </patternset>
271 <  </fileset>
245 >  <defjtregtests v="14"/>
246 >  <defjtregtests v="13"/>
247 >  <defjtregtests v="12"/>
248 >  <defjtregtests v="11"/>
249  
250 <  <fileset dir="${jtreg7.src.dir}">
251 <    <patternset id="jdk7.jtreg.tests">
275 <      <include name="**/*.java"/>
276 <    </patternset>
277 <  </fileset>
250 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251 >  <property name="jtreg.flags" value=""/>
252  
253    <macrodef name="run-jtreg-tests">
254 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
281 <    <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"/>
288    <delete dir="@{workdir}/JTreport" quiet="true"/>
289    <mkdir dir="@{workdir}/JTwork/scratch"/>
290    <mkdir dir="@{workdir}/JTreport"/>
268      <jtreg dir="${jtreg@{target}.src.dir}"
269             jdk="${jdk@{target}.home}"
270 <           workDir="@{workdir}/JTwork"
294 <           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 310 | 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"/>
347      <compilerarg value="-Xdoclint:all/protected"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
352  
# Line 354 | 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 368 | 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 402 | Line 426
426            description="Puts all distributable products in single hierarchy"/>
427  
428  
405  <target name="release"
406          depends="dist"
407          description="Puts entire CVS tree, plus distribution productions, in a jar">
408
409    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
410
411    <jar basedir="${basedir}" destfile="${release.jar}">
412      <!-- <exclude name="build/**"/> -->
413      <exclude name="${release.jar}"/>
414      <exclude name="user.properties"/>
415      <exclude name="etc/notes/**"/>
416      <exclude name="src/emulation/**"/>
417      <exclude name="**/SyntaxTest.java"/>
418      <exclude name="**/SuperfluousAbstract.java"/>
419    </jar>
420  </target>
421
422
429    <target name="clean"
430            description="Removes all build products">
425
431      <delete dir="${build.dir}"/>
427
432    </target>
433  
434  
435    <target name="dist-clean"
436            description="Removes all build and distribution products">
433
437      <delete dir="${build.dir}"/>
438      <delete dir="${dist.dir}"/>
436
439    </target>
440  
441  
# Line 448 | Line 450
450    </target>
451  
452    <target name="tck"
453 <          depends="jar"
454 <          description="Runs tck tests for main directly">
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="tck-parallelism-1"
467 <          description="Runs tck with given common pool parallelism">
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="tck-parallelism-0"
474 <          description="Runs tck with given common pool parallelism">
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="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 main using the jtreg ant task">
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="tck, tck-parallelism-1, jtreg"
498 <          description="Runs tck and jtreg tests for main">
486 <  </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 530 | Line 606
606    </target>
607  
608  
533
534  <!-- Various demos and test programs -->
535
536
537  <target name="loops" depends="configure-compiler"
538          description="Benchmark from Doug Lea's AQS paper">
539
540    <mkdir dir="${build.loops.dir}"/>
541
542    <javac srcdir="${loops.src.dir}"
543          destdir="${build.loops.dir}"
544            debug="${build.debug}"
545       debuglevel="${build.debuglevel}"
546      deprecation="${build.deprecation}"
547           source="${build.sourcelevel}"
548             fork="true">
549
550      <compilerarg line="${build.args}"/>
551      <classpath refid="loops.classpath"/>
552      <compilerarg value="-XDignore.symbol.file=true"/>
553
554    </javac>
555
556    <java classname="ALoops" fork="true">
557      <classpath refid="loops.classpath"/>
558    </java>
559
560  </target>
561
562
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 572 | 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}"/>
583
630      </javac>
585
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}"
598 <           destdir="${build.4jdk7.classes.dir}"
599 <           debug="${build.debug}"
600 <           debuglevel="${build.debuglevel}"
601 <           deprecation="${build.deprecation}"
602 <           source="6"
603 <           classpath=""
604 <           bootclasspath="${bootclasspath6}"
605 <           includeAntRuntime="false"
606 <           includeJavaRuntime="false"
607 <           executable="${javac7}"
608 <           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"/>
615 <      <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  
620  <target name="4jdk7doclint"
621          depends="configure-compiler"
622          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}"
631           source="6"
708             classpath=""
633           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}"/>
645
730      </javac>
647  </target>
731  
732 <
733 <  <target name="4jdk7jar"
651 <          depends="4jdk7compile"
652 <          description="Builds library jar from compiled sources">
653 <
654 <    <jar destfile="${4jdk7product.jar}">
655 <      <fileset dir="${build.4jdk7.classes.dir}"/>
732 >    <jar destfile="${product.jar}">
733 >      <fileset dir="${destdir}"/>
734      </jar>
735  
658  </target>
659
660
661  <target name="4jdk7-tck"
662          depends="4jdk7jar"
663          description="Runs tck tests for jsr166-4jdk7 directly">
664
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"/>
678 <        <exclude name="SplittableRandomTest.java"/>
679 <        <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-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 <
707 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
708 <      </test>
709 <
838 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
839 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
840      </junit>
841    </target>
842  
713  <target name="4jdk7-jtreg"
714          depends="4jdk7jar"
715          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
716    <run-jtreg-tests
717       target="7"
718       workdir="${build.4jdk7.dir}"
719       classes="${4jdk7product.jar}"/>
720  </target>
721
722
723  <target name="4jdk7-test"
724          depends="4jdk7-tck, 4jdk7-jtreg"
725          description="Runs tck and jtreg tests for jsr166-4jdk7">
726  </target>
727
728
729  <target name="4jdk7docs"
730          description="Builds javadocs for src/jdk7 to dist dir">
731
732    <delete dir="${4jdk7docs.dir}"/>
733    <mkdir dir="${4jdk7docs.dir}"/>
734
735    <javadoc destdir="${4jdk7docs.dir}"
736             packagenames="none"
737             link="${java7.api.url}"
738             overview="${4jdk7src.dir}/intro.html"
739             access="${build.javadoc.access}"
740             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
741             classpath=""
742             executable="${javadoc7}">
743      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
744        <include name="**/*.java"/>
745      </fileset>
746      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
747      <arg value="-XDignore.symbol.file=true"/>
748    </javadoc>
749  </target>
750
751
752  <target name="4jdk7dist"
753          depends="4jdk7dist-jar, 4jdk7dist-docs"
754          description="Puts all distributable products in single hierarchy"/>
755
756
757  <target name="4jdk7clean"
758          description="Removes all 4jdk7 build products">
759
760    <delete dir="${build.4jdk7.dir}"/>
761
762  </target>
763
764
765  <target name="4jdk7dist-jar"
766          depends="4jdk7clean, 4jdk7jar">
767    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
768  </target>
769
770
771  <target name="4jdk7dist-docs"
772          depends="4jdk7clean, 4jdk7docs">
773    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
774  </target>
775
776
777  <!-- jsr166x -->
778
779  <target name="jsr166xcompile"
780          depends="configure-compiler"
781          description="Compiles jsr166x sources to build dir">
782
783    <mkdir dir="${build.jsr166x.classes.dir}"/>
784
785    <javac srcdir="${topsrc.dir}"
786           destdir="${build.jsr166x.classes.dir}"
787           debug="${build.debug}"
788           debuglevel="${build.debuglevel}"
789           deprecation="${build.deprecation}"
790           classpath=""
791           bootclasspath="${bootclasspath6}"
792           source="5"
793           includeAntRuntime="false"
794           includeJavaRuntime="false"
795           executable="${javac7}"
796           fork="true">
797
798      <include name="jsr166x/**/*.java"/>
799      <compilerarg value="-XDignore.symbol.file=true"/>
800      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
801      <compilerarg value="-Werror"/>
802      <compilerarg line="${build.args}"/>
803
804    </javac>
805  </target>
806
807
808  <target name="jsr166xjar"
809          depends="jsr166xcompile"
810          description="Builds library jar from compiled sources">
811
812    <jar destfile="${jsr166x.jar}">
813      <fileset dir="${build.jsr166x.classes.dir}"/>
814    </jar>
815
816  </target>
817
818
819  <target name="jsr166xdocs"
820          description="Builds javadocs to dist dir">
821
822    <delete dir="${jsr166xdocs.dir}"/>
823    <mkdir dir="${jsr166xdocs.dir}"/>
824
825    <javadoc destdir="${jsr166xdocs.dir}"
826             packagenames="jsr166x.*"
827             link="${java.api.url}"
828             access="${build.javadoc.access}"
829             sourcepath="${topsrc.dir}:${jdk6src.dir}"
830             bootclasspath="${bootclasspath6}"
831             source="5"
832             executable="${javadoc7}">
833      <arg line="-Xdocrootparent ${java.docroot.url}"/>
834      <arg value="-XDignore.symbol.file=true"/>
835
836    </javadoc>
837  </target>
838
839
840  <target name="jsr166xdist"
841          depends="jsr166xdist-jar, jsr166xdist-docs"
842          description="Puts all distributable products in single hierarchy"/>
843
844
845  <target name="jsr166xclean"
846          description="Removes all jsr166x build products">
847
848    <delete dir="${build.jsr166x.dir}"/>
849
850  </target>
851
852
853  <target name="jsr166xdist-jar"
854          depends="jsr166xclean, jsr166xjar">
855    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
856  </target>
857
858  <target name="jsr166xdist-docs"
859          depends="jsr166xclean, jsr166xdocs">
860    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
861  </target>
862
863  <!-- jsr166y -->
864
865
866  <target name="jsr166ycompile"
867          depends="configure-compiler"
868          description="Compiles jsr166y sources">
869
870    <mkdir dir="${build.jsr166y.classes.dir}"/>
871
872    <javac srcdir="${topsrc.dir}"
873           destdir="${build.jsr166y.classes.dir}"
874           debug="${build.debug}"
875           debuglevel="${build.debuglevel}"
876           deprecation="${build.deprecation}"
877           source="6"
878           classpath=""
879           bootclasspath="${bootclasspath6}"
880           includeAntRuntime="false"
881           includeJavaRuntime="false"
882           executable="${javac7}"
883           fork="true">
884
885      <include name="jsr166y/**/*.java"/>
886      <compilerarg value="-XDignore.symbol.file=true"/>
887      <compilerarg value="-Xlint:all"/>
888      <compilerarg value="-Werror"/>
889      <compilerarg line="${build.args}"/>
890
891    </javac>
892  </target>
893
894
895  <target name="jsr166yjar"
896          depends="jsr166ycompile"
897          description="Builds library jar from compiled sources">
898
899    <jar destfile="${jsr166y.jar}" index="true">
900      <fileset dir="${build.jsr166y.classes.dir}"/>
901    </jar>
902
903  </target>
904
905
906  <target name="jsr166ydocs"
907          description="Builds javadocs to dist dir">
908
909    <delete dir="${jsr166ydocs.dir}"/>
910    <mkdir dir="${jsr166ydocs.dir}"/>
911
912    <javadoc destdir="${jsr166ydocs.dir}"
913             packagenames="jsr166y.*"
914             link="${java.api.url}"
915             access="${build.javadoc.access}"
916             sourcepath="${topsrc.dir}:${jdk6src.dir}"
917             bootclasspath="${bootclasspath6}"
918             source="6"
919             executable="${javadoc7}">
920      <arg line="-Xdocrootparent ${java.docroot.url}"/>
921      <arg value="-XDignore.symbol.file=true"/>
922
923    </javadoc>
924  </target>
925
926
927  <target name="jsr166ydist"
928          depends="jsr166ydist-jar, jsr166ydist-docs"
929          description="Puts all distributable products in single hierarchy"/>
930
931
932  <target name="jsr166yclean"
933          description="Removes all jsr166y build products">
934
935    <delete dir="${build.jsr166y.dir}"/>
936
937  </target>
938
939
940  <target name="jsr166ydist-jar"
941          depends="jsr166yclean, jsr166yjar">
942    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
943  </target>
944
945  <target name="jsr166ydist-docs"
946          depends="jsr166yclean, jsr166ydocs">
947    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
948  </target>
949
950
951  <!-- extra166y -->
952
953
954  <target name="extra166ycompile"
955          depends="configure-compiler, jsr166yjar"
956          description="Compiles extra166y sources">
957
958    <mkdir dir="${build.extra166y.classes.dir}"/>
959
960    <javac srcdir="${topsrc.dir}"
961           destdir="${build.extra166y.classes.dir}"
962           debug="${build.debug}"
963           debuglevel="${build.debuglevel}"
964           deprecation="${build.deprecation}"
965           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
966           classpath=""
967           source="6"
968           includeAntRuntime="false"
969           includeJavaRuntime="false"
970           executable="${javac7}"
971           fork="true">
972
973      <include name="extra166y/**/*.java"/>
974      <compilerarg value="-XDignore.symbol.file=true"/>
975      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
976      <compilerarg value="-Werror"/>
977      <compilerarg line="${build.args}"/>
978
979    </javac>
980  </target>
981
982
983  <target name="extra166yjar"
984          depends="extra166ycompile"
985          description="Builds library jar from compiled sources">
986
987    <jar destfile="${extra166y.jar}" index="true">
988      <fileset dir="${build.extra166y.classes.dir}"/>
989    </jar>
990
991  </target>
992
993
994  <target name="extra166ydocs"
995          description="Builds javadocs to build dir">
996
997    <delete dir="${extra166ydocs.dir}"/>
998    <mkdir dir="${extra166ydocs.dir}"/>
999
1000    <javadoc destdir="${extra166ydocs.dir}"
1001             packagenames="extra166y.*"
1002             link="${java.api.url}"
1003             access="${build.javadoc.access}"
1004             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1005             bootclasspath="${bootclasspath6}"
1006             source="6"
1007             executable="${javadoc7}">
1008      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1009      <arg value="-XDignore.symbol.file=true"/>
1010
1011    </javadoc>
1012  </target>
1013
1014
1015  <target name="extra166ydist"
1016          depends="extra166ydist-jar, extra166ydist-docs"
1017          description="Puts all distributable products in single hierarchy"/>
1018
1019
1020  <target name="extra166yclean"
1021          description="Removes all extra166y build products">
1022
1023    <delete dir="${build.extra166y.dir}"/>
1024
1025  </target>
1026
1027
1028  <target name="extra166ydist-jar"
1029          depends="extra166yclean, extra166yjar">
1030    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1031  </target>
1032
1033  <target name="extra166ydist-docs"
1034          depends="extra166yclean, extra166ydocs">
1035    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1036  </target>
1037
1038  <!-- jsr166e -->
1039
1040  <property name="build.jsr166e.java.version" value="6"/>
1041  <property name="build.jsr166e.javac" value="${javac6}"/>
1042
1043  <target name="jsr166ecompile"
1044          depends="configure-compiler"
1045          description="Compiles jsr166e sources">
1046
1047    <mkdir dir="${build.jsr166e.classes.dir}"/>
1048
1049    <javac srcdir="${topsrc.dir}"
1050           destdir="${build.jsr166e.classes.dir}"
1051           debug="${build.debug}"
1052           debuglevel="${build.debuglevel}"
1053           deprecation="${build.deprecation}"
1054           source="${build.jsr166e.java.version}"
1055           classpath=""
1056           includeAntRuntime="false"
1057           includeJavaRuntime="false"
1058           executable="${build.jsr166e.javac}"
1059           fork="true">
1060
1061      <include name="jsr166e/**/*.java"/>
1062      <compilerarg value="-XDignore.symbol.file=true"/>
1063      <compilerarg value="-Xlint:all"/>
1064      <compilerarg value="-Werror"/>
1065      <compilerarg line="${build.args}"/>
1066
1067    </javac>
1068  </target>
1069
1070  <!-- jsr166e: find doclint errors -->
1071  <target name="jsr166edoclint">
1072
1073    <mkdir dir="${build.jsr166e.classes.dir}"/>
1074
1075    <javac srcdir="${topsrc.dir}"
1076           destdir="${build.jsr166e.classes.dir}"
1077           debug="${build.debug}"
1078           debuglevel="${build.debuglevel}"
1079           deprecation="${build.deprecation}"
1080           source="${build.jsr166e.java.version}"
1081           classpath=""
1082           bootclasspath="${bootclasspath7}"
1083           includeAntRuntime="false"
1084           includeJavaRuntime="false"
1085           executable="${javac8}"
1086           fork="true">
1087
1088      <include name="jsr166e/**/*.java"/>
1089      <compilerarg value="-XDignore.symbol.file=true"/>
1090      <compilerarg value="-Xlint:all"/>
1091      <compilerarg value="-Werror"/>
1092      <compilerarg value="-Xdoclint:all/protected"/>
1093
1094    </javac>
1095  </target>
1096
1097
1098  <target name="jsr166ejar"
1099          depends="jsr166ecompile"
1100          description="Builds library jar from compiled sources">
1101
1102    <jar destfile="${jsr166e.jar}" index="true">
1103      <fileset dir="${build.jsr166e.classes.dir}"/>
1104    </jar>
1105
1106  </target>
1107
1108
1109  <target name="jsr166edocs"
1110          description="Builds javadocs to build dir">
1111
1112    <delete dir="${jsr166edocs.dir}"/>
1113    <mkdir dir="${jsr166edocs.dir}"/>
1114
1115    <javadoc destdir="${jsr166edocs.dir}"
1116             packagenames="jsr166e.*"
1117             link="${java.api.url}"
1118             access="${build.javadoc.access}"
1119             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1120             source="${build.jsr166e.java.version}"
1121             executable="${javadoc7}">
1122      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1123      <arg value="-XDignore.symbol.file=true"/>
1124
1125    </javadoc>
1126  </target>
1127
1128
1129  <target name="jsr166e-tck-one-java-version"
1130          depends="jsr166ejar">
1131
1132    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1133
1134    <run-tck-tests
1135      tck.src.dir="${test.src.dir}/tck-jsr166e"
1136      target="${build.jsr166e.java.version}"
1137      workdir="${build.jsr166e.dir}"
1138      classes="${jsr166e.jar}"/>
1139  </target>
1140
1141  <target name="jsr166e-tck"
1142          description="Runs tck tests for jsr166e for multiple java versions">
1143
1144 <!--     <antcall target="clean"/> -->
1145 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1146 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1147 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1148 <!--     </antcall> -->
1149
1150    <antcall target="clean"/>
1151    <antcall target="jsr166e-tck-one-java-version">
1152      <param name="build.jsr166e.java.version" value="7"/>
1153      <param name="build.jsr166e.javac" value="${javac7}"/>
1154    </antcall>
1155
1156    <antcall target="clean"/>
1157    <antcall target="jsr166e-tck-one-java-version">
1158      <param name="build.jsr166e.java.version" value="6"/>
1159      <param name="build.jsr166e.javac" value="${javac6}"/>
1160    </antcall>
1161  </target>
1162
1163
1164  <target name="jsr166e-test"
1165          depends="jsr166e-tck"
1166          description="Runs all tests for jsr166e">
1167  </target>
1168
1169  <target name="jsr166edist"
1170          depends="jsr166edist-jar, jsr166edist-docs"
1171          description="Puts all distributable products in single hierarchy"/>
1172
1173
1174  <target name="jsr166eclean"
1175          description="Removes all jsr166e build products">
1176    <delete dir="${build.jsr166e.dir}"/>
1177  </target>
1178
1179
1180  <target name="jsr166edist-jar"
1181          depends="jsr166eclean, jsr166ejar">
1182    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1183  </target>
1184
1185  <target name="jsr166edist-docs"
1186          depends="jsr166eclean, jsr166edocs">
1187    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1188  </target>
1189
1190
1191 <!-- Find buglets that can be detected by static build tools -->
1192
1193  <target name="lint">
1194    <antcall target="dists">
1195      <param name="build.javadoc.access" value="public"/>
1196    </antcall>
1197  </target>
1198
1199 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1200  <target name="lint-private">
1201    <antcall target="dist">
1202      <param name="build.javadoc.access" value="private"/>
1203    </antcall>
1204  </target>
1205
1206
843   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines