ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC vs.
Revision 1.161 by jsr166, Sat Jan 17 23:12:49 2015 UTC

#	Line 16 | Line 16
16		$HOME/jdk/jdk6
17		$HOME/jdk/jdk7
18		$HOME/jdk/jdk8
19	+	$HOME/jdk/jdk9
20		where each of the above is a JDK or a symlink to same, and
21		$HOME/jdk/src/jdk6
22		$HOME/jdk/src/jdk7
23		$HOME/jdk/src/jdk8
24	+	$HOME/jdk/src/jdk9
25		where each of the above is a complete JDK source tree
26		(e.g. mercurial forest) or a symlink to same.
27	+
28	+	Alternatively, define ant variables thus:
29	+	ant -Djdk$N.home=...
30	+	for $N in 6 7 8 9 ...
31		------------------------------------------------------------------------------
32		</description>
33
34	<	<target name="usage" description="Advises user to run with -projecthelp">
35	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
34	>	<!-- Display main targets by running 'ant -projecthelp' -->
35	>	<target name="usage">
36	>	<java classname="org.apache.tools.ant.Main">
37	>	<arg value="-projecthelp" />
38	>	</java>
39		</target>
40
41
#	Line 39 | Line 48
48		<property name="build.debug"          value="true"/>
49		<property name="build.debuglevel"     value="source,lines,vars"/>
50		<property name="build.deprecation"    value="false"/>
51	+	<property name="build.javadoc.access" value="protected"/>
52	+
53	+	<!-- Tck options; see JSR166TestCase.java
54	+	To profile a single tck test class:
55	+	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56	+	To stress test a single tck test class:
57	+	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58	+	-->
59	+	<property name="jsr166.profileTests"     value="false"/>
60	+	<property name="jsr166.profileThreshold" value="100"/>
61	+	<property name="jsr166.runsPerTest"      value="1"/>
62	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63
64		<!-- Build locations -->
65		<property name="build.dir"                   location="build"/>
#	Line 57 | Line 78
78		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
79		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
80
81	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
82	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
83	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
84	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
81	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
82	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
83	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
84	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
85
86	<	<!-- JDK binary locations -->
86	>	<!-- JDK locations -->
87		<property name="jdks.home"  location="${user.home}/jdk"/>
88
89		<macrodef name="defjdklocations">
#	Line 72 | Line 93
93		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
94		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
95		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
96		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
97	<	<property name="bootclasspath@{v}"
98	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
97	>	<local name="boot.jar.dir"/>
98	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
99	>	<path id="bootclasspath@{v}">
100	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
101	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
102	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
103	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
104	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
105	>	</path>
106	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
107		</sequential>
108		</macrodef>
109
110	<	<defjdklocations v="6"/>
111	<	<defjdklocations v="7"/>
112	<	<defjdklocations v="8"/>
85	<
86	<	<macrodef name="run-tck-tests">
87	<	<attribute name="target"/>
88	<	<attribute name="workdir"/>
89	<	<attribute name="product.jar" default="${product.jar}"/>
90	<	<attribute name="jvmflags" default=""/>
110	>	<macrodef name="mirror-dir">
111	>	<attribute name="src"/>
112	>	<attribute name="dst"/>
113		<sequential>
114	<
115	<	<mkdir dir="@{workdir}/tck-classes"/>
116	<
117	<	<javac srcdir="${tck.src.dir}"
118	<	destdir="@{workdir}/tck-classes"
97	<	debug="${build.debug}"
98	<	debuglevel="${build.debuglevel}"
99	<	deprecation="${build.deprecation}"
100	<	source="6"
101	<	classpath="${junit.jar}"
102	<	bootclasspath="@{product.jar}:${bootclasspath6}"
103	<	includeAntRuntime="false"
104	<	includeJavaRuntime="false"
105	<	executable="${javac@{target}}"
106	<	fork="true">
107	<
108	<	<include name="**/*.java"/>
109	<	<compilerarg value="-XDignore.symbol.file=true"/>
110	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111	<	<compilerarg line="${build.args}"/>
112	<	</javac>
113	<
114	<	<java classname="JSR166TestCase"
115	<	failonerror="true"
116	<	jvm="${java@{target}}"
117	<	fork="true">
118	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
119	<	<jvmarg line="@{jvmflags}"/>
120	<	<classpath>
121	<	<pathelement location="${junit.jar}"/>
122	<	<pathelement location="@{workdir}/tck-classes"/>
123	<	</classpath>
124	<	</java>
125	<
114	>	<delete dir="@{dst}"/>
115	>	<mkdir dir="@{dst}"/>
116	>	<copy todir="@{dst}" preservelastmodified="true">
117	>	<fileset dir="@{src}"/>
118	>	</copy>
119		</sequential>
120		</macrodef>
121
122	+	<defjdklocations v="6"/>
123	+	<defjdklocations v="7"/>
124	+	<defjdklocations v="8"/>
125	+	<defjdklocations v="9"/>
126	+
127		<!-- Source locations -->
128		<property name="src.dir"              location="${basedir}/src/main"/>
129		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 141 | Line 139
139		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
140		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
141
142	<	<!-- Distribution locations -->
143	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
144	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
145	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
146	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
147	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
148	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
142	>	<!-- Javadoc locations -->
143	>	<property name="docs.dir"          location="${build.dir}/docs"/>
144	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
145	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
146	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
147	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
148	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
149	>
150	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
151	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
152	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
153	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
154	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
155	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
156
157		<!-- Jar locations -->
158		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 158 | Line 163
163		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165
166	<	<!-- Bootclasspath argument -->
167	<	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
166	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170	>	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171	>	<!-- The expected canonical location does not yet exist as of 2014-07 -->
172	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173	>	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174	>	<!-- Default jdk doc location (latest stable release seems best) -->
175	>	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
176
177		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
179	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
180	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
181	<
182	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
183	<	<!-- The below does not yet exist as of 2012-11 -->
171	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
172	<
173	<	<!-- Default jdk api doc location (latest stable release seems best) -->
174	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
178	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
184
185		<!-- Define the "jtreg" task -->
186		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 184 | Line 193
193		<pathelement location="${junit.jar}"/>
194		</path>
195
196	+	<macrodef name="run-tck-tests">
197	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
198	+	<attribute name="target"/>
199	+	<attribute name="compile-target" default="@{target}"/>
200	+	<attribute name="workdir"/>
201	+	<attribute name="classes"/>
202	+	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203	+	<element name="javac-elements" optional="true"/>
204	+	<sequential>
205	+
206	+	<mkdir dir="@{workdir}/tck-classes"/>
207	+
208	+	<javac srcdir="@{tck.src.dir}"
209	+	destdir="@{workdir}/tck-classes"
210	+	debug="${build.debug}"
211	+	debuglevel="${build.debuglevel}"
212	+	deprecation="${build.deprecation}"
213	+	source="@{compile-target}"
214	+	target="@{compile-target}"
215	+	classpath="${junit.jar}"
216	+	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
217	+	includeAntRuntime="false"
218	+	includeJavaRuntime="false"
219	+	executable="${javac@{compile-target}}"
220	+	fork="true">
221	+
222	+	<include name="*.java"/>
223	+	<compilerarg value="-XDignore.symbol.file=true"/>
224	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
225	+	<compilerarg line="${build.args}"/>
226	+	<javac-elements/>
227	+
228	+	</javac>
229	+
230	+	<java classname="${jsr166.tckTestClass}"
231	+	failonerror="true"
232	+	jvm="${java@{target}}"
233	+	fork="true">
234	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
235	+	<jvmarg line="@{jvmflags}"/>
236	+
237	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238	+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239	+	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240	+	</syspropertyset>
241	+
242	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245	+	<classpath>
246	+	<pathelement location="${junit.jar}"/>
247	+	<pathelement location="@{workdir}/tck-classes"/>
248	+	</classpath>
249	+	</java>
250	+
251	+	</sequential>
252	+	</macrodef>
253	+
254	+	<macrodef name="run-jtreg-tests">
255	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
256	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
257	+	<attribute name="source" default="7"/>
258	+	<attribute name="target"/>
259	+	<attribute name="workdir"/>
260	+	<attribute name="classes"/>
261	+	<attribute name="jtregflags" default=""/>
262	+	<sequential>
263	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
264	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
265	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
266	+	<mkdir dir="@{workdir}/JTreport"/>
267	+	<jtreg dir="@{jtreg.src.dir}"
268	+	jdk="${jdk@{target}.home}"
269	+	workDir="@{workdir}/JTwork"
270	+	reportDir="@{workdir}/JTreport">
271	+
272	+	<arg value="-Xbootclasspath/p:@{classes}"/>
273	+	<arg value="-agentvm"/>
274	+	<arg value="-v:nopass,fail"/>
275	+	<arg value="-vmoptions:-esa -ea"/>
276	+	<arg value="-automatic"/>
277	+	<arg value="-k:!ignore"/>
278	+	<arg line="@{jtregflags}"/>
279	+	</jtreg>
280	+	</sequential>
281	+	</macrodef>
282	+
283		<!-- ALoops classpath -->
284		<path id="loops.classpath">
285		<pathelement location="${build.loops.dir}"/>
286		</path>
287
288		<!-- Support @jls tag, used in jdk8+ javadoc -->
289	<	<!-- TODO: How do we get &trade to work? -->
194	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
195	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
196	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
289	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
290		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
291
292		<!-- Main targets -->
293
294	+	<property name="build.main.java.version" value="9"/>
295	+	<property name="build.main.javac" value="${javac9}"/>
296	+
297		<target name="dists"
298		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
299		description="Builds all public jars and docs"/>
#	Line 216 | Line 312
312		classpath=""
313		includeAntRuntime="false"
314		includeJavaRuntime="false"
315	<	executable="${javac8}"
315	>	executable="${build.main.javac}"
316		fork="true">
317
318		<include name="**/*.java"/>
319	<	<compilerarg line="${build.args}"/>
319	>	<compilerarg value="-Xprefer:source"/>
320		<compilerarg value="-XDignore.symbol.file=true"/>
321		<compilerarg value="-Xlint:all"/>
322	<
323	<	<!--
228	<	<exclude name="java/lang/**"/>
322	>	<compilerarg value="-Xdoclint:all/protected"/>
323	>	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
324		<compilerarg line="${build.args}"/>
230	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
231	–	-->
325
326		</javac>
234	–
327		</target>
328
329
238	–
330		<target name="jar"
331		depends="compile"
332		description="Builds library jar from compiled sources">
#	Line 243 | Line 334
334		<jar destfile="${product.jar}">
335		<fileset dir="${build.classes.dir}"/>
336		</jar>
246	–
337		</target>
338
339
250	–
251	–	<target name="test"
252	–	depends="configure-tests, report-tests"
253	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
254	–
255	–
256	–
340		<target name="docs"
341		description="Builds javadocs for src/main to dist dir">
342
343	<	<delete dir="${dist.javadocs.dir}"/>
344	<	<mkdir dir="${dist.javadocs.dir}"/>
343	>	<delete dir="${docs.dir}"/>
344	>	<mkdir dir="${docs.dir}"/>
345
346		<!-- the packagenames="none" hack below prevents scanning the -->
347		<!-- sourcepath for packages -->
348
349	<	<javadoc destdir="${dist.javadocs.dir}"
349	>	<javadoc destdir="${docs.dir}"
350		packagenames="none"
351	<	link="${jdkapi8docs.url}"
351	>	link="${java9.api.url}"
352		overview="${src.dir}/intro.html"
353	<	sourcepath="${src.dir}:${jdk8src.dir}"
353	>	access="${build.javadoc.access}"
354	>	sourcepath="${src.dir}:${jdk9src.dir}"
355		classpath=""
356	<	executable="${javadoc8}">
273	<	<arg value="-XDignore.symbol.file=true"/>
274	<	<arg value="-tag"/>
275	<	<arg value="${javadoc.jls.option}"/>
356	>	executable="${javadoc9}">
357		<fileset dir="${src.dir}" defaultexcludes="yes">
358		<include name="**/*.java"/>
359		</fileset>
360	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
361	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
362	+	<arg value="-XDignore.symbol.file=true"/>
363	+	<arg value="-tag"/>
364	+	<arg value="${javadoc.jls.option}"/>
365	+	<arg value="-tag"/>
366	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
367	+	<arg value="-tag"/>
368	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
369	+	<arg value="-tag"/>
370	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
371		</javadoc>
280	–
372		</target>
373
374
284	–
375		<target name="dist"
376	<	depends="dist-clean, dist-jar, docs"
376	>	depends="dist-clean, dist-jar, dist-docs"
377		description="Puts all distributable products in single hierarchy"/>
378
379
#	Line 302 | Line 392
392		<exclude name="**/SyntaxTest.java"/>
393		<exclude name="**/SuperfluousAbstract.java"/>
394		</jar>
305	–
395		</target>
396
397
309	–
398		<target name="clean"
399		description="Removes all build products">
400
#	Line 315 | Line 403
403		</target>
404
405
318	–
406		<target name="dist-clean"
407		description="Removes all build and distribution products">
408
409	+	<delete dir="${build.dir}"/>
410		<delete dir="${dist.dir}"/>
411
412		</target>
413
414
327	–
328	–	<!-- Internal targets -->
329	–
330	–
415		<target name="dist-jar"
416		depends="clean, jar">
333	–
417		<copy file="${product.jar}" todir="${dist.dir}"/>
335	–
418		</target>
419
420	<
421	<	<target name="compile-tests"
422	<	depends="jar">
341	<
342	<	<mkdir dir="${build.testcases.dir}"/>
343	<
344	<	<javac srcdir="${tck.src.dir}"
345	<	destdir="${build.testcases.dir}"
346	<	debug="${build.debug}"
347	<	debuglevel="${build.debuglevel}"
348	<	deprecation="${build.deprecation}"
349	<	source="6"
350	<	classpath="${junit.jar}"
351	<	bootclasspath="${product.jar}:${bootclasspath6}"
352	<	includeAntRuntime="false"
353	<	includeJavaRuntime="false"
354	<	executable="${javac8}"
355	<	fork="true">
356	<
357	<	<include name="**/*.java"/>
358	<	<compilerarg line="${build.args}"/>
359	<	<compilerarg value="-XDignore.symbol.file=true"/>
360	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
361	<
362	<	</javac>
363	<
364	<	<javac srcdir="${test.src.dir}"
365	<	destdir="${build.testcases.dir}"
366	<	debug="${build.debug}"
367	<	debuglevel="${build.debuglevel}"
368	<	deprecation="${build.deprecation}"
369	<	source="6"
370	<	classpath=""
371	<	bootclasspath="${product.jar}:${bootclasspath6}"
372	<	includeAntRuntime="false"
373	<	includeJavaRuntime="false"
374	<	executable="${javac8}"
375	<	fork="true">
376	<
377	<	<include name="jsr166/test/**/*.java"/>
378	<
379	<	<compilerarg line="${build.args}"/>
380	<	<compilerarg value="-XDignore.symbol.file=true"/>
381	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
382	<
383	<	</javac>
384	<
385	<	<!--
386	<	<javac srcdir="${jtreg.src.dir}"
387	<	destdir="${build.testcases.dir}"
388	<	debug="${build.debug}"
389	<	debuglevel="${build.debuglevel}"
390	<	deprecation="${build.deprecation}"
391	<	source="${build.sourcelevel}"
392	<	fork="true">
393	<
394	<	<compilerarg value="${bootclasspath.args}"/>
395	<	<compilerarg line="${build.args}"/>
396	<	<compilerarg value="-XDignore.symbol.file=true"/>
397	<
398	<	</javac>
399	<	-->
400	<
420	>	<target name="dist-docs"
421	>	depends="clean, docs">
422	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
423		</target>
424
425
426	<	<target name="run-tests"
427	<	depends="compile-tests">
428	<
407	<	<!-- May be overridden by user.properties -->
408	<	<property name="testcase" value="*"/>
409	<
410	<	<mkdir dir="${build.reports.dir}"/>
411	<
412	<	<junit printsummary="true"
413	<	showoutput="true"
414	<	errorProperty="junit.failed"
415	<	failureProperty="junit.failed"
416	<	dir="${build.reports.dir}"
417	<	jvm="${java8}"
418	<	fork="true">
419	<
420	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
421	<	<jvmarg value="-server"/>
422	<	<jvmarg value="-showversion"/>
423	<
424	<	<classpath refid="test.classpath"/>
425	<
426	<	<formatter type="xml"/>
427	<
428	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
429	<	<fileset dir="${tck.src.dir}">
430	<	<include name="**/${testcase}Test.java"/>
431	<	</fileset>
432	<	</batchtest>
433	<
434	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
435	<	<fileset dir="${test.src.dir}">
436	<	<include name="jsr166/test/**/${testcase}Test.java"/>
437	<	</fileset>
438	<	</batchtest>
439	<
440	<	<!--
441	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
442	<	<fileset dir="${jtreg.src.dir}">
443	<	<include name="**/${testcase}Test.java"/>
444	<	</fileset>
445	<	</batchtest>
446	<	-->
447	<
448	<	</junit>
426	>	<target name="test-tck"
427	>	depends="jar"
428	>	description="Runs tck tests for main directly">
429
430	+	<run-tck-tests
431	+	target="${build.main.java.version}"
432	+	workdir="${build.dir}"
433	+	classes="${product.jar}"/>
434	+	</target>
435	+
436	+	<target name="test-tck-parallelism-1"
437	+	description="Runs test-tck with given common pool parallelism">
438	+	<antcall target="test-tck">
439	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
440	+	</antcall>
441	+	</target>
442	+
443	+	<target name="test-tck-parallelism-0"
444	+	description="Runs test-tck with given common pool parallelism">
445	+	<antcall target="test-tck">
446	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
447	+	</antcall>
448	+	</target>
449	+
450	+	<target name="test-jtreg"
451	+	depends="jar"
452	+	description="Runs jtreg tests for main using the jtreg ant task">
453	+	<run-jtreg-tests
454	+	target="${build.main.java.version}"
455	+	workdir="${build.dir}"
456	+	classes="${product.jar}"/>
457		</target>
458
459	+	<target name="test"
460	+	depends="test-tck, test-tck-parallelism-1, test-jtreg"
461	+	description="Runs tck and jtreg tests for main">
462	+	</target>
463
464	<	<target name="report-tests"
465	<	depends="run-tests">
455	<
456	<	<!-- Sets junit.report.format to frames if redirection is present,
457	<	otherwise sets it to noframes. -->
458	<	<available property="junit.report.format"
459	<	value="frames"
460	<	classname="org.apache.xalan.lib.Redirect"
461	<	/>
462	<	<property name="junit.report.format" value="noframes"/>
463	<
464	<	<junitreport todir="${build.reports.dir}">
465	<	<fileset dir="${build.reports.dir}">
466	<	<include name="TEST-*.xml"/>
467	<	</fileset>
468	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
469	<	/>
470	<	</junitreport>
464	>	<target name="test89"
465	>	description="Runs tck and jtreg tests for main for multiple java versions">
466
467	<	<fail message="Test Cases Failed" if="junit.failed"/>
467	>	<antcall target="clean"/>
468	>	<antcall target="test">
469	>	<param name="build.main.java.version" value="8"/>
470	>	<param name="build.main.javac" value="${javac8}"/>
471	>	</antcall>
472	>
473	>	<antcall target="clean"/>
474	>	<antcall target="test">
475	>	<param name="build.main.java.version" value="9"/>
476	>	<param name="build.main.javac" value="${javac9}"/>
477	>	</antcall>
478
479		</target>
480
481
482	+
483		<target name="configure-compiler">
484
485		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 491 | Line 497
497		</target>
498
499
494	–	<target name="configure-tests"
495	–	depends="configure-compiler">
496	–
497	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
498	–	<available property="junit.available"
499	–	classname="junit.framework.Protectable"/>
500	–
501	–	<!-- Xalan -->
502	–	<available property="xalan.available"
503	–	classname="org.apache.xalan.Version"/>
504	–
505	–
506	–	<!-- Ant 1.6beta and later don't need or want this check -->
507	–	<!--
508	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
509	–	unless="junit.available"/>
510	–
511	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
512	–	unless="xalan.available"/>
513	–	-->
514	–
515	–	</target>
516	–
500
501		<!-- Various demos and test programs -->
502
#	Line 546 | Line 529
529
530		<!-- jsr166 4jdk7 -->
531
549	–
532		<target name="4jdk7compile"
533		depends="configure-compiler"
534		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 567 | Line 549
549		fork="true">
550
551		<include name="**/*.java"/>
552	<	<compilerarg line="${build.args}"/>
552	>	<compilerarg value="-Xprefer:source"/>
553		<compilerarg value="-XDignore.symbol.file=true"/>
554		<compilerarg value="-Xlint:all"/>
555	+	<compilerarg line="${build.args}"/>
556
557		</javac>
558	+	</target>
559	+
560	+	<target name="4jdk7doclint"
561	+	depends="configure-compiler"
562	+	description="Finds doclint warnings">
563	+
564	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
565	+
566	+	<javac srcdir="${4jdk7src.dir}"
567	+	destdir="${build.4jdk7.classes.dir}"
568	+	debug="${build.debug}"
569	+	debuglevel="${build.debuglevel}"
570	+	deprecation="${build.deprecation}"
571	+	source="6"
572	+	classpath=""
573	+	bootclasspath="${bootclasspath7}"
574	+	includeAntRuntime="false"
575	+	includeJavaRuntime="false"
576	+	executable="${javac8}"
577	+	fork="true">
578
579	+	<include name="**/*.java"/>
580	+	<compilerarg value="-Xprefer:source"/>
581	+	<compilerarg value="-XDignore.symbol.file=true"/>
582	+	<compilerarg value="-Xlint:all"/>
583	+	<compilerarg value="-Xdoclint:all/protected"/>
584	+	<compilerarg line="${build.args}"/>
585	+
586	+	</javac>
587		</target>
588
589	<	<target name="4jdk7-jar"
589	>
590	>	<target name="4jdk7jar"
591		depends="4jdk7compile"
592		description="Builds library jar from compiled sources">
593
#	Line 587 | Line 599
599
600
601		<target name="4jdk7-test-tck"
602	<	depends="4jdk7-jar"
602	>	depends="4jdk7jar"
603		description="Runs tck tests for jsr166-4jdk7 directly">
604
605		<run-tck-tests
606		target="7"
607		workdir="${build.4jdk7.dir}"
608	<	product.jar="${4jdk7product.jar}"/>
608	>	classes="${4jdk7product.jar}">
609	>	<javac-elements>
610	>	<!-- JDK8+ test classes -->
611	>	<exclude name="*8Test.java"/>
612	>	<exclude name="*9Test.java"/>
613	>	<exclude name="DoubleAccumulatorTest.java"/>
614	>	<exclude name="DoubleAdderTest.java"/>
615	>	<exclude name="LongAccumulatorTest.java"/>
616	>	<exclude name="LongAdderTest.java"/>
617	>	<exclude name="CompletableFutureTest.java"/>
618	>	<exclude name="SplittableRandomTest.java"/>
619	>	<exclude name="StampedLockTest.java"/>
620	>	</javac-elements>
621	>	</run-tck-tests>
622		</target>
623
624
#	Line 619 | Line 644
644
645		<formatter type="brief"/>
646
647	<	<test name="JSR166TestCase" haltonfailure="no">
647	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
648		</test>
649
650		</junit>
651		</target>
652
653		<target name="4jdk7-test-jtreg"
654	<	depends="4jdk7compile"
654	>	depends="4jdk7jar"
655		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
656	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
657	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
658	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
659	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
660	<	<jtreg dir="${jtreg.src.dir}"
636	<	jdk="${jdk7.home}"
637	<	workDir="${build.4jdk7.dir}/JTwork"
638	<	reportDir="${build.4jdk7.dir}/JTreport">
639	<
640	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641	<	<arg value="-agentvm"/>
642	<	<arg value="-v:nopass,fail"/>
643	<	<arg value="-vmoptions:-esa -ea"/>
644	<	<arg value="-automatic"/>
645	<	<arg value="-k:!ignore"/>
646	<	</jtreg>
656	>	<run-jtreg-tests
657	>	target="7"
658	>	workdir="${build.4jdk7.dir}"
659	>	classes="${4jdk7product.jar}"
660	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
661		</target>
662
663
#	Line 656 | Line 670
670		<target name="4jdk7docs"
671		description="Builds javadocs for src/jdk7 to dist dir">
672
673	<	<delete dir="${dist.4jdk7.docs.dir}"/>
674	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
673	>	<delete dir="${4jdk7docs.dir}"/>
674	>	<mkdir dir="${4jdk7docs.dir}"/>
675
676	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
676	>	<javadoc destdir="${4jdk7docs.dir}"
677		packagenames="none"
678	<	link="${jdkapi7docs.url}"
678	>	link="${java7.api.url}"
679		overview="${4jdk7src.dir}/intro.html"
680	+	access="${build.javadoc.access}"
681		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
682		classpath=""
683		executable="${javadoc7}">
669	–	<arg value="-XDignore.symbol.file=true"/>
684		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
685		<include name="**/*.java"/>
686		</fileset>
687	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
688	+	<arg value="-XDignore.symbol.file=true"/>
689		</javadoc>
674	–
690		</target>
691
692
693		<target name="4jdk7dist"
694	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
694	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
695		description="Puts all distributable products in single hierarchy"/>
696
697
683	–
698		<target name="4jdk7clean"
699		description="Removes all 4jdk7 build products">
700
#	Line 689 | Line 703
703		</target>
704
705
692	–
693	–	<target name="4jdk7dist-clean"
694	–	description="Removes all build and distribution products">
695	–
696	–	</target>
697	–
706		<target name="4jdk7dist-jar"
707	<	depends="4jdk7clean, 4jdk7compile">
700	<
707	>	depends="4jdk7clean, 4jdk7jar">
708		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
709	+	</target>
710	+
711
712	+	<target name="4jdk7dist-docs"
713	+	depends="4jdk7clean, 4jdk7docs">
714	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
715		</target>
716
717
#	Line 717 | Line 729
729		debuglevel="${build.debuglevel}"
730		deprecation="${build.deprecation}"
731		classpath=""
720	–	source="5"
732		bootclasspath="${bootclasspath6}"
733	+	source="5"
734		includeAntRuntime="false"
735		includeJavaRuntime="false"
736		executable="${javac7}"
737		fork="true">
738
739		<include name="jsr166x/**/*.java"/>
728	–	<compilerarg line="${build.args}"/>
740		<compilerarg value="-XDignore.symbol.file=true"/>
741		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
742	+	<compilerarg line="${build.args}"/>
743
744		</javac>
733	–
745		</target>
746
747
737	–
748		<target name="jsr166xjar"
749		depends="jsr166xcompile"
750		description="Builds library jar from compiled sources">
#	Line 746 | Line 756
756		</target>
757
758
749	–
759		<target name="jsr166xdocs"
760		description="Builds javadocs to dist dir">
761
762	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
763	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
762	>	<delete dir="${jsr166xdocs.dir}"/>
763	>	<mkdir dir="${jsr166xdocs.dir}"/>
764
765	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
765	>	<javadoc destdir="${jsr166xdocs.dir}"
766		packagenames="jsr166x.*"
767	<	link="${jdkapidocs.url}"
768	<	source="5"
760	<	bootclasspath="${bootclasspath6}"
767	>	link="${java.api.url}"
768	>	access="${build.javadoc.access}"
769		sourcepath="${topsrc.dir}:${jdk6src.dir}"
770	<	executable="${javadoc7}"
771	<	additionalparam="-XDignore.symbol.file=true"/>
770	>	bootclasspath="${bootclasspath6}"
771	>	source="5"
772	>	executable="${javadoc7}">
773	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
774	>	<arg value="-XDignore.symbol.file=true"/>
775
776	+	</javadoc>
777		</target>
778
779
780		<target name="jsr166xdist"
781	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
781	>	depends="jsr166xdist-jar, jsr166xdist-docs"
782		description="Puts all distributable products in single hierarchy"/>
783
784
773	–
785		<target name="jsr166xclean"
786		description="Removes all jsr166x build products">
787
#	Line 779 | Line 790
790		</target>
791
792
782	–
783	–	<target name="jsr166xdist-clean"
784	–	description="Removes all build and distribution products">
785	–
786	–	</target>
787	–
788	–
793		<target name="jsr166xdist-jar"
794		depends="jsr166xclean, jsr166xjar">
791	–
795		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
796	+	</target>
797
798	+	<target name="jsr166xdist-docs"
799	+	depends="jsr166xclean, jsr166xdocs">
800	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
801		</target>
802
803		<!-- jsr166y -->
#	Line 816 | Line 823
823		fork="true">
824
825		<include name="jsr166y/**/*.java"/>
819	–	<compilerarg line="${build.args}"/>
826		<compilerarg value="-XDignore.symbol.file=true"/>
827		<compilerarg value="-Xlint:all"/>
828	+	<compilerarg line="${build.args}"/>
829	+
830		</javac>
831		</target>
832
#	Line 834 | Line 842
842		</target>
843
844
837	–
845		<target name="jsr166ydocs"
846		description="Builds javadocs to dist dir">
847
848	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
849	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
848	>	<delete dir="${jsr166ydocs.dir}"/>
849	>	<mkdir dir="${jsr166ydocs.dir}"/>
850
851	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
851	>	<javadoc destdir="${jsr166ydocs.dir}"
852		packagenames="jsr166y.*"
853	<	link="${jdkapidocs.url}"
854	<	source="6"
848	<	bootclasspath="${bootclasspath6}"
853	>	link="${java.api.url}"
854	>	access="${build.javadoc.access}"
855		sourcepath="${topsrc.dir}:${jdk6src.dir}"
856	<	executable="${javadoc7}"
857	<	additionalparam="-XDignore.symbol.file=true"/>
856	>	bootclasspath="${bootclasspath6}"
857	>	source="6"
858	>	executable="${javadoc7}">
859	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
860	>	<arg value="-XDignore.symbol.file=true"/>
861
862	+	</javadoc>
863		</target>
864
865
866		<target name="jsr166ydist"
867	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
867	>	depends="jsr166ydist-jar, jsr166ydist-docs"
868		description="Puts all distributable products in single hierarchy"/>
869
870
861	–
871		<target name="jsr166yclean"
872		description="Removes all jsr166y build products">
873
#	Line 867 | Line 876
876		</target>
877
878
870	–
871	–	<target name="jsr166ydist-clean"
872	–	description="Removes all build and distribution products">
873	–
874	–	</target>
875	–
879		<target name="jsr166ydist-jar"
880		depends="jsr166yclean, jsr166yjar">
878	–
881		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
882	+	</target>
883
884	+	<target name="jsr166ydist-docs"
885	+	depends="jsr166yclean, jsr166ydocs">
886	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
887		</target>
888
889
#	Line 895 | Line 901
901		debug="${build.debug}"
902		debuglevel="${build.debuglevel}"
903		deprecation="${build.deprecation}"
904	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
905		classpath=""
906		source="6"
900	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
907		includeAntRuntime="false"
908		includeJavaRuntime="false"
909		executable="${javac7}"
910		fork="true">
911
912		<include name="extra166y/**/*.java"/>
907	–	<compilerarg line="${build.args}"/>
913		<compilerarg value="-XDignore.symbol.file=true"/>
914		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
915	+	<compilerarg line="${build.args}"/>
916
917		</javac>
912	–
918		</target>
919
920
916	–
921		<target name="extra166yjar"
922		depends="extra166ycompile"
923		description="Builds library jar from compiled sources">
#	Line 925 | Line 929
929		</target>
930
931
928	–
932		<target name="extra166ydocs"
933		description="Builds javadocs to build dir">
934
935	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
936	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
935	>	<delete dir="${extra166ydocs.dir}"/>
936	>	<mkdir dir="${extra166ydocs.dir}"/>
937
938	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
938	>	<javadoc destdir="${extra166ydocs.dir}"
939		packagenames="extra166y.*"
940	<	link="${jdkapidocs.url}"
941	<	source="6"
939	<	bootclasspath="${bootclasspath6}"
940	>	link="${java.api.url}"
941	>	access="${build.javadoc.access}"
942		sourcepath="${topsrc.dir}:${jdk6src.dir}"
943	<	executable="${javadoc7}"
944	<	additionalparam="-XDignore.symbol.file=true"/>
943	>	bootclasspath="${bootclasspath6}"
944	>	source="6"
945	>	executable="${javadoc7}">
946	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
947	>	<arg value="-XDignore.symbol.file=true"/>
948
949	+	</javadoc>
950		</target>
951
952
953		<target name="extra166ydist"
954	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
954	>	depends="extra166ydist-jar, extra166ydist-docs"
955		description="Puts all distributable products in single hierarchy"/>
956
957
952	–
958		<target name="extra166yclean"
959		description="Removes all extra166y build products">
960
#	Line 958 | Line 963
963		</target>
964
965
961	–
962	–	<target name="extra166ydist-clean"
963	–	description="Removes all build and distribution products">
964	–
965	–	</target>
966	–
966		<target name="extra166ydist-jar"
967		depends="extra166yclean, extra166yjar">
969	–
968		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
969	+	</target>
970
971	+	<target name="extra166ydist-docs"
972	+	depends="extra166yclean, extra166ydocs">
973	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
974		</target>
975
976		<!-- jsr166e -->
977
978	+	<property name="build.jsr166e.java.version" value="6"/>
979	+	<property name="build.jsr166e.javac" value="${javac6}"/>
980	+
981		<target name="jsr166ecompile"
982		depends="configure-compiler"
983		description="Compiles jsr166e sources">
#	Line 984 | Line 989
989		debug="${build.debug}"
990		debuglevel="${build.debuglevel}"
991		deprecation="${build.deprecation}"
992	<	source="7"
992	>	source="${build.jsr166e.java.version}"
993		classpath=""
994		includeAntRuntime="false"
995		includeJavaRuntime="false"
996	<	executable="${javac7}"
996	>	executable="${build.jsr166e.javac}"
997		fork="true">
998
999		<include name="jsr166e/**/*.java"/>
995	–	<compilerarg line="${build.args}"/>
1000		<compilerarg value="-XDignore.symbol.file=true"/>
1001		<compilerarg value="-Xlint:all"/>
1002	+	<compilerarg line="${build.args}"/>
1003
1004		</javac>
1000	–
1005		</target>
1006
1007	+	<!-- jsr166e: find doclint errors -->
1008	+	<target name="jsr166edoclint">
1009	+
1010	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1011	+
1012	+	<javac srcdir="${topsrc.dir}"
1013	+	destdir="${build.jsr166e.classes.dir}"
1014	+	debug="${build.debug}"
1015	+	debuglevel="${build.debuglevel}"
1016	+	deprecation="${build.deprecation}"
1017	+	source="${build.jsr166e.java.version}"
1018	+	classpath=""
1019	+	bootclasspath="${bootclasspath7}"
1020	+	includeAntRuntime="false"
1021	+	includeJavaRuntime="false"
1022	+	executable="${javac8}"
1023	+	fork="true">
1024	+
1025	+	<include name="jsr166e/**/*.java"/>
1026	+	<compilerarg value="-XDignore.symbol.file=true"/>
1027	+	<compilerarg value="-Xlint:all"/>
1028	+	<compilerarg value="-Xdoclint:all/protected"/>
1029	+
1030	+	</javac>
1031	+	</target>
1032
1033
1034		<target name="jsr166ejar"
#	Line 1013 | Line 1042
1042		</target>
1043
1044
1016	–
1045		<target name="jsr166edocs"
1046		description="Builds javadocs to build dir">
1047
1048	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1049	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1048	>	<delete dir="${jsr166edocs.dir}"/>
1049	>	<mkdir dir="${jsr166edocs.dir}"/>
1050
1051	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1051	>	<javadoc destdir="${jsr166edocs.dir}"
1052		packagenames="jsr166e.*"
1053	<	link="${jdkapidocs.url}"
1054	<	source="7"
1055	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1056	<	executable="${javadoc7}"
1057	<	additionalparam="-XDignore.symbol.file=true" >
1053	>	link="${java.api.url}"
1054	>	access="${build.javadoc.access}"
1055	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1056	>	source="${build.jsr166e.java.version}"
1057	>	executable="${javadoc7}">
1058	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1059	>	<arg value="-XDignore.symbol.file=true"/>
1060	>
1061		</javadoc>
1062	+	</target>
1063	+
1064
1065	+	<target name="jsr166e-test-tck-one-java-version"
1066	+	depends="jsr166ejar">
1067	+
1068	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1069	+
1070	+	<run-tck-tests
1071	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1072	+	target="${build.jsr166e.java.version}"
1073	+	workdir="${build.jsr166e.dir}"
1074	+	classes="${jsr166e.jar}"/>
1075	+	</target>
1076	+
1077	+	<target name="jsr166e-test-tck"
1078	+	description="Runs tck tests for jsr166e for multiple java versions">
1079	+
1080	+	<!--     <antcall target="clean"/> -->
1081	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1082	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1083	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1084	+	<!--     </antcall> -->
1085	+
1086	+	<antcall target="clean"/>
1087	+	<antcall target="jsr166e-test-tck-one-java-version">
1088	+	<param name="build.jsr166e.java.version" value="7"/>
1089	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1090	+	</antcall>
1091	+
1092	+	<antcall target="clean"/>
1093	+	<antcall target="jsr166e-test-tck-one-java-version">
1094	+	<param name="build.jsr166e.java.version" value="6"/>
1095	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1096	+	</antcall>
1097		</target>
1098
1099
1100	+	<target name="jsr166e-test"
1101	+	depends="jsr166e-test-tck"
1102	+	description="Runs all tests for jsr166e">
1103	+	</target>
1104	+
1105		<target name="jsr166edist"
1106	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1106	>	depends="jsr166edist-jar, jsr166edist-docs"
1107		description="Puts all distributable products in single hierarchy"/>
1108
1109
1040	–
1110		<target name="jsr166eclean"
1111		description="Removes all jsr166e build products">
1043	–
1112		<delete dir="${build.jsr166e.dir}"/>
1045	–
1113		</target>
1114
1115
1116	<	<target name="jsr166edist-clean"
1117	<	description="Removes all build and distribution products">
1116	>	<target name="jsr166edist-jar"
1117	>	depends="jsr166eclean, jsr166ejar">
1118	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1119	>	</target>
1120
1121	+	<target name="jsr166edist-docs"
1122	+	depends="jsr166eclean, jsr166edocs">
1123	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1124		</target>
1125
1054	–	<target name="jsr166edist-jar"
1055	–	depends="jsr166eclean, jsr166ejar">
1126
1127	<	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1127	>	<!-- Find buglets that can be detected by static build tools -->
1128
1129	+	<target name="lint">
1130	+	<antcall target="dists">
1131	+	<param name="build.javadoc.access" value="public"/>
1132	+	</antcall>
1133		</target>
1134
1135	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1136	+	<target name="lint-private">
1137	+	<antcall target="dist">
1138	+	<param name="build.javadoc.access" value="private"/>
1139	+	</antcall>
1140	+	</target>
1141	+
1142	+
1143		</project>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines