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.104 by jsr166, Sat Jan 19 21:40:04 2013 UTC vs.
Revision 1.148 by jsr166, Sat Jul 20 18:26:16 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	>	<!-- Display main targets by running 'ant -projecthelp' -->
30	>	<target name="usage">
31	>	<java classname="org.apache.tools.ant.Main">
32	>	<arg value="-projecthelp" />
33	>	</java>
34		</target>
35
36
#	Line 35 | Line 39
39
40
41		<!-- Compilation options -->
42	<	<property name="build.sourcelevel"    value="1.6"/>
42	>	<property name="build.sourcelevel"    value="6"/>
43		<property name="build.debug"          value="true"/>
44		<property name="build.debuglevel"     value="source,lines,vars"/>
45		<property name="build.deprecation"    value="false"/>
46	+	<property name="build.javadoc.access" value="protected"/>
47	+
48	+	<!-- Tck options; see JSR166TestCase.java -->
49	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
50	+	<property name="jsr166.profileTests"     value="false"/>
51	+	<property name="jsr166.profileThreshold" value="100"/>
52	+	<property name="jsr166.runsPerTest"      value="1"/>
53	+	<!-- Allow running an individual tck test class -->
54	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
55	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
56
57		<!-- Build locations -->
58		<property name="build.dir"                   location="build"/>
59		<property name="build.classes.dir"           location="${build.dir}/classes"/>
60		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
61		<property name="build.loops.dir"             location="${build.dir}/loops"/>
48	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
49	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
62		<property name="build.reports.dir"           location="${build.dir}/reports"/>
63
64	<	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
65	<	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
66	<	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
67	<	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56	<	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
64	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
65	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
66	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
67	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
68
69		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61	–
70		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65	–
71		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69	–
72		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72	–	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73
74	<	<!-- JDK binary locations -->
74	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
75	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
76	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
77	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
78	>
79	>	<!-- JDK locations -->
80		<property name="jdks.home"  location="${user.home}/jdk"/>
81
82		<macrodef name="defjdklocations">
#	Line 81 | Line 86
86		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
87		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
88		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
89		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
90	<	<property name="bootclasspath@{v}"
91	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
90	>	<local name="boot.jar.dir"/>
91	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
92	>	<path id="bootclasspath@{v}">
93	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
94	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
95	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
96	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
97	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
98	>	</path>
99	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
100		</sequential>
101		</macrodef>
102
103	<	<defjdklocations v="6"/>
104	<	<defjdklocations v="7"/>
105	<	<defjdklocations v="8"/>
94	<
95	<	<macrodef name="run-tck-tests">
96	<	<attribute name="jvm"/>
97	<	<attribute name="tck.classes"/>
98	<	<attribute name="product.jar" default="${product.jar}"/>
99	<	<attribute name="jvmflags" default=""/>
103	>	<macrodef name="mirror-dir">
104	>	<attribute name="src"/>
105	>	<attribute name="dst"/>
106		<sequential>
107	<	<java classname="JSR166TestCase"
108	<	jvm="@{jvm}" fork="true">
109	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
110	<	<jvmarg line="@{jvmflags}"/>
111	<	<classpath>
106	<	<pathelement location="${junit.jar}"/>
107	<	<pathelement location="@{tck.classes}"/>
108	<	</classpath>
109	<	</java>
107	>	<delete dir="@{dst}"/>
108	>	<mkdir dir="@{dst}"/>
109	>	<copy todir="@{dst}" preservelastmodified="true">
110	>	<fileset dir="@{src}"/>
111	>	</copy>
112		</sequential>
113		</macrodef>
114
115	+	<defjdklocations v="6"/>
116	+	<defjdklocations v="7"/>
117	+	<defjdklocations v="8"/>
118	+
119		<!-- Source locations -->
120		<property name="src.dir"              location="${basedir}/src/main"/>
121		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 124 | Line 130
130		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
131		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
132		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
133
134	<	<!-- Distribution locations -->
135	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
136	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
137	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
138	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
139	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
140	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
134	>	<!-- Javadoc locations -->
135	>	<property name="docs.dir"          location="${build.dir}/docs"/>
136	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
137	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
138	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
139	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
140	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
141	>
142	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
143	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
144	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
145	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
146	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
147	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
148
149		<!-- Jar locations -->
150	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
151	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
152	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
153	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
154	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
155	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
156	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
145	<
146	<	<!-- Bootclasspath argument -->
147	<	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
150	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
151	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
152	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
153	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
154	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
155	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
156	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
157
158		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
159		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
#	Line 152 | Line 161
161		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
162
163		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
164	<	<!-- The below does not yet exist as of 2012-11 -->
164	>	<!-- The below does not yet exist as of 2013-01 -->
165		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
166	+
167	+	<!-- Default jdk api doc location (latest stable release seems best) -->
168		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
169
170	+	<!-- Define the "jtreg" task -->
171	+	<!-- See the docs in "jtreg -onlineHelp" -->
172	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
173	+	classpath="${lib.dir}/jtreg.jar" />
174	+
175		<!-- Test classpath -->
176		<path id="test.classpath">
177		<pathelement location="${build.testcases.dir}"/>
178		<pathelement location="${junit.jar}"/>
179		</path>
180
181	+	<macrodef name="run-tck-tests">
182	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
183	+	<attribute name="target"/>
184	+	<attribute name="compile-target" default="@{target}"/>
185	+	<attribute name="workdir"/>
186	+	<attribute name="classes"/>
187	+	<attribute name="jvmflags" default=""/>
188	+	<element name="javac-elements" optional="true"/>
189	+	<sequential>
190	+
191	+	<mkdir dir="@{workdir}/tck-classes"/>
192	+
193	+	<javac srcdir="@{tck.src.dir}"
194	+	destdir="@{workdir}/tck-classes"
195	+	debug="${build.debug}"
196	+	debuglevel="${build.debuglevel}"
197	+	deprecation="${build.deprecation}"
198	+	source="@{compile-target}"
199	+	target="@{compile-target}"
200	+	classpath="${junit.jar}"
201	+	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
202	+	includeAntRuntime="false"
203	+	includeJavaRuntime="false"
204	+	executable="${javac@{compile-target}}"
205	+	fork="true">
206	+
207	+	<include name="*.java"/>
208	+	<compilerarg value="-XDignore.symbol.file=true"/>
209	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
210	+	<compilerarg line="${build.args}"/>
211	+	<javac-elements/>
212	+
213	+	</javac>
214	+
215	+	<java classname="${jsr166.tckTestClass}"
216	+	failonerror="true"
217	+	jvm="${java@{target}}"
218	+	fork="true">
219	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
220	+	<jvmarg line="@{jvmflags}"/>
221	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
222	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
223	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
224	+	<classpath>
225	+	<pathelement location="${junit.jar}"/>
226	+	<pathelement location="@{workdir}/tck-classes"/>
227	+	</classpath>
228	+	</java>
229	+
230	+	</sequential>
231	+	</macrodef>
232	+
233	+	<macrodef name="run-jtreg-tests">
234	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
235	+	<attribute name="source" default="7"/>
236	+	<attribute name="target"/>
237	+	<attribute name="workdir"/>
238	+	<attribute name="classes"/>
239	+	<attribute name="jtregflags" default=""/>
240	+	<sequential>
241	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
242	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
243	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
244	+	<mkdir dir="@{workdir}/JTreport"/>
245	+	<jtreg dir="@{jtreg.src.dir}"
246	+	jdk="${jdk@{target}.home}"
247	+	workDir="@{workdir}/JTwork"
248	+	reportDir="@{workdir}/JTreport">
249	+
250	+	<arg value="-Xbootclasspath/p:@{classes}"/>
251	+	<arg value="-agentvm"/>
252	+	<arg value="-v:nopass,fail"/>
253	+	<arg value="-vmoptions:-esa -ea"/>
254	+	<arg value="-automatic"/>
255	+	<arg value="-k:!ignore"/>
256	+	<arg line="@{jtregflags}"/>
257	+	</jtreg>
258	+	</sequential>
259	+	</macrodef>
260	+
261		<!-- ALoops classpath -->
262		<path id="loops.classpath">
263		<pathelement location="${build.loops.dir}"/>
264		</path>
265
266		<!-- Support @jls tag, used in jdk8+ javadoc -->
267	<	<!-- TODO: How do we get &trade to work? -->
172	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
173	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
267	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
268		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
269
270		<!-- Main targets -->
271
272		<target name="dists"
273	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
273	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
274		description="Builds all public jars and docs"/>
275
276		<target name="compile"
#	Line 198 | Line 291
291		fork="true">
292
293		<include name="**/*.java"/>
294	<	<compilerarg line="${build.args}"/>
294	>	<compilerarg value="-Xprefer:source"/>
295		<compilerarg value="-XDignore.symbol.file=true"/>
296		<compilerarg value="-Xlint:all"/>
297	<
298	<	<!--
206	<	<exclude name="java/lang/**"/>
297	>	<compilerarg value="-Xdoclint:all/protected"/>
298	>	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
299		<compilerarg line="${build.args}"/>
208	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
209	–	-->
300
301		</javac>
212	–
302		</target>
303
304
216	–
305		<target name="jar"
306		depends="compile"
307		description="Builds library jar from compiled sources">
308
221	–	<mkdir dir="${build.lib.dir}"/>
222	–
309		<jar destfile="${product.jar}">
310		<fileset dir="${build.classes.dir}"/>
311		</jar>
226	–
312		</target>
313
314
230	–
231	–	<target name="test"
232	–	depends="configure-tests, report-tests"
233	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234	–
235	–
236	–
315		<target name="docs"
316		description="Builds javadocs for src/main to dist dir">
317
318	<	<delete dir="${dist.javadocs.dir}"/>
319	<	<mkdir dir="${dist.javadocs.dir}"/>
318	>	<delete dir="${docs.dir}"/>
319	>	<mkdir dir="${docs.dir}"/>
320
321		<!-- the packagenames="none" hack below prevents scanning the -->
322		<!-- sourcepath for packages -->
323
324	<	<javadoc destdir="${dist.javadocs.dir}"
324	>	<javadoc destdir="${docs.dir}"
325		packagenames="none"
326		link="${jdkapi8docs.url}"
327		overview="${src.dir}/intro.html"
328	+	access="${build.javadoc.access}"
329		sourcepath="${src.dir}:${jdk8src.dir}"
330		classpath=""
331		executable="${javadoc8}">
253	–	<arg value="-XDignore.symbol.file=true"/>
254	–	<arg value="-tag"/>
255	–	<arg value="${javadoc.jls.option}"/>
332		<fileset dir="${src.dir}" defaultexcludes="yes">
333		<include name="**/*.java"/>
334		</fileset>
335	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
336	+	<arg value="-XDignore.symbol.file=true"/>
337	+	<arg value="-tag"/>
338	+	<arg value="${javadoc.jls.option}"/>
339	+	<arg value="-tag"/>
340	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
341	+	<arg value="-tag"/>
342	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
343	+	<arg value="-tag"/>
344	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
345		</javadoc>
260	–
346		</target>
347
348
264	–
349		<target name="dist"
350	<	depends="dist-clean, dist-jar, docs"
350	>	depends="dist-clean, dist-jar, dist-docs"
351		description="Puts all distributable products in single hierarchy"/>
352
353
#	Line 282 | Line 366
366		<exclude name="**/SyntaxTest.java"/>
367		<exclude name="**/SuperfluousAbstract.java"/>
368		</jar>
285	–
369		</target>
370
371
289	–
372		<target name="clean"
373		description="Removes all build products">
374
375		<delete dir="${build.dir}"/>
294	–	<delete dir="${build.classes.dir}"/>
295	–	<delete dir="${build.lib.dir}"/>
376
377		</target>
378
379
300	–
380		<target name="dist-clean"
381		description="Removes all build and distribution products">
382
383	+	<delete dir="${build.dir}"/>
384		<delete dir="${dist.dir}"/>
385
386		</target>
387
388
309	–
310	–	<!-- Internal targets -->
311	–
312	–
389		<target name="dist-jar"
390		depends="clean, jar">
315	–
391		<copy file="${product.jar}" todir="${dist.dir}"/>
317	–
392		</target>
393
394	<
395	<	<target name="compile-tests"
396	<	depends="jar">
323	<
324	<	<mkdir dir="${build.testcases.dir}"/>
325	<
326	<	<javac srcdir="${tck.src.dir}"
327	<	destdir="${build.testcases.dir}"
328	<	debug="${build.debug}"
329	<	debuglevel="${build.debuglevel}"
330	<	deprecation="${build.deprecation}"
331	<	source="${build.sourcelevel}"
332	<	fork="true">
333	<
334	<	<compilerarg value="${bootclasspath.args}"/>
335	<	<compilerarg line="${build.args}"/>
336	<	<compilerarg value="-XDignore.symbol.file=true"/>
337	<
338	<	<classpath refid="test.classpath"/>
339	<
340	<	</javac>
341	<
342	<	<javac srcdir="${test.src.dir}"
343	<	destdir="${build.testcases.dir}"
344	<	debug="${build.debug}"
345	<	debuglevel="${build.debuglevel}"
346	<	deprecation="${build.deprecation}"
347	<	source="${build.sourcelevel}"
348	<	fork="true">
349	<
350	<	<include name="jsr166/test/**"/>
351	<
352	<	<compilerarg value="${bootclasspath.args}"/>
353	<	<compilerarg line="${build.args}"/>
354	<	<compilerarg value="-XDignore.symbol.file=true"/>
355	<
356	<	<classpath refid="test.classpath"/>
357	<
358	<	</javac>
359	<
360	<	<!--
361	<	<javac srcdir="${jtreg.src.dir}"
362	<	destdir="${build.testcases.dir}"
363	<	debug="${build.debug}"
364	<	debuglevel="${build.debuglevel}"
365	<	deprecation="${build.deprecation}"
366	<	source="${build.sourcelevel}"
367	<	fork="true">
368	<
369	<	<compilerarg value="${bootclasspath.args}"/>
370	<	<compilerarg line="${build.args}"/>
371	<	<compilerarg value="-XDignore.symbol.file=true"/>
372	<
373	<	<classpath refid="test.classpath"/>
374	<
375	<	</javac>
376	<	-->
377	<
394	>	<target name="dist-docs"
395	>	depends="clean, docs">
396	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
397		</target>
398
399
400	<	<target name="run-tests"
401	<	depends="compile-tests">
402	<
384	<	<!-- May be overridden by user.properties -->
385	<	<property name="testcase" value="*"/>
386	<
387	<	<mkdir dir="${build.reports.dir}"/>
388	<
389	<	<junit printsummary="true"
390	<	showoutput="true"
391	<	errorProperty="junit.failed"
392	<	failureProperty="junit.failed"
393	<	dir="${build.reports.dir}"
394	<	fork="true">
395	<
396	<	<jvmarg value="${bootclasspath.args}"/>
397	<	<jvmarg value="-server"/>
398	<	<jvmarg value="-showversion"/>
399	<
400	<	<classpath refid="test.classpath"/>
401	<
402	<	<formatter type="xml"/>
403	<
404	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
405	<	<fileset dir="${tck.src.dir}">
406	<	<include name="**/${testcase}Test.java"/>
407	<	</fileset>
408	<	</batchtest>
409	<
410	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
411	<	<fileset dir="${test.src.dir}">
412	<	<include name="jsr166/test/**/${testcase}Test.java"/>
413	<	</fileset>
414	<	</batchtest>
415	<
416	<	<!--
417	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
418	<	<fileset dir="${jtreg.src.dir}">
419	<	<include name="**/${testcase}Test.java"/>
420	<	</fileset>
421	<	</batchtest>
422	<	-->
423	<
424	<	</junit>
400	>	<target name="test-tck"
401	>	depends="jar"
402	>	description="Runs tck tests for main directly">
403
404	+	<run-tck-tests
405	+	target="8"
406	+	workdir="${build.dir}"
407	+	classes="${product.jar}"/>
408		</target>
409
410	+	<target name="test-jtreg"
411	+	depends="jar"
412	+	description="Runs jtreg tests for main using the jtreg ant task">
413	+	<run-jtreg-tests
414	+	target="8"
415	+	workdir="${build.dir}"
416	+	classes="${product.jar}"/>
417	+	</target>
418
419	<	<target name="report-tests"
420	<	depends="run-tests">
421	<
432	<	<!-- Sets junit.report.format to frames if redirection is present,
433	<	otherwise sets it to noframes. -->
434	<	<available property="junit.report.format"
435	<	value="frames"
436	<	classname="org.apache.xalan.lib.Redirect"
437	<	/>
438	<	<property name="junit.report.format" value="noframes"/>
439	<
440	<	<junitreport todir="${build.reports.dir}">
441	<	<fileset dir="${build.reports.dir}">
442	<	<include name="TEST-*.xml"/>
443	<	</fileset>
444	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
445	<	/>
446	<	</junitreport>
447	<
448	<	<fail message="Test Cases Failed" if="junit.failed"/>
449	<
419	>	<target name="test"
420	>	depends="test-tck, test-jtreg"
421	>	description="Runs tck and jtreg tests for main">
422		</target>
423
424
425	+
426		<target name="configure-compiler">
427
428		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 467 | Line 440
440		</target>
441
442
470	–	<target name="configure-tests"
471	–	depends="configure-compiler">
472	–
473	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
474	–	<available property="junit.available"
475	–	classname="junit.framework.Protectable"/>
476	–
477	–	<!-- Xalan -->
478	–	<available property="xalan.available"
479	–	classname="org.apache.xalan.Version"/>
480	–
481	–
482	–	<!-- Ant 1.6beta and later don't need or want this check -->
483	–	<!--
484	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
485	–	unless="junit.available"/>
486	–
487	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
488	–	unless="xalan.available"/>
489	–	-->
490	–
491	–	</target>
492	–
443
444		<!-- Various demos and test programs -->
445
#	Line 522 | Line 472
472
473		<!-- jsr166 4jdk7 -->
474
525	–
475		<target name="4jdk7compile"
476		depends="configure-compiler"
477		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 534 | Line 483
483		debug="${build.debug}"
484		debuglevel="${build.debuglevel}"
485		deprecation="${build.deprecation}"
486	<	source="1.6"
486	>	source="6"
487		classpath=""
488		bootclasspath="${bootclasspath6}"
489		includeAntRuntime="false"
#	Line 543 | Line 492
492		fork="true">
493
494		<include name="**/*.java"/>
495	<	<compilerarg line="${build.args}"/>
495	>	<compilerarg value="-Xprefer:source"/>
496		<compilerarg value="-XDignore.symbol.file=true"/>
497		<compilerarg value="-Xlint:all"/>
498	+	<compilerarg line="${build.args}"/>
499
500		</javac>
501	+	</target>
502	+
503
504	<	<mkdir dir="${build.4jdk7.lib.dir}"/>
504	>	<target name="4jdk7jar"
505	>	depends="4jdk7compile"
506	>	description="Builds library jar from compiled sources">
507
508	<	<jar destfile="${4jdk7product.jar}" index="true">
508	>	<jar destfile="${4jdk7product.jar}">
509		<fileset dir="${build.4jdk7.classes.dir}"/>
510		</jar>
511
558	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
559	–
560	–	<javac srcdir="${tck.src.dir}"
561	–	destdir="${build.4jdk7.tck.classes.dir}"
562	–	debug="${build.debug}"
563	–	debuglevel="${build.debuglevel}"
564	–	deprecation="${build.deprecation}"
565	–	source="1.6"
566	–	classpath="${junit.jar}"
567	–	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
568	–	includeAntRuntime="false"
569	–	includeJavaRuntime="false"
570	–	executable="${javac7}"
571	–	fork="true">
572	–
573	–	<include name="**/*.java"/>
574	–	<compilerarg line="${build.args}"/>
575	–	<compilerarg value="-XDignore.symbol.file=true"/>
576	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577	–
578	–	</javac>
579	–
512		</target>
513
514
515		<target name="4jdk7-test-tck"
516	<	depends="4jdk7compile"
516	>	depends="4jdk7jar"
517		description="Runs tck tests for jsr166-4jdk7 directly">
518	+
519		<run-tck-tests
520	<	jvm="${java7}"
521	<	tck.classes="${build.4jdk7.tck.classes.dir}"
522	<	product.jar="${4jdk7product.jar}"/>
520	>	target="7"
521	>	workdir="${build.4jdk7.dir}"
522	>	classes="${4jdk7product.jar}">
523	>	<javac-elements>
524	>	<!-- JDK8+ test classes -->
525	>	<exclude name="*8Test.java"/>
526	>	<exclude name="DoubleAccumulatorTest.java"/>
527	>	<exclude name="DoubleAdderTest.java"/>
528	>	<exclude name="LongAccumulatorTest.java"/>
529	>	<exclude name="LongAdderTest.java"/>
530	>	<exclude name="CompletableFutureTest.java"/>
531	>	<exclude name="SplittableRandomTest.java"/>
532	>	<exclude name="StampedLockTest.java"/>
533	>	</javac-elements>
534	>	</run-tck-tests>
535		</target>
536
537
#	Line 612 | Line 557
557
558		<formatter type="brief"/>
559
560	<	<test name="JSR166TestCase" haltonfailure="no">
560	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
561		</test>
562
563		</junit>
564		</target>
565
566	+	<target name="4jdk7-test-jtreg"
567	+	depends="4jdk7jar"
568	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
569	+	<run-jtreg-tests
570	+	target="7"
571	+	workdir="${build.4jdk7.dir}"
572	+	classes="${4jdk7product.jar}"
573	+	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
574	+	</target>
575	+
576	+
577	+	<target name="4jdk7-test"
578	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
579	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
580	+	</target>
581	+
582
583		<target name="4jdk7docs"
584		description="Builds javadocs for src/jdk7 to dist dir">
585
586	<	<delete dir="${dist.4jdk7.docs.dir}"/>
587	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
586	>	<delete dir="${4jdk7docs.dir}"/>
587	>	<mkdir dir="${4jdk7docs.dir}"/>
588
589	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
589	>	<javadoc destdir="${4jdk7docs.dir}"
590		packagenames="none"
591		link="${jdkapi7docs.url}"
592		overview="${4jdk7src.dir}/intro.html"
593	+	access="${build.javadoc.access}"
594		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
595		classpath=""
596		executable="${javadoc7}">
635	–	<arg value="-XDignore.symbol.file=true"/>
597		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
598		<include name="**/*.java"/>
599		</fileset>
600	+	<arg value="-XDignore.symbol.file=true"/>
601		</javadoc>
640	–
602		</target>
603
604
605		<target name="4jdk7dist"
606	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
606	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
607		description="Puts all distributable products in single hierarchy"/>
608
609
649	–
610		<target name="4jdk7clean"
611	<	description="Removes all build products">
611	>	description="Removes all 4jdk7 build products">
612
613		<delete dir="${build.4jdk7.dir}"/>
614
615		</target>
616
617
658	–
659	–	<target name="4jdk7dist-clean"
660	–	description="Removes all build and distribution products">
661	–
662	–	</target>
663	–
618		<target name="4jdk7dist-jar"
619	<	depends="4jdk7clean, 4jdk7compile">
666	<
619	>	depends="4jdk7clean, 4jdk7jar">
620		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
621	+	</target>
622	+
623
624	+	<target name="4jdk7dist-docs"
625	+	depends="4jdk7clean, 4jdk7docs">
626	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
627		</target>
628
671	–	<!-- jsr166x -->
629
630	+	<!-- jsr166x -->
631
632		<target name="jsr166xcompile"
633		depends="configure-compiler"
634	<	description="Compiles jsr166x sources">
634	>	description="Compiles jsr166x sources to build dir">
635
636	<	<mkdir dir="${build.jsr166x.dir}"/>
636	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
637
638	<	<javac srcdir="${jsr166xsrc.dir}"
639	<	destdir="${build.jsr166x.dir}"
640	<	debug="${build.debug}"
641	<	debuglevel="${build.debuglevel}"
642	<	deprecation="${build.deprecation}"
643	<	source="${build.sourcelevel}"
644	<	fork="true">
638	>	<javac srcdir="${topsrc.dir}"
639	>	destdir="${build.jsr166x.classes.dir}"
640	>	debug="${build.debug}"
641	>	debuglevel="${build.debuglevel}"
642	>	deprecation="${build.deprecation}"
643	>	classpath=""
644	>	bootclasspath="${bootclasspath6}"
645	>	source="5"
646	>	includeAntRuntime="false"
647	>	includeJavaRuntime="false"
648	>	executable="${javac7}"
649	>	fork="true">
650
651	<	<include name="**/*.java"/>
689	<	<compilerarg line="${build.args}"/>
651	>	<include name="jsr166x/**/*.java"/>
652		<compilerarg value="-XDignore.symbol.file=true"/>
653	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
654	+	<compilerarg line="${build.args}"/>
655
656		</javac>
693	–
657		</target>
658
659
697	–
660		<target name="jsr166xjar"
661		depends="jsr166xcompile"
662		description="Builds library jar from compiled sources">
663
664	<	<mkdir dir="${build.jsr166xlib.dir}"/>
665	<
704	<	<jar destfile="${jsr166xproduct.jar}">
705	<	<fileset dir="${build.jsr166x.dir}"/>
664	>	<jar destfile="${jsr166x.jar}">
665	>	<fileset dir="${build.jsr166x.classes.dir}"/>
666		</jar>
667
668		</target>
669
670
711	–
671		<target name="jsr166xdocs"
672		description="Builds javadocs to dist dir">
673
674	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
675	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
674	>	<delete dir="${jsr166xdocs.dir}"/>
675	>	<mkdir dir="${jsr166xdocs.dir}"/>
676
677	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
678	<	packagenames="jsr166x"
677	>	<javadoc destdir="${jsr166xdocs.dir}"
678	>	packagenames="jsr166x.*"
679		link="${jdkapidocs.url}"
680	<	source="${build.sourcelevel}"
681	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
682	<	additionalparam="-XDignore.symbol.file=true" />
680	>	access="${build.javadoc.access}"
681	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
682	>	bootclasspath="${bootclasspath6}"
683	>	source="5"
684	>	executable="${javadoc7}">
685	>	<arg value="-XDignore.symbol.file=true"/>
686
687	+	</javadoc>
688		</target>
689
690
691		<target name="jsr166xdist"
692	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
692	>	depends="jsr166xdist-jar, jsr166xdist-docs"
693		description="Puts all distributable products in single hierarchy"/>
694
695
733	–
696		<target name="jsr166xclean"
697	<	description="Removes all build products">
697	>	description="Removes all jsr166x build products">
698
699		<delete dir="${build.jsr166x.dir}"/>
738	–	<delete dir="${build.jsr166xlib.dir}"/>
739	–
740	–	</target>
741	–
742	–
743	–
744	–	<target name="jsr166xdist-clean"
745	–	description="Removes all build and distribution products">
700
701		</target>
702
703
750	–
751	–	<target name="jsr166xdist-docs"
752	–	description="Builds javadocs to dist dir">
753	–
754	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
755	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
756	–
757	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
758	–	packagenames="jsr166x"
759	–	link="${jdkapidocs.url}"
760	–	source="${build.sourcelevel}"
761	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
762	–	additionalparam="-XDignore.symbol.file=true" />
763	–
764	–	</target>
765	–
704		<target name="jsr166xdist-jar"
705		depends="jsr166xclean, jsr166xjar">
706	+	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
707	+	</target>
708
709	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
710	<
709	>	<target name="jsr166xdist-docs"
710	>	depends="jsr166xclean, jsr166xdocs">
711	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
712		</target>
713
714		<!-- jsr166y -->
#	Line 777 | Line 718
718		depends="configure-compiler"
719		description="Compiles jsr166y sources">
720
721	<	<mkdir dir="${build.jsr166y.dir}"/>
721	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
722
723		<javac srcdir="${topsrc.dir}"
724	<	destdir="${build.jsr166y.dir}"
724	>	destdir="${build.jsr166y.classes.dir}"
725		debug="${build.debug}"
726		debuglevel="${build.debuglevel}"
727		deprecation="${build.deprecation}"
728	<	source="1.6"
728	>	source="6"
729		classpath=""
730		bootclasspath="${bootclasspath6}"
731		includeAntRuntime="false"
#	Line 793 | Line 734
734		fork="true">
735
736		<include name="jsr166y/**/*.java"/>
796	–	<compilerarg line="${build.args}"/>
737		<compilerarg value="-XDignore.symbol.file=true"/>
738		<compilerarg value="-Xlint:all"/>
739	+	<compilerarg line="${build.args}"/>
740	+
741		</javac>
742		</target>
743
#	Line 804 | Line 746
746		depends="jsr166ycompile"
747		description="Builds library jar from compiled sources">
748
749	<	<mkdir dir="${build.jsr166ylib.dir}"/>
750	<
809	<	<jar destfile="${jsr166yproduct.jar}" index="true">
810	<	<fileset dir="${build.jsr166y.dir}"/>
749	>	<jar destfile="${jsr166y.jar}" index="true">
750	>	<fileset dir="${build.jsr166y.classes.dir}"/>
751		</jar>
752
753		</target>
754
755
816	–
756		<target name="jsr166ydocs"
757		description="Builds javadocs to dist dir">
758
759	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
760	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
759	>	<delete dir="${jsr166ydocs.dir}"/>
760	>	<mkdir dir="${jsr166ydocs.dir}"/>
761
762	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
763	<	packagenames="jsr166y"
762	>	<javadoc destdir="${jsr166ydocs.dir}"
763	>	packagenames="jsr166y.*"
764		link="${jdkapidocs.url}"
765	<	source="${build.sourcelevel}"
766	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
767	<	additionalparam="-XDignore.symbol.file=true" />
765	>	access="${build.javadoc.access}"
766	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
767	>	bootclasspath="${bootclasspath6}"
768	>	source="6"
769	>	executable="${javadoc7}">
770	>	<arg value="-XDignore.symbol.file=true"/>
771
772	+	</javadoc>
773		</target>
774
775
776		<target name="jsr166ydist"
777	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
777	>	depends="jsr166ydist-jar, jsr166ydist-docs"
778		description="Puts all distributable products in single hierarchy"/>
779
780
838	–
781		<target name="jsr166yclean"
782	<	description="Removes all build products">
782	>	description="Removes all jsr166y build products">
783
784		<delete dir="${build.jsr166y.dir}"/>
843	–	<delete dir="${build.jsr166ylib.dir}"/>
785
786		</target>
787
788
848	–
849	–	<target name="jsr166ydist-clean"
850	–	description="Removes all build and distribution products">
851	–
852	–	</target>
853	–
854	–	<target name="jsr166ydist-docs"
855	–	description="Builds javadocs to dist dir">
856	–
857	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
858	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
859	–
860	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
861	–	packagenames="jsr166y"
862	–	link="${jdkapidocs.url}"
863	–	source="${build.sourcelevel}"
864	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
865	–	additionalparam="-XDignore.symbol.file=true" />
866	–
867	–	</target>
868	–
789		<target name="jsr166ydist-jar"
790		depends="jsr166yclean, jsr166yjar">
791	+	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
792	+	</target>
793
794	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
795	<
794	>	<target name="jsr166ydist-docs"
795	>	depends="jsr166yclean, jsr166ydocs">
796	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
797		</target>
798
799
#	Line 881 | Line 804
804		depends="configure-compiler, jsr166yjar"
805		description="Compiles extra166y sources">
806
807	<	<mkdir dir="${build.extra166y.dir}"/>
807	>	<mkdir dir="${build.extra166y.classes.dir}"/>
808
809		<javac srcdir="${topsrc.dir}"
810	<	destdir="${build.extra166y.dir}"
810	>	destdir="${build.extra166y.classes.dir}"
811		debug="${build.debug}"
889	–	classpath=""
812		debuglevel="${build.debuglevel}"
813		deprecation="${build.deprecation}"
814	<	source="1.6"
815	<	bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
814	>	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
815	>	classpath=""
816	>	source="6"
817		includeAntRuntime="false"
818		includeJavaRuntime="false"
819		executable="${javac7}"
820		fork="true">
821
822		<include name="extra166y/**/*.java"/>
900	–	<compilerarg line="${build.args}"/>
823		<compilerarg value="-XDignore.symbol.file=true"/>
824		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
825	+	<compilerarg line="${build.args}"/>
826
827		</javac>
905	–
828		</target>
829
830
909	–
831		<target name="extra166yjar"
832		depends="extra166ycompile"
833		description="Builds library jar from compiled sources">
834
835	<	<mkdir dir="${build.extra166ylib.dir}"/>
836	<
916	<	<jar destfile="${extra166yproduct.jar}" index="true">
917	<	<fileset dir="${build.extra166y.dir}"/>
835	>	<jar destfile="${extra166y.jar}" index="true">
836	>	<fileset dir="${build.extra166y.classes.dir}"/>
837		</jar>
838
839		</target>
840
841
923	–
842		<target name="extra166ydocs"
843	<	description="Builds javadocs with custom tags to build dir">
843	>	description="Builds javadocs to build dir">
844
845	<	<delete dir="${build.extra166yjavadocs.dir}"/>
846	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
845	>	<delete dir="${extra166ydocs.dir}"/>
846	>	<mkdir dir="${extra166ydocs.dir}"/>
847
848	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
849	<	packagenames="extra166y"
848	>	<javadoc destdir="${extra166ydocs.dir}"
849	>	packagenames="extra166y.*"
850		link="${jdkapidocs.url}"
851	<	source="${build.sourcelevel}"
852	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
853	<	additionalparam="-XDignore.symbol.file=true" />
851	>	access="${build.javadoc.access}"
852	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
853	>	bootclasspath="${bootclasspath6}"
854	>	source="6"
855	>	executable="${javadoc7}">
856	>	<arg value="-XDignore.symbol.file=true"/>
857
858	+	</javadoc>
859		</target>
860
861
862		<target name="extra166ydist"
863	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
863	>	depends="extra166ydist-jar, extra166ydist-docs"
864		description="Puts all distributable products in single hierarchy"/>
865
866
945	–
867		<target name="extra166yclean"
868	<	description="Removes all build products">
868	>	description="Removes all extra166y build products">
869
870		<delete dir="${build.extra166y.dir}"/>
950	–	<delete dir="${build.extra166ylib.dir}"/>
871
872		</target>
873
874
955	–
956	–	<target name="extra166ydist-clean"
957	–	description="Removes all build and distribution products">
958	–
959	–	</target>
960	–
961	–	<target name="extra166ydist-docs"
962	–	description="Builds javadocs to dist dir">
963	–
964	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
965	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
966	–
967	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
968	–	packagenames="extra166y"
969	–	link="${jdkapidocs.url}"
970	–	source="${build.sourcelevel}"
971	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
972	–	additionalparam="-XDignore.symbol.file=true" />
973	–
974	–	</target>
975	–
875		<target name="extra166ydist-jar"
876		depends="extra166yclean, extra166yjar">
877	+	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
878	+	</target>
879
880	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
881	<
880	>	<target name="extra166ydist-docs"
881	>	depends="extra166yclean, extra166ydocs">
882	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
883		</target>
884
885		<!-- jsr166e -->
886
887	+	<property name="build.jsr166e.java.version" value="6"/>
888	+	<property name="build.jsr166e.javac" value="${javac6}"/>
889	+
890		<target name="jsr166ecompile"
891		depends="configure-compiler"
892		description="Compiles jsr166e sources">
893
894	<	<mkdir dir="${build.jsr166e.dir}"/>
894	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
895
896		<javac srcdir="${topsrc.dir}"
897	<	destdir="${build.jsr166e.dir}"
897	>	destdir="${build.jsr166e.classes.dir}"
898		debug="${build.debug}"
899		debuglevel="${build.debuglevel}"
900		deprecation="${build.deprecation}"
901	<	source="1.7"
901	>	source="${build.jsr166e.java.version}"
902		classpath=""
903		includeAntRuntime="false"
904		includeJavaRuntime="false"
905	<	executable="${javac7}"
905	>	executable="${build.jsr166e.javac}"
906		fork="true">
907
908		<include name="jsr166e/**/*.java"/>
1004	–	<compilerarg line="${build.args}"/>
909		<compilerarg value="-XDignore.symbol.file=true"/>
910		<compilerarg value="-Xlint:all"/>
911	+	<compilerarg line="${build.args}"/>
912
913		</javac>
1009	–
914		</target>
915
916
1013	–
917		<target name="jsr166ejar"
918		depends="jsr166ecompile"
919		description="Builds library jar from compiled sources">
920
921	<	<mkdir dir="${build.jsr166elib.dir}"/>
922	<
1020	<	<jar destfile="${jsr166eproduct.jar}" index="true">
1021	<	<fileset dir="${build.jsr166e.dir}"/>
921	>	<jar destfile="${jsr166e.jar}" index="true">
922	>	<fileset dir="${build.jsr166e.classes.dir}"/>
923		</jar>
924
925		</target>
926
927
1027	–
928		<target name="jsr166edocs"
929	<	description="Builds javadocs with custom tags to build dir">
929	>	description="Builds javadocs to build dir">
930
931	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
932	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
931	>	<delete dir="${jsr166edocs.dir}"/>
932	>	<mkdir dir="${jsr166edocs.dir}"/>
933	>
934	>	<javadoc destdir="${jsr166edocs.dir}"
935	>	packagenames="jsr166e.*"
936	>	link="${jdkapidocs.url}"
937	>	access="${build.javadoc.access}"
938	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
939	>	source="${build.jsr166e.java.version}"
940	>	executable="${javadoc7}">
941	>	<arg value="-XDignore.symbol.file=true"/>
942
1034	–	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1035	–	packagenames="jsr166e,jsr166e.extra"
1036	–	link="${jdkapi7docs.url}"
1037	–	source="1.7"
1038	–	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1039	–	executable="${javadoc7}"
1040	–	additionalparam="-XDignore.symbol.file=true" >
1041	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1042	–	<include name="jsr166e/**/*.java"/>
1043	–	</fileset>
943		</javadoc>
944	+	</target>
945	+
946	+
947	+	<target name="jsr166e-test-tck-one-java-version"
948	+	depends="jsr166ejar">
949	+
950	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
951
952	+	<run-tck-tests
953	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
954	+	target="${build.jsr166e.java.version}"
955	+	workdir="${build.jsr166e.dir}"
956	+	classes="${jsr166e.jar}"/>
957	+	</target>
958	+
959	+	<target name="jsr166e-test-tck"
960	+	description="Runs tck tests for jsr166e for multiple java versions">
961	+
962	+	<!--     <antcall target="clean"/> -->
963	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
964	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
965	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
966	+	<!--     </antcall> -->
967	+
968	+	<antcall target="clean"/>
969	+	<antcall target="jsr166e-test-tck-one-java-version">
970	+	<param name="build.jsr166e.java.version" value="7"/>
971	+	<param name="build.jsr166e.javac" value="${javac7}"/>
972	+	</antcall>
973	+
974	+	<antcall target="clean"/>
975	+	<antcall target="jsr166e-test-tck-one-java-version">
976	+	<param name="build.jsr166e.java.version" value="6"/>
977	+	<param name="build.jsr166e.javac" value="${javac6}"/>
978	+	</antcall>
979		</target>
980
981
982	+	<target name="jsr166e-test"
983	+	depends="jsr166e-test-tck"
984	+	description="Runs all tests for jsr166e">
985	+	</target>
986	+
987		<target name="jsr166edist"
988	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
988	>	depends="jsr166edist-jar, jsr166edist-docs"
989		description="Puts all distributable products in single hierarchy"/>
990
991
1054	–
992		<target name="jsr166eclean"
993	<	description="Removes all build products">
1057	<
993	>	description="Removes all jsr166e build products">
994		<delete dir="${build.jsr166e.dir}"/>
1059	–	<delete dir="${build.jsr166elib.dir}"/>
1060	–
995		</target>
996
997
998	<
999	<	<target name="jsr166edist-clean"
1000	<	description="Removes all build and distribution products">
1067	<
998	>	<target name="jsr166edist-jar"
999	>	depends="jsr166eclean, jsr166ejar">
1000	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1001		</target>
1002
1003		<target name="jsr166edist-docs"
1004	<	description="Builds javadocs to dist dir">
1005	<
1073	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1074	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1075	<
1076	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1077	<	packagenames="jsr166e,jsr166e.extra"
1078	<	link="${jdkapidocs.url}"
1079	<	source="1.7"
1080	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1081	<	additionalparam="-XDignore.symbol.file=true" />
1082	<
1004	>	depends="jsr166eclean, jsr166edocs">
1005	>	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1006		</target>
1007
1085	–	<target name="jsr166edist-jar"
1086	–	depends="jsr166eclean, jsr166ejar">
1008
1009	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1009	>	<!-- Find buglets that can be detected by static build tools -->
1010
1011	+	<target name="lint">
1012	+	<antcall target="dists">
1013	+	<param name="build.javadoc.access" value="private"/>
1014	+	</antcall>
1015		</target>
1016
1017	+
1018		</project>

Diff Legend

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