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.142 by jsr166, Tue Jun 18 20:54:57 2013 UTC

#	Line 22 | Line 22
22		$HOME/jdk/src/jdk8
23		where each of the above is a complete JDK source tree
24		(e.g. mercurial forest) or a symlink to same.
25	+	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Advises user to run with -projecthelp">
30	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
29	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<java classname="org.apache.tools.ant.Main">
31	>	<arg value="-projecthelp" />
32	>	</java>
33		</target>
34
35
#	Line 39 | Line 42
42		<property name="build.debug"          value="true"/>
43		<property name="build.debuglevel"     value="source,lines,vars"/>
44		<property name="build.deprecation"    value="false"/>
45	+	<property name="build.javadoc.access" value="protected"/>
46	+
47	+	<!-- Tck options; see JSR166TestCase.java -->
48	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49	+	<property name="jsr166.profileTests"     value="false"/>
50	+	<property name="jsr166.profileThreshold" value="100"/>
51	+	<property name="jsr166.runsPerTest"      value="1"/>
52	+	<!-- Allow running an individual tck test class -->
53	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
56		<!-- Build locations -->
57		<property name="build.dir"                   location="build"/>
#	Line 57 | Line 70
70		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72
73	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
74	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
75	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
76	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
73	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77
78	<	<!-- JDK binary locations -->
78	>	<!-- JDK locations -->
79		<property name="jdks.home"  location="${user.home}/jdk"/>
80
81		<macrodef name="defjdklocations">
#	Line 72 | Line 85
85		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
86		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
87		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
88		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
89	<	<property name="bootclasspath@{v}"
90	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
89	>	<local name="boot.jar.dir"/>
90	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91	>	<path id="bootclasspath@{v}">
92	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
93	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
94	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
95	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
96	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
97	>	</path>
98	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
99		</sequential>
100		</macrodef>
101
102	<	<defjdklocations v="6"/>
103	<	<defjdklocations v="7"/>
104	<	<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=""/>
102	>	<macrodef name="mirror-dir">
103	>	<attribute name="src"/>
104	>	<attribute name="dst"/>
105		<sequential>
106	<
107	<	<mkdir dir="@{workdir}/tck-classes"/>
108	<
109	<	<javac srcdir="${tck.src.dir}"
110	<	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	<
106	>	<delete dir="@{dst}"/>
107	>	<mkdir dir="@{dst}"/>
108	>	<copy todir="@{dst}" preservelastmodified="true">
109	>	<fileset dir="@{src}"/>
110	>	</copy>
111		</sequential>
112		</macrodef>
113
114	+	<defjdklocations v="6"/>
115	+	<defjdklocations v="7"/>
116	+	<defjdklocations v="8"/>
117	+
118		<!-- Source locations -->
119		<property name="src.dir"              location="${basedir}/src/main"/>
120		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 141 | Line 130
130		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132
133	<	<!-- Distribution locations -->
134	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
135	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
136	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
137	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
138	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
139	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
133	>	<!-- Javadoc locations -->
134	>	<property name="docs.dir"          location="${build.dir}/docs"/>
135	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140	>
141	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147
148		<!-- Jar locations -->
149		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 158 | Line 154
154		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
155		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
156
161	–	<!-- Bootclasspath argument -->
162	–	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
163	–
157		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
158		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
159		<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
160		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
161
162		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163	<	<!-- The below does not yet exist as of 2012-11 -->
163	>	<!-- The below does not yet exist as of 2013-01 -->
164		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165
166		<!-- Default jdk api doc location (latest stable release seems best) -->
#	Line 184 | Line 177
177		<pathelement location="${junit.jar}"/>
178		</path>
179
180	+	<macrodef name="run-tck-tests">
181	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
182	+	<attribute name="target"/>
183	+	<attribute name="compile-target" default="@{target}"/>
184	+	<attribute name="workdir"/>
185	+	<attribute name="classes"/>
186	+	<attribute name="jvmflags" default=""/>
187	+	<element name="javac-elements" optional="true"/>
188	+	<sequential>
189	+
190	+	<mkdir dir="@{workdir}/tck-classes"/>
191	+
192	+	<javac srcdir="@{tck.src.dir}"
193	+	destdir="@{workdir}/tck-classes"
194	+	debug="${build.debug}"
195	+	debuglevel="${build.debuglevel}"
196	+	deprecation="${build.deprecation}"
197	+	source="@{compile-target}"
198	+	target="@{compile-target}"
199	+	classpath="${junit.jar}"
200	+	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201	+	includeAntRuntime="false"
202	+	includeJavaRuntime="false"
203	+	executable="${javac@{compile-target}}"
204	+	fork="true">
205	+
206	+	<include name="*.java"/>
207	+	<compilerarg value="-XDignore.symbol.file=true"/>
208	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209	+	<compilerarg line="${build.args}"/>
210	+	<javac-elements/>
211	+
212	+	</javac>
213	+
214	+	<java classname="${jsr166.tckTestClass}"
215	+	failonerror="true"
216	+	jvm="${java@{target}}"
217	+	fork="true">
218	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
219	+	<jvmarg line="@{jvmflags}"/>
220	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223	+	<classpath>
224	+	<pathelement location="${junit.jar}"/>
225	+	<pathelement location="@{workdir}/tck-classes"/>
226	+	</classpath>
227	+	</java>
228	+
229	+	</sequential>
230	+	</macrodef>
231	+
232	+	<macrodef name="run-jtreg-tests">
233	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234	+	<attribute name="source" default="7"/>
235	+	<attribute name="target"/>
236	+	<attribute name="workdir"/>
237	+	<attribute name="classes"/>
238	+	<attribute name="jtregflags" default=""/>
239	+	<sequential>
240	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
241	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
242	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
243	+	<mkdir dir="@{workdir}/JTreport"/>
244	+	<jtreg dir="@{jtreg.src.dir}"
245	+	jdk="${jdk@{target}.home}"
246	+	workDir="@{workdir}/JTwork"
247	+	reportDir="@{workdir}/JTreport">
248	+
249	+	<arg value="-Xbootclasspath/p:@{classes}"/>
250	+	<arg value="-agentvm"/>
251	+	<arg value="-v:nopass,fail"/>
252	+	<arg value="-vmoptions:-esa -ea"/>
253	+	<arg value="-automatic"/>
254	+	<arg value="-k:!ignore"/>
255	+	<arg line="@{jtregflags}"/>
256	+	</jtreg>
257	+	</sequential>
258	+	</macrodef>
259	+
260		<!-- ALoops classpath -->
261		<path id="loops.classpath">
262		<pathelement location="${build.loops.dir}"/>
263		</path>
264
265		<!-- Support @jls tag, used in jdk8+ javadoc -->
266	<	<!-- 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"/>
266	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
267		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
268
269		<!-- Main targets -->
#	Line 220 | Line 290
290		fork="true">
291
292		<include name="**/*.java"/>
293	<	<compilerarg line="${build.args}"/>
293	>	<compilerarg value="-Xprefer:source"/>
294		<compilerarg value="-XDignore.symbol.file=true"/>
295		<compilerarg value="-Xlint:all"/>
226	–
227	–	<!--
228	–	<exclude name="java/lang/**"/>
296		<compilerarg line="${build.args}"/>
230	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
231	–	-->
297
298		</javac>
234	–
299		</target>
300
301
238	–
302		<target name="jar"
303		depends="compile"
304		description="Builds library jar from compiled sources">
#	Line 243 | Line 306
306		<jar destfile="${product.jar}">
307		<fileset dir="${build.classes.dir}"/>
308		</jar>
246	–
309		</target>
310
311
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	–
312		<target name="docs"
313		description="Builds javadocs for src/main to dist dir">
314
315	<	<delete dir="${dist.javadocs.dir}"/>
316	<	<mkdir dir="${dist.javadocs.dir}"/>
315	>	<delete dir="${docs.dir}"/>
316	>	<mkdir dir="${docs.dir}"/>
317
318		<!-- the packagenames="none" hack below prevents scanning the -->
319		<!-- sourcepath for packages -->
320
321	<	<javadoc destdir="${dist.javadocs.dir}"
321	>	<javadoc destdir="${docs.dir}"
322		packagenames="none"
323		link="${jdkapi8docs.url}"
324		overview="${src.dir}/intro.html"
325	+	access="${build.javadoc.access}"
326		sourcepath="${src.dir}:${jdk8src.dir}"
327		classpath=""
328		executable="${javadoc8}">
273	–	<arg value="-XDignore.symbol.file=true"/>
274	–	<arg value="-tag"/>
275	–	<arg value="${javadoc.jls.option}"/>
329		<fileset dir="${src.dir}" defaultexcludes="yes">
330		<include name="**/*.java"/>
331		</fileset>
332	+	<arg value="-XDignore.symbol.file=true"/>
333	+	<arg value="-tag"/>
334	+	<arg value="${javadoc.jls.option}"/>
335		</javadoc>
280	–
336		</target>
337
338
284	–
339		<target name="dist"
340	<	depends="dist-clean, dist-jar, docs"
340	>	depends="dist-clean, dist-jar, dist-docs"
341		description="Puts all distributable products in single hierarchy"/>
342
343
#	Line 302 | Line 356
356		<exclude name="**/SyntaxTest.java"/>
357		<exclude name="**/SuperfluousAbstract.java"/>
358		</jar>
305	–
359		</target>
360
361
309	–
362		<target name="clean"
363		description="Removes all build products">
364
#	Line 315 | Line 367
367		</target>
368
369
318	–
370		<target name="dist-clean"
371		description="Removes all build and distribution products">
372
#	Line 324 | Line 375
375		</target>
376
377
327	–
328	–	<!-- Internal targets -->
329	–
330	–
378		<target name="dist-jar"
379		depends="clean, jar">
333	–
380		<copy file="${product.jar}" todir="${dist.dir}"/>
335	–
381		</target>
382
383	<
384	<	<target name="compile-tests"
385	<	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	<
383	>	<target name="dist-docs"
384	>	depends="clean, docs">
385	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
386		</target>
387
388
389	<	<target name="run-tests"
390	<	depends="compile-tests">
391	<
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>
389	>	<target name="test-tck"
390	>	depends="jar"
391	>	description="Runs tck tests for main directly">
392
393	+	<run-tck-tests
394	+	target="8"
395	+	workdir="${build.dir}"
396	+	classes="${product.jar}"/>
397		</target>
398
399	+	<target name="test-jtreg"
400	+	depends="jar"
401	+	description="Runs jtreg tests for main using the jtreg ant task">
402	+	<run-jtreg-tests
403	+	target="8"
404	+	workdir="${build.dir}"
405	+	classes="${product.jar}"/>
406	+	</target>
407
408	<	<target name="report-tests"
409	<	depends="run-tests">
410	<
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>
471	<
472	<	<fail message="Test Cases Failed" if="junit.failed"/>
473	<
408	>	<target name="test"
409	>	depends="test-tck, test-jtreg"
410	>	description="Runs tck and jtreg tests for main">
411		</target>
412
413
414	+
415		<target name="configure-compiler">
416
417		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 491 | Line 429
429		</target>
430
431
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	–
432
433		<!-- Various demos and test programs -->
434
#	Line 546 | Line 461
461
462		<!-- jsr166 4jdk7 -->
463
549	–
464		<target name="4jdk7compile"
465		depends="configure-compiler"
466		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 567 | Line 481
481		fork="true">
482
483		<include name="**/*.java"/>
484	<	<compilerarg line="${build.args}"/>
484	>	<compilerarg value="-Xprefer:source"/>
485		<compilerarg value="-XDignore.symbol.file=true"/>
486		<compilerarg value="-Xlint:all"/>
487	+	<compilerarg line="${build.args}"/>
488
489		</javac>
575	–
490		</target>
491
492	<	<target name="4jdk7-jar"
492	>
493	>	<target name="4jdk7jar"
494		depends="4jdk7compile"
495		description="Builds library jar from compiled sources">
496
#	Line 587 | Line 502
502
503
504		<target name="4jdk7-test-tck"
505	<	depends="4jdk7-jar"
505	>	depends="4jdk7jar"
506		description="Runs tck tests for jsr166-4jdk7 directly">
507
508		<run-tck-tests
509		target="7"
510		workdir="${build.4jdk7.dir}"
511	<	product.jar="${4jdk7product.jar}"/>
511	>	classes="${4jdk7product.jar}">
512	>	<javac-elements>
513	>	<!-- JDK8+ test classes -->
514	>	<exclude name="*8Test.java"/>
515	>	<exclude name="DoubleAccumulatorTest.java"/>
516	>	<exclude name="DoubleAdderTest.java"/>
517	>	<exclude name="LongAccumulatorTest.java"/>
518	>	<exclude name="LongAdderTest.java"/>
519	>	<exclude name="CompletableFutureTest.java"/>
520	>	<exclude name="StampedLockTest.java"/>
521	>	</javac-elements>
522	>	</run-tck-tests>
523		</target>
524
525
#	Line 619 | Line 545
545
546		<formatter type="brief"/>
547
548	<	<test name="JSR166TestCase" haltonfailure="no">
548	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
549		</test>
550
551		</junit>
552		</target>
553
554		<target name="4jdk7-test-jtreg"
555	<	depends="4jdk7compile"
555	>	depends="4jdk7jar"
556		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
557	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
558	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
559	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
560	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
561	<	<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>
557	>	<run-jtreg-tests
558	>	target="7"
559	>	workdir="${build.4jdk7.dir}"
560	>	classes="${4jdk7product.jar}"
561	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
562		</target>
563
564
#	Line 656 | Line 571
571		<target name="4jdk7docs"
572		description="Builds javadocs for src/jdk7 to dist dir">
573
574	<	<delete dir="${dist.4jdk7.docs.dir}"/>
575	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
574	>	<delete dir="${4jdk7docs.dir}"/>
575	>	<mkdir dir="${4jdk7docs.dir}"/>
576
577	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
577	>	<javadoc destdir="${4jdk7docs.dir}"
578		packagenames="none"
579		link="${jdkapi7docs.url}"
580		overview="${4jdk7src.dir}/intro.html"
581	+	access="${build.javadoc.access}"
582		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
583		classpath=""
584		executable="${javadoc7}">
669	–	<arg value="-XDignore.symbol.file=true"/>
585		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
586		<include name="**/*.java"/>
587		</fileset>
588	+	<arg value="-XDignore.symbol.file=true"/>
589		</javadoc>
674	–
590		</target>
591
592
593		<target name="4jdk7dist"
594	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
594	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
595		description="Puts all distributable products in single hierarchy"/>
596
597
683	–
598		<target name="4jdk7clean"
599		description="Removes all 4jdk7 build products">
600
#	Line 689 | Line 603
603		</target>
604
605
692	–
606		<target name="4jdk7dist-clean"
607		description="Removes all build and distribution products">
608
609		</target>
610
611		<target name="4jdk7dist-jar"
612	<	depends="4jdk7clean, 4jdk7compile">
700	<
612	>	depends="4jdk7clean, 4jdk7jar">
613		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
614	+	</target>
615
616	+
617	+	<target name="4jdk7dist-docs"
618	+	depends="4jdk7clean, 4jdk7docs">
619	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
620		</target>
621
622
#	Line 717 | Line 634
634		debuglevel="${build.debuglevel}"
635		deprecation="${build.deprecation}"
636		classpath=""
720	–	source="5"
637		bootclasspath="${bootclasspath6}"
638	+	source="5"
639		includeAntRuntime="false"
640		includeJavaRuntime="false"
641		executable="${javac7}"
642		fork="true">
643
644		<include name="jsr166x/**/*.java"/>
728	–	<compilerarg line="${build.args}"/>
645		<compilerarg value="-XDignore.symbol.file=true"/>
646		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
647	+	<compilerarg line="${build.args}"/>
648
649		</javac>
733	–
650		</target>
651
652
737	–
653		<target name="jsr166xjar"
654		depends="jsr166xcompile"
655		description="Builds library jar from compiled sources">
#	Line 746 | Line 661
661		</target>
662
663
749	–
664		<target name="jsr166xdocs"
665		description="Builds javadocs to dist dir">
666
667	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
668	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
667	>	<delete dir="${jsr166xdocs.dir}"/>
668	>	<mkdir dir="${jsr166xdocs.dir}"/>
669
670	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
670	>	<javadoc destdir="${jsr166xdocs.dir}"
671		packagenames="jsr166x.*"
672		link="${jdkapidocs.url}"
673	<	source="5"
760	<	bootclasspath="${bootclasspath6}"
673	>	access="${build.javadoc.access}"
674		sourcepath="${topsrc.dir}:${jdk6src.dir}"
675	<	executable="${javadoc7}"
676	<	additionalparam="-XDignore.symbol.file=true"/>
675	>	bootclasspath="${bootclasspath6}"
676	>	source="5"
677	>	executable="${javadoc7}">
678	>	<arg value="-XDignore.symbol.file=true"/>
679
680	+	</javadoc>
681		</target>
682
683
684		<target name="jsr166xdist"
685	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
685	>	depends="jsr166xdist-jar, jsr166xdist-docs"
686		description="Puts all distributable products in single hierarchy"/>
687
688
773	–
689		<target name="jsr166xclean"
690		description="Removes all jsr166x build products">
691
#	Line 779 | Line 694
694		</target>
695
696
782	–
697		<target name="jsr166xdist-clean"
698		description="Removes all build and distribution products">
699
#	Line 788 | Line 702
702
703		<target name="jsr166xdist-jar"
704		depends="jsr166xclean, jsr166xjar">
791	–
705		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
706	+	</target>
707
708	+	<target name="jsr166xdist-docs"
709	+	depends="jsr166xclean, jsr166xdocs">
710	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
711		</target>
712
713		<!-- jsr166y -->
#	Line 816 | Line 733
733		fork="true">
734
735		<include name="jsr166y/**/*.java"/>
819	–	<compilerarg line="${build.args}"/>
736		<compilerarg value="-XDignore.symbol.file=true"/>
737		<compilerarg value="-Xlint:all"/>
738	+	<compilerarg line="${build.args}"/>
739	+
740		</javac>
741		</target>
742
#	Line 834 | Line 752
752		</target>
753
754
837	–
755		<target name="jsr166ydocs"
756		description="Builds javadocs to dist dir">
757
758	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
759	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
758	>	<delete dir="${jsr166ydocs.dir}"/>
759	>	<mkdir dir="${jsr166ydocs.dir}"/>
760
761	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
761	>	<javadoc destdir="${jsr166ydocs.dir}"
762		packagenames="jsr166y.*"
763		link="${jdkapidocs.url}"
764	<	source="6"
848	<	bootclasspath="${bootclasspath6}"
764	>	access="${build.javadoc.access}"
765		sourcepath="${topsrc.dir}:${jdk6src.dir}"
766	<	executable="${javadoc7}"
767	<	additionalparam="-XDignore.symbol.file=true"/>
766	>	bootclasspath="${bootclasspath6}"
767	>	source="6"
768	>	executable="${javadoc7}">
769	>	<arg value="-XDignore.symbol.file=true"/>
770
771	+	</javadoc>
772		</target>
773
774
775		<target name="jsr166ydist"
776	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
776	>	depends="jsr166ydist-jar, jsr166ydist-docs"
777		description="Puts all distributable products in single hierarchy"/>
778
779
861	–
780		<target name="jsr166yclean"
781		description="Removes all jsr166y build products">
782
#	Line 867 | Line 785
785		</target>
786
787
870	–
788		<target name="jsr166ydist-clean"
789		description="Removes all build and distribution products">
790
#	Line 875 | Line 792
792
793		<target name="jsr166ydist-jar"
794		depends="jsr166yclean, jsr166yjar">
878	–
795		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
796	+	</target>
797
798	+	<target name="jsr166ydist-docs"
799	+	depends="jsr166yclean, jsr166ydocs">
800	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
801		</target>
802
803
#	Line 895 | Line 815
815		debug="${build.debug}"
816		debuglevel="${build.debuglevel}"
817		deprecation="${build.deprecation}"
818	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
819		classpath=""
820		source="6"
900	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
821		includeAntRuntime="false"
822		includeJavaRuntime="false"
823		executable="${javac7}"
824		fork="true">
825
826		<include name="extra166y/**/*.java"/>
907	–	<compilerarg line="${build.args}"/>
827		<compilerarg value="-XDignore.symbol.file=true"/>
828		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
829	+	<compilerarg line="${build.args}"/>
830
831		</javac>
912	–
832		</target>
833
834
916	–
835		<target name="extra166yjar"
836		depends="extra166ycompile"
837		description="Builds library jar from compiled sources">
#	Line 925 | Line 843
843		</target>
844
845
928	–
846		<target name="extra166ydocs"
847		description="Builds javadocs to build dir">
848
849	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
850	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
849	>	<delete dir="${extra166ydocs.dir}"/>
850	>	<mkdir dir="${extra166ydocs.dir}"/>
851
852	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
852	>	<javadoc destdir="${extra166ydocs.dir}"
853		packagenames="extra166y.*"
854		link="${jdkapidocs.url}"
855	<	source="6"
939	<	bootclasspath="${bootclasspath6}"
855	>	access="${build.javadoc.access}"
856		sourcepath="${topsrc.dir}:${jdk6src.dir}"
857	<	executable="${javadoc7}"
858	<	additionalparam="-XDignore.symbol.file=true"/>
857	>	bootclasspath="${bootclasspath6}"
858	>	source="6"
859	>	executable="${javadoc7}">
860	>	<arg value="-XDignore.symbol.file=true"/>
861
862	+	</javadoc>
863		</target>
864
865
866		<target name="extra166ydist"
867	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
867	>	depends="extra166ydist-jar, extra166ydist-docs"
868		description="Puts all distributable products in single hierarchy"/>
869
870
952	–
871		<target name="extra166yclean"
872		description="Removes all extra166y build products">
873
#	Line 958 | Line 876
876		</target>
877
878
961	–
879		<target name="extra166ydist-clean"
880		description="Removes all build and distribution products">
881
#	Line 966 | Line 883
883
884		<target name="extra166ydist-jar"
885		depends="extra166yclean, extra166yjar">
969	–
886		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
887	+	</target>
888
889	+	<target name="extra166ydist-docs"
890	+	depends="extra166yclean, extra166ydocs">
891	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
892		</target>
893
894		<!-- jsr166e -->
#	Line 992 | Line 912
912		fork="true">
913
914		<include name="jsr166e/**/*.java"/>
995	–	<compilerarg line="${build.args}"/>
915		<compilerarg value="-XDignore.symbol.file=true"/>
916		<compilerarg value="-Xlint:all"/>
917	+	<compilerarg line="${build.args}"/>
918
919		</javac>
1000	–
920		</target>
921
922
1004	–
923		<target name="jsr166ejar"
924		depends="jsr166ecompile"
925		description="Builds library jar from compiled sources">
#	Line 1013 | Line 931
931		</target>
932
933
1016	–
934		<target name="jsr166edocs"
935		description="Builds javadocs to build dir">
936
937	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
938	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
937	>	<delete dir="${jsr166edocs.dir}"/>
938	>	<mkdir dir="${jsr166edocs.dir}"/>
939
940	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
940	>	<javadoc destdir="${jsr166edocs.dir}"
941		packagenames="jsr166e.*"
942		link="${jdkapidocs.url}"
943	<	source="7"
943	>	access="${build.javadoc.access}"
944		sourcepath="${topsrc.dir}:${jdk7src.dir}"
945	<	executable="${javadoc7}"
946	<	additionalparam="-XDignore.symbol.file=true" >
945	>	source="7"
946	>	executable="${javadoc7}">
947	>	<arg value="-XDignore.symbol.file=true"/>
948	>
949		</javadoc>
950	+	</target>
951	+
952	+
953	+	<target name="jsr166e-test-tck"
954	+	depends="jsr166ejar"
955	+	description="Runs tck tests for jsr166e">
956
957	+	<run-tck-tests
958	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
959	+	target="7"
960	+	workdir="${build.jsr166e.dir}"
961	+	classes="${jsr166e.jar}"/>
962		</target>
963
964
965		<target name="jsr166edist"
966	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
966	>	depends="jsr166edist-jar, jsr166edist-docs"
967		description="Puts all distributable products in single hierarchy"/>
968
969
1040	–
970		<target name="jsr166eclean"
971		description="Removes all jsr166e build products">
1043	–
972		<delete dir="${build.jsr166e.dir}"/>
1045	–
973		</target>
974
975
#	Line 1053 | Line 980
980
981		<target name="jsr166edist-jar"
982		depends="jsr166eclean, jsr166ejar">
1056	–
983		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
984	+	</target>
985	+
986	+	<target name="jsr166edist-docs"
987	+	depends="jsr166eclean, jsr166edocs">
988	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
989	+	</target>
990	+
991
992	+	<!-- Find buglets that can be detected by static build tools -->
993	+
994	+	<target name="lint">
995	+	<antcall target="dists">
996	+	<param name="build.javadoc.access" value="private"/>
997	+	</antcall>
998		</target>
999
1000	+
1001		</project>

Diff Legend

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