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.65 by jsr166, Fri Apr 9 20:10:29 2004 UTC vs.
Revision 1.320 by jsr166, Tue Sep 15 19:09:50 2020 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 +
18 +  The repository contains all dependencies except for ant and the JDK
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/jdk11
23 +  $HOME/jdk/jdk12
24 +  $HOME/jdk/jdk13
25 +  $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27 +  $HOME/jdk/jdk16
28 +  where each of the above is a JDK or a symlink to same, and
29 +  $HOME/jdk/src/jdk11
30 +  $HOME/jdk/src/jdk12
31 +  $HOME/jdk/src/jdk13
32 +  $HOME/jdk/src/jdk14
33 +  $HOME/jdk/src/jdk15
34 +  $HOME/jdk/src/jdk16
35 +  where each of the above is a JDK source tree or a symlink to same.
36 +
37 +  Alternatively, define ant variables thus:
38 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
39 +  for $N in 11 .. 16 ...
40 +
41 +  As of 2016-03, the sources in src/main are for jdk9+ only.
42 +  As of 2019-08, the sources in src/main are for jdk11+ only.
43 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
44   ------------------------------------------------------------------------------
45    </description>
46  
47 <  <target name="usage" description="Advises user to run with -projecthelp">
48 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
47 >  <!-- Run 'ant -projecthelp' (default target) -->
48 >  <target name="usage">
49 >    <java classname="org.apache.tools.ant.Main">
50 >      <arg value="-projecthelp" />
51 >    </java>
52    </target>
53  
54 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
55  
56    <!-- User-specific settings -->
57    <property file="user.properties"/>
58  
59  
60    <!-- Compilation options -->
24  <property name="build.sourcelevel"    value="1.5"/>
61    <property name="build.debug"          value="true"/>
62    <property name="build.debuglevel"     value="source,lines,vars"/>
63    <property name="build.deprecation"    value="false"/>
64 +  <property name="build.javadoc.access" value="protected"/>
65  
66    <!-- Build locations -->
67 <  <property name="build.dir"            location="build"/>
68 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
69 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
70 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
71 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
72 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
73 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
74 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
75 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
76 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
77 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
78 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
79 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
67 >  <property name="build.dir"                   location="build"/>
68 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
69 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
70 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
71 >
72 >  <!-- JDK locations -->
73 >  <property name="jdks.home"  location="${user.home}/jdk"/>
74 >
75 >  <macrodef name="defjdklocations">
76 >    <attribute name="v"/>
77 >    <sequential>
78 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
79 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
80 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
81 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
82 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
83 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
84 >    </sequential>
85 >  </macrodef>
86 >
87 >  <macrodef name="mirror-dir">
88 >    <attribute name="src"/>
89 >    <attribute name="dst"/>
90 >    <sequential>
91 >    <delete dir="@{dst}"/>
92 >    <mkdir dir="@{dst}"/>
93 >    <copy todir="@{dst}" preservelastmodified="true">
94 >      <fileset dir="@{src}"/>
95 >    </copy>
96 >    </sequential>
97 >  </macrodef>
98 >
99 >  <defjdklocations v="11"/>
100 >  <defjdklocations v="12"/>
101 >  <defjdklocations v="13"/>
102 >  <defjdklocations v="14"/>
103 >  <defjdklocations v="15"/>
104 >  <defjdklocations v="16"/>
105  
106    <!-- Source locations -->
107    <property name="src.dir"              location="${basedir}/src/main"/>
108    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
109    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
110    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
111 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
112 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
113 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
111 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
112 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
113 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
114 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
115 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
116 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
117 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
118    <property name="lib.dir"              location="${basedir}/lib"/>
119    <property name="dist.dir"             location="${basedir}/dist"/>
120 +  <property name="topsrc.dir"           location="${basedir}/src"/>
121  
122 <  <!-- Distribution locations -->
123 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
122 >  <!-- Javadoc locations -->
123 >  <property name="docs.dir"          location="${build.dir}/docs"/>
124 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
125  
126    <!-- Jar locations -->
127 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
128 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
127 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
128 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
129  
130 <  <!-- Bootclasspath argument -->
131 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
130 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
131 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
132 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
133 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
134 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
135 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
136 >  <!-- The location of jdk early access docs (RIP) -->
137 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
138 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
139 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
140 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
141 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
142 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
143 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
144 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
145 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
146 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
147 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
148 >
149 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
151 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
152 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
153 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
154 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
155 >  <property name="java16.api.url"     value="${java15.docroot.url}/api/"/>
156 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
157 >
158 >  <!-- Define the "jtreg" task -->
159 >  <!-- See the docs in "jtreg -onlineHelp" -->
160 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
161 >           classpath="${lib.dir}/jtreg.jar" />
162 >
163 >  <!-- Tck configuration options; see JSR166TestCase.java
164 >   To profile a single tck test class:
165 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
166 >   To stress test a single tck test class:
167 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
168 >   To stress test a single tck test method:
169 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
170 >  -->
171 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
172 >  <macrodef name="run-tck-tests">
173 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
174 >    <attribute name="target"/>
175 >    <attribute name="compile-target" default="@{target}"/>
176 >    <attribute name="workdir"/>
177 >    <attribute name="classes"/>
178 >    <!--
179 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
180 >    -->
181 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
182 >    <element name="javac-elements" optional="true"/>
183  
184 <  <!-- Test classpath -->
185 <  <path id="test.classpath">
186 <    <pathelement location="${build.testcases.dir}"/>
187 <    <pathelement location="${junit.jar}"/>
188 <  </path>
184 >    <sequential>
185 >
186 >    <mkdir dir="@{workdir}/tck-classes"/>
187 >
188 >    <javac srcdir="@{tck.src.dir}"
189 >           destdir="@{workdir}/tck-classes"
190 >           debug="${build.debug}"
191 >           debuglevel="${build.debuglevel}"
192 >           deprecation="${build.deprecation}"
193 >           source="@{compile-target}"
194 >           target="@{compile-target}"
195 >           classpath="${junit.jar}"
196 >           includeAntRuntime="false"
197 >           includeJavaRuntime="false"
198 >           encoding="ASCII"
199 >           executable="${javac@{compile-target}}"
200 >           fork="true">
201 >
202 >      <include name="*.java"/>
203 >      <compilerarg value="-XDignore.symbol.file=true"/>
204 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
205 >      <compilerarg value="-Xdoclint:reference/private"/>
206 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
207 >      <compilerarg line="${build.args}"/>
208 >      <javac-elements/>
209 >
210 >    </javac>
211 >
212 >    <java classname="${jsr166.tckTestClass}"
213 >          failonerror="true"
214 >          jvm="${java@{target}}"
215 >          fork="true">
216 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
217 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
218 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
219 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
220 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
221 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
222 >        <jvmarg line="@{jvmflags}"/>
223 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
224 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
225 >
226 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
227 >        <syspropertyset id="system-properties-used-by-tck">
228 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
229 >          <propertyref prefix="jsr166."/>
230 >          <propertyref name="test.timeout.factor"/>
231 >        </syspropertyset>
232 >
233 >        <classpath>
234 >          <pathelement location="${junit.jar}"/>
235 >          <pathelement location="@{workdir}/tck-classes"/>
236 >        </classpath>
237 >    </java>
238 >
239 >    </sequential>
240 >  </macrodef>
241 >
242 >  <!-- Define jtreg test sets for different jdk versions -->
243 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
244 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
245 >  <property name="jtreg.test.pattern" value="**/*.java"/>
246 >  <macrodef name="defjtregtests">
247 >    <attribute name="v"/>
248 >    <sequential>
249 >      <fileset dir="${jtreg@{v}.src.dir}">
250 >        <patternset id="jdk@{v}.jtreg.tests">
251 >          <include name="${jtreg.test.pattern}"/>
252 >        </patternset>
253 >      </fileset>
254 >    </sequential>
255 >  </macrodef>
256 >
257 >  <defjtregtests v="16"/>
258 >  <defjtregtests v="15"/>
259 >  <defjtregtests v="14"/>
260 >  <defjtregtests v="13"/>
261 >  <defjtregtests v="12"/>
262 >  <defjtregtests v="11"/>
263 >
264 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
265 >  <property name="jtreg.flags" value=""/>
266 >
267 >  <macrodef name="run-jtreg-tests">
268 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
269 >    <attribute name="target"/>
270 >    <attribute name="workdir"/>
271 >    <attribute name="classes"/>
272 >    <attribute name="verbose" default="${jtreg.verbose}"/>
273 >    <attribute name="jtregflags" default=""/>
274 >    <element name="jtreg-elements" optional="true"/>
275 >
276 >    <sequential>
277 >
278 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
280 >
281 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
282 >    <jtreg dir="${jtreg@{target}.src.dir}"
283 >           jdk="${jdk@{target}.home}"
284 >           workDir="@{workdir}/JTwork">
285 >      <patternset refid="jdk@{target}.jtreg.tests"/>
286 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
287 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
288 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
289 >      <arg value="-agentvm"/>
290 >      <arg value="-noreport"/>
291 >      <arg value="-verbose:@{verbose}"/>
292 >      <arg value="-vmoptions:-esa -ea"/>
293 >      <arg value="-automatic"/>
294 >      <arg value="-k:!ignore"/>
295 >      <arg line="@{jtregflags}"/>
296 >      <arg line="${jtreg.flags}"/>
297 >      <jtreg-elements/>
298 >    </jtreg>
299 >    </sequential>
300 >  </macrodef>
301  
302    <!-- ALoops classpath -->
303    <path id="loops.classpath">
304      <pathelement location="${build.loops.dir}"/>
305    </path>
306  
307 <  <!-- J1 classpath -->
308 <  <path id="j1.classpath">
309 <    <pathelement location="${build.j1.dir}"/>
310 <    <pathelement location="${junit.jar}"/>
81 <  </path>
82 <
307 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
308 >  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
309 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
310 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
311  
312    <!-- Main targets -->
313  
314 +  <!-- Default values: may seem strange ... -->
315 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
316 +  <!-- But at build time, target jdk9, for maximal binary portability -->
317 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
318 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
319 +    o override-methods=summary
320 +    o {@systemProperty ...}
321 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
322 +    o 8202628: javadoc generates bad links in TestModules.java
323 +    -->
324 +  <property name="java.runtime.target" value="11"/>
325 +  <property name="build.main.java" value="${java11}"/>
326 +  <property name="build.main.javac" value="${javac11}"/>
327 +  <property name="build.main.javadoc" value="${javadoc12}"/>
328 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
329 +
330 +  <target name="dists"
331 +          depends="dist"
332 +          description="Builds all public jars and docs"/>
333  
334    <target name="compile"
335 <          depends="init, configure-compiler"
336 <          description="Compiles main sources to build folder">
335 >          depends="configure-compiler"
336 >          description="Compiles src/main sources to build dir">
337  
338 <    <mkdir dir="${build.classes.dir}"/>
338 >    <local name="destdir"/>
339 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
340  
341 <    <javac srcdir="${src.dir}"
94 <          destdir="${build.classes.dir}"
95 <            debug="${build.debug}"
96 <       debuglevel="${build.debuglevel}"
97 <      deprecation="${build.deprecation}"
98 <           source="${build.sourcelevel}"
99 <             fork="true">
341 >    <mkdir dir="${destdir}"/>
342  
343 +    <javac srcdir="${src.dir}"
344 +           destdir="${destdir}"
345 +           debug="${build.debug}"
346 +           debuglevel="${build.debuglevel}"
347 +           deprecation="${build.deprecation}"
348 +           classpath=""
349 +           includeAntRuntime="false"
350 +           includeJavaRuntime="false"
351 +           encoding="ASCII"
352 +           executable="${build.main.javac}"
353 +           fork="true">
354 +
355 +      <include name="**/*.java"/>
356 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
357 +      <compilerarg value="-Xprefer:source"/>
358 +      <compilerarg value="-XDignore.symbol.file=true"/>
359 + <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360 +      <compilerarg value="-Xlint:all,-removal"/>
361 +      <compilerarg line="--doclint-format html5"/>
362 + <!--  Temporarily disable doclint for private elements, due to -->
363 + <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
364 + <!--  which is expected to be fixed in openjdk 11.0.8 -->
365 + <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
366 +      <compilerarg value="-Xdoclint:all/protected"/>
367 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
368 +      <compilerarg value="-Werror"/>
369 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
370        <compilerarg line="${build.args}"/>
371  
372      </javac>
104
373    </target>
374  
375  
108
376    <target name="jar"
377            depends="compile"
378 <          description="Builds library jar from compiled sources">
379 <
380 <    <mkdir dir="${build.lib.dir}"/>
114 <
378 >          description="Builds library jar for src/main from compiled sources">
379 >    <local name="subdir"/>
380 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
381      <jar destfile="${product.jar}">
382 <      <fileset dir="${build.classes.dir}"/>
382 >      <fileset dir="${build.classes.dir}${subdir}"/>
383 >      <manifest>
384 >        <attribute name="Built-By" value="${user.name}"/>
385 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
386 >      </manifest>
387      </jar>
118
388    </target>
389  
390  
122
123  <target name="test"
124          depends="init, configure-tests, report-tests"
125          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
126
127
128
391    <target name="docs"
392 <          description="Builds javadocs with custom tags to build folder">
131 <
132 <    <delete dir="${build.javadocs.dir}"/>
133 <    <mkdir dir="${build.javadocs.dir}"/>
134 <
135 <    <javadoc destdir="${build.javadocs.dir}"
136 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
137 <            overview="${src.dir}/intro.html"
138 <              source="${build.sourcelevel}">
392 >          description="Builds javadocs for src/main to dist dir">
393  
394 <      <tag name="revised" description="Last revised:"/>
395 <      <tag name="spec"    description="Specified by:"/>
142 <
143 <      <packageset dir="${src.dir}"/>
144 <
145 <    </javadoc>
146 <
147 <  </target>
394 >    <delete dir="${docs.dir}" quiet="true"/>
395 >    <mkdir dir="${docs.dir}"/>
396  
397 +    <!-- old school frames via docs/index.html?overview-summary.html -->
398 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
399 +    <local name="use-frames"/>
400 +    <condition property="use-frames">
401 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
402 +    </condition>
403  
404 +    <!-- the packagenames="none" hack below prevents scanning the -->
405 +    <!-- sourcepath for packages -->
406  
407 <  <target name="doccheck"
408 <          depends="filter-doccheck"
409 <          description="Reports on javadoc style errors">
410 <
411 <    <delete dir="${build.doccheck.dir}"/>
412 <    <mkdir dir="${build.doccheck.dir}"/>
413 <
414 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
415 <         docletpath="${lib.dir}/doccheck.jar"
416 <            destdir="${build.doccheck.dir}">
417 <      <packageset dir="${build.dc-filter.dir}"/>
407 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
408 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
409 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
410 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
411 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
412 >    <javadoc destdir="${docs.dir}"
413 >             packagenames="none"
414 >             link="${java.api.url}"
415 >             overview="${src.dir}/intro.html"
416 >             access="${build.javadoc.access}"
417 >             sourcepath="${src.dir}"
418 >             classpath=""
419 >             source="${build.main.javadoc.source}"
420 >             executable="${build.main.javadoc}">
421 > <!-- TODO: JDK-8214571 failonerror = "true" -->
422 >      <fileset dir="${src.dir}" defaultexcludes="yes">
423 >        <include name="java/**/*.java"/>
424 >      </fileset>
425 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
426 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
427 >      <arg value="-quiet"/>
428 >      <arg value="-XDignore.symbol.file=true"/>
429 >      <arg value="-html5"/>
430 >      <arg value="-Xdoclint:all,-missing"/>
431 >      <arg value="--patch-module=java.base=${src.dir}"/>
432 >      <arg value="--frames" if:set="use-frames"/>
433 >      <arg value="--override-methods=summary"/>
434 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
435 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
436 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
437 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
438 > <!-- tags added in jdk9: currently unused -->
439 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
440 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
441      </javadoc>
163
164    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
165
442    </target>
443  
444  
169
170  <target name="checkstyle"
171          depends="filter-src"
172          description="Reports on style errors in Java source (verbose, mostly chaff)">
173
174    <taskdef resource="checkstyletask.properties"
175            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
176
177    <mkdir dir="${build.checkstyle.dir}"/>
178
179    <checkstyle config="etc/checkstyle/sun_checks.xml"
180       failOnViolation="false">
181      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
182      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
183    </checkstyle>
184
185    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
186          out="${build.checkstyle.dir}/checkstyle-report.html"
187        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
188
189  </target>
190
191
192
445    <target name="dist"
446 <          depends="init, dist-clean, dist-jar, dist-docs"
446 >          depends="dist-clean, dist-jar, dist-docs"
447            description="Puts all distributable products in single hierarchy"/>
448  
449  
198
199  <target name="release"
200          depends="dist"
201          description="Puts entire CVS tree, plus distribution productions, in a jar">
202
203    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
204
205    <jar basedir="${basedir}" destfile="${release.jar}">
206      <!-- <exclude name="build/**"/> -->
207      <exclude name="${release.jar}"/>
208      <exclude name="user.properties"/>
209      <exclude name="etc/notes/**"/>
210      <exclude name="src/emulation/**"/>
211      <exclude name="**/SyntaxTest.java"/>
212      <exclude name="**/SuperfluousAbstract.java"/>
213    </jar>
214
215  </target>
216
217
218
450    <target name="clean"
451            description="Removes all build products">
221
452      <delete dir="${build.dir}"/>
223    <delete dir="${build.classes.dir}"/>
224    <delete dir="${build.lib.dir}"/>
225
453    </target>
454  
455  
229
456    <target name="dist-clean"
457            description="Removes all build and distribution products">
458 <
458 >    <delete dir="${build.dir}"/>
459      <delete dir="${dist.dir}"/>
234
235  </target>
236
237
238
239  <target name="dist-docs"
240          description="Builds javadocs without custom tags to dist folder">
241
242    <delete dir="${dist.javadocs.dir}"/>
243    <mkdir dir="${dist.javadocs.dir}"/>
244
245    <javadoc destdir="${dist.javadocs.dir}"
246                link="http://java.sun.com/j2se/1.4.2/docs/api"
247            overview="${src.dir}/intro.html"
248              source="${build.sourcelevel}">
249
250      <packageset dir="${src.dir}"/>
251
252    </javadoc>
253
254  </target>
255
256
257
258  <!-- Internal targets -->
259
260
261  <target name="init">
262
263    <!-- Version is kept in a separate file -->
264    <loadfile property="version" srcFile="version.properties"/>
265    <echo>Building JSR-166 version ${version}</echo>
266    <echo>java.home is ${java.home}</echo>
267
460    </target>
461  
462  
463    <target name="dist-jar"
464            depends="clean, jar">
273
465      <copy file="${product.jar}" todir="${dist.dir}"/>
275
466    </target>
467  
468 <
469 <  <target name="compile-ant-filter"
470 <          depends="init">
281 <
282 <    <mkdir dir="${build.ant.dir}"/>
283 <
284 <    <javac srcdir="${ant.src.dir}"
285 <          destdir="${build.ant.dir}"
286 <           source="1.4"/>
287 <
288 <  </target>
289 <
290 <
291 <  <target name="filter-src"
292 <          depends="compile-ant-filter">
293 <
294 <    <mkdir dir="${build.filter.src.dir}"/>
295 <
296 <    <copy todir="${build.filter.src.dir}">
297 <      <fileset dir="${src.dir}">
298 <        <include name="**/*.html"/>
299 <      </fileset>
300 <    </copy>
301 <
302 <    <copy todir="${build.filter.src.dir}">
303 <      <fileset dir="${src.dir}">
304 <        <exclude name="**/*.html"/>
305 <        <!-- Files excluded from dist-docs -->
306 <        <exclude name="java/util/Random.*"/>
307 <        <exclude name="sun/misc/Unsafe.*"/>
308 <      </fileset>
309 <      <!--
310 <      <filterchain>
311 <      -->
312 <
313 <        <!--
314 <         # This filter gets rid of angle-bracketed type parameters
315 <         # so that javadoc can run on the result. The following
316 <         # heuristic seems to work:
317 <         #
318 <         # For all lines not starting with space(s)-asterisk-space(s),
319 <         #   replace <something> with a space, where there may be more
320 <         #   than one right angle bracket at the end, and "something"
321 <         #   must not contain parens or pipes. (This may need some
322 <         #   tweaking.)
323 <         -->
324 <
325 <        <!--
326 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
327 <                      classpath="${build.ant.dir}">
328 <          <param name="notmatching" value="^\s+\*\s.*$"/>
329 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
330 <          <param name="replacement" value=" "/>
331 <        </filterreader>
332 <        -->
333 <
334 <      <!--
335 <      </filterchain>
336 <      -->
337 <    </copy>
338 <
339 <  </target>
340 <
341 <
342 <  <target name="filter-doccheck"
343 <          depends="filter-src">
344 <
345 <    <mkdir dir="${build.dc-filter.dir}"/>
346 <
347 <    <copy todir="${build.dc-filter.dir}">
348 <      <fileset dir="${build.filter.src.dir}">
349 <        <include name="**/*.html"/>
350 <      </fileset>
351 <    </copy>
352 <
353 <    <property name="generic.declarations"
354 <             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
355 <    />
356 <
357 <    <copy todir="${build.dc-filter.dir}">
358 <      <fileset dir="${build.filter.src.dir}">
359 <        <exclude name="**/*.html"/>
360 <      </fileset>
361 <      <filterchain>
362 <        <!--
363 <         # These two filters try to make the source look like
364 <         # something that doccheck can process. The first removes
365 <         # -source 1.4 assertions and the second adds in a bunch
366 <         # of single letter public nested marker interfaces so that
367 <         # the generic type parameters are recognized.
368 <         -->
369 <
370 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
371 <                      classpath="${build.ant.dir}">
372 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
373 <          <param name="pattern"     value="assert"/>
374 <          <param name="replacement" value="//assert"/>
375 <        </filterreader>
376 <
377 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
378 <                      classpath="${build.ant.dir}">
379 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
380 <          <param name="pattern"     value="$"/>
381 <          <param name="replacement" value=" ${generic.declarations}"/>
382 <        </filterreader>
383 <
384 <      </filterchain>
385 <    </copy>
386 <
387 <  </target>
388 <
389 <
390 <  <target name="compile-tests"
391 <          depends="jar">
392 <
393 <    <mkdir dir="${build.testcases.dir}"/>
394 <
395 <    <javac srcdir="${tck.src.dir}"
396 <          destdir="${build.testcases.dir}"
397 <            debug="${build.debug}"
398 <       debuglevel="${build.debuglevel}"
399 <      deprecation="${build.deprecation}"
400 <           source="${build.sourcelevel}"
401 <             fork="true">
402 <
403 <      <compilerarg value="${bootclasspath.args}"/>
404 <      <compilerarg line="${build.args}"/>
405 <
406 <      <classpath refid="test.classpath"/>
407 <
408 <    </javac>
409 <
410 <    <javac srcdir="${test.src.dir}"
411 <          destdir="${build.testcases.dir}"
412 <            debug="${build.debug}"
413 <       debuglevel="${build.debuglevel}"
414 <      deprecation="${build.deprecation}"
415 <           source="${build.sourcelevel}"
416 <             fork="true">
417 <
418 <      <include name="jsr166/test/**"/>
419 <
420 <      <compilerarg value="${bootclasspath.args}"/>
421 <      <compilerarg line="${build.args}"/>
422 <
423 <      <classpath refid="test.classpath"/>
424 <
425 <    </javac>
426 <
427 < <!--
428 <    <javac srcdir="${jtreg.src.dir}"
429 <          destdir="${build.testcases.dir}"
430 <            debug="${build.debug}"
431 <       debuglevel="${build.debuglevel}"
432 <      deprecation="${build.deprecation}"
433 <           source="${build.sourcelevel}"
434 <             fork="true">
435 <
436 <      <compilerarg value="${bootclasspath.args}"/>
437 <      <compilerarg line="${build.args}"/>
438 <
439 <      <classpath refid="test.classpath"/>
440 <
441 <    </javac>
442 < -->
443 <
468 >  <target name="dist-docs"
469 >          depends="clean, docs">
470 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
471    </target>
472  
473 <
474 <  <target name="run-tests"
475 <          depends="compile-tests">
476 <
477 <    <!-- May be overridden by user.properties -->
478 <    <property name="testcase" value="*"/>
479 <
480 <    <mkdir dir="${build.reports.dir}"/>
481 <
482 <    <junit printsummary="true"
483 <             showoutput="true"
484 <          errorProperty="junit.failed"
485 <        failureProperty="junit.failed"
486 <                    dir="${build.reports.dir}"
487 <                   fork="true">
488 <
489 <      <jvmarg value="${bootclasspath.args}"/>
490 <      <jvmarg value="-server"/>
491 <      <jvmarg value="-showversion"/>
492 <
493 <      <classpath refid="test.classpath"/>
494 <
495 <      <formatter type="xml"/>
496 <
497 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
498 <        <fileset dir="${tck.src.dir}">
499 <          <include name="**/${testcase}Test.java"/>
500 <        </fileset>
501 <      </batchtest>
502 <
503 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
504 <        <fileset dir="${test.src.dir}">
505 <          <include name="jsr166/test/**/${testcase}Test.java"/>
506 <        </fileset>
507 <      </batchtest>
508 <
509 < <!--
510 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
511 <        <fileset dir="${jtreg.src.dir}">
512 <          <include name="**/${testcase}Test.java"/>
513 <        </fileset>
514 <      </batchtest>
488 < -->
489 <
490 <    </junit>
491 <
473 >  <target name="tck"
474 >          depends="jar"
475 >          description="Runs tck tests for src/main directly">
476 >
477 >    <run-tck-tests
478 >      target="${java.runtime.target}"
479 >      workdir="${build.dir}"
480 >      classes="${product.jar}">
481 >      <javac-elements>
482 >        <compilerarg value="-Werror"/>
483 >      </javac-elements>
484 >    </run-tck-tests>
485 >  </target>
486 >
487 >  <target name="tck-parallelism-1"
488 >          description="Runs tck with common pool parallelism 1">
489 >    <antcall target="tck">
490 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
491 >    </antcall>
492 >  </target>
493 >
494 >  <target name="tck-parallelism-0"
495 >          description="Runs tck with common pool parallelism 0">
496 >    <antcall target="tck">
497 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
498 >    </antcall>
499 >  </target>
500 >
501 >  <target name="tck-security-manager"
502 >          description="Runs tck with a security manager">
503 >    <antcall target="tck">
504 >      <param name="jsr166.useSecurityManager" value="true"/>
505 >    </antcall>
506 >  </target>
507 >
508 >  <target name="jtreg"
509 >          depends="jar"
510 >          description="Runs jtreg tests for src/main using the jtreg ant task">
511 >    <run-jtreg-tests
512 >       target="${java.runtime.target}"
513 >       workdir="${build.dir}"
514 >       classes="${product.jar}"/>
515    </target>
516  
517 +  <target name="test"
518 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
519 +          description="Runs tck and jtreg tests for src/main"/>
520  
521 <  <target name="report-tests"
522 <          depends="run-tests">
523 <
524 <    <!-- Sets junit.report.format to frames if redirection is present,
525 <         otherwise sets it to noframes. -->
526 <    <available property="junit.report.format"
527 <                  value="frames"
528 <              classname="org.apache.xalan.lib.Redirect"
529 <    />
530 <    <property name="junit.report.format" value="noframes"/>
531 <
532 <    <junitreport todir="${build.reports.dir}">
533 <      <fileset dir="${build.reports.dir}">
534 <        <include name="TEST-*.xml"/>
535 <      </fileset>
536 <      <report styledir="${stylesheet.dir}"
537 <                format="${junit.report.format}"
538 <                 todir="${build.reports.dir}"
539 <      />
540 <    </junitreport>
541 <
542 <    <fail message="Test Cases Failed" if="junit.failed"/>
543 <
521 >  <target name="test-version-permutations"
522 >          depends="test11, test12, test13, test14, test15, test16,
523 >          test11-12, test11-13, test11-14, test11-15, test11-16,
524 >          clean, test, docs"
525 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
526 >
527 >  <target name="test11">
528 >    <antcall>
529 >      <param name="java.runtime.target" value="11"/>
530 >      <param name="build.main.javac" value="${javac11}"/>
531 >      <param name="build.main.javadoc" value="${javadoc12}"/>
532 >      <param name="build.main.javadoc.source" value="11"/>
533 >      <target name="clean"/>
534 >      <target name="test"/>
535 >      <target name="docs"/>
536 >    </antcall>
537 >  </target>
538 >
539 >  <target name="test12">
540 >    <antcall>
541 >      <param name="java.runtime.target" value="12"/>
542 >      <param name="build.main.javac" value="${javac12}"/>
543 >      <param name="build.main.javadoc" value="${javadoc12}"/>
544 >      <param name="build.main.javadoc.source" value="12"/>
545 >      <target name="clean"/>
546 >      <target name="test"/>
547 >      <target name="docs"/>
548 >    </antcall>
549 >  </target>
550 >
551 >  <target name="test13">
552 >    <antcall>
553 >      <param name="java.runtime.target" value="13"/>
554 >      <param name="build.main.javac" value="${javac13}"/>
555 >      <param name="build.main.javadoc" value="${javadoc13}"/>
556 >      <param name="build.main.javadoc.source" value="13"/>
557 >      <target name="clean"/>
558 >      <target name="test"/>
559 >      <target name="docs"/>
560 >    </antcall>
561 >  </target>
562 >
563 >  <target name="test14">
564 >    <antcall>
565 >      <param name="java.runtime.target" value="14"/>
566 >      <param name="build.main.javac" value="${javac14}"/>
567 >      <param name="build.main.javadoc" value="${javadoc14}"/>
568 >      <param name="build.main.javadoc.source" value="14"/>
569 >      <target name="clean"/>
570 >      <target name="test"/>
571 >      <target name="docs"/>
572 >    </antcall>
573 >  </target>
574 >
575 >  <target name="test15">
576 >    <antcall>
577 >      <param name="java.runtime.target" value="15"/>
578 >      <param name="build.main.javac" value="${javac15}"/>
579 >      <param name="build.main.javadoc" value="${javadoc15}"/>
580 >      <param name="build.main.javadoc.source" value="15"/>
581 >      <target name="clean"/>
582 >      <target name="test"/>
583 >      <target name="docs"/>
584 >    </antcall>
585 >  </target>
586 >
587 >  <target name="test16">
588 >    <antcall>
589 >      <param name="java.runtime.target" value="16"/>
590 >      <param name="build.main.javac" value="${javac16}"/>
591 >      <param name="build.main.javadoc" value="${javadoc16}"/>
592 >      <param name="build.main.javadoc.source" value="16"/>
593 >      <target name="clean"/>
594 >      <target name="test"/>
595 >      <target name="docs"/>
596 >    </antcall>
597 >  </target>
598 >
599 >  <target name="test11-12">
600 >    <antcall>
601 >      <param name="java.runtime.target" value="12"/>
602 >      <param name="build.main.javac" value="${javac11}"/>
603 >      <param name="build.main.javadoc" value="${javadoc12}"/>
604 >      <param name="build.main.javadoc.source" value="11"/>
605 >      <target name="clean"/>
606 >      <target name="test"/>
607 >      <target name="docs"/>
608 >    </antcall>
609 >  </target>
610 >
611 >  <target name="test11-13">
612 >    <antcall>
613 >      <param name="java.runtime.target" value="13"/>
614 >      <param name="build.main.javac" value="${javac11}"/>
615 >      <param name="build.main.javadoc" value="${javadoc13}"/>
616 >      <param name="build.main.javadoc.source" value="11"/>
617 >      <target name="clean"/>
618 >      <target name="test"/>
619 >      <target name="docs"/>
620 >    </antcall>
621 >  </target>
622 >
623 >  <target name="test11-14">
624 >    <antcall>
625 >      <param name="java.runtime.target" value="14"/>
626 >      <param name="build.main.javac" value="${javac11}"/>
627 >      <param name="build.main.javadoc" value="${javadoc14}"/>
628 >      <param name="build.main.javadoc.source" value="11"/>
629 >      <target name="clean"/>
630 >      <target name="test"/>
631 >      <target name="docs"/>
632 >    </antcall>
633 >  </target>
634 >
635 >  <target name="test11-15">
636 >    <antcall>
637 >      <param name="java.runtime.target" value="15"/>
638 >      <param name="build.main.javac" value="${javac11}"/>
639 >      <param name="build.main.javadoc" value="${javadoc15}"/>
640 >      <param name="build.main.javadoc.source" value="11"/>
641 >      <target name="clean"/>
642 >      <target name="test"/>
643 >      <target name="docs"/>
644 >    </antcall>
645 >  </target>
646 >
647 >  <target name="test11-16">
648 >    <antcall>
649 >      <param name="java.runtime.target" value="16"/>
650 >      <param name="build.main.javac" value="${javac11}"/>
651 >      <param name="build.main.javadoc" value="${javadoc16}"/>
652 >      <param name="build.main.javadoc.source" value="11"/>
653 >      <target name="clean"/>
654 >      <target name="test"/>
655 >      <target name="docs"/>
656 >    </antcall>
657 >  </target>
658 >
659 >  <target name="docs16">
660 >    <antcall>
661 >      <param name="java.runtime.target" value="16"/>
662 >      <param name="build.main.javac" value="${javac16}"/>
663 >      <param name="build.main.javadoc" value="${javadoc16}"/>
664 >      <param name="build.main.javadoc.source" value="16"/>
665 >      <target name="clean"/>
666 >      <target name="docs"/>
667 >    </antcall>
668    </target>
669  
670  
671    <target name="configure-compiler">
672 +    <fail message="ant version too old">
673 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
674 +    </fail>
675  
676      <property name="unchecked.option" value="-Xlint:unchecked"/>
677  
# Line 535 | Line 688
688    </target>
689  
690  
691 <  <target name="configure-tests"
692 <       depends="configure-compiler">
540 <
541 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
542 <    <available property="junit.available"
543 <               classname="junit.framework.Protectable"/>
544 <
545 <    <!-- Xalan -->
546 <    <available property="xalan.available"
547 <               classname="org.apache.xalan.Version"/>
548 <
549 <
550 <    <!-- Ant 1.6beta and later don't need or want this check -->
551 <    <!--
552 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
553 <          unless="junit.available"/>
554 <
555 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
556 <          unless="xalan.available"/>
557 <    -->
558 <
559 <  </target>
560 <
561 <
562 <
563 <  <!-- Anthill targets -->
564 <
565 <  <target name="anthill-build">
566 <
567 <    <!-- Override this in user.properties -->
568 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
569 <
570 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
571 <      <arg value="-Xmx256000000"/>
572 <      <!-- classpath of new JVM -->
573 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
574 <      <!-- location of Ant home directory -->
575 <      <arg value="-Dant.home=${ant.home}"/>
576 <      <!-- the Ant main class -->
577 <      <arg value="org.apache.tools.ant.Main"/>
578 <      <!-- The build file -->
579 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
580 <      <!-- the target to build on the new Ant instance -->
581 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
582 <      <arg value="do-anthill-build"/>
583 <    </exec>
584 <  </target>
585 <
586 <  <target name="do-anthill-build"
587 <          depends="jar, test, docs, dist-docs"/>
588 <
589 <  <target name="anthill-publish">
590 <
591 <    <copy todir="${deployDir}/docs/private">
592 <      <fileset dir="${build.javadocs.dir}"/>
593 <    </copy>
594 <
595 <    <copy todir="${deployDir}/docs/public">
596 <      <fileset dir="${dist.javadocs.dir}"/>
597 <    </copy>
598 <
599 <    <copy tofile="${deployDir}/index.html"
600 <          file="${basedir}/etc/anthill-index.html"/>
601 <
602 <    <copy todir="${deployDir}/notes">
603 <      <fileset dir="${basedir}/etc/notes"/>
604 <    </copy>
605 <
606 <  </target>
607 <
608 <
609 <
610 <  <!-- Various demos and test programs -->
611 <
612 <
613 <  <target name="sample" depends="init, configure-compiler"
614 <          description="Standalone demo program">
615 <
616 <    <mkdir dir="${build.testcases.dir}"/>
617 <
618 <    <javac srcdir="${test.src.dir}"
619 <          destdir="${build.testcases.dir}"
620 <            debug="${build.debug}"
621 <       debuglevel="${build.debuglevel}"
622 <      deprecation="${build.deprecation}"
623 <           source="${build.sourcelevel}"
624 <             fork="true">
625 <
626 <      <include name="jsr166/test/Sample.java"/>
627 <
628 <    </javac>
629 <
630 <    <copy todir="${build.testcases.dir}">
631 <      <fileset dir="${test.src.dir}">
632 <        <include name="**/*.properties"/>
633 <      </fileset>
634 <    </copy>
635 <
636 <
637 <    <java classname="jsr166.test.Sample" fork="true">
638 <      <classpath refid="test.classpath"/>
639 <      <!-- <jvmarg value="-ea"/> -->
640 <      <!-- <jvmarg value="-server"/> -->
641 <      <!-- <arg value="1000"/> -->
642 <    </java>
643 <  </target>
644 <
645 <
646 <  <target name="loops" depends="init, configure-compiler"
647 <          description="Benchmark from Doug Lea's AQS paper">
648 <
649 <    <mkdir dir="${build.loops.dir}"/>
650 <
651 <    <javac srcdir="${loops.src.dir}"
652 <          destdir="${build.loops.dir}"
653 <            debug="${build.debug}"
654 <       debuglevel="${build.debuglevel}"
655 <      deprecation="${build.deprecation}"
656 <           source="${build.sourcelevel}"
657 <             fork="true">
658 <
659 <      <compilerarg line="${build.args}"/>
660 <      <classpath refid="loops.classpath"/>
661 <
662 <    </javac>
663 <
664 <    <java classname="ALoops" fork="true">
665 <      <classpath refid="loops.classpath"/>
666 <    </java>
667 <
668 <  </target>
669 <
670 <
671 <  <target name="compile-j1" depends="init, configure-compiler">
672 <
673 <    <mkdir dir="${build.j1.dir}"/>
674 <
675 <    <javac srcdir="${j1.src.dir}"
676 <          destdir="${build.j1.dir}"
677 <            debug="${build.debug}"
678 <       debuglevel="${build.debuglevel}"
679 <      deprecation="${build.deprecation}"
680 <           source="${build.sourcelevel}"
681 <             fork="true">
682 <
683 <      <compilerarg line="${build.args}"/>
684 <      <classpath refid="j1.classpath"/>
685 <
686 <    </javac>
687 <
688 <  </target>
689 <
690 <
691 <  <target name="sw" depends="compile-j1"
692 <          description="Runs the SwingWorker demo">
693 <
694 <    <!--
695 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
696 <      <classpath refid="j1.classpath"/>
697 <    </java>
698 <    -->
699 <
700 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
701 <
702 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
703 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
704 <    </exec>
705 <
706 <  </target>
707 <
708 <  <target name="j1" depends="compile-j1"
709 <          description="Runs a standalone JavaOne program">
710 <
711 <    <java classname="jsr166.misc.SortedEnumSet" fork="true">
712 <      <classpath refid="j1.classpath"/>
713 <    </java>
714 <
715 <  </target>
716 <
717 <
718 <  <target name="test-j1" depends="compile-j1"
719 <          description="Runs testcases from the JavaOne source directories">
720 <
721 <    <junit printsummary="true"
722 <             showoutput="true"
723 <          errorProperty="junit.failed"
724 <        failureProperty="junit.failed"
725 <                    dir="${build.j1.dir}"
726 <                   fork="true">
727 <
728 <      <!-- <jvmarg value="-server"/> -->
729 <      <classpath refid="j1.classpath"/>
730 <      <formatter type="xml"/>
731 <
732 <      <batchtest todir="${build.j1.dir}">
733 <        <fileset dir="${j1.src.dir}">
734 <          <include name="**/*Test.java"/>
735 <        </fileset>
736 <      </batchtest>
737 <
738 <    </junit>
739 <
740 <    <available property="junit.report.format"
741 <                  value="frames"
742 <              classname="org.apache.xalan.lib.Redirect"/>
743 <    <property name="junit.report.format" value="noframes"/>
744 <
745 <    <junitreport todir="${build.j1.dir}">
746 <      <fileset dir="${build.j1.dir}">
747 <        <include name="TEST-*.xml"/>
748 <      </fileset>
749 <      <report styledir="${stylesheet.dir}"
750 <                format="${junit.report.format}"
751 <                 todir="${build.j1.dir}"
752 <      />
753 <    </junitreport>
691 >  <target name="compile-test-loops" depends="jar"
692 >          description="Compiles all the perf tests in src/test/loops">
693  
694 <    <fail message="Test Cases Failed" if="junit.failed"/>
756 <
757 <  </target>
694 >    <mkdir dir="${build.dir}/test/loops"/>
695  
696 <
697 <
698 <  <!-- C++ and JNI definitions and demos -->
699 <
700 <  <target name="configure-cpp">
701 <
702 <    <!-- Define tasks and types -->
703 <
704 <    <path id="cpptasks.path">
705 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
706 <    </path>
707 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
708 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
709 <
710 <    <!-- Set platform property for JNI includes -->
774 <
775 <    <condition property="platform" value="linux">
776 <      <os name="Linux"/>
777 <    </condition>
778 <    <condition property="platform" value="win32">
779 <      <os family="windows"/>
780 <    </condition>
781 <    <condition property="platform" value="solaris">
782 <      <os name="SunOS"/>
783 <    </condition>
784 <
785 <  </target>
786 <
787 <
788 <  <target name="cppdemo" depends="configure-cpp">
789 <
790 <    <mkdir dir="${build.dir}"/>
791 <
792 <    <cc multithreaded="true"
793 <                 name="g++"
794 <               objdir="${build.dir}"
795 <              outfile="${build.dir}/CppDemo">
796 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
797 <      <libset libs="stdc++"/>
798 <    </cc>
799 <
800 <    <exec executable="${build.dir}/CppDemo">
801 <      <arg line="count in word frequency of word in command line count"/>
802 <    </exec>
803 <
804 <  </target>
805 <
806 <
807 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
808 <
809 <    <mkdir dir="${build.testcases.dir}"/>
810 <
811 <    <javac srcdir="${test.src.dir}"
812 <          destdir="${build.testcases.dir}"
813 <            debug="${build.debug}"
814 <       debuglevel="${build.debuglevel}"
815 <      deprecation="${build.deprecation}"
816 <           source="${build.sourcelevel}"
817 <             fork="true">
818 <      <compilerarg value="${bootclasspath.args}"/>
696 >    <javac srcdir="${basedir}/src/test/loops"
697 >           destdir="${build.dir}/test/loops"
698 >           debug="${build.debug}"
699 >           debuglevel="${build.debuglevel}"
700 >           deprecation="${build.deprecation}"
701 >           includeAntRuntime="false"
702 >           includeJavaRuntime="false"
703 >           encoding="ASCII"
704 >           executable="${build.main.javac}"
705 >           fork="true">
706 >
707 >      <include name="*.java"/>
708 >      <compilerarg value="-XDignore.symbol.file=true"/>
709 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
710 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
711        <compilerarg line="${build.args}"/>
820      <classpath refid="test.classpath"/>
821      <include name="JniDemo.java"/>
712      </javac>
823
824    <javah destdir="${build.testcases.dir}"
825      classpathref="test.classpath">
826      <class name="JniDemo"/>
827    </javah>
828
829    <cc multithreaded="true"
830                 name="g++"
831               objdir="${build.dir}"
832              outfile="${build.dir}/JniDemo"
833              outtype="shared">
834
835      <compiler>
836        <defineset>
837          <define name="__int64" value="long long"/>
838        </defineset>
839        <includepath location="${java.home}/../include"/>
840        <includepath location="${java.home}/../include/${platform}"/>
841        <compilerarg value="-mno-cygwin"/>
842      </compiler>
843
844      <linker>
845        <linkerarg value="--add-stdcall-alias"/>
846      </linker>
847
848      <includepath location="${build.testcases.dir}"/>
849
850      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
851
852      <libset libs="stdc++"/>
853
854    </cc>
855
856    <!-- Necessary if windows, harmless if not -->
857    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
858
859    <java classname="JniDemo" fork="true">
860      <!-- Watch out: path separator hardwired to semicolon here! -->
861      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
862      <classpath refid="test.classpath"/>
863      <arg line="count in word frequency of word in command line count"/>
864    </java>
865
713    </target>
714  
715  
716 <
717 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
718 <
719 <
720 <
721 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
722 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
723 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
724 <  <property name="pretiger.sourcelevel" value="1.4"/>
725 <
726 <  <target name="defang"
727 <       depends="init"
728 <   description="Generates pre-Tiger compatible source">
729 <
730 <    <delete dir="${pretiger.src.dir}"/>
731 <    <mkdir dir="${pretiger.src.dir}"/>
732 <
733 <    <exec executable="perl">
734 <      <arg file="etc/defang.pl"/>
735 <      <!-- <arg value="-v"/> -->
736 <      <arg value="-s"/> <arg file="${src.dir}"/>
890 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
891 <    </exec>
892 <
716 >  <!-- old branches no longer maintained.  build support deleted -->
717 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
718 >  <!-- jsr166 4jdk7 (no longer maintained) -->
719 >  <!-- jsr166x (no longer maintained) -->
720 >  <!-- jsr166y (no longer maintained) -->
721 >  <!-- extra166y (no longer maintained) -->
722 >  <!-- jsr166e (no longer maintained) -->
723 >
724 > <!-- Find buglets that can be detected by static build tools -->
725 >
726 > <!--   <target name="lint"> -->
727 > <!--     <antcall target="dists"> -->
728 > <!--       <param name="build.javadoc.access" value="protected"/> -->
729 > <!--     </antcall> -->
730 > <!--   </target> -->
731 >
732 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
733 >  <target name="doclint-private">
734 >    <antcall target="dist">
735 >      <param name="build.javadoc.access" value="private"/>
736 >    </antcall>
737    </target>
738  
895  <target name="compile-pretiger"
896          depends="init, configure-compiler, defang"
897          description="Compiles pre-Tiger sources to build folder">
898
899    <mkdir dir="${build.pretiger.dir}"/>
739  
740 <    <javac srcdir="${pretiger.src.dir}"
741 <          destdir="${build.pretiger.dir}"
742 <            debug="${build.debug}"
743 <       debuglevel="${build.debuglevel}"
744 <      deprecation="${build.deprecation}"
745 <           source="${pretiger.sourcelevel}"
746 <             fork="true">
740 > <!-- ==============================================================
741 >  Experimental errorprone support
742 >  https://errorprone.info
743 >  https://errorprone.info/docs/installation
744 >  https://github.com/google/error-prone/issues/1143
745 > =================================================================== -->
746 >  <path id="errorprone.processorpath.path">
747 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
748 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
749 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
750 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
751 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
752 >  </path>
753 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
754 >  <property name="errorprone.jsr166.user.flags" value=""/>
755 >  <property name="errorprone.jsr166.flags"
756 >            value="-Xep:HashtableContains:OFF
757 >                   -Xep:PreferJavaTimeOverload:OFF
758 >                   -Xep:JdkObsolete:OFF
759 >                   -Xep:MissingOverride:OFF
760 >                   -Xep:MissingFail:OFF
761 >                   -Xep:ThreadPriorityCheck:OFF
762 >                   -Xep:MixedArrayDimensions:ERROR
763 >                   -Xep:RemoveUnusedImports:ERROR
764 >                   -Xep:EmptyIf:ERROR
765 >                   -Xep:MultipleTopLevelClasses:ERROR
766 >                   -Xep:ClassName:ERROR
767 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
768 >                   -Xep:RedundantThrows:ERROR
769 >                   -Xep:IdentityBinaryExpression:WARN
770 >                   -Xep:ConstructorInvokesOverridable:WARN
771 >                   -Xep:MethodCanBeStatic:WARN
772 >                   ${errorprone.jsr166.user.flags}"/>
773 >  <!-- -Xep:WildcardImport:ERROR -->
774 >  <property name="errorprone.jsr166.test.flags"
775 >            value="-Xep:StringSplitter:OFF
776 >                   -Xep:BoxedPrimitiveConstructor:OFF
777 >                   -Xep:UnnecessaryParentheses:OFF
778 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
779 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
780 >  <target name="errorprone"
781 >          depends="clean, configure-compiler"
782 >          description="Run errorprone over jsr166 source code (experimental)">
783 >
784 >    <local name="destdir"/>
785 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
786 >    <mkdir dir="${destdir}"/>
787  
788 +    <javac srcdir="${src.dir}"
789 +           destdir="${destdir}"
790 +           debug="${build.debug}"
791 +           debuglevel="${build.debuglevel}"
792 +           deprecation="${build.deprecation}"
793 +           classpath=""
794 +           includeAntRuntime="false"
795 +           includeJavaRuntime="false"
796 +           encoding="ASCII"
797 +           executable="${build.main.javac}"
798 +           fork="true">
799 +
800 +      <include name="**/*.java"/>
801 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
802 +      <compilerarg value="-J--illegal-access=permit"/>
803 +      <compilerarg value="-XDcompilePolicy=simple"/>
804 +      <compilerarg value="-processorpath"/>
805 +      <compilerarg pathref="errorprone.processorpath.path"/>
806 +      <compilerarg value="-Xplugin:ErrorProne
807 +                          ${errorprone.jsr166.flags}"/>
808 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
809 +      <compilerarg value="-Xprefer:source"/>
810 +      <compilerarg value="-XDignore.symbol.file=true"/>
811 +      <compilerarg value="-Xlint:all"/>
812 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
813 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
814        <compilerarg line="${build.args}"/>
910      <exclude name="**/Thread.java"/>
911
815      </javac>
816  
817 <  </target>
818 <
916 <  <target name="pretiger" depends="compile-pretiger">
917 <
918 <    <mkdir dir="${build.lib.dir}"/>
919 <
920 <    <jar destfile="${pretiger.jar}">
921 <      <fileset dir="${build.pretiger.dir}">
922 <      </fileset>
817 >    <jar destfile="${product.jar}">
818 >      <fileset dir="${destdir}"/>
819      </jar>
820  
821 +    <run-tck-tests
822 +      target="${java.runtime.target}"
823 +      workdir="${build.dir}"
824 +      classes="${product.jar}">
825 +      <javac-elements>
826 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
827 +        <compilerarg value="-J--illegal-access=permit"/>
828 +        <compilerarg value="-XDcompilePolicy=simple"/>
829 +        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
830 +        <compilerarg value="-Xplugin:ErrorProne
831 +                            ${errorprone.jsr166.flags}
832 +                            ${errorprone.jsr166.test.flags}"/>
833 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
834 +      </javac-elements>
835 +    </run-tck-tests>
836 +  </target>
837 +
838 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
839 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
840 +  <target name="errorprone-jtreg"
841 +          depends="jar"
842 +          description="Run errorprone over jtreg tests (experimental)">
843 +
844 +    <run-jtreg-tests
845 +       target="${java.runtime.target}"
846 +       workdir="${build.dir}"
847 +       classes="${product.jar}"
848 +       verbose="all">
849 +      <jtreg-elements>
850 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
851 +        <arg value="-javacoption:-processorpath"/>
852 +        <arg value="-javacoption:${errorprone.processorpath}"/>
853 +        <arg value="-javacoption:-Xplugin:ErrorProne
854 +                            ${errorprone.jsr166.flags}
855 +                            ${errorprone.jsr166.test.flags}
856 +                            -Xep:MultipleTopLevelClasses:WARN
857 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
858 +      </jtreg-elements>
859 +    </run-jtreg-tests>
860 +  </target>
861 +
862 +
863 + <!-- ==============================================================
864 +  Running guava tests against jsr166 code
865 + =================================================================== -->
866 +
867 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
868 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
869 + <!-- <property name="guava.version" value="21.0"/> -->
870 +
871 + <!-- HOWTO debug print a path id -->
872 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
873 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
874 +
875 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
876 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
877 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
878 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
879 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
880 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
881 +
882 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
883 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
884 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
885 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
886 +
887 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
888 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
889 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
890 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
891 +
892 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
893 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
894 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
895 +
896 +  <target name="init-ivy">
897 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
898 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
899 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
900 +             classpath="${build.dir}/ivy.jar"/>
901 +  </target>
902 +
903 +  <target name="guava-tests" depends="jar, init-ivy"
904 +          description="Guava tests run against jsr166 collections">
905 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
906 +    <mkdir dir="${guava.dir}"/>
907 +    <ivy:retrieve pathid="guava.testlib.classpath"
908 +      type="jar,bundle" inline="true" conf="default,master"
909 +      pattern="${guava.dir}/[artifact].[ext]"
910 +      organisation="com.google.guava" module="guava-testlib"/>
911 +    <property name="guava.version" value="21.0"/>
912 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
913 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
914 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
915 +           jvm="${build.main.java}" fork="true">
916 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
917 +      <formatter type="brief"/>
918 +      <classpath>
919 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
920 +        <path refid="guava.testlib.classpath"/>
921 +      </classpath>
922 +
923 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
924 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
925 +    </junit>
926    </target>
927  
928   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines