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.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC vs.
Revision 1.152 by jsr166, Tue Feb 25 16:33:15 2014 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		</description>
29
30	<	<target name="usage" description="Advises user to run with -projecthelp">
31	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
30	>	<!-- Display main targets by running 'ant -projecthelp' -->
31	>	<target name="usage">
32	>	<java classname="org.apache.tools.ant.Main">
33	>	<arg value="-projecthelp" />
34	>	</java>
35		</target>
36
37
#	Line 39 | Line 44
44		<property name="build.debug"          value="true"/>
45		<property name="build.debuglevel"     value="source,lines,vars"/>
46		<property name="build.deprecation"    value="false"/>
47	+	<property name="build.javadoc.access" value="protected"/>
48	+
49	+	<!-- Tck options; see JSR166TestCase.java -->
50	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51	+	<property name="jsr166.profileTests"     value="false"/>
52	+	<property name="jsr166.profileThreshold" value="100"/>
53	+	<property name="jsr166.runsPerTest"      value="1"/>
54	+	<!-- Allow running an individual tck test class -->
55	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57
58		<!-- Build locations -->
59		<property name="build.dir"                   location="build"/>
#	Line 57 | Line 72
72		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
73		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
74
75	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
76	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
77	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
78	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
75	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
76	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
77	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
78	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
79
80		<!-- JDK locations -->
81		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 86 | Line 101
101		</sequential>
102		</macrodef>
103
104	+	<macrodef name="mirror-dir">
105	+	<attribute name="src"/>
106	+	<attribute name="dst"/>
107	+	<sequential>
108	+	<delete dir="@{dst}"/>
109	+	<mkdir dir="@{dst}"/>
110	+	<copy todir="@{dst}" preservelastmodified="true">
111	+	<fileset dir="@{src}"/>
112	+	</copy>
113	+	</sequential>
114	+	</macrodef>
115	+
116		<defjdklocations v="6"/>
117		<defjdklocations v="7"/>
118		<defjdklocations v="8"/>
119	+	<defjdklocations v="9"/>
120
121		<!-- Source locations -->
122		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 105 | Line 133
133		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
134		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
135
136	<	<!-- Distribution locations -->
137	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>
138	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
139	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
140	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
141	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
142	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
136	>	<!-- Javadoc locations -->
137	>	<property name="docs.dir"          location="${build.dir}/docs"/>
138	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
139	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
140	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
141	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
142	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
143	>
144	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
145	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
146	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
147	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
148	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
149	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
150
151		<!-- Jar locations -->
152		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 122 | Line 157
157		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
158		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
159
160	<	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
161	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
162	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
163	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
164	<
165	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
166	<	<!-- The below does not yet exist as of 2013-01 -->
167	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
160	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
161	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
162	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
163	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
164	>	<!-- The expected canonical location does not yet exist as of 2014-02 -->
165	>	<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
166	>	<property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167	>	<!-- No published jdk9 docs exist as of 2014-02 -->
168	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
169	>	<property name="java9.docroot.url"      value="${java8.docroot.url}"/>
170	>	<!-- Default jdk doc location (latest stable release seems best) -->
171	>	<property name="java.docroot.url"       value="${java7.docroot.url}"/>
172
173	<	<!-- Default jdk api doc location (latest stable release seems best) -->
174	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
173	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
174	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
175	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
176	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
177	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
178	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
179	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
180
181		<!-- Define the "jtreg" task -->
182		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 147 | Line 191
191
192		<macrodef name="run-tck-tests">
193		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
150	–	<attribute name="source" default="6"/>
194		<attribute name="target"/>
195	+	<attribute name="compile-target" default="@{target}"/>
196		<attribute name="workdir"/>
197		<attribute name="classes"/>
198		<attribute name="jvmflags" default=""/>
199	+	<element name="javac-elements" optional="true"/>
200		<sequential>
201
202		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 161 | Line 206
206		debug="${build.debug}"
207		debuglevel="${build.debuglevel}"
208		deprecation="${build.deprecation}"
209	<	source="@{source}"
209	>	source="@{compile-target}"
210	>	target="@{compile-target}"
211		classpath="${junit.jar}"
212	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
212	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
213		includeAntRuntime="false"
214		includeJavaRuntime="false"
215	<	executable="${javac@{target}}"
215	>	executable="${javac@{compile-target}}"
216		fork="true">
217
218		<include name="*.java"/>
219		<compilerarg value="-XDignore.symbol.file=true"/>
220		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
221		<compilerarg line="${build.args}"/>
222	+	<javac-elements/>
223
224		</javac>
225
226	<	<java classname="JSR166TestCase"
226	>	<java classname="${jsr166.tckTestClass}"
227		failonerror="true"
228		jvm="${java@{target}}"
229		fork="true">
230		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
231		<jvmarg line="@{jvmflags}"/>
232	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
233	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
234	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
235		<classpath>
236		<pathelement location="${junit.jar}"/>
237		<pathelement location="@{workdir}/tck-classes"/>
#	Line 191 | Line 241
241		</sequential>
242		</macrodef>
243
244	+	<macrodef name="run-jtreg-tests">
245	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
246	+	<attribute name="source" default="7"/>
247	+	<attribute name="target"/>
248	+	<attribute name="workdir"/>
249	+	<attribute name="classes"/>
250	+	<attribute name="jtregflags" default=""/>
251	+	<sequential>
252	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
253	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
254	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
255	+	<mkdir dir="@{workdir}/JTreport"/>
256	+	<jtreg dir="@{jtreg.src.dir}"
257	+	jdk="${jdk@{target}.home}"
258	+	workDir="@{workdir}/JTwork"
259	+	reportDir="@{workdir}/JTreport">
260	+
261	+	<arg value="-Xbootclasspath/p:@{classes}"/>
262	+	<arg value="-agentvm"/>
263	+	<arg value="-v:nopass,fail"/>
264	+	<arg value="-vmoptions:-esa -ea"/>
265	+	<arg value="-automatic"/>
266	+	<arg value="-k:!ignore"/>
267	+	<arg line="@{jtregflags}"/>
268	+	</jtreg>
269	+	</sequential>
270	+	</macrodef>
271	+
272		<!-- ALoops classpath -->
273		<path id="loops.classpath">
274		<pathelement location="${build.loops.dir}"/>
#	Line 202 | Line 280
280
281		<!-- Main targets -->
282
283	+	<property name="build.main.java.version" value="9"/>
284	+	<property name="build.main.javac" value="${javac9}"/>
285	+
286		<target name="dists"
287		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
288		description="Builds all public jars and docs"/>
#	Line 220 | Line 301
301		classpath=""
302		includeAntRuntime="false"
303		includeJavaRuntime="false"
304	<	executable="${javac8}"
304	>	executable="${build.main.javac}"
305		fork="true">
306
307		<include name="**/*.java"/>
308	+	<compilerarg value="-Xprefer:source"/>
309		<compilerarg value="-XDignore.symbol.file=true"/>
310		<compilerarg value="-Xlint:all"/>
311	+	<compilerarg value="-Xdoclint:all/protected"/>
312	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
313		<compilerarg line="${build.args}"/>
314
315		</javac>
#	Line 242 | Line 326
326		</target>
327
328
245	–	<target name="test"
246	–	depends="configure-tests, report-tests"
247	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
248	–
249	–
329		<target name="docs"
330		description="Builds javadocs for src/main to dist dir">
331
332	<	<delete dir="${dist.javadocs.dir}"/>
333	<	<mkdir dir="${dist.javadocs.dir}"/>
332	>	<delete dir="${docs.dir}"/>
333	>	<mkdir dir="${docs.dir}"/>
334
335		<!-- the packagenames="none" hack below prevents scanning the -->
336		<!-- sourcepath for packages -->
337
338	<	<javadoc destdir="${dist.javadocs.dir}"
338	>	<javadoc destdir="${docs.dir}"
339		packagenames="none"
340	<	link="${jdkapi8docs.url}"
340	>	link="${java9.api.url}"
341		overview="${src.dir}/intro.html"
342	<	sourcepath="${src.dir}:${jdk8src.dir}"
342	>	access="${build.javadoc.access}"
343	>	sourcepath="${src.dir}:${jdk9src.dir}"
344		classpath=""
345	<	executable="${javadoc8}">
345	>	executable="${javadoc9}">
346		<fileset dir="${src.dir}" defaultexcludes="yes">
347		<include name="**/*.java"/>
348		</fileset>
349	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
350	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351		<arg value="-XDignore.symbol.file=true"/>
352		<arg value="-tag"/>
353		<arg value="${javadoc.jls.option}"/>
354	+	<arg value="-tag"/>
355	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
356	+	<arg value="-tag"/>
357	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
358	+	<arg value="-tag"/>
359	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
360		</javadoc>
361		</target>
362
363
364		<target name="dist"
365	<	depends="dist-clean, dist-jar, docs"
365	>	depends="dist-clean, dist-jar, dist-docs"
366		description="Puts all distributable products in single hierarchy"/>
367
368
#	Line 307 | Line 395
395		<target name="dist-clean"
396		description="Removes all build and distribution products">
397
398	+	<delete dir="${build.dir}"/>
399		<delete dir="${dist.dir}"/>
400
401		</target>
402
403
315	–	<!-- Internal targets -->
316	–
317	–
404		<target name="dist-jar"
405		depends="clean, jar">
320	–
406		<copy file="${product.jar}" todir="${dist.dir}"/>
322	–
407		</target>
408
409	<
410	<	<target name="compile-tests"
411	<	depends="jar">
328	<
329	<	<mkdir dir="${build.testcases.dir}"/>
330	<
331	<	<javac srcdir="${tck.src.dir}"
332	<	destdir="${build.testcases.dir}"
333	<	debug="${build.debug}"
334	<	debuglevel="${build.debuglevel}"
335	<	deprecation="${build.deprecation}"
336	<	source="6"
337	<	classpath="${junit.jar}"
338	<	bootclasspath="@{product.jar}:${bootclasspath6}"
339	<	includeAntRuntime="false"
340	<	includeJavaRuntime="false"
341	<	executable="${javac8}"
342	<	fork="true">
343	<
344	<	<include name="**/*.java"/>
345	<	<compilerarg value="-XDignore.symbol.file=true"/>
346	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347	<	<compilerarg line="${build.args}"/>
348	<
349	<	</javac>
350	<
351	<	<javac srcdir="${test.src.dir}"
352	<	destdir="${build.testcases.dir}"
353	<	debug="${build.debug}"
354	<	debuglevel="${build.debuglevel}"
355	<	deprecation="${build.deprecation}"
356	<	source="6"
357	<	classpath=""
358	<	bootclasspath="@{product.jar}:${bootclasspath6}"
359	<	includeAntRuntime="false"
360	<	includeJavaRuntime="false"
361	<	executable="${javac8}"
362	<	fork="true">
363	<
364	<	<include name="jsr166/test/**/*.java"/>
365	<	<compilerarg value="-XDignore.symbol.file=true"/>
366	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
367	<	<compilerarg line="${build.args}"/>
368	<
369	<	</javac>
370	<
371	<	<!--
372	<	<javac srcdir="${jtreg.src.dir}"
373	<	destdir="${build.testcases.dir}"
374	<	debug="${build.debug}"
375	<	debuglevel="${build.debuglevel}"
376	<	deprecation="${build.deprecation}"
377	<	source="${build.sourcelevel}"
378	<	fork="true">
379	<
380	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
381	<	<compilerarg value="-XDignore.symbol.file=true"/>
382	<	<compilerarg line="${build.args}"/>
383	<
384	<	</javac>
385	<	-->
386	<
409	>	<target name="dist-docs"
410	>	depends="clean, docs">
411	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
412		</target>
413
414
415	<	<target name="run-tests"
416	<	depends="compile-tests">
417	<
393	<	<!-- May be overridden by user.properties -->
394	<	<property name="testcase" value="*"/>
395	<
396	<	<mkdir dir="${build.reports.dir}"/>
397	<
398	<	<junit printsummary="true"
399	<	showoutput="true"
400	<	errorProperty="junit.failed"
401	<	failureProperty="junit.failed"
402	<	dir="${build.reports.dir}"
403	<	jvm="${java8}"
404	<	fork="true">
405	<
406	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
407	<	<jvmarg value="-server"/>
408	<	<jvmarg value="-showversion"/>
409	<
410	<	<classpath refid="test.classpath"/>
411	<
412	<	<formatter type="xml"/>
413	<
414	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
415	<	<fileset dir="${tck.src.dir}">
416	<	<include name="**/${testcase}Test.java"/>
417	<	</fileset>
418	<	</batchtest>
419	<
420	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
421	<	<fileset dir="${test.src.dir}">
422	<	<include name="jsr166/test/**/${testcase}Test.java"/>
423	<	</fileset>
424	<	</batchtest>
425	<
426	<	<!--
427	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
428	<	<fileset dir="${jtreg.src.dir}">
429	<	<include name="**/${testcase}Test.java"/>
430	<	</fileset>
431	<	</batchtest>
432	<	-->
433	<
434	<	</junit>
415	>	<target name="test-tck"
416	>	depends="jar"
417	>	description="Runs tck tests for main directly">
418
419	+	<run-tck-tests
420	+	target="${build.main.java.version}"
421	+	workdir="${build.dir}"
422	+	classes="${product.jar}"/>
423		</target>
424
425	+	<target name="test-jtreg"
426	+	depends="jar"
427	+	description="Runs jtreg tests for main using the jtreg ant task">
428	+	<run-jtreg-tests
429	+	target="${build.main.java.version}"
430	+	workdir="${build.dir}"
431	+	classes="${product.jar}"/>
432	+	</target>
433
434	<	<target name="report-tests"
435	<	depends="run-tests">
434	>	<target name="test"
435	>	depends="test-tck, test-jtreg"
436	>	description="Runs tck and jtreg tests for main">
437	>	</target>
438
439	<	<!-- Sets junit.report.format to frames if redirection is present,
440	<	otherwise sets it to noframes. -->
444	<	<available property="junit.report.format"
445	<	value="frames"
446	<	classname="org.apache.xalan.lib.Redirect"
447	<	/>
448	<	<property name="junit.report.format" value="noframes"/>
449	<
450	<	<junitreport todir="${build.reports.dir}">
451	<	<fileset dir="${build.reports.dir}">
452	<	<include name="TEST-*.xml"/>
453	<	</fileset>
454	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
455	<	/>
456	<	</junitreport>
439	>	<target name="test89"
440	>	description="Runs tck and jtreg tests for main for multiple java versions">
441
442	<	<fail message="Test Cases Failed" if="junit.failed"/>
442	>	<antcall target="clean"/>
443	>	<antcall target="test">
444	>	<param name="build.main.java.version" value="8"/>
445	>	<param name="build.main.javac" value="${javac8}"/>
446	>	</antcall>
447	>
448	>	<antcall target="clean"/>
449	>	<antcall target="test">
450	>	<param name="build.main.java.version" value="9"/>
451	>	<param name="build.main.javac" value="${javac9}"/>
452	>	</antcall>
453
454		</target>
455
456
457	+
458		<target name="configure-compiler">
459
460		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 477 | Line 472
472		</target>
473
474
480	–	<target name="configure-tests"
481	–	depends="configure-compiler">
482	–
483	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
484	–	<available property="junit.available"
485	–	classname="junit.framework.Protectable"/>
486	–
487	–	<!-- Xalan -->
488	–	<available property="xalan.available"
489	–	classname="org.apache.xalan.Version"/>
490	–
491	–
492	–	<!-- Ant 1.6beta and later don't need or want this check -->
493	–	<!--
494	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
495	–	unless="junit.available"/>
496	–
497	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
498	–	unless="xalan.available"/>
499	–	-->
500	–
501	–	</target>
502	–
475
476		<!-- Various demos and test programs -->
477
#	Line 552 | Line 524
524		fork="true">
525
526		<include name="**/*.java"/>
527	+	<compilerarg value="-Xprefer:source"/>
528	+	<compilerarg value="-XDignore.symbol.file=true"/>
529	+	<compilerarg value="-Xlint:all"/>
530	+	<compilerarg line="${build.args}"/>
531	+
532	+	</javac>
533	+	</target>
534	+
535	+	<target name="4jdk7doclint"
536	+	depends="configure-compiler"
537	+	description="Finds doclint warnings">
538	+
539	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
540	+
541	+	<javac srcdir="${4jdk7src.dir}"
542	+	destdir="${build.4jdk7.classes.dir}"
543	+	debug="${build.debug}"
544	+	debuglevel="${build.debuglevel}"
545	+	deprecation="${build.deprecation}"
546	+	source="6"
547	+	classpath=""
548	+	bootclasspath="${bootclasspath7}"
549	+	includeAntRuntime="false"
550	+	includeJavaRuntime="false"
551	+	executable="${javac8}"
552	+	fork="true">
553	+
554	+	<include name="**/*.java"/>
555	+	<compilerarg value="-Xprefer:source"/>
556		<compilerarg value="-XDignore.symbol.file=true"/>
557		<compilerarg value="-Xlint:all"/>
558	+	<compilerarg value="-Xdoclint:all/protected"/>
559		<compilerarg line="${build.args}"/>
560
561		</javac>
562		</target>
563
564
565	<	<target name="4jdk7-jar"
565	>	<target name="4jdk7jar"
566		depends="4jdk7compile"
567		description="Builds library jar from compiled sources">
568
#	Line 572 | Line 574
574
575
576		<target name="4jdk7-test-tck"
577	<	depends="4jdk7-jar"
577	>	depends="4jdk7jar"
578		description="Runs tck tests for jsr166-4jdk7 directly">
579
580		<run-tck-tests
581		target="7"
582		workdir="${build.4jdk7.dir}"
583	<	classes="${4jdk7product.jar}"/>
583	>	classes="${4jdk7product.jar}">
584	>	<javac-elements>
585	>	<!-- JDK8+ test classes -->
586	>	<exclude name="*8Test.java"/>
587	>	<exclude name="*9Test.java"/>
588	>	<exclude name="DoubleAccumulatorTest.java"/>
589	>	<exclude name="DoubleAdderTest.java"/>
590	>	<exclude name="LongAccumulatorTest.java"/>
591	>	<exclude name="LongAdderTest.java"/>
592	>	<exclude name="CompletableFutureTest.java"/>
593	>	<exclude name="SplittableRandomTest.java"/>
594	>	<exclude name="StampedLockTest.java"/>
595	>	</javac-elements>
596	>	</run-tck-tests>
597		</target>
598
599
#	Line 604 | Line 619
619
620		<formatter type="brief"/>
621
622	<	<test name="JSR166TestCase" haltonfailure="no">
622	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
623		</test>
624
625		</junit>
626		</target>
627
628		<target name="4jdk7-test-jtreg"
629	<	depends="4jdk7compile"
629	>	depends="4jdk7jar"
630		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
632	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
633	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
634	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
635	<	<jtreg dir="${jtreg.src.dir}"
621	<	jdk="${jdk7.home}"
622	<	workDir="${build.4jdk7.dir}/JTwork"
623	<	reportDir="${build.4jdk7.dir}/JTreport">
624	<
625	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
626	<	<arg value="-agentvm"/>
627	<	<arg value="-v:nopass,fail"/>
628	<	<arg value="-vmoptions:-esa -ea"/>
629	<	<arg value="-automatic"/>
630	<	<arg value="-k:!ignore"/>
631	<	</jtreg>
631	>	<run-jtreg-tests
632	>	target="7"
633	>	workdir="${build.4jdk7.dir}"
634	>	classes="${4jdk7product.jar}"
635	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
636		</target>
637
638
#	Line 641 | Line 645
645		<target name="4jdk7docs"
646		description="Builds javadocs for src/jdk7 to dist dir">
647
648	<	<delete dir="${dist.4jdk7.docs.dir}"/>
649	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
648	>	<delete dir="${4jdk7docs.dir}"/>
649	>	<mkdir dir="${4jdk7docs.dir}"/>
650
651	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
651	>	<javadoc destdir="${4jdk7docs.dir}"
652		packagenames="none"
653	<	link="${jdkapi7docs.url}"
653	>	link="${java7.api.url}"
654		overview="${4jdk7src.dir}/intro.html"
655	+	access="${build.javadoc.access}"
656		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
657		classpath=""
658		executable="${javadoc7}">
659		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
660		<include name="**/*.java"/>
661		</fileset>
662	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
663		<arg value="-XDignore.symbol.file=true"/>
664		</javadoc>
665		</target>
666
667
668		<target name="4jdk7dist"
669	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
669	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
670		description="Puts all distributable products in single hierarchy"/>
671
672
#	Line 672 | Line 678
678		</target>
679
680
675	–	<target name="4jdk7dist-clean"
676	–	description="Removes all build and distribution products">
677	–
678	–	</target>
679	–
681		<target name="4jdk7dist-jar"
682	<	depends="4jdk7clean, 4jdk7-jar">
682	<
682	>	depends="4jdk7clean, 4jdk7jar">
683		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
684	+	</target>
685	+
686
687	+	<target name="4jdk7dist-docs"
688	+	depends="4jdk7clean, 4jdk7docs">
689	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
690		</target>
691
692
#	Line 715 | Line 720
720		</target>
721
722
723	<	<target name="jsr166x-jar"
723	>	<target name="jsr166xjar"
724		depends="jsr166xcompile"
725		description="Builds library jar from compiled sources">
726
#	Line 729 | Line 734
734		<target name="jsr166xdocs"
735		description="Builds javadocs to dist dir">
736
737	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
738	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
737	>	<delete dir="${jsr166xdocs.dir}"/>
738	>	<mkdir dir="${jsr166xdocs.dir}"/>
739
740	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
740	>	<javadoc destdir="${jsr166xdocs.dir}"
741		packagenames="jsr166x.*"
742	<	link="${jdkapidocs.url}"
742	>	link="${java.api.url}"
743	>	access="${build.javadoc.access}"
744		sourcepath="${topsrc.dir}:${jdk6src.dir}"
745		bootclasspath="${bootclasspath6}"
746		source="5"
747		executable="${javadoc7}">
748	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
749		<arg value="-XDignore.symbol.file=true"/>
750
751		</javadoc>
#	Line 746 | Line 753
753
754
755		<target name="jsr166xdist"
756	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
756	>	depends="jsr166xdist-jar, jsr166xdist-docs"
757		description="Puts all distributable products in single hierarchy"/>
758
759
#	Line 758 | Line 765
765		</target>
766
767
761	–	<target name="jsr166xdist-clean"
762	–	description="Removes all build and distribution products">
763	–
764	–	</target>
765	–
766	–
768		<target name="jsr166xdist-jar"
769	<	depends="jsr166xclean, jsr166x-jar">
769	<
769	>	depends="jsr166xclean, jsr166xjar">
770		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
771	+	</target>
772
773	+	<target name="jsr166xdist-docs"
774	+	depends="jsr166xclean, jsr166xdocs">
775	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
776		</target>
777
778		<!-- jsr166y -->
#	Line 802 | Line 806
806		</target>
807
808
809	<	<target name="jsr166y-jar"
809	>	<target name="jsr166yjar"
810		depends="jsr166ycompile"
811		description="Builds library jar from compiled sources">
812
#	Line 816 | Line 820
820		<target name="jsr166ydocs"
821		description="Builds javadocs to dist dir">
822
823	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
824	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
823	>	<delete dir="${jsr166ydocs.dir}"/>
824	>	<mkdir dir="${jsr166ydocs.dir}"/>
825
826	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
826	>	<javadoc destdir="${jsr166ydocs.dir}"
827		packagenames="jsr166y.*"
828	<	link="${jdkapidocs.url}"
828	>	link="${java.api.url}"
829	>	access="${build.javadoc.access}"
830		sourcepath="${topsrc.dir}:${jdk6src.dir}"
831		bootclasspath="${bootclasspath6}"
832		source="6"
833		executable="${javadoc7}">
834	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
835		<arg value="-XDignore.symbol.file=true"/>
836
837		</javadoc>
#	Line 833 | Line 839
839
840
841		<target name="jsr166ydist"
842	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
842	>	depends="jsr166ydist-jar, jsr166ydist-docs"
843		description="Puts all distributable products in single hierarchy"/>
844
845
#	Line 845 | Line 851
851		</target>
852
853
848	–	<target name="jsr166ydist-clean"
849	–	description="Removes all build and distribution products">
850	–
851	–	</target>
852	–
854		<target name="jsr166ydist-jar"
855	<	depends="jsr166yclean, jsr166y-jar">
855	<
855	>	depends="jsr166yclean, jsr166yjar">
856		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
857	+	</target>
858
859	+	<target name="jsr166ydist-docs"
860	+	depends="jsr166yclean, jsr166ydocs">
861	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
862		</target>
863
864
#	Line 862 | Line 866
866
867
868		<target name="extra166ycompile"
869	<	depends="configure-compiler, jsr166y-jar"
869	>	depends="configure-compiler, jsr166yjar"
870		description="Compiles extra166y sources">
871
872		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 889 | Line 893
893		</target>
894
895
896	<	<target name="extra166y-jar"
896	>	<target name="extra166yjar"
897		depends="extra166ycompile"
898		description="Builds library jar from compiled sources">
899
#	Line 903 | Line 907
907		<target name="extra166ydocs"
908		description="Builds javadocs to build dir">
909
910	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
911	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
910	>	<delete dir="${extra166ydocs.dir}"/>
911	>	<mkdir dir="${extra166ydocs.dir}"/>
912
913	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
913	>	<javadoc destdir="${extra166ydocs.dir}"
914		packagenames="extra166y.*"
915	<	link="${jdkapidocs.url}"
915	>	link="${java.api.url}"
916	>	access="${build.javadoc.access}"
917		sourcepath="${topsrc.dir}:${jdk6src.dir}"
918		bootclasspath="${bootclasspath6}"
919		source="6"
920		executable="${javadoc7}">
921	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
922		<arg value="-XDignore.symbol.file=true"/>
923
924		</javadoc>
#	Line 920 | Line 926
926
927
928		<target name="extra166ydist"
929	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
929	>	depends="extra166ydist-jar, extra166ydist-docs"
930		description="Puts all distributable products in single hierarchy"/>
931
932
#	Line 932 | Line 938
938		</target>
939
940
935	–	<target name="extra166ydist-clean"
936	–	description="Removes all build and distribution products">
937	–
938	–	</target>
939	–
941		<target name="extra166ydist-jar"
942	<	depends="extra166yclean, extra166y-jar">
942	<
942	>	depends="extra166yclean, extra166yjar">
943		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
944	+	</target>
945
946	+	<target name="extra166ydist-docs"
947	+	depends="extra166yclean, extra166ydocs">
948	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
949		</target>
950
951		<!-- jsr166e -->
952
953	+	<property name="build.jsr166e.java.version" value="6"/>
954	+	<property name="build.jsr166e.javac" value="${javac6}"/>
955	+
956		<target name="jsr166ecompile"
957		depends="configure-compiler"
958		description="Compiles jsr166e sources">
#	Line 957 | Line 964
964		debug="${build.debug}"
965		debuglevel="${build.debuglevel}"
966		deprecation="${build.deprecation}"
967	<	source="7"
967	>	source="${build.jsr166e.java.version}"
968		classpath=""
969		includeAntRuntime="false"
970		includeJavaRuntime="false"
971	<	executable="${javac7}"
971	>	executable="${build.jsr166e.javac}"
972		fork="true">
973
974		<include name="jsr166e/**/*.java"/>
#	Line 972 | Line 979
979		</javac>
980		</target>
981
982	+	<!-- jsr166e: find doclint errors -->
983	+	<target name="jsr166edoclint">
984	+
985	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
986	+
987	+	<javac srcdir="${topsrc.dir}"
988	+	destdir="${build.jsr166e.classes.dir}"
989	+	debug="${build.debug}"
990	+	debuglevel="${build.debuglevel}"
991	+	deprecation="${build.deprecation}"
992	+	source="${build.jsr166e.java.version}"
993	+	classpath=""
994	+	bootclasspath="${bootclasspath7}"
995	+	includeAntRuntime="false"
996	+	includeJavaRuntime="false"
997	+	executable="${javac8}"
998	+	fork="true">
999	+
1000	+	<include name="jsr166e/**/*.java"/>
1001	+	<compilerarg value="-XDignore.symbol.file=true"/>
1002	+	<compilerarg value="-Xlint:all"/>
1003	+	<compilerarg value="-Xdoclint:all/protected"/>
1004	+
1005	+	</javac>
1006	+	</target>
1007	+
1008
1009	<	<target name="jsr166e-jar"
1009	>	<target name="jsr166ejar"
1010		depends="jsr166ecompile"
1011		description="Builds library jar from compiled sources">
1012
#	Line 987 | Line 1020
1020		<target name="jsr166edocs"
1021		description="Builds javadocs to build dir">
1022
1023	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1024	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1023	>	<delete dir="${jsr166edocs.dir}"/>
1024	>	<mkdir dir="${jsr166edocs.dir}"/>
1025
1026	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1026	>	<javadoc destdir="${jsr166edocs.dir}"
1027		packagenames="jsr166e.*"
1028	<	link="${jdkapidocs.url}"
1029	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1030	<	source="7"
1028	>	link="${java.api.url}"
1029	>	access="${build.javadoc.access}"
1030	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1031	>	source="${build.jsr166e.java.version}"
1032		executable="${javadoc7}">
1033	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1034		<arg value="-XDignore.symbol.file=true"/>
1035
1036		</javadoc>
1037		</target>
1038
1039
1040	<	<target name="jsr166e-test-tck"
1041	<	depends="jsr166e-jar"
1042	<	description="Runs tck tests for jsr166e">
1040	>	<target name="jsr166e-test-tck-one-java-version"
1041	>	depends="jsr166ejar">
1042	>
1043	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1044
1045		<run-tck-tests
1046		tck.src.dir="${test.src.dir}/tck-jsr166e"
1047	<	source="7"
1012	<	target="8"
1047	>	target="${build.jsr166e.java.version}"
1048		workdir="${build.jsr166e.dir}"
1049		classes="${jsr166e.jar}"/>
1050		</target>
1051
1052	+	<target name="jsr166e-test-tck"
1053	+	description="Runs tck tests for jsr166e for multiple java versions">
1054	+
1055	+	<!--     <antcall target="clean"/> -->
1056	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1057	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1058	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1059	+	<!--     </antcall> -->
1060	+
1061	+	<antcall target="clean"/>
1062	+	<antcall target="jsr166e-test-tck-one-java-version">
1063	+	<param name="build.jsr166e.java.version" value="7"/>
1064	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1065	+	</antcall>
1066	+
1067	+	<antcall target="clean"/>
1068	+	<antcall target="jsr166e-test-tck-one-java-version">
1069	+	<param name="build.jsr166e.java.version" value="6"/>
1070	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1071	+	</antcall>
1072	+	</target>
1073	+
1074	+
1075	+	<target name="jsr166e-test"
1076	+	depends="jsr166e-test-tck"
1077	+	description="Runs all tests for jsr166e">
1078	+	</target>
1079
1080		<target name="jsr166edist"
1081	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1081	>	depends="jsr166edist-jar, jsr166edist-docs"
1082		description="Puts all distributable products in single hierarchy"/>
1083
1084
1085		<target name="jsr166eclean"
1086		description="Removes all jsr166e build products">
1025	–
1087		<delete dir="${build.jsr166e.dir}"/>
1027	–
1088		</target>
1089
1090
1091	<	<target name="jsr166edist-clean"
1092	<	description="Removes all build and distribution products">
1091	>	<target name="jsr166edist-jar"
1092	>	depends="jsr166eclean, jsr166ejar">
1093	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1094	>	</target>
1095
1096	+	<target name="jsr166edist-docs"
1097	+	depends="jsr166eclean, jsr166edocs">
1098	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1099		</target>
1100
1036	–	<target name="jsr166edist-jar"
1037	–	depends="jsr166eclean, jsr166e-jar">
1101
1102	<	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1102	>	<!-- Find buglets that can be detected by static build tools -->
1103
1104	+	<target name="lint">
1105	+	<antcall target="dists">
1106	+	<param name="build.javadoc.access" value="private"/>
1107	+	</antcall>
1108		</target>
1109
1110	+
1111		</project>

Diff Legend

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