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.56 by tim, Mon Sep 1 04:21:55 2003 UTC vs.
Revision 1.255 by jsr166, Thu Sep 28 01:17:47 2017 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless"
3 >  xmlns:ivy="antlib:org.apache.ivy.ant">
4  
5    <description>
6   ------------------------------------------------------------------------------
# Line 6 | Line 8
8  
9    Usage: ant [target]
10  
11 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12 +  more details.
13 +
14    User-specific settings are read from user.properties.
15    See user.properties.sample for an explanation of some useful settings.
16 +
17 +  The repository contains all dependencies except for ant and the JDK
18 +  itself.  Because the JDK version matters and because different
19 +  targets require different JDKs, we assume that users have created a
20 +  hierarchy containing:
21 +  $HOME/jdk/jdk8
22 +  $HOME/jdk/jdk9
23 +  $HOME/jdk/jdk10
24 +  where each of the above is a JDK or a symlink to same, and
25 +  $HOME/jdk/src/jdk8
26 +  $HOME/jdk/src/jdk9
27 +  $HOME/jdk/src/jdk10
28 +  where each of the above is a complete JDK source tree
29 +  (e.g. mercurial forest) or a symlink to same.
30 +
31 +  Alternatively, define ant variables thus:
32 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
33 +  for $N in 8 9 10 ...
34 +
35 +  As of 2016-03, the sources in src/main are for jdk9+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
39 <  <target name="usage" description="Advises user to run with -projecthelp">
40 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
39 >  <!-- Run 'ant -projecthelp' (default target) -->
40 >  <target name="usage">
41 >    <java classname="org.apache.tools.ant.Main">
42 >      <arg value="-projecthelp" />
43 >    </java>
44    </target>
45  
46 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
47  
48    <!-- User-specific settings -->
49    <property file="user.properties"/>
50  
51  
52    <!-- Compilation options -->
53 <  <property name="build.sourcelevel"    value="1.5"/>
25 <  <property name="build.docsourcelevel" value="1.4"/>
53 >  <property name="build.sourcelevel"    value="6"/>
54    <property name="build.debug"          value="true"/>
55    <property name="build.debuglevel"     value="source,lines,vars"/>
56    <property name="build.deprecation"    value="false"/>
57 +  <property name="build.javadoc.access" value="protected"/>
58  
59    <!-- Build locations -->
60 <  <property name="build.dir"            location="build"/>
61 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
62 <  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
63 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
64 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
65 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
66 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
67 <  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
68 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
69 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
70 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
71 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
72 <  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
60 >  <property name="build.dir"                   location="build"/>
61 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
62 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
63 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
64 >
65 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69 >
70 >  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
71 >  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
72 >  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
73 >  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
74 >
75 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
76 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
78 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
79 >
80 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
81 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
82 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
83 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
84 >
85 >  <!-- JDK locations -->
86 >  <property name="jdks.home"  location="${user.home}/jdk"/>
87 >
88 >  <macrodef name="defjdklocations">
89 >    <attribute name="v"/>
90 >    <sequential>
91 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
92 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
93 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
94 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
95 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
96 >    <local name="have.java.base"/>
97 >    <available property="have.java.base"
98 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
99 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
100 >      if:set="have.java.base"/>
101 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
102 >      unless:set="have.java.base"/>
103 >    <local name="modules"/>
104 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
105 >    <local name="boot.jar.dir"/>
106 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
107 >    <path id="bootclasspath@{v}" unless:set="modules">
108 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
109 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
110 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
111 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
112 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
113 >    </path>
114 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
115 >    </sequential>
116 >  </macrodef>
117 >
118 >  <macrodef name="mirror-dir">
119 >    <attribute name="src"/>
120 >    <attribute name="dst"/>
121 >    <sequential>
122 >    <delete dir="@{dst}"/>
123 >    <mkdir dir="@{dst}"/>
124 >    <copy todir="@{dst}" preservelastmodified="true">
125 >      <fileset dir="@{src}"/>
126 >    </copy>
127 >    </sequential>
128 >  </macrodef>
129 >
130 >  <defjdklocations v="6"/>
131 >  <defjdklocations v="7"/>
132 >  <defjdklocations v="8"/>
133 >  <defjdklocations v="9"/>
134 >  <defjdklocations v="10"/>
135  
136    <!-- Source locations -->
137    <property name="src.dir"              location="${basedir}/src/main"/>
47  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
138    <property name="test.src.dir"         location="${basedir}/src/test"/>
139 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
140 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
139 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
140 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
141 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
142 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
143 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
144 >  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
145 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>
148 <
149 <  <!-- Distribution locations -->
150 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
148 >  <property name="topsrc.dir"           location="${basedir}/src"/>
149 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150 >  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
155 >
156 >  <!-- Javadoc locations -->
157 >  <property name="docs.dir"          location="${build.dir}/docs"/>
158 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 >  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 >
165 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 >  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
172  
173    <!-- Jar locations -->
174 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
175 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
176 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
177 <  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
178 <
179 <
180 <  <!-- Files excluded from dist-docs and emulation jar -->
181 <  <patternset id="unsafe.exclusion">
182 <    <exclude name="java/util/Random.*"/>
183 <    <exclude name="sun/misc/Unsafe.*"/>
184 <  </patternset>
185 <
186 <  <!-- Files excludes from emulation jar -->
187 <  <patternset id="atomic.exclusion">
188 <    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
189 <    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
190 <    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
191 <    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
192 <    <exclude name="java/util/concurrent/locks/LockSupport*"/>
193 <    <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
194 <  </patternset>
195 <
196 <
197 <
198 <  <!-- Main targets -->
199 <
200 <  <target name="compile"
201 <          depends="init, configure-compiler, prepare-src"
202 <          description="Compiles main sources to build folder">
203 <
204 <    <property name="prepare.src.dir" value="${src.dir}"/>
205 <
206 <    <mkdir dir="${build.classes.dir}"/>
174 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176 >  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
181 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
182 >
183 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
184 >  <property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>
185 >  <property name="java6.docroot.url"  value="http://docs.oracle.com/javase/6/docs"/>
186 >  <property name="java7.docroot.url"  value="http://docs.oracle.com/javase/7/docs"/>
187 >  <property name="java8.docroot.url"  value="http://docs.oracle.com/javase/8/docs"/>
188 >  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
189 >  <!-- The location of jdk9 early access docs -->
190 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
191 >  <!-- Default jdk doc location (latest stable release seems best) -->
192 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
193 >
194 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
195 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
196 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
197 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
198 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
199 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
200 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
201 >
202 >  <!-- Define the "jtreg" task -->
203 >  <!-- See the docs in "jtreg -onlineHelp" -->
204 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205 >           classpath="${lib.dir}/jtreg.jar" />
206 >
207 >  <!-- Tck options; see JSR166TestCase.java
208 >   To profile a single tck test class:
209 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210 >   To stress test a single tck test class:
211 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212 >   To stress test a single tck test method:
213 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214 >  -->
215 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216 >  <macrodef name="run-tck-tests">
217 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
218 >    <attribute name="target"/>
219 >    <attribute name="compile-target" default="@{target}"/>
220 >    <attribute name="workdir"/>
221 >    <attribute name="classes"/>
222 >    <!--
223 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224 >    -->
225 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226 >    <element name="javac-elements" optional="true"/>
227 >
228 >    <sequential>
229 >
230 >    <local name="modules"/>
231 >    <condition property="modules">
232 >      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233 >    </condition>
234  
235 < <!--
236 <    <echo>javac ${gjc.args}</echo>
237 <    <echo>bootclasspath=${compile.bootclasspath}</echo>
238 < -->
235 >    <local name="use-doclint"/>
236 >    <condition property="use-doclint">
237 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
238 >    </condition>
239  
240 <    <javac srcdir="${prepare.src.dir}"
98 <          destdir="${build.classes.dir}"
99 <            debug="${build.debug}"
100 <       debuglevel="${build.debuglevel}"
101 <      deprecation="${build.deprecation}"
102 <           source="${build.sourcelevel}"
103 <             fork="true">
240 >    <mkdir dir="@{workdir}/tck-classes"/>
241  
242 <      <compilerarg    line="${gjc.args}"/>
243 < <!--
244 <      <bootclasspath refid="compile.bootclasspath"/>
245 < -->
242 >    <javac srcdir="@{tck.src.dir}"
243 >           destdir="@{workdir}/tck-classes"
244 >           debug="${build.debug}"
245 >           debuglevel="${build.debuglevel}"
246 >           deprecation="${build.deprecation}"
247 >           source="@{compile-target}"
248 >           target="@{compile-target}"
249 >           classpath="${junit.jar}"
250 >           includeAntRuntime="false"
251 >           includeJavaRuntime="false"
252 >           encoding="ASCII"
253 >           executable="${javac@{compile-target}}"
254 >           fork="true">
255 >
256 >      <include name="*.java"/>
257 >      <compilerarg value="-XDignore.symbol.file=true"/>
258 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
259 >      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
260 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262 >      <compilerarg line="${build.args}"/>
263 >      <javac-elements/>
264  
265      </javac>
266  
267 <  </target>
268 <
269 <
270 <  <target name="jar"
271 <          depends="configure-emulation, init-jar, native-jar, emulation-jar"
272 <          description="Builds library jar from compiled sources"/>
273 <
267 >    <java classname="${jsr166.tckTestClass}"
268 >          failonerror="true"
269 >          jvm="${java@{target}}"
270 >          fork="true">
271 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
273 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
274 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
275 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
276 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
277 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
278 >        <jvmarg line="@{jvmflags}"/>
279 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
280 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
281 >
282 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
283 >        <syspropertyset id="system-properties-used-by-tck">
284 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
285 >          <propertyref prefix="jsr166."/>
286 >          <propertyref name="test.timeout.factor"/>
287 >        </syspropertyset>
288 >
289 >        <classpath>
290 >          <pathelement location="${junit.jar}"/>
291 >          <pathelement location="@{workdir}/tck-classes"/>
292 >        </classpath>
293 >    </java>
294  
295 <  <target name="test"
296 <          depends="init, configure-tests, report-tests"
122 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
295 >    </sequential>
296 >  </macrodef>
297  
298 +  <!-- Define jtreg test sets for different jdk versions -->
299 +  <fileset dir="${jtreg10.src.dir}">
300 +    <patternset id="jdk10.jtreg.tests">
301 +      <include name="**/*.java"/>
302 +    </patternset>
303 +  </fileset>
304 +
305 +  <fileset dir="${jtreg9.src.dir}">
306 +    <patternset id="jdk9.jtreg.tests">
307 +      <include name="**/*.java"/>
308 +    </patternset>
309 +  </fileset>
310 +
311 +  <fileset dir="${jtreg8.src.dir}">
312 +    <patternset id="jdk8.jtreg.tests">
313 +      <include name="**/*.java"/>
314 +    </patternset>
315 +  </fileset>
316 +
317 +  <fileset dir="${jtreg7.src.dir}">
318 +    <patternset id="jdk7.jtreg.tests">
319 +      <include name="**/*.java"/>
320 +    </patternset>
321 +  </fileset>
322 +
323 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
324 +  <property name="jtreg.flags" value=""/>
325 +
326 +  <macrodef name="run-jtreg-tests">
327 +    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
328 +    <attribute name="target"/>
329 +    <attribute name="workdir"/>
330 +    <attribute name="classes"/>
331 +    <attribute name="verbose" default="${jtreg.verbose}"/>
332 +    <attribute name="jtregflags" default=""/>
333 +    <element name="jtreg-elements" optional="true"/>
334 +
335 +    <sequential>
336 +
337 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
338 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
339 +
340 +    <local name="modules"/>
341 +    <condition property="modules">
342 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
343 +    </condition>
344  
345 <  <target name="checkstyle"
346 <          depends="filter-src"
347 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
345 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
346 >    <jtreg dir="${jtreg@{target}.src.dir}"
347 >           jdk="${jdk@{target}.home}"
348 >           workDir="@{workdir}/JTwork">
349 >      <patternset refid="jdk@{target}.jtreg.tests"/>
350 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
351 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
352 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
353 >      <arg value="-agentvm"/>
354 >      <arg value="-noreport"/>
355 >      <arg value="-verbose:@{verbose}"/>
356 >      <arg value="-vmoptions:-esa -ea"/>
357 >      <arg value="-automatic"/>
358 >      <arg value="-k:!ignore"/>
359 >      <arg line="@{jtregflags}"/>
360 >      <arg line="${jtreg.flags}"/>
361 >      <jtreg-elements/>
362 >    </jtreg>
363 >    </sequential>
364 >  </macrodef>
365 >
366 >  <!-- ALoops classpath -->
367 >  <path id="loops.classpath">
368 >    <pathelement location="${build.loops.dir}"/>
369 >  </path>
370 >
371 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
372 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
373 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
374  
375 <    <taskdef resource="checkstyletask.properties"
130 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
375 >  <!-- Main targets -->
376  
377 <    <checkstyle>
378 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
379 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
380 <    </checkstyle>
377 >  <property name="build.main.java.version" value="9"/>
378 >  <!-- Workaround "no nested properties in ant" -->
379 >  <macrodef name="define-build-main-properties">
380 >    <attribute name="v"/>
381 >    <sequential>
382 >      <property name="build.main.java"    value="${java@{v}}"/>
383 >      <property name="build.main.javac"   value="${javac@{v}}"/>
384 >      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
385 >    </sequential>
386 >  </macrodef>
387 >  <define-build-main-properties v="${build.main.java.version}"/>
388 >
389 >  <target name="dists"
390 >          depends="dist, 4jdk8dist"
391 >          description="Builds all public jars and docs"/>
392 >          <!--
393 >              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
394 >          -->
395  
396 <  </target>
396 >  <target name="compile"
397 >          depends="configure-compiler"
398 >          description="Compiles src/main sources to build dir">
399  
400 +    <local name="destdir"/>
401 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
402  
403 <  <target name="doccheck"
141 <          depends="filter-doccheck"
142 <          description="Reports on javadoc style errors">
403 >    <mkdir dir="${destdir}"/>
404  
405 <    <delete dir="${build.doccheck.dir}"/>
406 <    <mkdir dir="${build.doccheck.dir}"/>
405 >    <javac srcdir="${src.dir}"
406 >           destdir="${destdir}"
407 >           debug="${build.debug}"
408 >           debuglevel="${build.debuglevel}"
409 >           deprecation="${build.deprecation}"
410 >           classpath=""
411 >           includeAntRuntime="false"
412 >           includeJavaRuntime="false"
413 >           encoding="ASCII"
414 >           executable="${build.main.javac}"
415 >           fork="true">
416 >
417 >      <include name="**/*.java"/>
418 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
419 >      <compilerarg value="-Xprefer:source"/>
420 >      <compilerarg value="-XDignore.symbol.file=true"/>
421 >      <compilerarg value="-Xlint:all"/>
422 >      <compilerarg line="--doclint-format html5"/>
423 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
424 >      <compilerarg value="-Werror"/>
425 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
426 >      <compilerarg line="${build.args}"/>
427  
428 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
429 <         docletpath="${lib.dir}/doccheck.jar"
149 <            destdir="${build.doccheck.dir}">
150 <      <packageset dir="${build.filter.doccheck.dir}"/>
151 <    </javadoc>
428 >    </javac>
429 >  </target>
430  
153    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
431  
432 +  <target name="jar"
433 +          depends="compile"
434 +          description="Builds library jar for src/main from compiled sources">
435 +    <local name="subdir"/>
436 +    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
437 +    <jar destfile="${product.jar}">
438 +      <fileset dir="${build.classes.dir}${subdir}"/>
439 +      <manifest>
440 +        <attribute name="Built-By" value="${user.name}"/>
441 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
442 +      </manifest>
443 +    </jar>
444    </target>
445  
446  
447    <target name="docs"
448 <          depends="filter-src"
160 <          description="Builds javadocs with custom tags to build folder">
161 <
162 <    <delete dir="${build.javadocs.dir}"/>
163 <    <mkdir dir="${build.javadocs.dir}"/>
448 >          description="Builds javadocs for src/main to dist dir">
449  
450 <    <javadoc destdir="${build.javadocs.dir}"
451 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
167 <            overview="${src.dir}/intro.html"
168 <              source="${build.docsourcelevel}">
169 <
170 <      <tag name="revised" description="Last revised:"/>
171 <      <tag name="spec"    description="Specified by:"/>
172 <      <tag name="editor"  description="Last edited by:"/>
173 <      <tag name="fixme"   description="FIX ME:"/>
450 >    <delete dir="${docs.dir}"/>
451 >    <mkdir dir="${docs.dir}"/>
452  
453 <      <packageset dir="${build.filter.src.dir}"/>
453 >    <!-- the packagenames="none" hack below prevents scanning the -->
454 >    <!-- sourcepath for packages -->
455  
456 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
457 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
458 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
459 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
460 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
461 +    <javadoc destdir="${docs.dir}"
462 +             packagenames="none"
463 +             link="${java9.api.url}"
464 +             overview="${src.dir}/intro.html"
465 +             access="${build.javadoc.access}"
466 +             sourcepath="${src.dir}"
467 +             classpath=""
468 +             source="9"
469 +             executable="${build.main.javadoc}">
470 +      <fileset dir="${src.dir}" defaultexcludes="yes">
471 +        <include name="**/*.java"/>
472 +      </fileset>
473 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
474 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
475 +      <arg value="-XDignore.symbol.file=true"/>
476 +      <arg value="-html5"/>
477 +      <arg value="--patch-module=java.base=${src.dir}"/>
478 +      <arg value="-tag"/>
479 +      <arg value="${javadoc.jls.option}"/>
480 + <!-- @apiNote currently unused -->
481 + <!--       <arg value="-tag"/> -->
482 + <!--       <arg value="apiNote:a:API Note:"/> -->
483 +      <arg value="-tag"/>
484 +      <arg value="implSpec:a:Implementation Requirements:"/>
485 +      <arg value="-tag"/>
486 +      <arg value="implNote:a:Implementation Note:"/>
487 + <!-- tags added in jdk9: currently unused -->
488 + <!--       <arg value="-tag"/> -->
489 + <!--       <arg value="revised:X"/> -->
490 + <!--       <arg value="-tag"/> -->
491 + <!--       <arg value="spec:X"/> -->
492      </javadoc>
178
179  </target>
180
181
182  <target name="sinjdocs"
183          depends="configure-tests"
184          description="Builds javadocs with custom tags to build folder">
185
186    <delete dir="${build.sinjdocs.dir}"/>
187    <mkdir dir="${build.sinjdocs.dir}"/>
188
189    <java classname="net.cscott.sinjdoc.Main" fork="true">
190
191      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
192
193      <classpath>
194        <pathelement location="${sinjdoc.jar}"/>
195        <pathelement location="${lib.dir}/jutil.jar"/>
196        <pathelement location="${lib.dir}/cup.jar"/>
197        <path refid="test.classpath"/>
198      </classpath>
199
200
201      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
202      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
203      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
204      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
205      <!-- <arg value="-verbose"/> -->
206      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
207      <arg value="java.lang"/>
208      <arg value="java.util"/>
209      <arg value="java.util.concurrent"/>
210      <arg value="java.util.concurrent.atomic"/>
211      <arg value="java.util.concurrent.locks"/>
212
213      <!--
214      <arg value="-help"/>
215      -->
216
217    </java>
218
219  </target>
220
221
222  <target name="strip"
223          depends="init, configure-compiler"
224          description="Strip generics from java source (not working yet)">
225
226    <mkdir dir="${build.stripped.dir}"/>
227
228    <!--
229     # javac -s doesn't reliably generate compilable code. It generates
230     # bridge methods (marked as "synthetic") that can have identical
231     # signatures to existing methods except for the return value.
232     -->
233    <javac srcdir="${src.dir}"
234          destdir="${build.stripped.dir}"
235            debug="${build.debug}"
236       debuglevel="${build.debuglevel}"
237      deprecation="${build.deprecation}"
238           source="${build.sourcelevel}"
239             fork="true">
240
241      <compilerarg    line="${gjc.args} -s"/>
242 <!--
243      <bootclasspath refid="compile.bootclasspath"/>
244 -->
245
246    </javac>
247
493    </target>
494  
495  
496    <target name="dist"
497 <          depends="init, dist-clean, dist-jar, dist-docs"
497 >          depends="dist-clean, dist-jar, dist-docs"
498            description="Puts all distributable products in single hierarchy"/>
499  
500 +
501    <target name="release"
502            depends="dist"
503            description="Puts entire CVS tree, plus distribution productions, in a jar">
504  
259 <!--
260    #keep build dir? - dl
261    <delete dir="${build.dir}"/>
262 -->
505      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
506  
507      <jar basedir="${basedir}" destfile="${release.jar}">
508 +      <!-- <exclude name="build/**"/> -->
509        <exclude name="${release.jar}"/>
510        <exclude name="user.properties"/>
511        <exclude name="etc/notes/**"/>
512 <      <exclude name="lib/gjc/2.1/**"/>
512 >      <exclude name="src/emulation/**"/>
513        <exclude name="**/SyntaxTest.java"/>
514 +      <exclude name="**/SuperfluousAbstract.java"/>
515 +      <manifest>
516 +        <attribute name="Built-By" value="${user.name}"/>
517 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
518 +      </manifest>
519      </jar>
272
520    </target>
521  
522 +
523    <target name="clean"
524            description="Removes all build products">
277
525      <delete dir="${build.dir}"/>
279    <delete dir="${build.classes.dir}"/>
280    <delete dir="${build.lib.dir}"/>
281
526    </target>
527  
528  
529    <target name="dist-clean"
530            description="Removes all build and distribution products">
531 <
531 >    <delete dir="${build.dir}"/>
532      <delete dir="${dist.dir}"/>
289
533    </target>
534  
535  
536 <  <target name="dist-docs"
537 <          depends="filter-src"
538 <          description="Builds javadocs without custom tags to dist folder">
539 <
297 <    <delete dir="${dist.javadocs.dir}"/>
298 <    <mkdir dir="${dist.javadocs.dir}"/>
536 >  <target name="dist-jar"
537 >          depends="clean, jar">
538 >    <copy file="${product.jar}" todir="${dist.dir}"/>
539 >  </target>
540  
541 <    <javadoc destdir="${dist.javadocs.dir}"
542 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
543 <            overview="${src.dir}/intro.html"
544 <              source="${build.docsourcelevel}">
541 >  <target name="dist-docs"
542 >          depends="clean, docs">
543 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
544 >  </target>
545  
546 <      <packageset dir="${build.filter.src.dir}"/>
546 >  <target name="tck"
547 >          depends="jar"
548 >          description="Runs tck tests for src/main directly">
549 >
550 >    <run-tck-tests
551 >      target="${build.main.java.version}"
552 >      workdir="${build.dir}"
553 >      classes="${product.jar}">
554 >      <javac-elements>
555 >        <compilerarg value="-Werror"/>
556 >      </javac-elements>
557 >    </run-tck-tests>
558 >  </target>
559 >
560 >  <target name="tck-parallelism-1"
561 >          description="Runs tck with common pool parallelism 1">
562 >    <antcall target="tck">
563 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
564 >    </antcall>
565 >  </target>
566 >
567 >  <target name="tck-parallelism-0"
568 >          description="Runs tck with common pool parallelism 0">
569 >    <antcall target="tck">
570 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
571 >    </antcall>
572 >  </target>
573 >
574 >  <target name="tck-security-manager"
575 >          description="Runs tck with a security manager">
576 >    <antcall target="tck">
577 >      <param name="jsr166.useSecurityManager" value="true"/>
578 >    </antcall>
579 >  </target>
580 >
581 >  <target name="jtreg"
582 >          depends="jar"
583 >          description="Runs jtreg tests for src/main using the jtreg ant task">
584 >    <run-jtreg-tests
585 >       target="${build.main.java.version}"
586 >       workdir="${build.dir}"
587 >       classes="${product.jar}"/>
588 >  </target>
589  
590 <    </javadoc>
590 >  <target name="test"
591 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
592 >          description="Runs tck and jtreg tests for src/main"/>
593  
594 <  </target>
594 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
595  
596 + <!--     <antcall target="jtreg"> -->
597 + <!--       <param name="build.main.java.version" value="8"/> -->
598 + <!--       <param name="build.main.javac" value="${javac8}"/> -->
599 + <!--     </antcall> -->
600  
601 + <!--   </target> -->
602  
603 <  <!-- Internal targets -->
603 >  <target name="test910"
604 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
605  
606 +    <antcall target="clean"/>
607 +    <antcall target="test">
608 +      <param name="build.main.java.version" value="9"/>
609 +    </antcall>
610  
611 <  <target name="init">
611 >    <antcall target="clean"/>
612 >    <antcall target="test">
613 >      <param name="build.main.java.version" value="10"/>
614 >    </antcall>
615  
616 <    <!-- Version is kept in a separate file -->
617 <    <loadfile property="version" srcFile="version.properties"/>
320 <    <echo>Building JSR-166 version ${version}</echo>
321 <    <echo>java.home is ${java.home}</echo>
616 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
617 >    <antcall target="clean"/>
618  
619    </target>
620  
621  
326  <target name="init-jar">
622  
623 <    <mkdir dir="${build.lib.dir}"/>
623 >  <target name="configure-compiler">
624 >    <fail message="ant version too old">
625 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
626 >    </fail>
627  
628 <  </target>
628 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
629  
630 +    <condition property="warnunchecked.arg" value="${unchecked.option}">
631 +      <istrue value="${build.warnunchecked}"/>
632 +    </condition>
633  
634 <  <target name="native-jar"
334 <          depends="compile"
335 <          unless="build.emulation.true">
634 >    <property name="warnunchecked.arg" value=""/>
635  
636 <    <jar destfile="${product.jar}">
637 <      <fileset dir="${build.classes.dir}"/>
638 <    </jar>
636 >
637 >    <!-- Common options in javac invocations -->
638 >    <property name="build.args" value="${warnunchecked.arg}"/>
639  
640    </target>
641  
642  
344  <target name="compile-emulation"
345          depends="init, configure-compiler"
346          if="build.emulation.true">
643  
644 <    <mkdir dir="${build.emulation.dir}"/>
644 >  <!-- Various demos and test programs -->
645 >
646 >
647 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
648 >  <target name="loops" depends="configure-compiler">
649  
650 <    <javac srcdir="${emulation.src.dir}"
651 <          destdir="${build.emulation.dir}"
650 >    <mkdir dir="${build.loops.dir}"/>
651 >
652 >    <javac srcdir="${loops.src.dir}"
653 >          destdir="${build.loops.dir}"
654              debug="${build.debug}"
655         debuglevel="${build.debuglevel}"
656        deprecation="${build.deprecation}"
657             source="${build.sourcelevel}"
658 +           target="${build.sourcelevel}"
659 +         encoding="ASCII"
660               fork="true">
661  
662 <      <compilerarg    line="${gjc.args}"/>
663 < <!--
664 <      <bootclasspath refid="compile.bootclasspath"/>
361 < -->
662 >      <compilerarg line="${build.args}"/>
663 >      <classpath refid="loops.classpath"/>
664 >      <compilerarg value="-XDignore.symbol.file=true"/>
665  
666      </javac>
667  
668 +    <java classname="ALoops" fork="true">
669 +      <classpath refid="loops.classpath"/>
670 +    </java>
671    </target>
672  
673  
674 <  <target name="emulation-jar"
675 <          depends="compile-emulation"
370 <          if="build.emulation.true">
674 >  <target name="compile-test-loops" depends="jar"
675 >          description="Compiles all the perf tests in src/test/loops">
676  
677 +    <mkdir dir="${build.dir}/test/loops"/>
678  
679 <    <jar destfile="${product.jar}" duplicate="add">
680 <      <fileset dir="${build.classes.dir}">
681 <        <patternset refid="atomic.exclusion"/>
682 <        <patternset refid="unsafe.exclusion"/>
683 <      </fileset>
684 <      <fileset dir="${build.emulation.dir}"/>
685 <    </jar>
686 <
679 >    <javac srcdir="${basedir}/src/test/loops"
680 >           destdir="${build.dir}/test/loops"
681 >           debug="${build.debug}"
682 >           debuglevel="${build.debuglevel}"
683 >           deprecation="${build.deprecation}"
684 >           includeAntRuntime="false"
685 >           includeJavaRuntime="false"
686 >           encoding="ASCII"
687 >           executable="${build.main.javac}"
688 >           fork="true">
689 >
690 >      <include name="*.java"/>
691 >      <compilerarg value="-XDignore.symbol.file=true"/>
692 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
693 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
694 >      <compilerarg line="${build.args}"/>
695 >    </javac>
696    </target>
697  
698  
699 <  <target name="dist-jar"
385 <          depends="clean, jar">
699 >  <!-- jsr166 4jdk8 -->
700  
701 <    <copy file="${product.jar}" todir="${dist.dir}"/>
701 >  <target name="4jdk8compile"
702 >          depends="configure-compiler"
703 >          description="Compiles src/jdk8 sources, targeting jdk8">
704 >
705 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
706  
707 +    <javac srcdir="${4jdk8src.dir}"
708 +           destdir="${build.4jdk8.classes.dir}"
709 +           debug="${build.debug}"
710 +           debuglevel="${build.debuglevel}"
711 +           deprecation="${build.deprecation}"
712 +           source="8"
713 +           target="8"
714 +           classpath=""
715 +           bootclasspath="${bootclasspath8}"
716 +           includeAntRuntime="false"
717 +           includeJavaRuntime="false"
718 +           encoding="ASCII"
719 +           executable="${javac8}"
720 +           fork="true">
721 +      <include name="**/*.java"/>
722 +      <compilerarg value="-Xprefer:source"/>
723 +      <compilerarg value="-XDignore.symbol.file=true"/>
724 +      <compilerarg value="-Xlint:all"/>
725 +      <compilerarg value="-Werror"/>
726 +      <compilerarg line="${build.args}"/>
727 +    </javac>
728    </target>
729  
730 +  <target name="4jdk8doclint"
731 +          depends="configure-compiler"
732 +          description="Finds doclint warnings">
733  
734 <  <target name="compile-ant-filter"
393 <          depends="init">
734 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
735  
736 <    <mkdir dir="${build.ant.dir}"/>
736 >    <javac srcdir="${4jdk8src.dir}"
737 >           destdir="${build.4jdk8.classes.dir}"
738 >           debug="${build.debug}"
739 >           debuglevel="${build.debuglevel}"
740 >           deprecation="${build.deprecation}"
741 >           source="8"
742 >           target="8"
743 >           classpath=""
744 >           bootclasspath="${bootclasspath8}"
745 >           includeAntRuntime="false"
746 >           includeJavaRuntime="false"
747 >           encoding="ASCII"
748 >           executable="${javac8}"
749 >           fork="true">
750 >      <include name="**/*.java"/>
751 >      <compilerarg value="-Xprefer:source"/>
752 >      <compilerarg value="-XDignore.symbol.file=true"/>
753 >      <compilerarg value="-Xlint:all"/>
754 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
755 >      <compilerarg line="${build.args}"/>
756 >    </javac>
757 >  </target>
758  
397    <javac srcdir="${ant.src.dir}"
398          destdir="${build.ant.dir}"
399           source="1.4"
400    />
759  
760 +  <target name="4jdk8jar"
761 +          depends="4jdk8compile"
762 +          description="Builds library jar from compiled sources">
763 +
764 +    <jar destfile="${4jdk8product.jar}">
765 +      <fileset dir="${build.4jdk8.classes.dir}"/>
766 +      <manifest>
767 +        <attribute name="Built-By" value="${user.name}"/>
768 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
769 +      </manifest>
770 +    </jar>
771    </target>
772  
773  
774 <  <target name="filter-src"
775 <          depends="compile-ant-filter">
776 <
777 <    <mkdir dir="${build.filter.src.dir}"/>
774 >  <target name="4jdk8-tck"
775 >          depends="4jdk8jar"
776 >          description="Runs tck tests for jsr166-4jdk8 directly">
777 >
778 >    <run-tck-tests
779 >      target="8"
780 >      workdir="${build.4jdk8.dir}"
781 >      classes="${4jdk8product.jar}">
782 >      <javac-elements>
783 >        <!-- JDK9+ test classes -->
784 >        <exclude name="*9Test.java"/>
785 >        <exclude name="*10Test.java"/>
786 >        <compilerarg value="-Werror"/>
787 >      </javac-elements>
788 >    </run-tck-tests>
789 >  </target>
790  
410    <copy todir="${build.filter.src.dir}">
411      <fileset dir="${src.dir}">
412        <include name="**/*.html"/>
413      </fileset>
414    </copy>
791  
792 <    <copy todir="${build.filter.src.dir}">
793 <      <fileset dir="${src.dir}">
794 <        <exclude name="**/*.html"/>
795 <        <patternset refid="unsafe.exclusion"/>
796 <      </fileset>
797 <      <filterchain>
792 >  <target name="4jdk8-jtreg"
793 >          depends="4jdk8jar"
794 >          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
795 >    <run-jtreg-tests
796 >       target="8"
797 >       workdir="${build.4jdk8.dir}"
798 >       classes="${4jdk8product.jar}"/>
799 >  </target>
800  
423        <!--
424         # This filter gets rid of angle-bracketed type parameters
425         # so that javadoc can run on the result. The following
426         # heuristic seems to work:
427         #
428         # For all lines not starting with space(s)-asterisk-space(s),
429         #   replace <something> with a space, where there may be more
430         #   than one right angle bracket at the end, and "something"
431         #   must not contain parens or pipes. (This may need some
432         #   tweaking.)
433         -->
434
435        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
436                      classpath="${build.ant.dir}">
437          <param name="notmatching" value="^\s+\*\s.*$"/>
438          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
439          <param name="replacement" value=" "/>
440        </filterreader>
441
442
443        <!--
444         # This filter uncomments lines beginning with "//@" so that
445         # javadoc can see imports that are needed to resolve links
446         # but that shouldn't be in the compiled code.
447         -->
448
449        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
450                      classpath="${build.ant.dir}">
451          <param name="matching"    value="^//@.*$"/>
452          <param name="pattern"     value="^//@"/>
453          <param name="replacement" value=""/>
454        </filterreader>
455      </filterchain>
456    </copy>
801  
802 +  <target name="4jdk8-test"
803 +          depends="4jdk8-tck, 4jdk8-jtreg"
804 +          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
805 +
806 +
807 +  <target name="4jdk8docs"
808 +          description="Builds javadocs for src/jdk8 to dist dir">
809 +
810 +    <delete dir="${4jdk8docs.dir}"/>
811 +    <mkdir dir="${4jdk8docs.dir}"/>
812 +
813 +    <javadoc destdir="${4jdk8docs.dir}"
814 +             packagenames="none"
815 +             link="${java8.api.url}"
816 +             overview="${4jdk8src.dir}/intro.html"
817 +             access="${build.javadoc.access}"
818 +             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
819 +             classpath=""
820 +             source="8"
821 +             executable="${javadoc8}"
822 +             failonerror = "true">
823 +      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
824 +        <include name="**/*.java"/>
825 +      </fileset>
826 +      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
827 +      <arg value="-XDignore.symbol.file=true"/>
828 +      <arg value="-tag"/>
829 +      <arg value="${javadoc.jls.option}"/>
830 + <!-- @apiNote currently unused -->
831 + <!--       <arg value="-tag"/> -->
832 + <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833 +      <arg value="-tag"/>
834 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
835 +      <arg value="-tag"/>
836 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
837 +    </javadoc>
838    </target>
839  
840  
841 +  <target name="4jdk8dist"
842 +          depends="4jdk8dist-jar, 4jdk8dist-docs"
843 +          description="Puts all distributable products in single hierarchy"/>
844  
845  
846 <  <target name="filter-doccheck"
847 <          depends="filter-src">
848 <
849 <    <mkdir dir="${build.filter.doccheck.dir}"/>
846 >  <target name="4jdk8clean"
847 >          description="Removes all 4jdk8 build products">
848 >    <delete dir="${build.4jdk8.dir}"/>
849 >  </target>
850  
468    <copy todir="${build.filter.doccheck.dir}">
469      <fileset dir="${build.filter.src.dir}">
470        <include name="**/*.html"/>
471      </fileset>
472    </copy>
851  
852 <    <property name="generic.declarations"
853 <             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 {}"
854 <    />
855 <
478 <    <copy todir="${build.filter.doccheck.dir}">
479 <      <fileset dir="${build.filter.src.dir}">
480 <        <exclude name="**/*.html"/>
481 <      </fileset>
482 <      <filterchain>
483 <        <!--
484 <         # These two filters try to make the source look like
485 <         # something that doccheck can process. The first removes
486 <         # -source 1.4 assertions and the second adds in a bunch
487 <         # of single letter public nested marker interfaces so that
488 <         # the generic type parameters are recognized.
489 <         -->
490 <
491 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
492 <                      classpath="${build.ant.dir}">
493 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
494 <          <param name="pattern"     value="assert"/>
495 <          <param name="replacement" value="//assert"/>
496 <        </filterreader>
497 <
498 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
499 <                      classpath="${build.ant.dir}">
500 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
501 <          <param name="pattern"     value="$"/>
502 <          <param name="replacement" value=" ${generic.declarations}"/>
503 <        </filterreader>
852 >  <target name="4jdk8dist-jar"
853 >          depends="4jdk8clean, 4jdk8jar">
854 >    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
855 >  </target>
856  
505      </filterchain>
506    </copy>
857  
858 +  <target name="4jdk8dist-docs"
859 +          depends="4jdk8clean, 4jdk8docs">
860 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
861    </target>
862  
863  
864 <  <target name="compile-tests"
512 <          depends="jar">
864 >  <!-- jsr166 4jdk7 (no longer maintained) -->
865  
866 <    <mkdir dir="${build.testcases.dir}"/>
866 >  <target name="4jdk7compile" depends="configure-compiler">
867 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
868  
869 < <!--
870 <    <echo>javac ${gjc.args}</echo>
871 <    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
872 <    <echo>classpath="${test.classpath}"</echo>
873 < -->
869 >    <javac srcdir="${4jdk7src.dir}"
870 >           destdir="${build.4jdk7.classes.dir}"
871 >           debug="${build.debug}"
872 >           debuglevel="${build.debuglevel}"
873 >           deprecation="${build.deprecation}"
874 >           source="6"
875 >           target="6"
876 >           classpath=""
877 >           bootclasspath="${bootclasspath6}"
878 >           includeAntRuntime="false"
879 >           includeJavaRuntime="false"
880 >           encoding="ASCII"
881 >           executable="${javac7}"
882 >           fork="true">
883  
884 <    <javac srcdir="${test.src.dir}"
885 <          destdir="${build.testcases.dir}"
886 <            debug="${build.debug}"
887 <       debuglevel="${build.debuglevel}"
888 <      deprecation="${build.deprecation}"
889 <           source="${build.sourcelevel}"
890 <             fork="true">
884 >      <include name="**/*.java"/>
885 >      <compilerarg value="-Xprefer:source"/>
886 >      <compilerarg value="-XDignore.symbol.file=true"/>
887 >      <compilerarg value="-Xlint:all"/>
888 >      <compilerarg value="-Werror"/>
889 >      <compilerarg line="${build.args}"/>
890 >    </javac>
891 >  </target>
892  
893 <      <compilerarg    line="${gjc.args}"/>
894 < <!--      
532 <      <bootclasspath refid="test.compile.bootclasspath"/>
533 < -->      
534 <      <classpath     refid="test.classpath"/>
535 <      
536 <      <include name="java/**"/>
537 <      <include name="jsr166/**"/>
893 >  <target name="4jdk7doclint" depends="configure-compiler">
894 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
895  
896 +    <javac srcdir="${4jdk7src.dir}"
897 +           destdir="${build.4jdk7.classes.dir}"
898 +           debug="${build.debug}"
899 +           debuglevel="${build.debuglevel}"
900 +           deprecation="${build.deprecation}"
901 +           source="6"
902 +           target="6"
903 +           classpath=""
904 +           bootclasspath="${bootclasspath6}"
905 +           includeAntRuntime="false"
906 +           includeJavaRuntime="false"
907 +           encoding="ASCII"
908 +           executable="${javac8}"
909 +           fork="true">
910 +
911 +      <include name="**/*.java"/>
912 +      <compilerarg value="-Xprefer:source"/>
913 +      <compilerarg value="-XDignore.symbol.file=true"/>
914 +      <compilerarg value="-Xlint:all"/>
915 +      <compilerarg value="-Xdoclint:all/protected"/>
916 +      <compilerarg line="${build.args}"/>
917      </javac>
918 +  </target>
919  
920 +  <target name="4jdk7jar" depends="4jdk7compile">
921 +    <jar destfile="${4jdk7product.jar}">
922 +      <fileset dir="${build.4jdk7.classes.dir}"/>
923 +      <manifest>
924 +        <attribute name="Built-By" value="${user.name}"/>
925 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
926 +      </manifest>
927 +    </jar>
928    </target>
929  
930 +  <target name="4jdk7-tck" depends="4jdk7jar">
931 +    <run-tck-tests
932 +      target="7"
933 +      workdir="${build.4jdk7.dir}"
934 +      classes="${4jdk7product.jar}">
935 +      <javac-elements>
936 +        <!-- JDK8+ test classes -->
937 +        <exclude name="*8Test.java"/>
938 +        <exclude name="*9Test.java"/>
939 +        <exclude name="*10Test.java"/>
940 +        <exclude name="DoubleAccumulatorTest.java"/>
941 +        <exclude name="DoubleAdderTest.java"/>
942 +        <exclude name="LongAccumulatorTest.java"/>
943 +        <exclude name="LongAdderTest.java"/>
944 +        <exclude name="CompletableFutureTest.java"/>
945 +        <exclude name="SplittableRandomTest.java"/>
946 +        <exclude name="StampedLockTest.java"/>
947 +        <exclude name="SubmissionPublisherTest.java"/>
948 +        <compilerarg value="-Werror"/>
949 +      </javac-elements>
950 +    </run-tck-tests>
951 +  </target>
952  
953 <  <target name="run-tests"
954 <          depends="compile-tests">
953 >  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
954 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
955  
956 <    <!-- May be overridden by user.properties -->
957 <    <property name="testcase" value="*"/>
956 >    <junit printsummary="true"
957 >           showoutput="true"
958 >           errorProperty="junit.failed"
959 >           failureProperty="junit.failed"
960 >           includeantruntime="true"
961 >           jvm="${java7}"
962 >           fork="true">
963  
964 <    <mkdir dir="${build.reports.dir}"/>
964 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
965 >      <jvmarg value="-server"/>
966  
967 <    <junit printsummary="true"
968 <             showoutput="true"
969 <          errorProperty="junit.failed"
970 <        failureProperty="junit.failed"
556 <                    dir="${build.reports.dir}"
557 <                   fork="true">
558 <
559 <      <jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/>
560 <
561 <      <formatter type="xml"/>
562 <
563 <      <batchtest todir="${build.reports.dir}">
564 <        <fileset dir="${test.src.dir}">
565 <          <include name="java/**/${testcase}Test.java"/>
566 <          <include name="jsr166/**/${testcase}Test.java"/>
567 <        </fileset>
568 <      </batchtest>
967 >      <classpath>
968 >        <pathelement location="${junit.jar}"/>
969 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
970 >      </classpath>
971  
972 <    </junit>
972 >      <formatter type="brief"/>
973  
974 +      <test name="${jsr166.tckTestClass}" haltonfailure="no">
975 +      </test>
976 +    </junit>
977    </target>
978  
979 +  <target name="4jdk7-jtreg" depends="4jdk7jar">
980 +    <run-jtreg-tests
981 +       target="7"
982 +       workdir="${build.4jdk7.dir}"
983 +       classes="${4jdk7product.jar}"/>
984 +  </target>
985 +
986 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
987 +
988 +  <target name="4jdk7docs">
989 +    <delete dir="${4jdk7docs.dir}"/>
990 +    <mkdir dir="${4jdk7docs.dir}"/>
991 +
992 +    <javadoc destdir="${4jdk7docs.dir}"
993 +             packagenames="none"
994 +             link="${java7.api.url}"
995 +             overview="${4jdk7src.dir}/intro.html"
996 +             access="${build.javadoc.access}"
997 +             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
998 +             classpath=""
999 +             executable="${javadoc7}"
1000 +             failonerror = "true">
1001 +      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1002 +        <include name="**/*.java"/>
1003 +      </fileset>
1004 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1005 +      <arg value="-XDignore.symbol.file=true"/>
1006 +    </javadoc>
1007 +  </target>
1008  
1009 <  <target name="report-tests"
576 <          depends="run-tests">
1009 >  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1010  
1011 <    <!-- Sets junit.report.format to frames if redirection is present,
1012 <         otherwise sets it to noframes. -->
1013 <    <available property="junit.report.format"
581 <                  value="frames"
582 <              classname="org.apache.xalan.lib.Redirect"
583 <    />
584 <    <property name="junit.report.format" value="noframes"/>
585 <
586 <    <junitreport todir="${build.reports.dir}">
587 <      <fileset dir="${build.reports.dir}">
588 <        <include name="TEST-*.xml"/>
589 <      </fileset>
590 <      <report styledir="${stylesheet.dir}"
591 <                format="${junit.report.format}"
592 <                 todir="${build.reports.dir}"
593 <      />
594 <    </junitreport>
1011 >  <target name="4jdk7clean">
1012 >    <delete dir="${build.4jdk7.dir}"/>
1013 >  </target>
1014  
1015 <    <fail message="Test Cases Failed" if="junit.failed"/>
1015 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1016 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1017 >  </target>
1018  
1019 +  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1020 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1021    </target>
1022  
1023  
1024 <  <target name="configure-compiler">
1024 >  <!-- jsr166x (no longer maintained) -->
1025  
1026 <    <property name="gjc.version"
1027 <             value="2.2"/>
1026 >  <target name="jsr166xcompile" depends="configure-compiler">
1027 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
1028  
1029 <    <condition property="novariance.arg" value="-novariance">
1030 <      <and>
1031 <        <equals arg1="${gjc.version}" arg2="2.0"/>
1032 <        <or>
1033 <          <not><isset property="gjc.novariance"/></not>
1034 <          <istrue value="${gjc.novariance}"/>
1035 <        </or>
1036 <      </and>
1037 <    </condition>
1029 >    <javac srcdir="${topsrc.dir}"
1030 >           destdir="${build.jsr166x.classes.dir}"
1031 >           debug="${build.debug}"
1032 >           debuglevel="${build.debuglevel}"
1033 >           deprecation="${build.deprecation}"
1034 >           classpath=""
1035 >           bootclasspath="${bootclasspath6}"
1036 >           source="5"
1037 >           target="5"
1038 >           includeAntRuntime="false"
1039 >           includeJavaRuntime="false"
1040 >           encoding="ASCII"
1041 >           executable="${javac7}"
1042 >           fork="true">
1043 >      <include name="jsr166x/**/*.java"/>
1044 >      <compilerarg value="-XDignore.symbol.file=true"/>
1045 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1046 >      <compilerarg value="-Werror"/>
1047 >      <compilerarg line="${build.args}"/>
1048 >    </javac>
1049 >  </target>
1050  
1051 <    <property name="novariance.arg"
1052 <             value=""/>
1051 >  <target name="jsr166xjar" depends="jsr166xcompile">
1052 >    <jar destfile="${jsr166x.jar}">
1053 >      <fileset dir="${build.jsr166x.classes.dir}"/>
1054 >      <manifest>
1055 >        <attribute name="Built-By" value="${user.name}"/>
1056 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1057 >      </manifest>
1058 >    </jar>
1059 >  </target>
1060  
1061 <    <property name="gjc.dir"
1062 <             value="${lib.dir}/gjc"/>
1061 >  <target name="jsr166xdocs">
1062 >    <delete dir="${jsr166xdocs.dir}"/>
1063 >    <mkdir dir="${jsr166xdocs.dir}"/>
1064 >
1065 >    <javadoc destdir="${jsr166xdocs.dir}"
1066 >             packagenames="jsr166x.*"
1067 >             link="${java.api.url}"
1068 >             access="${build.javadoc.access}"
1069 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1070 >             bootclasspath="${bootclasspath6}"
1071 >             source="5"
1072 >             executable="${javadoc7}"
1073 >             failonerror = "true">
1074 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1075 >      <arg value="-XDignore.symbol.file=true"/>
1076 >    </javadoc>
1077 >  </target>
1078  
1079 <    <property name="javac.jar"
623 <          location="${gjc.dir}/${gjc.version}/javac.jar"/>
1079 >  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1080  
1081 <    <property name="collect.jar"
1082 <          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
1081 >  <target name="jsr166xclean">
1082 >    <delete dir="${build.jsr166x.dir}"/>
1083 >  </target>
1084  
1085 < <!--
1086 <    <property name="unchecked.option" value="-warnunchecked"/>
1087 < -->
1085 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1086 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1087 >  </target>
1088  
1089 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
1089 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1090 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1091 >  </target>
1092  
634    <condition property="warnunchecked.arg" value="${unchecked.option}">
635      <istrue value="${gjc.warnunchecked}"/>
636    </condition>
1093  
1094 <    <property name="warnunchecked.arg" value=""/>
639 <    
640 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
641 <      <istrue value="${build.nothreads}"/>
642 <    </condition>
1094 >  <!-- jsr166y (no longer maintained) -->
1095  
1096 +  <target name="jsr166ycompile" depends="configure-compiler">
1097 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
1098  
1099 <    <!--
1100 <     ! Bootclasspath munging for source compilation.
1101 <     -->
1099 >    <javac srcdir="${topsrc.dir}"
1100 >           destdir="${build.jsr166y.classes.dir}"
1101 >           debug="${build.debug}"
1102 >           debuglevel="${build.debuglevel}"
1103 >           deprecation="${build.deprecation}"
1104 >           source="6"
1105 >           target="6"
1106 >           classpath=""
1107 >           bootclasspath="${bootclasspath6}"
1108 >           includeAntRuntime="false"
1109 >           includeJavaRuntime="false"
1110 >           encoding="ASCII"
1111 >           executable="${javac7}"
1112 >           fork="true">
1113  
1114 <    <path id="pre.bootclasspath">
1115 < <!--
1116 <      <pathelement location="${javac.jar}"/>
1117 < -->
1118 <    </path>
1114 >      <include name="jsr166y/**/*.java"/>
1115 >      <compilerarg value="-XDignore.symbol.file=true"/>
1116 >      <compilerarg value="-Xlint:all"/>
1117 >      <compilerarg value="-Werror"/>
1118 >      <compilerarg line="${build.args}"/>
1119 >    </javac>
1120 >  </target>
1121  
1122 <    <path id="compile.bootclasspath">
1123 <      <pathelement location="${build.classes.dir}"/>
1124 < <!--      
1125 <      <pathelement location="${collect.jar}"/>
1126 < -->
1127 <      <pathelement location="${rt.jar}"/>
1128 <    </path>
1122 >  <target name="jsr166yjar" depends="jsr166ycompile">
1123 >    <jar destfile="${jsr166y.jar}" index="true">
1124 >      <fileset dir="${build.jsr166y.classes.dir}"/>
1125 >      <manifest>
1126 >        <attribute name="Built-By" value="${user.name}"/>
1127 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1128 >      </manifest>
1129 >    </jar>
1130 >  </target>
1131 >
1132 >  <target name="jsr166ydocs">
1133 >    <delete dir="${jsr166ydocs.dir}"/>
1134 >    <mkdir dir="${jsr166ydocs.dir}"/>
1135 >
1136 >    <javadoc destdir="${jsr166ydocs.dir}"
1137 >             packagenames="jsr166y.*"
1138 >             link="${java.api.url}"
1139 >             access="${build.javadoc.access}"
1140 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1141 >             bootclasspath="${bootclasspath6}"
1142 >             source="6"
1143 >             executable="${javadoc7}"
1144 >             failonerror = "true">
1145 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1146 >      <arg value="-XDignore.symbol.file=true"/>
1147 >    </javadoc>
1148 >  </target>
1149  
1150 <    <!-- Flatten paths into platform-appropriate strings -->
664 <    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
665 <    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
1150 >  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1151  
1152 +  <target name="jsr166yclean">
1153 +    <delete dir="${build.jsr166y.dir}"/>
1154 +  </target>
1155  
1156 <    <!-- Common options in javac invocations -->
1157 < <!--
1158 <    <property name="gjc.args"
671 <             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
672 <    />
673 < -->
674 <    <property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/>
1156 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1157 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1158 >  </target>
1159  
1160 +  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1161 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1162    </target>
1163  
1164  
1165 <  <target name="prepare-src"
680 <          depends="configure-compiler"
681 <          if="prepare.src.dir">
1165 >  <!-- extra166y (no longer maintained) -->
1166  
1167 <    <mkdir dir="${prepare.src.dir}"/>
1168 <    <copy todir="${prepare.src.dir}">
1169 <      <fileset dir="${src.dir}">
1170 <        <exclude name="java/lang/**"/>
1171 <      </fileset>
1172 <    </copy>
1167 >  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1168 >    <mkdir dir="${build.extra166y.classes.dir}"/>
1169 >
1170 >    <javac srcdir="${topsrc.dir}"
1171 >           destdir="${build.extra166y.classes.dir}"
1172 >           debug="${build.debug}"
1173 >           debuglevel="${build.debuglevel}"
1174 >           deprecation="${build.deprecation}"
1175 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1176 >           classpath=""
1177 >           source="6"
1178 >           target="6"
1179 >           includeAntRuntime="false"
1180 >           includeJavaRuntime="false"
1181 >           encoding="ASCII"
1182 >           executable="${javac7}"
1183 >           fork="true">
1184  
1185 +      <include name="extra166y/**/*.java"/>
1186 +      <compilerarg value="-XDignore.symbol.file=true"/>
1187 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1188 +      <compilerarg value="-Werror"/>
1189 +      <compilerarg line="${build.args}"/>
1190 +    </javac>
1191    </target>
1192  
1193 +  <target name="extra166yjar" depends="extra166ycompile">
1194 +    <jar destfile="${extra166y.jar}" index="true">
1195 +      <fileset dir="${build.extra166y.classes.dir}"/>
1196 +      <manifest>
1197 +        <attribute name="Built-By" value="${user.name}"/>
1198 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1199 +      </manifest>
1200 +    </jar>
1201 +  </target>
1202  
1203 <  <target name="configure-emulation">
1203 >  <target name="extra166ydocs">
1204 >    <delete dir="${extra166ydocs.dir}"/>
1205 >    <mkdir dir="${extra166ydocs.dir}"/>
1206 >
1207 >    <javadoc destdir="${extra166ydocs.dir}"
1208 >             packagenames="extra166y.*"
1209 >             link="${java.api.url}"
1210 >             access="${build.javadoc.access}"
1211 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1212 >             bootclasspath="${bootclasspath6}"
1213 >             source="6"
1214 >             executable="${javadoc7}">
1215 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1216 >      <arg value="-XDignore.symbol.file=true"/>
1217 >    </javadoc>
1218 >  </target>
1219  
1220 <    <condition property="build.emulation.true">
696 <      <istrue value="${build.emulation}"/>
697 <    </condition>
1220 >  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1221  
1222 +  <target name="extra166yclean">
1223 +    <delete dir="${build.extra166y.dir}"/>
1224    </target>
1225  
1226 +  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1227 +    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1228 +  </target>
1229  
1230 <  <target name="configure-tests"
1231 <       depends="configure-compiler">
1230 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1231 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1232 >  </target>
1233  
705    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
706    <available property="junit.available"
707               classname="junit.framework.Protectable"/>
708
709    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
710          unless="junit.available"/>
711
712    <!-- Xalan -->
713    <available property="xalan.available"
714               classname="org.apache.xalan.Version"/>
1234  
1235 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
717 <          unless="xalan.available"/>
1235 >  <!-- jsr166e (no longer maintained) -->
1236  
1237 +  <property name="build.jsr166e.java.version" value="6"/>
1238 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1239  
1240 <    <!--
1241 <     ! Bootclasspath munging for testing, so JUnit can test our local
722 <     ! modifications to java.*.
723 <     -->
724 <
725 <    <path id="test.classpath">
726 <      <pathelement location="${product.jar}"/>
727 <      <pathelement location="${rt.jar}"/>
728 <      <pathelement location="${build.testcases.dir}"/>
729 <      <pathelement location="${junit.jar}"/>
730 <    </path>
1240 >  <target name="jsr166ecompile" depends="configure-compiler">
1241 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1242  
1243 <    <path id="test.compile.bootclasspath">
1244 <      <pathelement location="${javac.jar}"/>
1245 <      <pathelement location="${collect.jar}"/>
1246 <      <pathelement location="${rt.jar}"/>
1247 <    </path>
1243 >    <javac srcdir="${topsrc.dir}"
1244 >           destdir="${build.jsr166e.classes.dir}"
1245 >           debug="${build.debug}"
1246 >           debuglevel="${build.debuglevel}"
1247 >           deprecation="${build.deprecation}"
1248 >           source="${build.jsr166e.java.version}"
1249 >           target="${build.jsr166e.java.version}"
1250 >           classpath=""
1251 >           includeAntRuntime="false"
1252 >           includeJavaRuntime="false"
1253 >           executable="${build.jsr166e.javac}"
1254 >           fork="true">
1255  
1256 <    <path id="test.run.bootclasspath">
1257 < <!--    
1258 <      <pathelement location="${javac.jar}"/>
1259 < -->      
1260 <      <path refid="test.classpath"/>
1261 <    </path>
1256 >      <include name="jsr166e/**/*.java"/>
1257 >      <compilerarg value="-XDignore.symbol.file=true"/>
1258 >      <compilerarg value="-Xlint:all"/>
1259 >      <compilerarg value="-Werror"/>
1260 >      <compilerarg line="${build.args}"/>
1261 >    </javac>
1262 >  </target>
1263  
1264 <    <!-- Flatten test classpaths into platform-appropriate strings -->
1265 <    <property name="test.classpath"             refid="test.classpath"/>
747 <    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
748 <    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
1264 >  <target name="jsr166edoclint">
1265 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1266  
1267 +    <javac srcdir="${topsrc.dir}"
1268 +           destdir="${build.jsr166e.classes.dir}"
1269 +           debug="${build.debug}"
1270 +           debuglevel="${build.debuglevel}"
1271 +           deprecation="${build.deprecation}"
1272 +           source="${build.jsr166e.java.version}"
1273 +           target="${build.jsr166e.java.version}"
1274 +           classpath=""
1275 +           bootclasspath="${bootclasspath6}"
1276 +           includeAntRuntime="false"
1277 +           includeJavaRuntime="false"
1278 +           executable="${javac8}"
1279 +           fork="true">
1280 +
1281 +      <include name="jsr166e/**/*.java"/>
1282 +      <compilerarg value="-XDignore.symbol.file=true"/>
1283 +      <compilerarg value="-Xlint:all"/>
1284 +      <compilerarg value="-Werror"/>
1285 +      <compilerarg value="-Xdoclint:all/protected"/>
1286 +    </javac>
1287    </target>
1288  
1289 +  <target name="jsr166ejar" depends="jsr166ecompile">
1290 +    <jar destfile="${jsr166e.jar}" index="true">
1291 +      <fileset dir="${build.jsr166e.classes.dir}"/>
1292 +      <manifest>
1293 +        <attribute name="Built-By" value="${user.name}"/>
1294 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1295 +      </manifest>
1296 +    </jar>
1297 +  </target>
1298  
1299 +  <target name="jsr166edocs">
1300 +    <delete dir="${jsr166edocs.dir}"/>
1301 +    <mkdir dir="${jsr166edocs.dir}"/>
1302 +
1303 +    <javadoc destdir="${jsr166edocs.dir}"
1304 +             packagenames="jsr166e.*"
1305 +             link="${java.api.url}"
1306 +             access="${build.javadoc.access}"
1307 +             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1308 +             source="${build.jsr166e.java.version}"
1309 +             executable="${javadoc7}"
1310 +             failonerror = "true">
1311 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1312 +      <arg value="-XDignore.symbol.file=true"/>
1313 +    </javadoc>
1314 +  </target>
1315  
1316 <  <!-- Anthill targets -->
1317 <
1318 <  <target name="anthill-build">
1319 <  
1320 <    <!-- Override this in user.properties -->
1321 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
1322 <    
1323 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
762 <      <arg value="-Xmx256000000"/>
763 <      <!-- classpath of new JVM -->
764 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
765 <      <!-- location of Ant home directory -->
766 <      <arg value="-Dant.home=${ant.home}"/>
767 <      <!-- the Ant main class -->
768 <      <arg value="org.apache.tools.ant.Main"/>
769 <      <!-- The build file -->
770 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
771 <      <!-- the target to build on the new Ant instance -->
772 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
773 <      <arg value="do-anthill-build"/>
774 <    </exec>
775 <  </target>
776 <  
777 <  <target name="do-anthill-build"
778 <          depends="jar, test, docs, dist-docs"/>
1316 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1317 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1318 >    <run-tck-tests
1319 >      tck.src.dir="${test.src.dir}/tck-jsr166e"
1320 >      target="${build.jsr166e.java.version}"
1321 >      workdir="${build.jsr166e.dir}"
1322 >      classes="${jsr166e.jar}"/>
1323 >  </target>
1324  
1325 <  <target name="anthill-publish">
1325 >  <target name="jsr166e-tck">
1326  
1327 <    <copy todir="${deployDir}/docs/private">
1328 <      <fileset dir="${build.javadocs.dir}"/>
1329 <    </copy>
1327 > <!--     <antcall target="clean"/> -->
1328 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1329 > <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1330 > <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1331 > <!--     </antcall> -->
1332  
1333 <    <copy todir="${deployDir}/docs/public">
1334 <      <fileset dir="${dist.javadocs.dir}"/>
1335 <    </copy>
1333 >    <antcall target="clean"/>
1334 >    <antcall target="jsr166e-tck-one-java-version">
1335 >      <param name="build.jsr166e.java.version" value="7"/>
1336 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1337 >    </antcall>
1338  
1339 <    <copy tofile="${deployDir}/index.html"
1340 <          file="${basedir}/etc/anthill-index.html"/>
1339 >    <antcall target="clean"/>
1340 >    <antcall target="jsr166e-tck-one-java-version">
1341 >      <param name="build.jsr166e.java.version" value="6"/>
1342 >      <param name="build.jsr166e.javac" value="${javac6}"/>
1343 >    </antcall>
1344 >  </target>
1345  
1346 <    <copy todir="${deployDir}/notes">
1347 <      <fileset dir="${basedir}/etc/notes"/>
1348 <    </copy>
1346 >  <target name="jsr166e-test" depends="jsr166e-tck"/>
1347 >
1348 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1349  
1350 +  <target name="jsr166eclean">
1351 +    <delete dir="${build.jsr166e.dir}"/>
1352    </target>
1353  
1354 +  <target name="jsr166edist-jar"
1355 +          depends="jsr166eclean, jsr166ejar">
1356 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1357 +  </target>
1358  
1359 <  <target name="ng" depends="test">
1360 <    <java classname="SuperfluousAbstract" fork="true">
1359 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1360 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1361 >  </target>
1362  
803      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
1363  
1364 <    </java>
1364 > <!-- Find buglets that can be detected by static build tools -->
1365 >
1366 >  <target name="lint">
1367 >    <antcall target="dists">
1368 >      <param name="build.javadoc.access" value="public"/>
1369 >    </antcall>
1370 >  </target>
1371 >
1372 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1373 >  <target name="lint-private">
1374 >    <antcall target="dist">
1375 >      <param name="build.javadoc.access" value="private"/>
1376 >    </antcall>
1377    </target>
1378  
1379  
1380 + <!-- ==============================================================
1381 +  Experimental errorprone support - http://errorprone.info
1382 + =================================================================== -->
1383 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1384 +  <target name="errorprone"
1385 +          depends="clean, configure-compiler"
1386 +          description="Run errorprone over jsr166 source code (experimental)">
1387 +
1388 +    <local name="destdir"/>
1389 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1390 +    <mkdir dir="${destdir}"/>
1391 +
1392 +    <javac srcdir="${src.dir}"
1393 +           destdir="${destdir}"
1394 +           debug="${build.debug}"
1395 +           debuglevel="${build.debuglevel}"
1396 +           deprecation="${build.deprecation}"
1397 +           classpath=""
1398 +           includeAntRuntime="false"
1399 +           includeJavaRuntime="false"
1400 +           encoding="ASCII"
1401 +           executable="${build.main.javac}"
1402 +           fork="true">
1403 +
1404 +      <include name="**/*.java"/>
1405 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1406 +      <compilerarg value="-Xplugin:ErrorProne
1407 +                          -Xep:IdentityBinaryExpression:WARN
1408 +                          -Xep:MissingOverride:OFF
1409 +                          -Xep:MixedArrayDimensions:WARN
1410 +                          -Xep:RemoveUnusedImports:ERROR
1411 +                          -Xep:ClassName:ERROR
1412 +                          -Xep:MultipleTopLevelClasses:ERROR
1413 +                          -Xep:EmptyIf:ERROR
1414 +                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1415 +                          -Xep:RedundantThrows:ERROR
1416 +                          -Xep:MethodCanBeStatic:WARN"/>
1417 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1418 +      <compilerarg value="-Xprefer:source"/>
1419 +      <compilerarg value="-XDignore.symbol.file=true"/>
1420 +      <compilerarg value="-Xlint:all"/>
1421 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1422 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1423 +      <compilerarg line="${build.args}"/>
1424 +    </javac>
1425 +
1426 +    <jar destfile="${product.jar}">
1427 +      <fileset dir="${destdir}"/>
1428 +    </jar>
1429 +
1430 +    <run-tck-tests
1431 +      target="${build.main.java.version}"
1432 +      workdir="${build.dir}"
1433 +      classes="${product.jar}">
1434 +      <javac-elements>
1435 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1436 +        <compilerarg value="-Xplugin:ErrorProne
1437 +                            -Xep:IdentityBinaryExpression:WARN
1438 +                            -Xep:BoxedPrimitiveConstructor:OFF
1439 +                            -Xep:HashtableContains:OFF
1440 +                            -Xep:ModifyingCollectionWithItself:OFF
1441 +                            -Xep:MissingOverride:OFF
1442 +                            -Xep:MixedArrayDimensions:WARN
1443 +                            -Xep:RemoveUnusedImports:ERROR
1444 +                            -Xep:ClassName:ERROR
1445 +                            -Xep:MultipleTopLevelClasses:ERROR
1446 +                            -Xep:EmptyIf:ERROR
1447 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1448 +                            -Xep:RedundantThrows:ERROR
1449 +                            -Xep:MethodCanBeStatic:WARN"/>
1450 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1451 +      </javac-elements>
1452 +    </run-tck-tests>
1453 +  </target>
1454 +
1455 +  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1456 +  <target name="errorprone-jtreg"
1457 +          depends="jar"
1458 +          description="Run errorprone over jtreg tests (experimental)">
1459 +
1460 +    <run-jtreg-tests
1461 +       target="${build.main.java.version}"
1462 +       workdir="${build.dir}"
1463 +       classes="${product.jar}"
1464 +       verbose="all">
1465 +      <jtreg-elements>
1466 +        <arg value="-javacoption:-processorpath"/>
1467 +        <arg value="-javacoption:${errorprone.jar}"/>
1468 +        <arg value="-javacoption:-Xplugin:ErrorProne
1469 +                            -Xep:IdentityBinaryExpression:WARN
1470 +                            -Xep:BoxedPrimitiveConstructor:OFF
1471 +                            -Xep:HashtableContains:OFF
1472 +                            -Xep:ModifyingCollectionWithItself:OFF
1473 +                            -Xep:MissingOverride:OFF
1474 +                            -Xep:MixedArrayDimensions:WARN
1475 +                            -Xep:RemoveUnusedImports:ERROR
1476 +                            -Xep:ClassName:ERROR
1477 +                            -Xep:MultipleTopLevelClasses:ERROR
1478 +                            -Xep:EmptyIf:ERROR
1479 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1480 +                            -Xep:RedundantThrows:ERROR
1481 +                            -Xep:MethodCanBeStatic:WARN"/>
1482 +      </jtreg-elements>
1483 +    </run-jtreg-tests>
1484 +  </target>
1485 +
1486 +
1487 + <!-- ==============================================================
1488 +  Running guava tests against jsr166 code
1489 + =================================================================== -->
1490 +
1491 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1492 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1493 + <!-- <property name="guava.version" value="21.0"/> -->
1494 +
1495 + <!-- HOWTO debug print a path id -->
1496 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1497 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1498 +
1499 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1500 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1501 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1502 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1503 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1504 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1505 +
1506 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1507 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1508 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1509 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1510 +
1511 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1512 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1513 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1514 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1515 +
1516 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1517 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1518 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1519 +
1520 +  <target name="init-ivy">
1521 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1522 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1523 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1524 +             classpath="${build.dir}/ivy.jar"/>
1525 +  </target>
1526 +
1527 +  <target name="guava-tests" depends="jar, init-ivy"
1528 +          description="Guava tests run against jsr166 collections">
1529 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1530 +    <mkdir dir="${guava.dir}"/>
1531 +    <ivy:retrieve pathid="guava.testlib.classpath"
1532 +      type="jar,bundle" inline="true" conf="default,master"
1533 +      pattern="${guava.dir}/[artifact].[ext]"
1534 +      organisation="com.google.guava" module="guava-testlib"/>
1535 +    <property name="guava.version" value="21.0"/>
1536 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1537 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1538 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1539 +           jvm="${build.main.java}" fork="true">
1540 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1541 +      <formatter type="brief"/>
1542 +      <classpath>
1543 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1544 +        <path refid="guava.testlib.classpath"/>
1545 +      </classpath>
1546 +
1547 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1548 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1549 +    </junit>
1550 +  </target>
1551 +
1552   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines