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.103 by jsr166, Sat Jan 19 21:35:40 2013 UTC vs.
Revision 1.170 by jsr166, Wed Sep 2 03:53:43 2015 UTC

#	Line 16 | Line 16
16		$HOME/jdk/jdk6
17		$HOME/jdk/jdk7
18		$HOME/jdk/jdk8
19	+	$HOME/jdk/jdk9
20		where each of the above is a JDK or a symlink to same, and
21		$HOME/jdk/src/jdk6
22		$HOME/jdk/src/jdk7
23		$HOME/jdk/src/jdk8
24	+	$HOME/jdk/src/jdk9
25		where each of the above is a complete JDK source tree
26		(e.g. mercurial forest) or a symlink to same.
27	+
28	+	Alternatively, define ant variables thus:
29	+	ant -Djdk$N.home=...
30	+	for $N in 6 7 8 9 ...
31		------------------------------------------------------------------------------
32		</description>
33
34	<	<target name="usage" description="Advises user to run with -projecthelp">
35	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
34	>	<!-- Display main targets by running 'ant -projecthelp' -->
35	>	<target name="usage">
36	>	<java classname="org.apache.tools.ant.Main">
37	>	<arg value="-projecthelp" />
38	>	</java>
39		</target>
40
41
#	Line 35 | Line 44
44
45
46		<!-- Compilation options -->
47	<	<property name="build.sourcelevel"    value="1.6"/>
47	>	<property name="build.sourcelevel"    value="6"/>
48		<property name="build.debug"          value="true"/>
49		<property name="build.debuglevel"     value="source,lines,vars"/>
50		<property name="build.deprecation"    value="false"/>
51	+	<property name="build.javadoc.access" value="protected"/>
52	+
53	+	<!-- Tck options; see JSR166TestCase.java
54	+	To profile a single tck test class:
55	+	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56	+	To stress test a single tck test class:
57	+	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58	+	-->
59	+	<property name="jsr166.profileTests"     value="false"/>
60	+	<property name="jsr166.profileThreshold" value="100"/>
61	+	<property name="jsr166.runsPerTest"      value="1"/>
62	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63
64		<!-- Build locations -->
65		<property name="build.dir"                   location="build"/>
66		<property name="build.classes.dir"           location="${build.dir}/classes"/>
67		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68		<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"/>
69		<property name="build.reports.dir"           location="${build.dir}/reports"/>
70
71	<	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
72	<	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
73	<	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
74	<	<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"/>
71	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
73	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
74	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
75
76		<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	–
77		<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	–
78		<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	–
79		<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"/>
80
81	<	<!-- JDK binary locations -->
81	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
82	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
83	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
84	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
85	>
86	>	<!-- JDK locations -->
87		<property name="jdks.home"  location="${user.home}/jdk"/>
88
89		<macrodef name="defjdklocations">
#	Line 81 | Line 93
93		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
94		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
95		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
96		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
97	<	<property name="bootclasspath@{v}"
98	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
97	>	<local name="boot.jar.dir"/>
98	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
99	>	<path id="bootclasspath@{v}">
100	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
101	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
102	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
103	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
104	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
105	>	</path>
106	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
107		</sequential>
108		</macrodef>
109
110	<	<defjdklocations v="6"/>
111	<	<defjdklocations v="7"/>
112	<	<defjdklocations v="8"/>
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=""/>
110	>	<macrodef name="mirror-dir">
111	>	<attribute name="src"/>
112	>	<attribute name="dst"/>
113		<sequential>
114	<	<java classname="JSR166TestCase"
115	<	jvm="@{jvm}" fork="true">
116	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
117	<	<jvmarg line="@{jvmflags}"/>
118	<	<classpath>
106	<	<pathelement location="${junit.jar}"/>
107	<	<pathelement location="@{tck.classes}"/>
108	<	</classpath>
109	<	</java>
114	>	<delete dir="@{dst}"/>
115	>	<mkdir dir="@{dst}"/>
116	>	<copy todir="@{dst}" preservelastmodified="true">
117	>	<fileset dir="@{src}"/>
118	>	</copy>
119		</sequential>
120		</macrodef>
121
122	+	<defjdklocations v="6"/>
123	+	<defjdklocations v="7"/>
124	+	<defjdklocations v="8"/>
125	+	<defjdklocations v="9"/>
126	+
127		<!-- Source locations -->
128		<property name="src.dir"              location="${basedir}/src/main"/>
129		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 124 | Line 138
138		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
139		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
140		<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"/>
141
142	<	<!-- Distribution locations -->
143	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
144	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
145	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
146	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
147	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
148	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
142	>	<!-- Javadoc locations -->
143	>	<property name="docs.dir"          location="${build.dir}/docs"/>
144	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
145	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
146	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
147	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
148	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
149	>
150	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
151	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
152	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
153	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
154	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
155	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
156
157		<!-- Jar locations -->
158	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
159	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
160	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
161	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
162	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
163	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
164	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
165	<
166	<	<!-- Bootclasspath argument -->
167	<	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
158	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
159	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
160	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
161	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
162	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
163	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165	>
166	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170	>	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171	>	<!-- The expected canonical location does not yet exist as of 2014-07 -->
172	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173	>	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174	>	<!-- Default jdk doc location (latest stable release seems best) -->
175	>	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
176
177		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
179	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
180	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
181	<
182	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
183	<	<!-- The below does not yet exist as of 2012-11 -->
184	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
185	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
178	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
184	>
185	>	<!-- Define the "jtreg" task -->
186	>	<!-- See the docs in "jtreg -onlineHelp" -->
187	>	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
188	>	classpath="${lib.dir}/jtreg.jar" />
189
190		<!-- Test classpath -->
191		<path id="test.classpath">
#	Line 162 | Line 193
193		<pathelement location="${junit.jar}"/>
194		</path>
195
196	+	<macrodef name="run-tck-tests">
197	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
198	+	<attribute name="target"/>
199	+	<attribute name="compile-target" default="@{target}"/>
200	+	<attribute name="workdir"/>
201	+	<attribute name="classes"/>
202	+	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203	+	<element name="javac-elements" optional="true"/>
204	+	<sequential>
205	+
206	+	<mkdir dir="@{workdir}/tck-classes"/>
207	+
208	+	<javac srcdir="@{tck.src.dir}"
209	+	destdir="@{workdir}/tck-classes"
210	+	debug="${build.debug}"
211	+	debuglevel="${build.debuglevel}"
212	+	deprecation="${build.deprecation}"
213	+	source="@{compile-target}"
214	+	target="@{compile-target}"
215	+	classpath="${junit.jar}"
216	+	includeAntRuntime="false"
217	+	includeJavaRuntime="false"
218	+	executable="${javac@{compile-target}}"
219	+	fork="true">
220	+
221	+	<include name="*.java"/>
222	+	<compilerarg value="-XDignore.symbol.file=true"/>
223	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224	+	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
225	+	<compilerarg line="${build.args}"/>
226	+	<javac-elements/>
227	+
228	+	</javac>
229	+
230	+	<java classname="${jsr166.tckTestClass}"
231	+	failonerror="true"
232	+	jvm="${java@{target}}"
233	+	fork="true">
234	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
235	+	<jvmarg line="@{jvmflags}"/>
236	+
237	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238	+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239	+	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240	+	</syspropertyset>
241	+
242	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245	+	<classpath>
246	+	<pathelement location="${junit.jar}"/>
247	+	<pathelement location="@{workdir}/tck-classes"/>
248	+	</classpath>
249	+	</java>
250	+
251	+	</sequential>
252	+	</macrodef>
253	+
254	+	<!-- Define jtreg test sets for different jdk versions -->
255	+	<fileset dir="${jtreg.src.dir}">
256	+	<patternset id="jdk9.jtreg.tests">
257	+	<include name="**/*.java"/>
258	+	</patternset>
259	+	</fileset>
260	+
261	+	<fileset dir="${jtreg.src.dir}">
262	+	<patternset id="jdk8.jtreg.tests">
263	+	<include name="**/*.java"/>
264	+	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265	+	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266	+	<exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267	+	</patternset>
268	+	</fileset>
269	+
270	+	<fileset dir="${jtreg.src.dir}">
271	+	<patternset id="jdk7.jtreg.tests">
272	+	<include name="**/*.java"/>
273	+	<exclude name="util/Collection/CollectionDefaults.java"/>
274	+	<exclude name="util/List/ListDefaults.java"/>
275	+	<exclude name="util/Spliterator/**/*.java"/>
276	+	<exclude name="**/CompletableFuture/**/*.java"/>
277	+	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278	+	<exclude name="**/StampedLock/**/*.java"/>
279	+	<exclude name="**/AtomicReferenceTest.java"/>
280	+	<exclude name="util/concurrent/atomic/Serial.java"/>
281	+	</patternset>
282	+	</fileset>
283	+
284	+	<macrodef name="run-jtreg-tests">
285	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
286	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
287	+	<attribute name="source" default="7"/>
288	+	<attribute name="target"/>
289	+	<attribute name="workdir"/>
290	+	<attribute name="classes"/>
291	+	<attribute name="jtregflags" default=""/>
292	+	<sequential>
293	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
294	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
295	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
296	+	<mkdir dir="@{workdir}/JTreport"/>
297	+	<jtreg dir="@{jtreg.src.dir}"
298	+	jdk="${jdk@{target}.home}"
299	+	workDir="@{workdir}/JTwork"
300	+	reportDir="@{workdir}/JTreport">
301	+	<patternset refid="jdk@{target}.jtreg.tests"/>
302	+	<arg value="-Xbootclasspath/p:@{classes}"/>
303	+	<arg value="-agentvm"/>
304	+	<arg value="-v:nopass,fail"/>
305	+	<arg value="-vmoptions:-esa -ea"/>
306	+	<arg value="-automatic"/>
307	+	<arg value="-k:!ignore"/>
308	+	<arg line="@{jtregflags}"/>
309	+	</jtreg>
310	+	</sequential>
311	+	</macrodef>
312	+
313		<!-- ALoops classpath -->
314		<path id="loops.classpath">
315		<pathelement location="${build.loops.dir}"/>
316		</path>
317
318		<!-- Support @jls tag, used in jdk8+ javadoc -->
319	<	<!-- 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"/>
319	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
320		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
321
322		<!-- Main targets -->
323
324	+	<property name="build.main.java.version" value="9"/>
325	+	<property name="build.main.javac" value="${javac9}"/>
326	+
327		<target name="dists"
328	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
328	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
329		description="Builds all public jars and docs"/>
330
331		<target name="compile"
#	Line 194 | Line 342
342		classpath=""
343		includeAntRuntime="false"
344		includeJavaRuntime="false"
345	<	executable="${javac8}"
345	>	executable="${build.main.javac}"
346		fork="true">
347
348		<include name="**/*.java"/>
349	<	<compilerarg line="${build.args}"/>
349	>	<compilerarg value="-Xprefer:source"/>
350		<compilerarg value="-XDignore.symbol.file=true"/>
351		<compilerarg value="-Xlint:all"/>
352	<
353	<	<!--
354	<	<exclude name="java/lang/**"/>
352	>	<compilerarg value="-Werror"/>
353	>	<compilerarg value="-Xdoclint:all/protected"/>
354	>	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
355		<compilerarg line="${build.args}"/>
208	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
209	–	-->
356
357		</javac>
212	–
358		</target>
359
360
216	–
361		<target name="jar"
362		depends="compile"
363		description="Builds library jar from compiled sources">
364
221	–	<mkdir dir="${build.lib.dir}"/>
222	–
365		<jar destfile="${product.jar}">
366		<fileset dir="${build.classes.dir}"/>
367		</jar>
226	–
368		</target>
369
370
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	–
371		<target name="docs"
372		description="Builds javadocs for src/main to dist dir">
373
374	<	<delete dir="${dist.javadocs.dir}"/>
375	<	<mkdir dir="${dist.javadocs.dir}"/>
374	>	<delete dir="${docs.dir}"/>
375	>	<mkdir dir="${docs.dir}"/>
376
377		<!-- the packagenames="none" hack below prevents scanning the -->
378		<!-- sourcepath for packages -->
379
380	<	<javadoc destdir="${dist.javadocs.dir}"
380	>	<javadoc destdir="${docs.dir}"
381		packagenames="none"
382	<	link="${jdkapi8docs.url}"
382	>	link="${java9.api.url}"
383		overview="${src.dir}/intro.html"
384	<	sourcepath="${src.dir}:${jdk8src.dir}"
384	>	access="${build.javadoc.access}"
385	>	sourcepath="${src.dir}:${jdk9src.dir}"
386		classpath=""
387	<	executable="${javadoc8}">
253	<	<arg value="-XDignore.symbol.file=true"/>
254	<	<arg value="-tag"/>
255	<	<arg value="${javadoc.jls.option}"/>
387	>	executable="${javadoc9}">
388		<fileset dir="${src.dir}" defaultexcludes="yes">
389		<include name="**/*.java"/>
390		</fileset>
391	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
392	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
393	+	<arg value="-XDignore.symbol.file=true"/>
394	+	<arg value="-tag"/>
395	+	<arg value="${javadoc.jls.option}"/>
396	+	<arg value="-tag"/>
397	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
398	+	<arg value="-tag"/>
399	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
400	+	<arg value="-tag"/>
401	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
402		</javadoc>
260	–
403		</target>
404
405
264	–
406		<target name="dist"
407	<	depends="dist-clean, dist-jar, docs"
407	>	depends="dist-clean, dist-jar, dist-docs"
408		description="Puts all distributable products in single hierarchy"/>
409
410
#	Line 282 | Line 423
423		<exclude name="**/SyntaxTest.java"/>
424		<exclude name="**/SuperfluousAbstract.java"/>
425		</jar>
285	–
426		</target>
427
428
289	–
429		<target name="clean"
430		description="Removes all build products">
431
432		<delete dir="${build.dir}"/>
294	–	<delete dir="${build.classes.dir}"/>
295	–	<delete dir="${build.lib.dir}"/>
433
434		</target>
435
436
300	–
437		<target name="dist-clean"
438		description="Removes all build and distribution products">
439
440	+	<delete dir="${build.dir}"/>
441		<delete dir="${dist.dir}"/>
442
443		</target>
444
445
309	–
310	–	<!-- Internal targets -->
311	–
312	–
313	–	<!--   <target name="init"> -->
314	–
315	–	<!-- Version is kept in a separate file -->
316	–	<!--     <loadfile property="version" srcFile="version.properties"/> -->
317	–	<!--     <echo>Building JSR-166 version ${version}</echo> -->
318	–	<!--     <echo>java.home is ${java.home}</echo> -->
319	–
320	–	<!--   </target> -->
321	–
322	–
446		<target name="dist-jar"
447		depends="clean, jar">
325	–
448		<copy file="${product.jar}" todir="${dist.dir}"/>
327	–
449		</target>
450
451	<
452	<	<target name="compile-tests"
453	<	depends="jar">
333	<
334	<	<mkdir dir="${build.testcases.dir}"/>
335	<
336	<	<javac srcdir="${tck.src.dir}"
337	<	destdir="${build.testcases.dir}"
338	<	debug="${build.debug}"
339	<	debuglevel="${build.debuglevel}"
340	<	deprecation="${build.deprecation}"
341	<	source="${build.sourcelevel}"
342	<	fork="true">
343	<
344	<	<compilerarg value="${bootclasspath.args}"/>
345	<	<compilerarg line="${build.args}"/>
346	<	<compilerarg value="-XDignore.symbol.file=true"/>
347	<
348	<	<classpath refid="test.classpath"/>
349	<
350	<	</javac>
351	<
352	<	<javac srcdir="${test.src.dir}"
353	<	destdir="${build.testcases.dir}"
354	<	debug="${build.debug}"
355	<	debuglevel="${build.debuglevel}"
356	<	deprecation="${build.deprecation}"
357	<	source="${build.sourcelevel}"
358	<	fork="true">
359	<
360	<	<include name="jsr166/test/**"/>
361	<
362	<	<compilerarg value="${bootclasspath.args}"/>
363	<	<compilerarg line="${build.args}"/>
364	<	<compilerarg value="-XDignore.symbol.file=true"/>
365	<
366	<	<classpath refid="test.classpath"/>
367	<
368	<	</javac>
369	<
370	<	<!--
371	<	<javac srcdir="${jtreg.src.dir}"
372	<	destdir="${build.testcases.dir}"
373	<	debug="${build.debug}"
374	<	debuglevel="${build.debuglevel}"
375	<	deprecation="${build.deprecation}"
376	<	source="${build.sourcelevel}"
377	<	fork="true">
378	<
379	<	<compilerarg value="${bootclasspath.args}"/>
380	<	<compilerarg line="${build.args}"/>
381	<	<compilerarg value="-XDignore.symbol.file=true"/>
382	<
383	<	<classpath refid="test.classpath"/>
384	<
385	<	</javac>
386	<	-->
387	<
451	>	<target name="dist-docs"
452	>	depends="clean, docs">
453	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
454		</target>
455
456	+	<target name="tck" depends="test-tck" description="alias for test-tck"/>
457	+	<target name="test-tck"
458	+	depends="jar"
459	+	description="Runs tck tests for main directly">
460
461	<	<target name="run-tests"
462	<	depends="compile-tests">
463	<
464	<	<!-- May be overridden by user.properties -->
465	<	<property name="testcase" value="*"/>
466	<
467	<	<mkdir dir="${build.reports.dir}"/>
468	<
469	<	<junit printsummary="true"
470	<	showoutput="true"
471	<	errorProperty="junit.failed"
472	<	failureProperty="junit.failed"
473	<	dir="${build.reports.dir}"
474	<	fork="true">
475	<
476	<	<jvmarg value="${bootclasspath.args}"/>
477	<	<jvmarg value="-server"/>
478	<	<jvmarg value="-showversion"/>
479	<
480	<	<classpath refid="test.classpath"/>
461	>	<run-tck-tests
462	>	target="${build.main.java.version}"
463	>	workdir="${build.dir}"
464	>	classes="${product.jar}"/>
465	>	</target>
466	>
467	>	<target name="test-tck-parallelism-1"
468	>	description="Runs test-tck with given common pool parallelism">
469	>	<antcall target="test-tck">
470	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
471	>	</antcall>
472	>	</target>
473	>
474	>	<target name="test-tck-parallelism-0"
475	>	description="Runs test-tck with given common pool parallelism">
476	>	<antcall target="test-tck">
477	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
478	>	</antcall>
479	>	</target>
480	>
481	>	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
482	>	<target name="test-jtreg"
483	>	depends="jar"
484	>	description="Runs jtreg tests for main using the jtreg ant task">
485	>	<run-jtreg-tests
486	>	target="${build.main.java.version}"
487	>	workdir="${build.dir}"
488	>	classes="${product.jar}"/>
489	>	</target>
490
491	<	<formatter type="xml"/>
491	>	<target name="test"
492	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
493	>	description="Runs tck and jtreg tests for main">
494	>	</target>
495
496	<	<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	<	-->
496	>	<target name="jtreg8" description="Runs jtreg tests with jdk8">
497
498	<	</junit>
498	>	<antcall target="jtreg">
499	>	<param name="build.main.java.version" value="8"/>
500	>	<param name="build.main.javac" value="${javac8}"/>
501	>	</antcall>
502
503		</target>
504
505	+	<target name="test89"
506	+	description="Runs tck and jtreg tests for main for multiple java versions">
507
508	<	<target name="report-tests"
509	<	depends="run-tests">
508	>	<antcall target="clean"/>
509	>	<antcall target="test">
510	>	<param name="build.main.java.version" value="8"/>
511	>	<param name="build.main.javac" value="${javac8}"/>
512	>	</antcall>
513
514	<	<!-- Sets junit.report.format to frames if redirection is present,
515	<	otherwise sets it to noframes. -->
516	<	<available property="junit.report.format"
517	<	value="frames"
518	<	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>
457	<
458	<	<fail message="Test Cases Failed" if="junit.failed"/>
514	>	<antcall target="clean"/>
515	>	<antcall target="test">
516	>	<param name="build.main.java.version" value="9"/>
517	>	<param name="build.main.javac" value="${javac9}"/>
518	>	</antcall>
519
520		</target>
521
522
523	+
524		<target name="configure-compiler">
525
526		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 477 | Line 538
538		</target>
539
540
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	–
541
542		<!-- Various demos and test programs -->
543
#	Line 530 | Line 568
568		</target>
569
570
571	<	<!-- jsr166 4jdk7 -->
571	>	<target name="compile-test-loops" depends="jar"
572	>	description="compile all the perf tests in src/test/loops">
573	>
574	>	<mkdir dir="${build.dir}/test/loops"/>
575	>
576	>	<javac srcdir="${basedir}/src/test/loops"
577	>	destdir="${build.dir}/test/loops"
578	>	debug="${build.debug}"
579	>	debuglevel="${build.debuglevel}"
580	>	deprecation="${build.deprecation}"
581	>	includeAntRuntime="false"
582	>	includeJavaRuntime="false"
583	>	executable="${javac9}"
584	>	fork="true">
585	>
586	>	<include name="*.java"/>
587	>	<compilerarg value="-XDignore.symbol.file=true"/>
588	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
589	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
590	>	<compilerarg line="${build.args}"/>
591
592	+	</javac>
593	+
594	+	</target>
595	+
596	+
597	+	<!-- jsr166 4jdk7 -->
598
599		<target name="4jdk7compile"
600		depends="configure-compiler"
#	Line 544 | Line 607
607		debug="${build.debug}"
608		debuglevel="${build.debuglevel}"
609		deprecation="${build.deprecation}"
610	<	source="1.6"
610	>	source="6"
611		classpath=""
612		bootclasspath="${bootclasspath6}"
613		includeAntRuntime="false"
#	Line 553 | Line 616
616		fork="true">
617
618		<include name="**/*.java"/>
619	<	<compilerarg line="${build.args}"/>
619	>	<compilerarg value="-Xprefer:source"/>
620		<compilerarg value="-XDignore.symbol.file=true"/>
621		<compilerarg value="-Xlint:all"/>
622	+	<compilerarg value="-Werror"/>
623	+	<compilerarg line="${build.args}"/>
624
625		</javac>
626	+	</target>
627
628	<	<mkdir dir="${build.4jdk7.lib.dir}"/>
629	<
630	<	<jar destfile="${4jdk7product.jar}" index="true">
565	<	<fileset dir="${build.4jdk7.classes.dir}"/>
566	<	</jar>
628	>	<target name="4jdk7doclint"
629	>	depends="configure-compiler"
630	>	description="Finds doclint warnings">
631
632	<	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
632	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
633
634	<	<javac srcdir="${tck.src.dir}"
635	<	destdir="${build.4jdk7.tck.classes.dir}"
634	>	<javac srcdir="${4jdk7src.dir}"
635	>	destdir="${build.4jdk7.classes.dir}"
636		debug="${build.debug}"
637		debuglevel="${build.debuglevel}"
638		deprecation="${build.deprecation}"
639	<	source="1.6"
640	<	classpath="${junit.jar}"
641	<	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
639	>	source="6"
640	>	classpath=""
641	>	bootclasspath="${bootclasspath7}"
642		includeAntRuntime="false"
643		includeJavaRuntime="false"
644	<	executable="${javac7}"
644	>	executable="${javac8}"
645		fork="true">
646
647		<include name="**/*.java"/>
648	<	<compilerarg line="${build.args}"/>
648	>	<compilerarg value="-Xprefer:source"/>
649		<compilerarg value="-XDignore.symbol.file=true"/>
650	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
650	>	<compilerarg value="-Xlint:all"/>
651	>	<compilerarg value="-Xdoclint:all/protected"/>
652	>	<compilerarg line="${build.args}"/>
653
654		</javac>
655	+	</target>
656	+
657	+
658	+	<target name="4jdk7jar"
659	+	depends="4jdk7compile"
660	+	description="Builds library jar from compiled sources">
661	+
662	+	<jar destfile="${4jdk7product.jar}">
663	+	<fileset dir="${build.4jdk7.classes.dir}"/>
664	+	</jar>
665
666		</target>
667
668
669		<target name="4jdk7-test-tck"
670	<	depends="4jdk7compile"
670	>	depends="4jdk7jar"
671		description="Runs tck tests for jsr166-4jdk7 directly">
672	+
673		<run-tck-tests
674	<	jvm="${java7}"
675	<	tck.classes="${build.4jdk7.tck.classes.dir}"
676	<	product.jar="${4jdk7product.jar}"/>
674	>	target="7"
675	>	workdir="${build.4jdk7.dir}"
676	>	classes="${4jdk7product.jar}">
677	>	<javac-elements>
678	>	<!-- JDK8+ test classes -->
679	>	<exclude name="*8Test.java"/>
680	>	<exclude name="*9Test.java"/>
681	>	<exclude name="DoubleAccumulatorTest.java"/>
682	>	<exclude name="DoubleAdderTest.java"/>
683	>	<exclude name="LongAccumulatorTest.java"/>
684	>	<exclude name="LongAdderTest.java"/>
685	>	<exclude name="CompletableFutureTest.java"/>
686	>	<exclude name="SplittableRandomTest.java"/>
687	>	<exclude name="StampedLockTest.java"/>
688	>	</javac-elements>
689	>	</run-tck-tests>
690		</target>
691
692
#	Line 622 | Line 712
712
713		<formatter type="brief"/>
714
715	<	<test name="JSR166TestCase" haltonfailure="no">
715	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
716		</test>
717
718		</junit>
719		</target>
720
721	+	<target name="4jdk7-test-jtreg"
722	+	depends="4jdk7jar"
723	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
724	+	<run-jtreg-tests
725	+	target="7"
726	+	workdir="${build.4jdk7.dir}"
727	+	classes="${4jdk7product.jar}"/>
728	+	</target>
729	+
730	+
731	+	<target name="4jdk7-test"
732	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
733	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
734	+	</target>
735	+
736
737		<target name="4jdk7docs"
738		description="Builds javadocs for src/jdk7 to dist dir">
739
740	<	<delete dir="${dist.4jdk7.docs.dir}"/>
741	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
740	>	<delete dir="${4jdk7docs.dir}"/>
741	>	<mkdir dir="${4jdk7docs.dir}"/>
742
743	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
743	>	<javadoc destdir="${4jdk7docs.dir}"
744		packagenames="none"
745	<	link="${jdkapi7docs.url}"
745	>	link="${java7.api.url}"
746		overview="${4jdk7src.dir}/intro.html"
747	+	access="${build.javadoc.access}"
748		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
749		classpath=""
750		executable="${javadoc7}">
645	–	<arg value="-XDignore.symbol.file=true"/>
751		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
752		<include name="**/*.java"/>
753		</fileset>
754	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
755	+	<arg value="-XDignore.symbol.file=true"/>
756		</javadoc>
650	–
757		</target>
758
759
760		<target name="4jdk7dist"
761	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
761	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
762		description="Puts all distributable products in single hierarchy"/>
763
764
659	–
765		<target name="4jdk7clean"
766	<	description="Removes all build products">
766	>	description="Removes all 4jdk7 build products">
767
768		<delete dir="${build.4jdk7.dir}"/>
769
770		</target>
771
772
668	–
669	–	<target name="4jdk7dist-clean"
670	–	description="Removes all build and distribution products">
671	–
672	–	</target>
673	–
773		<target name="4jdk7dist-jar"
774	<	depends="4jdk7clean, 4jdk7compile">
676	<
774	>	depends="4jdk7clean, 4jdk7jar">
775		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
776	+	</target>
777
778	+
779	+	<target name="4jdk7dist-docs"
780	+	depends="4jdk7clean, 4jdk7docs">
781	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
782		</target>
783
681	–	<!-- jsr166x -->
784
785	+	<!-- jsr166x -->
786
787		<target name="jsr166xcompile"
788		depends="configure-compiler"
789	<	description="Compiles jsr166x sources">
789	>	description="Compiles jsr166x sources to build dir">
790
791	<	<mkdir dir="${build.jsr166x.dir}"/>
791	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
792
793	<	<javac srcdir="${jsr166xsrc.dir}"
794	<	destdir="${build.jsr166x.dir}"
795	<	debug="${build.debug}"
796	<	debuglevel="${build.debuglevel}"
797	<	deprecation="${build.deprecation}"
798	<	source="${build.sourcelevel}"
799	<	fork="true">
793	>	<javac srcdir="${topsrc.dir}"
794	>	destdir="${build.jsr166x.classes.dir}"
795	>	debug="${build.debug}"
796	>	debuglevel="${build.debuglevel}"
797	>	deprecation="${build.deprecation}"
798	>	classpath=""
799	>	bootclasspath="${bootclasspath6}"
800	>	source="5"
801	>	includeAntRuntime="false"
802	>	includeJavaRuntime="false"
803	>	executable="${javac7}"
804	>	fork="true">
805
806	<	<include name="**/*.java"/>
699	<	<compilerarg line="${build.args}"/>
806	>	<include name="jsr166x/**/*.java"/>
807		<compilerarg value="-XDignore.symbol.file=true"/>
808	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
809	+	<compilerarg value="-Werror"/>
810	+	<compilerarg line="${build.args}"/>
811
812		</javac>
703	–
813		</target>
814
815
707	–
816		<target name="jsr166xjar"
817		depends="jsr166xcompile"
818		description="Builds library jar from compiled sources">
819
820	<	<mkdir dir="${build.jsr166xlib.dir}"/>
821	<
714	<	<jar destfile="${jsr166xproduct.jar}">
715	<	<fileset dir="${build.jsr166x.dir}"/>
820	>	<jar destfile="${jsr166x.jar}">
821	>	<fileset dir="${build.jsr166x.classes.dir}"/>
822		</jar>
823
824		</target>
825
826
721	–
827		<target name="jsr166xdocs"
828		description="Builds javadocs to dist dir">
829
830	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
831	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
830	>	<delete dir="${jsr166xdocs.dir}"/>
831	>	<mkdir dir="${jsr166xdocs.dir}"/>
832
833	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
834	<	packagenames="jsr166x"
835	<	link="${jdkapidocs.url}"
836	<	source="${build.sourcelevel}"
837	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
838	<	additionalparam="-XDignore.symbol.file=true" />
833	>	<javadoc destdir="${jsr166xdocs.dir}"
834	>	packagenames="jsr166x.*"
835	>	link="${java.api.url}"
836	>	access="${build.javadoc.access}"
837	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
838	>	bootclasspath="${bootclasspath6}"
839	>	source="5"
840	>	executable="${javadoc7}">
841	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
842	>	<arg value="-XDignore.symbol.file=true"/>
843
844	+	</javadoc>
845		</target>
846
847
848		<target name="jsr166xdist"
849	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
849	>	depends="jsr166xdist-jar, jsr166xdist-docs"
850		description="Puts all distributable products in single hierarchy"/>
851
852
743	–
853		<target name="jsr166xclean"
854	<	description="Removes all build products">
854	>	description="Removes all jsr166x build products">
855
856		<delete dir="${build.jsr166x.dir}"/>
748	–	<delete dir="${build.jsr166xlib.dir}"/>
857
858		</target>
859
860
753	–
754	–	<target name="jsr166xdist-clean"
755	–	description="Removes all build and distribution products">
756	–
757	–	</target>
758	–
759	–
760	–
761	–	<target name="jsr166xdist-docs"
762	–	description="Builds javadocs to dist dir">
763	–
764	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
765	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766	–
767	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
768	–	packagenames="jsr166x"
769	–	link="${jdkapidocs.url}"
770	–	source="${build.sourcelevel}"
771	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
772	–	additionalparam="-XDignore.symbol.file=true" />
773	–
774	–	</target>
775	–
861		<target name="jsr166xdist-jar"
862		depends="jsr166xclean, jsr166xjar">
863	+	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
864	+	</target>
865
866	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
867	<
866	>	<target name="jsr166xdist-docs"
867	>	depends="jsr166xclean, jsr166xdocs">
868	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
869		</target>
870
871		<!-- jsr166y -->
#	Line 787 | Line 875
875		depends="configure-compiler"
876		description="Compiles jsr166y sources">
877
878	<	<mkdir dir="${build.jsr166y.dir}"/>
878	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
879
880		<javac srcdir="${topsrc.dir}"
881	<	destdir="${build.jsr166y.dir}"
881	>	destdir="${build.jsr166y.classes.dir}"
882		debug="${build.debug}"
883		debuglevel="${build.debuglevel}"
884		deprecation="${build.deprecation}"
885	<	source="1.6"
885	>	source="6"
886		classpath=""
887		bootclasspath="${bootclasspath6}"
888		includeAntRuntime="false"
#	Line 803 | Line 891
891		fork="true">
892
893		<include name="jsr166y/**/*.java"/>
806	–	<compilerarg line="${build.args}"/>
894		<compilerarg value="-XDignore.symbol.file=true"/>
895		<compilerarg value="-Xlint:all"/>
896	+	<compilerarg value="-Werror"/>
897	+	<compilerarg line="${build.args}"/>
898	+
899		</javac>
900		</target>
901
#	Line 814 | Line 904
904		depends="jsr166ycompile"
905		description="Builds library jar from compiled sources">
906
907	<	<mkdir dir="${build.jsr166ylib.dir}"/>
908	<
819	<	<jar destfile="${jsr166yproduct.jar}" index="true">
820	<	<fileset dir="${build.jsr166y.dir}"/>
907	>	<jar destfile="${jsr166y.jar}" index="true">
908	>	<fileset dir="${build.jsr166y.classes.dir}"/>
909		</jar>
910
911		</target>
912
913
826	–
914		<target name="jsr166ydocs"
915		description="Builds javadocs to dist dir">
916
917	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
918	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
917	>	<delete dir="${jsr166ydocs.dir}"/>
918	>	<mkdir dir="${jsr166ydocs.dir}"/>
919
920	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
921	<	packagenames="jsr166y"
922	<	link="${jdkapidocs.url}"
923	<	source="${build.sourcelevel}"
924	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
925	<	additionalparam="-XDignore.symbol.file=true" />
920	>	<javadoc destdir="${jsr166ydocs.dir}"
921	>	packagenames="jsr166y.*"
922	>	link="${java.api.url}"
923	>	access="${build.javadoc.access}"
924	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
925	>	bootclasspath="${bootclasspath6}"
926	>	source="6"
927	>	executable="${javadoc7}">
928	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
929	>	<arg value="-XDignore.symbol.file=true"/>
930
931	+	</javadoc>
932		</target>
933
934
935		<target name="jsr166ydist"
936	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
936	>	depends="jsr166ydist-jar, jsr166ydist-docs"
937		description="Puts all distributable products in single hierarchy"/>
938
939
848	–
940		<target name="jsr166yclean"
941	<	description="Removes all build products">
941	>	description="Removes all jsr166y build products">
942
943		<delete dir="${build.jsr166y.dir}"/>
853	–	<delete dir="${build.jsr166ylib.dir}"/>
944
945		</target>
946
947
858	–
859	–	<target name="jsr166ydist-clean"
860	–	description="Removes all build and distribution products">
861	–
862	–	</target>
863	–
864	–	<target name="jsr166ydist-docs"
865	–	description="Builds javadocs to dist dir">
866	–
867	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
868	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
869	–
870	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
871	–	packagenames="jsr166y"
872	–	link="${jdkapidocs.url}"
873	–	source="${build.sourcelevel}"
874	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
875	–	additionalparam="-XDignore.symbol.file=true" />
876	–
877	–	</target>
878	–
948		<target name="jsr166ydist-jar"
949		depends="jsr166yclean, jsr166yjar">
950	+	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
951	+	</target>
952
953	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
954	<
953	>	<target name="jsr166ydist-docs"
954	>	depends="jsr166yclean, jsr166ydocs">
955	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
956		</target>
957
958
#	Line 891 | Line 963
963		depends="configure-compiler, jsr166yjar"
964		description="Compiles extra166y sources">
965
966	<	<mkdir dir="${build.extra166y.dir}"/>
966	>	<mkdir dir="${build.extra166y.classes.dir}"/>
967
968		<javac srcdir="${topsrc.dir}"
969	<	destdir="${build.extra166y.dir}"
969	>	destdir="${build.extra166y.classes.dir}"
970		debug="${build.debug}"
899	–	classpath=""
971		debuglevel="${build.debuglevel}"
972		deprecation="${build.deprecation}"
973	<	source="1.6"
974	<	bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
973	>	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
974	>	classpath=""
975	>	source="6"
976		includeAntRuntime="false"
977		includeJavaRuntime="false"
978		executable="${javac7}"
979		fork="true">
980
981		<include name="extra166y/**/*.java"/>
910	–	<compilerarg line="${build.args}"/>
982		<compilerarg value="-XDignore.symbol.file=true"/>
983		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
984	+	<compilerarg value="-Werror"/>
985	+	<compilerarg line="${build.args}"/>
986
987		</javac>
915	–
988		</target>
989
990
919	–
991		<target name="extra166yjar"
992		depends="extra166ycompile"
993		description="Builds library jar from compiled sources">
994
995	<	<mkdir dir="${build.extra166ylib.dir}"/>
996	<
926	<	<jar destfile="${extra166yproduct.jar}" index="true">
927	<	<fileset dir="${build.extra166y.dir}"/>
995	>	<jar destfile="${extra166y.jar}" index="true">
996	>	<fileset dir="${build.extra166y.classes.dir}"/>
997		</jar>
998
999		</target>
1000
1001
933	–
1002		<target name="extra166ydocs"
1003	<	description="Builds javadocs with custom tags to build dir">
1003	>	description="Builds javadocs to build dir">
1004
1005	<	<delete dir="${build.extra166yjavadocs.dir}"/>
1006	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
1005	>	<delete dir="${extra166ydocs.dir}"/>
1006	>	<mkdir dir="${extra166ydocs.dir}"/>
1007
1008	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
1009	<	packagenames="extra166y"
1010	<	link="${jdkapidocs.url}"
1011	<	source="${build.sourcelevel}"
1012	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1013	<	additionalparam="-XDignore.symbol.file=true" />
1008	>	<javadoc destdir="${extra166ydocs.dir}"
1009	>	packagenames="extra166y.*"
1010	>	link="${java.api.url}"
1011	>	access="${build.javadoc.access}"
1012	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1013	>	bootclasspath="${bootclasspath6}"
1014	>	source="6"
1015	>	executable="${javadoc7}">
1016	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1017	>	<arg value="-XDignore.symbol.file=true"/>
1018
1019	+	</javadoc>
1020		</target>
1021
1022
1023		<target name="extra166ydist"
1024	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
1024	>	depends="extra166ydist-jar, extra166ydist-docs"
1025		description="Puts all distributable products in single hierarchy"/>
1026
1027
955	–
1028		<target name="extra166yclean"
1029	<	description="Removes all build products">
1029	>	description="Removes all extra166y build products">
1030
1031		<delete dir="${build.extra166y.dir}"/>
960	–	<delete dir="${build.extra166ylib.dir}"/>
961	–
962	–	</target>
963	–
964	–
965	–
966	–	<target name="extra166ydist-clean"
967	–	description="Removes all build and distribution products">
1032
1033		</target>
1034
971	–	<target name="extra166ydist-docs"
972	–	description="Builds javadocs to dist dir">
973	–
974	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
975	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
976	–
977	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
978	–	packagenames="extra166y"
979	–	link="${jdkapidocs.url}"
980	–	source="${build.sourcelevel}"
981	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
982	–	additionalparam="-XDignore.symbol.file=true" />
983	–
984	–	</target>
1035
1036		<target name="extra166ydist-jar"
1037		depends="extra166yclean, extra166yjar">
1038	+	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1039	+	</target>
1040
1041	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1042	<
1041	>	<target name="extra166ydist-docs"
1042	>	depends="extra166yclean, extra166ydocs">
1043	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1044		</target>
1045
1046		<!-- jsr166e -->
1047
1048	+	<property name="build.jsr166e.java.version" value="6"/>
1049	+	<property name="build.jsr166e.javac" value="${javac6}"/>
1050	+
1051		<target name="jsr166ecompile"
1052		depends="configure-compiler"
1053		description="Compiles jsr166e sources">
1054
1055	<	<mkdir dir="${build.jsr166e.dir}"/>
1055	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
1056
1057		<javac srcdir="${topsrc.dir}"
1058	<	destdir="${build.jsr166e.dir}"
1058	>	destdir="${build.jsr166e.classes.dir}"
1059		debug="${build.debug}"
1060		debuglevel="${build.debuglevel}"
1061		deprecation="${build.deprecation}"
1062	<	source="1.7"
1062	>	source="${build.jsr166e.java.version}"
1063		classpath=""
1064		includeAntRuntime="false"
1065		includeJavaRuntime="false"
1066	<	executable="${javac7}"
1066	>	executable="${build.jsr166e.javac}"
1067		fork="true">
1068
1069		<include name="jsr166e/**/*.java"/>
1014	–	<compilerarg line="${build.args}"/>
1070		<compilerarg value="-XDignore.symbol.file=true"/>
1071		<compilerarg value="-Xlint:all"/>
1072	+	<compilerarg value="-Werror"/>
1073	+	<compilerarg line="${build.args}"/>
1074
1075		</javac>
1019	–
1076		</target>
1077
1078	+	<!-- jsr166e: find doclint errors -->
1079	+	<target name="jsr166edoclint">
1080	+
1081	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1082	+
1083	+	<javac srcdir="${topsrc.dir}"
1084	+	destdir="${build.jsr166e.classes.dir}"
1085	+	debug="${build.debug}"
1086	+	debuglevel="${build.debuglevel}"
1087	+	deprecation="${build.deprecation}"
1088	+	source="${build.jsr166e.java.version}"
1089	+	classpath=""
1090	+	bootclasspath="${bootclasspath7}"
1091	+	includeAntRuntime="false"
1092	+	includeJavaRuntime="false"
1093	+	executable="${javac8}"
1094	+	fork="true">
1095	+
1096	+	<include name="jsr166e/**/*.java"/>
1097	+	<compilerarg value="-XDignore.symbol.file=true"/>
1098	+	<compilerarg value="-Xlint:all"/>
1099	+	<compilerarg value="-Werror"/>
1100	+	<compilerarg value="-Xdoclint:all/protected"/>
1101	+
1102	+	</javac>
1103	+	</target>
1104
1105
1106		<target name="jsr166ejar"
1107		depends="jsr166ecompile"
1108		description="Builds library jar from compiled sources">
1109
1110	<	<mkdir dir="${build.jsr166elib.dir}"/>
1111	<
1030	<	<jar destfile="${jsr166eproduct.jar}" index="true">
1031	<	<fileset dir="${build.jsr166e.dir}"/>
1110	>	<jar destfile="${jsr166e.jar}" index="true">
1111	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1112		</jar>
1113
1114		</target>
1115
1116
1037	–
1117		<target name="jsr166edocs"
1118	<	description="Builds javadocs with custom tags to build dir">
1118	>	description="Builds javadocs to build dir">
1119
1120	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
1121	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1120	>	<delete dir="${jsr166edocs.dir}"/>
1121	>	<mkdir dir="${jsr166edocs.dir}"/>
1122	>
1123	>	<javadoc destdir="${jsr166edocs.dir}"
1124	>	packagenames="jsr166e.*"
1125	>	link="${java.api.url}"
1126	>	access="${build.javadoc.access}"
1127	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1128	>	source="${build.jsr166e.java.version}"
1129	>	executable="${javadoc7}">
1130	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1131	>	<arg value="-XDignore.symbol.file=true"/>
1132
1044	–	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1045	–	packagenames="jsr166e,jsr166e.extra"
1046	–	link="${jdkapi7docs.url}"
1047	–	source="1.7"
1048	–	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1049	–	executable="${javadoc7}"
1050	–	additionalparam="-XDignore.symbol.file=true" >
1051	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1052	–	<include name="jsr166e/**/*.java"/>
1053	–	</fileset>
1133		</javadoc>
1134	+	</target>
1135	+
1136	+
1137	+	<target name="jsr166e-test-tck-one-java-version"
1138	+	depends="jsr166ejar">
1139
1140	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1141	+
1142	+	<run-tck-tests
1143	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1144	+	target="${build.jsr166e.java.version}"
1145	+	workdir="${build.jsr166e.dir}"
1146	+	classes="${jsr166e.jar}"/>
1147	+	</target>
1148	+
1149	+	<target name="jsr166e-test-tck"
1150	+	description="Runs tck tests for jsr166e for multiple java versions">
1151	+
1152	+	<!--     <antcall target="clean"/> -->
1153	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1154	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1155	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1156	+	<!--     </antcall> -->
1157	+
1158	+	<antcall target="clean"/>
1159	+	<antcall target="jsr166e-test-tck-one-java-version">
1160	+	<param name="build.jsr166e.java.version" value="7"/>
1161	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1162	+	</antcall>
1163	+
1164	+	<antcall target="clean"/>
1165	+	<antcall target="jsr166e-test-tck-one-java-version">
1166	+	<param name="build.jsr166e.java.version" value="6"/>
1167	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1168	+	</antcall>
1169		</target>
1170
1171
1172	+	<target name="jsr166e-test"
1173	+	depends="jsr166e-test-tck"
1174	+	description="Runs all tests for jsr166e">
1175	+	</target>
1176	+
1177		<target name="jsr166edist"
1178	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1178	>	depends="jsr166edist-jar, jsr166edist-docs"
1179		description="Puts all distributable products in single hierarchy"/>
1180
1181
1064	–
1182		<target name="jsr166eclean"
1183	<	description="Removes all build products">
1067	<
1183	>	description="Removes all jsr166e build products">
1184		<delete dir="${build.jsr166e.dir}"/>
1069	–	<delete dir="${build.jsr166elib.dir}"/>
1070	–
1185		</target>
1186
1187
1188	<
1189	<	<target name="jsr166edist-clean"
1190	<	description="Removes all build and distribution products">
1077	<
1188	>	<target name="jsr166edist-jar"
1189	>	depends="jsr166eclean, jsr166ejar">
1190	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1191		</target>
1192
1193		<target name="jsr166edist-docs"
1194	<	description="Builds javadocs to dist dir">
1194	>	depends="jsr166eclean, jsr166edocs">
1195	>	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1196	>	</target>
1197
1083	–	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1084	–	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1198
1199	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1087	<	packagenames="jsr166e,jsr166e.extra"
1088	<	link="${jdkapidocs.url}"
1089	<	source="1.7"
1090	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1091	<	additionalparam="-XDignore.symbol.file=true" />
1199	>	<!-- Find buglets that can be detected by static build tools -->
1200
1201	+	<target name="lint">
1202	+	<antcall target="dists">
1203	+	<param name="build.javadoc.access" value="public"/>
1204	+	</antcall>
1205		</target>
1206
1207	<	<target name="jsr166edist-jar"
1208	<	depends="jsr166eclean, jsr166ejar">
1209	<
1210	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1211	<
1207	>	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1208	>	<target name="lint-private">
1209	>	<antcall target="dist">
1210	>	<param name="build.javadoc.access" value="private"/>
1211	>	</antcall>
1212		</target>
1213
1214	+
1215		</project>

Diff Legend

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