[ViewVC] Diff of: jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.112 by jsr166, Sun Jan 20 03:44:54 2013 UTC vs.
Revision 1.199 by jsr166, Fri Mar 25 03:36:15 2016 UTC

#	Line 1 \| Line 1
1	<	<project name="jsr166" default="usage">
1	>	<project name="jsr166" default="usage"
2	>	xmlns:if="ant:if" xmlns:unless="ant:unless">
3
4		<description>
5		------------------------------------------------------------------------------
#	Line 16 \| Line 17
17		$HOME/jdk/jdk6
18		$HOME/jdk/jdk7
19		$HOME/jdk/jdk8
20	+	$HOME/jdk/jdk9
21		where each of the above is a JDK or a symlink to same, and
22		$HOME/jdk/src/jdk6
23		$HOME/jdk/src/jdk7
24		$HOME/jdk/src/jdk8
25	+	$HOME/jdk/src/jdk9
26		where each of the above is a complete JDK source tree
27		(e.g. mercurial forest) or a symlink to same.
28	+
29	+	Alternatively, define ant variables thus:
30	+	ant -Djdk$N.home=... -Djdk$N.src.home=...
31	+	for $N in 6 7 8 9 ...
32	+
33	+	As of 2015-09, there is incomplete hacky support for jigsaw
34	+	Build for jigsaw using something like:
35	+	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36	+	"docs" target is still broken.
37		------------------------------------------------------------------------------
38		</description>
39
40	<	<target name="usage" description="Advises user to run with -projecthelp">
41	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
40	>	<!-- Display main targets by running 'ant -projecthelp' -->
41	>	<target name="usage">
42	>	<java classname="org.apache.tools.ant.Main">
43	>	<arg value="-projecthelp" />
44	>	</java>
45		</target>
46
47	+	<!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48
49		<!-- User-specific settings -->
50		<property file="user.properties"/>
51
52
53		<!-- Compilation options -->
54	<	<property name="build.sourcelevel" value="1.6"/>
54	>	<property name="build.sourcelevel" value="6"/>
55		<property name="build.debug" value="true"/>
56		<property name="build.debuglevel" value="source,lines,vars"/>
57		<property name="build.deprecation" value="false"/>
58	+	<property name="build.javadoc.access" value="protected"/>
59
60		<!-- Build locations -->
61		<property name="build.dir" location="build"/>
#	Line 49 \| Line 66
66
67		<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/>
68		<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/>
69	<	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
69	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70		<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/>
71
72		<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/>
#	Line 57 \| Line 74
74		<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/>
75		<property name="build.extra166y.dir" location="${build.dir}/extra166y"/>
76
77	<	<!-- JDK binary locations -->
77	>	<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/>
78	>	<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/>
79	>	<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/>
80	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
81	>
82	>	<!-- JDK locations -->
83		<property name="jdks.home" location="${user.home}/jdk"/>
84
85		<macrodef name="defjdklocations">
86		<attribute name="v"/>
87		<sequential>
88	<	<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/>
89	<	<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/>
90	<	<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/>
91	<	<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/>
92	<	<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/>
93	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
94	<	<property name="bootclasspath@{v}"
95	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88	>	<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/>
89	>	<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/>
90	>	<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/>
91	>	<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/>
92	>	<property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
93	>	<local name="have.java.base"/>
94	>	<available property="have.java.base"
95	>	file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
96	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
97	>	if:set="have.java.base"/>
98	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
99	>	unless:set="have.java.base"/>
100	>	<local name="modules"/>
101	>	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
102	>	<local name="boot.jar.dir"/>
103	>	<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
104	>	<path id="bootclasspath@{v}" unless:set="modules">
105	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
106	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
107	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
108	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
109	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
110	>	</path>
111	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
112		</sequential>
113		</macrodef>
114
115	<	<defjdklocations v="6"/>
116	<	<defjdklocations v="7"/>
117	<	<defjdklocations v="8"/>
80	<
81	<	<macrodef name="run-tck-tests">
82	<	<attribute name="jvm"/>
83	<	<attribute name="tck.classes"/>
84	<	<attribute name="product.jar" default="${product.jar}"/>
85	<	<attribute name="jvmflags" default=""/>
115	>	<macrodef name="mirror-dir">
116	>	<attribute name="src"/>
117	>	<attribute name="dst"/>
118		<sequential>
119	<	<java classname="JSR166TestCase"
120	<	jvm="@{jvm}" fork="true">
121	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
122	<	<jvmarg line="@{jvmflags}"/>
123	<	<classpath>
92	<	<pathelement location="${junit.jar}"/>
93	<	<pathelement location="@{tck.classes}"/>
94	<	</classpath>
95	<	</java>
119	>	<delete dir="@{dst}"/>
120	>	<mkdir dir="@{dst}"/>
121	>	<copy todir="@{dst}" preservelastmodified="true">
122	>	<fileset dir="@{src}"/>
123	>	</copy>
124		</sequential>
125		</macrodef>
126
127	+	<defjdklocations v="6"/>
128	+	<defjdklocations v="7"/>
129	+	<defjdklocations v="8"/>
130	+	<defjdklocations v="9"/>
131	+
132		<!-- Source locations -->
133		<property name="src.dir" location="${basedir}/src/main"/>
134		<property name="test.src.dir" location="${basedir}/src/test"/>
135		<property name="loops.src.dir" location="${basedir}/src/loops"/>
136		<property name="tck.src.dir" location="${test.src.dir}/tck"/>
137	<	<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/>
137	>	<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/>
138	>	<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg"/>
139	>	<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/>
140	>	<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/>
141		<property name="lib.dir" location="${basedir}/lib"/>
142		<property name="dist.dir" location="${basedir}/dist"/>
143		<property name="topsrc.dir" location="${basedir}/src"/>
#	Line 111 \| Line 147
147		<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/>
148		<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/>
149
150	<	<!-- Distribution locations -->
151	<	<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/>
152	<	<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/>
153	<	<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/>
154	<	<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/>
155	<	<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/>
156	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
150	>	<!-- Javadoc locations -->
151	>	<property name="docs.dir" location="${build.dir}/docs"/>
152	>	<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/>
153	>	<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/>
154	>	<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/>
155	>	<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/>
156	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
157	>
158	>	<property name="dist.docs.dir" location="${dist.dir}/docs"/>
159	>	<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/>
160	>	<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/>
161	>	<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/>
162	>	<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/>
163	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
164
165		<!-- Jar locations -->
166		<property name="product.jar" location="${build.dir}/jsr166.jar"/>
#	Line 128 \| Line 171
171		<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/>
172		<property name="junit.jar" location="${lib.dir}/junit.jar"/>
173
174	<	<!-- Bootclasspath argument -->
175	<	<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/>
174	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
175	>	<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/>
176	>	<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/>
177	>	<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/>
178	>	<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/>
179	>	<!-- The expected canonical location does not yet exist as of 2015-11 -->
180	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
181	>	<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/>
182	>	<!-- Default jdk doc location (latest stable release seems best) -->
183	>	<property name="java.docroot.url" value="${java8.docroot.url}"/>
184
185		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
186	<	<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
187	<	<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/>
188	<	<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/>
189	<
190	<	<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/>
191	<	<!-- The below does not yet exist as of 2012-11 -->
192	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
193	<
194	<	<!-- Default jdk api doc location (latest stable release seems best) -->
195	<	<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/>
196	<
197	<	<!-- Test classpath -->
198	<	<path id="test.classpath">
199	<	<pathelement location="${build.testcases.dir}"/>
200	<	<pathelement location="${junit.jar}"/>
201	<	</path>
186	>	<property name="java5.api.url" value="${java5.docroot.url}/api/"/>
187	>	<property name="java6.api.url" value="${java6.docroot.url}/api/"/>
188	>	<property name="java7.api.url" value="${java7.docroot.url}/api/"/>
189	>	<property name="java8.api.url" value="${java8.docroot.url}/api/"/>
190	>	<property name="java9.api.url" value="${java9.docroot.url}/api/"/>
191	>	<property name="java.api.url" value="${java.docroot.url}/api/"/>
192	>
193	>	<!-- Define the "jtreg" task -->
194	>	<!-- See the docs in "jtreg -onlineHelp" -->
195	>	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
196	>	classpath="${lib.dir}/jtreg.jar" />
197	>
198	>	<!-- Tck options; see JSR166TestCase.java
199	>	To profile a single tck test class:
200	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
201	>	To stress test a single tck test class:
202	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
203	>	To stress test a single tck test method:
204	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
205	>	-->
206	>	<property name="jsr166.tckTestClass" value="JSR166TestCase"/>
207	>	<macrodef name="run-tck-tests">
208	>	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
209	>	<attribute name="target"/>
210	>	<attribute name="compile-target" default="@{target}"/>
211	>	<attribute name="workdir"/>
212	>	<attribute name="classes"/>
213	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
214	>	<element name="javac-elements" optional="true"/>
215	>
216	>	<sequential>
217	>
218	>	<local name="modules"/>
219	>	<condition property="modules">
220	>	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
221	>	</condition>
222	>
223	>	<mkdir dir="@{workdir}/tck-classes"/>
224	>
225	>	<javac srcdir="@{tck.src.dir}"
226	>	destdir="@{workdir}/tck-classes"
227	>	debug="${build.debug}"
228	>	debuglevel="${build.debuglevel}"
229	>	deprecation="${build.deprecation}"
230	>	source="@{compile-target}"
231	>	target="@{compile-target}"
232	>	classpath="${junit.jar}"
233	>	includeAntRuntime="false"
234	>	includeJavaRuntime="false"
235	>	executable="${javac@{compile-target}}"
236	>	fork="true">
237	>
238	>	<include name="*.java"/>
239	>	<compilerarg value="-XDignore.symbol.file=true"/>
240	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
241	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
242	>	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
243	>	<compilerarg line="${build.args}"/>
244	>	<javac-elements/>
245	>
246	>	</javac>
247	>
248	>	<java classname="${jsr166.tckTestClass}"
249	>	failonerror="true"
250	>	jvm="${java@{target}}"
251	>	fork="true">
252	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
253	>	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
254	>	<jvmarg line="@{jvmflags}"/>
255	>
256	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
257	>	<syspropertyset id="system-properties-used-by-tck">
258	>	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
259	>	<propertyref prefix="jsr166."/>
260	>	<propertyref name="test.timeout.factor"/>
261	>	</syspropertyset>
262	>
263	>	<classpath>
264	>	<pathelement location="${junit.jar}"/>
265	>	<pathelement location="@{workdir}/tck-classes"/>
266	>	</classpath>
267	>	</java>
268	>
269	>	</sequential>
270	>	</macrodef>
271	>
272	>	<!-- Define jtreg test sets for different jdk versions -->
273	>	<fileset dir="${jtreg9.src.dir}">
274	>	<patternset id="jdk9.jtreg.tests">
275	>	<include name="*/.java"/>
276	>	</patternset>
277	>	</fileset>
278	>
279	>	<fileset dir="${jtreg8.src.dir}">
280	>	<patternset id="jdk8.jtreg.tests">
281	>	<include name="*/.java"/>
282	>	<exclude name="**/SpliteratorCharacteristics.java"/>
283	>	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
284	>	<exclude name="**/GCDuringIteration.java"/>
285	>	</patternset>
286	>	</fileset>
287	>
288	>	<fileset dir="${jtreg7.src.dir}">
289	>	<patternset id="jdk7.jtreg.tests">
290	>	<include name="*/.java"/>
291	>	</patternset>
292	>	</fileset>
293	>
294	>	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
295	>	<property name="jtreg.flags" value=""/>
296	>
297	>	<macrodef name="run-jtreg-tests">
298	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
299	>	<attribute name="source" default="7"/>
300	>	<attribute name="target"/>
301	>	<attribute name="workdir"/>
302	>	<attribute name="classes"/>
303	>	<attribute name="jtregflags" default=""/>
304	>
305	>	<sequential>
306	>
307	>	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
308	>	<property name="jtreg.verbose" value="nopass,fail,error"/>
309	>
310	>	<local name="modules"/>
311	>	<condition property="modules">
312	>	<available file="${jdk@{target}.home}/jmods" type="dir"/>
313	>	</condition>
314	>
315	>	<delete dir="@{workdir}/JTwork" quiet="true"/>
316	>	<delete dir="@{workdir}/JTreport" quiet="true"/>
317	>	<mkdir dir="@{workdir}/JTwork/scratch"/>
318	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
319	>	<mkdir dir="@{workdir}/JTreport/html"/>
320	>	<mkdir dir="@{workdir}/JTreport/text"/>
321	>	<jtreg dir="${jtreg@{target}.src.dir}"
322	>	jdk="${jdk@{target}.home}"
323	>	workDir="@{workdir}/JTwork"
324	>	reportDir="@{workdir}/JTreport">
325	>	<patternset refid="jdk@{target}.jtreg.tests"/>
326	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
327	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
328	>	<arg value="-agentvm"/>
329	>	<arg value="-verbose:${jtreg.verbose}"/>
330	>	<arg value="-vmoptions:-esa -ea"/>
331	>	<arg value="-automatic"/>
332	>	<arg value="-k:!ignore"/>
333	>	<arg line="@{jtregflags}"/>
334	>	<arg line="${jtreg.flags}"/>
335	>	</jtreg>
336	>	</sequential>
337	>	</macrodef>
338
339		<!-- ALoops classpath -->
340		<path id="loops.classpath">
#	Line 155 \| Line 342
342		</path>
343
344		<!-- Support @jls tag, used in jdk8+ javadoc -->
345	<	<!-- TODO: How do we get &trade to work? -->
159	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
160	<	<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" -->
161	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
345	>	<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/>
346		<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/>
347
348		<!-- Main targets -->
349
350	+	<property name="build.main.java.version" value="9"/>
351	+	<property name="build.main.javac" value="${javac9}"/>
352	+
353		<target name="dists"
354		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
355		description="Builds all public jars and docs"/>
#	Line 171 \| Line 358
358		depends="configure-compiler"
359		description="Compiles src/main sources to build dir">
360
361	<	<mkdir dir="${build.classes.dir}"/>
361	>	<local name="modules"/>
362	>	<condition property="modules">
363	>	<and>
364	>	<available file="${jdk9.home}/jmods" type="dir"/>
365	>	<equals arg1="9" arg2="${build.main.java.version}"/>
366	>	</and>
367	>	</condition>
368	>
369	>	<local name="destdir"/>
370	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
371	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
372	>
373	>	<mkdir dir="${destdir}"/>
374
375		<javac srcdir="${src.dir}"
376	<	destdir="${build.classes.dir}"
376	>	destdir="${destdir}"
377		debug="${build.debug}"
378		debuglevel="${build.debuglevel}"
379		deprecation="${build.deprecation}"
380		classpath=""
381		includeAntRuntime="false"
382		includeJavaRuntime="false"
383	<	executable="${javac8}"
383	>	executable="${build.main.javac}"
384		fork="true">
385
386		<include name="*/.java"/>
387	<	<compilerarg line="${build.args}"/>
387	>	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
388	>	<compilerarg value="-Xprefer:source"/>
389		<compilerarg value="-XDignore.symbol.file=true"/>
390		<compilerarg value="-Xlint:all"/>
391	<
392	<	<!--
393	<	<exclude name="java/lang/**"/>
391	>	<compilerarg value="-Werror"/>
392	>	<compilerarg value="-Xdoclint:all/protected"/>
393	>	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
394		<compilerarg line="${build.args}"/>
195	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
196	–	-->
395
396		</javac>
397
398	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
399	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
400		</target>
401
402
203	–
403		<target name="jar"
404		depends="compile"
405		description="Builds library jar from compiled sources">
406
407		<jar destfile="${product.jar}">
408		<fileset dir="${build.classes.dir}"/>
409	+	<manifest>
410	+	<attribute name="Built-By" value="${user.name}"/>
411	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
412	+	</manifest>
413		</jar>
211	–
414		</target>
415
416
215	–
216	–	<target name="test"
217	–	depends="configure-tests, report-tests"
218	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219	–
220	–
221	–
417		<target name="docs"
418		description="Builds javadocs for src/main to dist dir">
419
420	<	<delete dir="${dist.javadocs.dir}"/>
421	<	<mkdir dir="${dist.javadocs.dir}"/>
420	>	<delete dir="${docs.dir}"/>
421	>	<mkdir dir="${docs.dir}"/>
422
423		<!-- the packagenames="none" hack below prevents scanning the -->
424		<!-- sourcepath for packages -->
425
426	<	<javadoc destdir="${dist.javadocs.dir}"
426	>	<javadoc destdir="${docs.dir}"
427		packagenames="none"
428	<	link="${jdkapi8docs.url}"
428	>	link="${java9.api.url}"
429		overview="${src.dir}/intro.html"
430	<	sourcepath="${src.dir}:${jdk8src.dir}"
430	>	access="${build.javadoc.access}"
431	>	sourcepath="${src.dir}:${jdk9.src.dir}"
432		classpath=""
433	<	executable="${javadoc8}">
238	<	<arg value="-XDignore.symbol.file=true"/>
239	<	<arg value="-tag"/>
240	<	<arg value="${javadoc.jls.option}"/>
433	>	executable="${javadoc9}">
434		<fileset dir="${src.dir}" defaultexcludes="yes">
435		<include name="*/.java"/>
436		</fileset>
437	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
438	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439	+	<arg value="-XDignore.symbol.file=true"/>
440	+	<!-- TODO <arg value="-Xmodule:java.base"/> -->
441	+	<arg value="-tag"/>
442	+	<arg value="${javadoc.jls.option}"/>
443	+	<arg value="-tag"/>
444	+	<arg value="apiNote:a:<em>API Note:</em>"/>
445	+	<arg value="-tag"/>
446	+	<arg value="implSpec:a:<em>Implementation Requirements:</em>"/>
447	+	<arg value="-tag"/>
448	+	<arg value="implNote:a:<em>Implementation Note:</em>"/>
449	+	<!-- tags added in jdk9 -->
450	+	<arg value="-tag"/>
451	+	<arg value="revised:X"/>
452	+	<arg value="-tag"/>
453	+	<arg value="spec:X"/>
454		</javadoc>
245	–
455		</target>
456
457
249	–
458		<target name="dist"
459	<	depends="dist-clean, dist-jar, docs"
459	>	depends="dist-clean, dist-jar, dist-docs"
460		description="Puts all distributable products in single hierarchy"/>
461
462
#	Line 266 \| Line 474
474		<exclude name="src/emulation/**"/>
475		<exclude name="**/SyntaxTest.java"/>
476		<exclude name="**/SuperfluousAbstract.java"/>
477	+	<manifest>
478	+	<attribute name="Built-By" value="${user.name}"/>
479	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
480	+	</manifest>
481		</jar>
270	–
482		</target>
483
484
274	–
485		<target name="clean"
486		description="Removes all build products">
487
#	Line 280 \| Line 490
490		</target>
491
492
283	–
493		<target name="dist-clean"
494		description="Removes all build and distribution products">
495
496	+	<delete dir="${build.dir}"/>
497		<delete dir="${dist.dir}"/>
498
499		</target>
500
501
292	–
293	–	<!-- Internal targets -->
294	–
295	–
502		<target name="dist-jar"
503		depends="clean, jar">
298	–
504		<copy file="${product.jar}" todir="${dist.dir}"/>
300	–
505		</target>
506
507	<
508	<	<target name="compile-tests"
509	<	depends="jar">
306	<
307	<	<mkdir dir="${build.testcases.dir}"/>
308	<
309	<	<javac srcdir="${tck.src.dir}"
310	<	destdir="${build.testcases.dir}"
311	<	debug="${build.debug}"
312	<	debuglevel="${build.debuglevel}"
313	<	deprecation="${build.deprecation}"
314	<	source="6"
315	<	classpath="${junit.jar}"
316	<	bootclasspath="${product.jar}:${bootclasspath6}"
317	<	includeAntRuntime="false"
318	<	includeJavaRuntime="false"
319	<	executable="${javac8}"
320	<	fork="true">
321	<
322	<	<include name="*/.java"/>
323	<	<compilerarg line="${build.args}"/>
324	<	<compilerarg value="-XDignore.symbol.file=true"/>
325	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326	<
327	<	</javac>
328	<
329	<	<javac srcdir="${test.src.dir}"
330	<	destdir="${build.testcases.dir}"
331	<	debug="${build.debug}"
332	<	debuglevel="${build.debuglevel}"
333	<	deprecation="${build.deprecation}"
334	<	source="6"
335	<	classpath=""
336	<	bootclasspath="${product.jar}:${bootclasspath6}"
337	<	includeAntRuntime="false"
338	<	includeJavaRuntime="false"
339	<	executable="${javac8}"
340	<	fork="true">
341	<
342	<	<include name="jsr166/test/*/.java"/>
343	<
344	<	<compilerarg line="${build.args}"/>
345	<	<compilerarg value="-XDignore.symbol.file=true"/>
346	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347	<
348	<	</javac>
349	<
350	<	<!--
351	<	<javac srcdir="${jtreg.src.dir}"
352	<	destdir="${build.testcases.dir}"
353	<	debug="${build.debug}"
354	<	debuglevel="${build.debuglevel}"
355	<	deprecation="${build.deprecation}"
356	<	source="${build.sourcelevel}"
357	<	fork="true">
358	<
359	<	<compilerarg value="${bootclasspath.args}"/>
360	<	<compilerarg line="${build.args}"/>
361	<	<compilerarg value="-XDignore.symbol.file=true"/>
362	<
363	<	</javac>
364	<	-->
365	<
507	>	<target name="dist-docs"
508	>	depends="clean, docs">
509	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
510		</target>
511
512	+	<target name="tck"
513	+	depends="jar"
514	+	description="Runs tck tests for main directly">
515
516	<	<target name="run-tests"
517	<	depends="compile-tests">
518	<
519	<	<!-- May be overridden by user.properties -->
520	<	<property name="testcase" value="*"/>
521	<
522	<	<mkdir dir="${build.reports.dir}"/>
523	<
524	<	<junit printsummary="true"
525	<	showoutput="true"
526	<	errorProperty="junit.failed"
527	<	failureProperty="junit.failed"
528	<	dir="${build.reports.dir}"
529	<	jvm="${java8}"
530	<	fork="true">
531	<
532	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
533	<	<jvmarg value="-server"/>
534	<	<jvmarg value="-showversion"/>
535	<
536	<	<classpath refid="test.classpath"/>
516	>	<run-tck-tests
517	>	target="${build.main.java.version}"
518	>	workdir="${build.dir}"
519	>	classes="${product.jar}"/>
520	>	</target>
521	>
522	>	<target name="tck-parallelism-1"
523	>	description="Runs tck with given common pool parallelism">
524	>	<antcall target="tck">
525	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
526	>	</antcall>
527	>	</target>
528	>
529	>	<target name="tck-parallelism-0"
530	>	description="Runs tck with given common pool parallelism">
531	>	<antcall target="tck">
532	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
533	>	</antcall>
534	>	</target>
535	>
536	>	<target name="jtreg"
537	>	depends="jar"
538	>	description="Runs jtreg tests for main using the jtreg ant task">
539	>	<run-jtreg-tests
540	>	target="${build.main.java.version}"
541	>	workdir="${build.dir}"
542	>	classes="${product.jar}"/>
543	>	</target>
544
545	<	<formatter type="xml"/>
545	>	<target name="test"
546	>	depends="tck, tck-parallelism-1, jtreg"
547	>	description="Runs tck and jtreg tests for main">
548	>	</target>
549
550	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
394	<	<fileset dir="${tck.src.dir}">
395	<	<include name="**/${testcase}Test.java"/>
396	<	</fileset>
397	<	</batchtest>
398	<
399	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
400	<	<fileset dir="${test.src.dir}">
401	<	<include name="jsr166/test/**/${testcase}Test.java"/>
402	<	</fileset>
403	<	</batchtest>
404	<
405	<	<!--
406	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
407	<	<fileset dir="${jtreg.src.dir}">
408	<	<include name="**/${testcase}Test.java"/>
409	<	</fileset>
410	<	</batchtest>
411	<	-->
550	>	<target name="jtreg8" description="Runs jtreg tests with jdk8">
551
552	<	</junit>
552	>	<antcall target="jtreg">
553	>	<param name="build.main.java.version" value="8"/>
554	>	<param name="build.main.javac" value="${javac8}"/>
555	>	</antcall>
556
557		</target>
558
559	+	<target name="test89"
560	+	description="Runs tck and jtreg tests for main for multiple java versions">
561
562	<	<target name="report-tests"
563	<	depends="run-tests">
562	>	<antcall target="clean"/>
563	>	<antcall target="test">
564	>	<param name="build.main.java.version" value="8"/>
565	>	<param name="build.main.javac" value="${javac8}"/>
566	>	</antcall>
567
568	<	<!-- Sets junit.report.format to frames if redirection is present,
569	<	otherwise sets it to noframes. -->
570	<	<available property="junit.report.format"
571	<	value="frames"
572	<	classname="org.apache.xalan.lib.Redirect"
426	<	/>
427	<	<property name="junit.report.format" value="noframes"/>
428	<
429	<	<junitreport todir="${build.reports.dir}">
430	<	<fileset dir="${build.reports.dir}">
431	<	<include name="TEST-*.xml"/>
432	<	</fileset>
433	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
434	<	/>
435	<	</junitreport>
436	<
437	<	<fail message="Test Cases Failed" if="junit.failed"/>
568	>	<antcall target="clean"/>
569	>	<antcall target="test">
570	>	<param name="build.main.java.version" value="9"/>
571	>	<param name="build.main.javac" value="${javac9}"/>
572	>	</antcall>
573
574		</target>
575
576
577	+
578		<target name="configure-compiler">
579	+	<fail message="ant version too old">
580	+	<condition>
581	+	<not> <antversion atleast="1.9.1"/> </not>
582	+	</condition>
583	+	</fail>
584
585		<property name="unchecked.option" value="-Xlint:unchecked"/>
586
#	Line 456 \| Line 597
597		</target>
598
599
459	–	<target name="configure-tests"
460	–	depends="configure-compiler">
461	–
462	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
463	–	<available property="junit.available"
464	–	classname="junit.framework.Protectable"/>
465	–
466	–	<!-- Xalan -->
467	–	<available property="xalan.available"
468	–	classname="org.apache.xalan.Version"/>
469	–
470	–
471	–	<!-- Ant 1.6beta and later don't need or want this check -->
472	–	<!--
473	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
474	–	unless="junit.available"/>
475	–
476	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
477	–	unless="xalan.available"/>
478	–	-->
479	–
480	–	</target>
481	–
600
601		<!-- Various demos and test programs -->
602
#	Line 494 \| Line 612
612		debuglevel="${build.debuglevel}"
613		deprecation="${build.deprecation}"
614		source="${build.sourcelevel}"
615	+	target="${build.sourcelevel}"
616		fork="true">
617
618		<compilerarg line="${build.args}"/>
#	Line 509 \| Line 628
628		</target>
629
630
631	<	<!-- jsr166 4jdk7 -->
631	>	<target name="compile-test-loops" depends="jar"
632	>	description="compile all the perf tests in src/test/loops">
633
634	+	<mkdir dir="${build.dir}/test/loops"/>
635	+
636	+	<javac srcdir="${basedir}/src/test/loops"
637	+	destdir="${build.dir}/test/loops"
638	+	debug="${build.debug}"
639	+	debuglevel="${build.debuglevel}"
640	+	deprecation="${build.deprecation}"
641	+	includeAntRuntime="false"
642	+	includeJavaRuntime="false"
643	+	executable="${javac9}"
644	+	fork="true">
645	+
646	+	<include name="*.java"/>
647	+	<compilerarg value="-XDignore.symbol.file=true"/>
648	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
649	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
650	+	<compilerarg line="${build.args}"/>
651	+
652	+	</javac>
653	+
654	+	</target>
655	+
656	+
657	+	<!-- jsr166 4jdk7 -->
658
659		<target name="4jdk7compile"
660		depends="configure-compiler"
#	Line 524 \| Line 668
668		debuglevel="${build.debuglevel}"
669		deprecation="${build.deprecation}"
670		source="6"
671	+	target="6"
672		classpath=""
673		bootclasspath="${bootclasspath6}"
674		includeAntRuntime="false"
#	Line 532 \| Line 677
677		fork="true">
678
679		<include name="*/.java"/>
680	<	<compilerarg line="${build.args}"/>
680	>	<compilerarg value="-Xprefer:source"/>
681		<compilerarg value="-XDignore.symbol.file=true"/>
682		<compilerarg value="-Xlint:all"/>
683	+	<compilerarg value="-Werror"/>
684	+	<compilerarg line="${build.args}"/>
685
686		</javac>
687	+	</target>
688
689	<	<jar destfile="${4jdk7product.jar}" index="true">
690	<	<fileset dir="${build.4jdk7.classes.dir}"/>
691	<	</jar>
689	>	<target name="4jdk7doclint"
690	>	depends="configure-compiler"
691	>	description="Finds doclint warnings">
692
693	<	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
693	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
694
695	<	<javac srcdir="${tck.src.dir}"
696	<	destdir="${build.4jdk7.tck.classes.dir}"
695	>	<javac srcdir="${4jdk7src.dir}"
696	>	destdir="${build.4jdk7.classes.dir}"
697		debug="${build.debug}"
698		debuglevel="${build.debuglevel}"
699		deprecation="${build.deprecation}"
700		source="6"
701	<	classpath="${junit.jar}"
702	<	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
701	>	target="6"
702	>	classpath=""
703	>	bootclasspath="${bootclasspath6}"
704		includeAntRuntime="false"
705		includeJavaRuntime="false"
706	<	executable="${javac7}"
706	>	executable="${javac8}"
707		fork="true">
708
709		<include name="*/.java"/>
710	<	<compilerarg line="${build.args}"/>
710	>	<compilerarg value="-Xprefer:source"/>
711		<compilerarg value="-XDignore.symbol.file=true"/>
712	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
712	>	<compilerarg value="-Xlint:all"/>
713	>	<compilerarg value="-Xdoclint:all/protected"/>
714	>	<compilerarg line="${build.args}"/>
715
716		</javac>
717	+	</target>
718	+
719	+
720	+	<target name="4jdk7jar"
721	+	depends="4jdk7compile"
722	+	description="Builds library jar from compiled sources">
723	+
724	+	<jar destfile="${4jdk7product.jar}">
725	+	<fileset dir="${build.4jdk7.classes.dir}"/>
726	+	<manifest>
727	+	<attribute name="Built-By" value="${user.name}"/>
728	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
729	+	</manifest>
730	+	</jar>
731
732		</target>
733
734
735	<	<target name="4jdk7-test-tck"
736	<	depends="4jdk7compile"
735	>	<target name="4jdk7-tck"
736	>	depends="4jdk7jar"
737		description="Runs tck tests for jsr166-4jdk7 directly">
738	+
739		<run-tck-tests
740	<	jvm="${java7}"
741	<	tck.classes="${build.4jdk7.tck.classes.dir}"
742	<	product.jar="${4jdk7product.jar}"/>
740	>	target="7"
741	>	workdir="${build.4jdk7.dir}"
742	>	classes="${4jdk7product.jar}">
743	>	<javac-elements>
744	>	<!-- JDK8+ test classes -->
745	>	<exclude name="*8Test.java"/>
746	>	<exclude name="*9Test.java"/>
747	>	<exclude name="*10Test.java"/>
748	>	<exclude name="DoubleAccumulatorTest.java"/>
749	>	<exclude name="DoubleAdderTest.java"/>
750	>	<exclude name="LongAccumulatorTest.java"/>
751	>	<exclude name="LongAdderTest.java"/>
752	>	<exclude name="CompletableFutureTest.java"/>
753	>	<exclude name="SplittableRandomTest.java"/>
754	>	<exclude name="StampedLockTest.java"/>
755	>	<exclude name="SubmissionPublisherTest.java"/>
756	>	</javac-elements>
757	>	</run-tck-tests>
758		</target>
759
760
761	<	<target name="4jdk7-test-tck-junit"
761	>	<target name="4jdk7-tck-junit"
762		depends="4jdk7compile"
763		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
764
#	Line 599 \| Line 780
780
781		<formatter type="brief"/>
782
783	<	<test name="JSR166TestCase" haltonfailure="no">
783	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
784		</test>
785
786		</junit>
787		</target>
788
789	+	<target name="4jdk7-jtreg"
790	+	depends="4jdk7jar"
791	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
792	+	<run-jtreg-tests
793	+	target="7"
794	+	workdir="${build.4jdk7.dir}"
795	+	classes="${4jdk7product.jar}"/>
796	+	</target>
797	+
798	+
799	+	<target name="4jdk7-test"
800	+	depends="4jdk7-tck, 4jdk7-jtreg"
801	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
802	+	</target>
803	+
804
805		<target name="4jdk7docs"
806		description="Builds javadocs for src/jdk7 to dist dir">
807
808	<	<delete dir="${dist.4jdk7.docs.dir}"/>
809	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
808	>	<delete dir="${4jdk7docs.dir}"/>
809	>	<mkdir dir="${4jdk7docs.dir}"/>
810
811	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
811	>	<javadoc destdir="${4jdk7docs.dir}"
812		packagenames="none"
813	<	link="${jdkapi7docs.url}"
813	>	link="${java7.api.url}"
814		overview="${4jdk7src.dir}/intro.html"
815	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
815	>	access="${build.javadoc.access}"
816	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
817		classpath=""
818		executable="${javadoc7}">
622	–	<arg value="-XDignore.symbol.file=true"/>
819		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
820		<include name="*/.java"/>
821		</fileset>
822	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
823	+	<arg value="-XDignore.symbol.file=true"/>
824		</javadoc>
627	–
825		</target>
826
827
828		<target name="4jdk7dist"
829	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
829	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
830		description="Puts all distributable products in single hierarchy"/>
831
832
636	–
833		<target name="4jdk7clean"
834		description="Removes all 4jdk7 build products">
835
#	Line 642 \| Line 838
838		</target>
839
840
645	–
646	–	<target name="4jdk7dist-clean"
647	–	description="Removes all build and distribution products">
648	–
649	–	</target>
650	–
841		<target name="4jdk7dist-jar"
842	<	depends="4jdk7clean, 4jdk7compile">
653	<
842	>	depends="4jdk7clean, 4jdk7jar">
843		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
844	+	</target>
845	+
846
847	+	<target name="4jdk7dist-docs"
848	+	depends="4jdk7clean, 4jdk7docs">
849	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
850		</target>
851
852
#	Line 662 \| Line 856
856		depends="configure-compiler"
857		description="Compiles jsr166x sources to build dir">
858
859	<	<mkdir dir="${build.jsr166x.dir}"/>
859	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
860
861		<javac srcdir="${topsrc.dir}"
862	<	destdir="${build.jsr166x.dir}"
862	>	destdir="${build.jsr166x.classes.dir}"
863		debug="${build.debug}"
864		debuglevel="${build.debuglevel}"
865		deprecation="${build.deprecation}"
866		classpath=""
673	–	source="5"
867		bootclasspath="${bootclasspath6}"
868	+	source="5"
869	+	target="5"
870		includeAntRuntime="false"
871		includeJavaRuntime="false"
872		executable="${javac7}"
873		fork="true">
874
875		<include name="jsr166x/*/.java"/>
681	–	<compilerarg line="${build.args}"/>
876		<compilerarg value="-XDignore.symbol.file=true"/>
877		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
878	+	<compilerarg value="-Werror"/>
879	+	<compilerarg line="${build.args}"/>
880
881		</javac>
686	–
882		</target>
883
884
690	–
885		<target name="jsr166xjar"
886		depends="jsr166xcompile"
887		description="Builds library jar from compiled sources">
888
889		<jar destfile="${jsr166x.jar}">
890	<	<fileset dir="${build.jsr166x.dir}"/>
890	>	<fileset dir="${build.jsr166x.classes.dir}"/>
891	>	<manifest>
892	>	<attribute name="Built-By" value="${user.name}"/>
893	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
894	>	</manifest>
895		</jar>
896
897		</target>
898
899
702	–
900		<target name="jsr166xdocs"
901		description="Builds javadocs to dist dir">
902
903	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
904	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
903	>	<delete dir="${jsr166xdocs.dir}"/>
904	>	<mkdir dir="${jsr166xdocs.dir}"/>
905
906	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
906	>	<javadoc destdir="${jsr166xdocs.dir}"
907		packagenames="jsr166x.*"
908	<	link="${jdkapidocs.url}"
909	<	source="5"
908	>	link="${java.api.url}"
909	>	access="${build.javadoc.access}"
910	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
911		bootclasspath="${bootclasspath6}"
912	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
913	<	executable="${javadoc7}"
914	<	additionalparam="-XDignore.symbol.file=true" />
912	>	source="5"
913	>	executable="${javadoc7}">
914	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
915	>	<arg value="-XDignore.symbol.file=true"/>
916
917	+	</javadoc>
918		</target>
919
920
921		<target name="jsr166xdist"
922	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
922	>	depends="jsr166xdist-jar, jsr166xdist-docs"
923		description="Puts all distributable products in single hierarchy"/>
924
925
726	–
926		<target name="jsr166xclean"
927		description="Removes all jsr166x build products">
928
#	Line 732 \| Line 931
931		</target>
932
933
735	–
736	–	<target name="jsr166xdist-clean"
737	–	description="Removes all build and distribution products">
738	–
739	–	</target>
740	–
741	–
934		<target name="jsr166xdist-jar"
935		depends="jsr166xclean, jsr166xjar">
744	–
936		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
937	+	</target>
938
939	+	<target name="jsr166xdist-docs"
940	+	depends="jsr166xclean, jsr166xdocs">
941	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
942		</target>
943
944		<!-- jsr166y -->
#	Line 753 \| Line 948
948		depends="configure-compiler"
949		description="Compiles jsr166y sources">
950
951	<	<mkdir dir="${build.jsr166y.dir}"/>
951	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
952
953		<javac srcdir="${topsrc.dir}"
954	<	destdir="${build.jsr166y.dir}"
954	>	destdir="${build.jsr166y.classes.dir}"
955		debug="${build.debug}"
956		debuglevel="${build.debuglevel}"
957		deprecation="${build.deprecation}"
958		source="6"
959	+	target="6"
960		classpath=""
961		bootclasspath="${bootclasspath6}"
962		includeAntRuntime="false"
#	Line 769 \| Line 965
965		fork="true">
966
967		<include name="jsr166y/*/.java"/>
772	–	<compilerarg line="${build.args}"/>
968		<compilerarg value="-XDignore.symbol.file=true"/>
969		<compilerarg value="-Xlint:all"/>
970	+	<compilerarg value="-Werror"/>
971	+	<compilerarg line="${build.args}"/>
972	+
973		</javac>
974		</target>
975
#	Line 781 \| Line 979
979		description="Builds library jar from compiled sources">
980
981		<jar destfile="${jsr166y.jar}" index="true">
982	<	<fileset dir="${build.jsr166y.dir}"/>
982	>	<fileset dir="${build.jsr166y.classes.dir}"/>
983	>	<manifest>
984	>	<attribute name="Built-By" value="${user.name}"/>
985	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
986	>	</manifest>
987		</jar>
988
989		</target>
990
991
790	–
992		<target name="jsr166ydocs"
993		description="Builds javadocs to dist dir">
994
995	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
996	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
995	>	<delete dir="${jsr166ydocs.dir}"/>
996	>	<mkdir dir="${jsr166ydocs.dir}"/>
997
998	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
998	>	<javadoc destdir="${jsr166ydocs.dir}"
999		packagenames="jsr166y.*"
1000	<	link="${jdkapidocs.url}"
1001	<	source="6"
1000	>	link="${java.api.url}"
1001	>	access="${build.javadoc.access}"
1002	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1003		bootclasspath="${bootclasspath6}"
1004	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1005	<	executable="${javadoc7}"
1006	<	additionalparam="-XDignore.symbol.file=true" />
1004	>	source="6"
1005	>	executable="${javadoc7}">
1006	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1007	>	<arg value="-XDignore.symbol.file=true"/>
1008
1009	+	</javadoc>
1010		</target>
1011
1012
1013		<target name="jsr166ydist"
1014	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
1014	>	depends="jsr166ydist-jar, jsr166ydist-docs"
1015		description="Puts all distributable products in single hierarchy"/>
1016
1017
814	–
1018		<target name="jsr166yclean"
1019		description="Removes all jsr166y build products">
1020
#	Line 820 \| Line 1023
1023		</target>
1024
1025
823	–
824	–	<target name="jsr166ydist-clean"
825	–	description="Removes all build and distribution products">
826	–
827	–	</target>
828	–
1026		<target name="jsr166ydist-jar"
1027		depends="jsr166yclean, jsr166yjar">
831	–
1028		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1029	+	</target>
1030
1031	+	<target name="jsr166ydist-docs"
1032	+	depends="jsr166yclean, jsr166ydocs">
1033	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1034		</target>
1035
1036
#	Line 841 \| Line 1041
1041		depends="configure-compiler, jsr166yjar"
1042		description="Compiles extra166y sources">
1043
1044	<	<mkdir dir="${build.extra166y.dir}"/>
1044	>	<mkdir dir="${build.extra166y.classes.dir}"/>
1045
1046		<javac srcdir="${topsrc.dir}"
1047	<	destdir="${build.extra166y.dir}"
1047	>	destdir="${build.extra166y.classes.dir}"
1048		debug="${build.debug}"
1049		debuglevel="${build.debuglevel}"
1050		deprecation="${build.deprecation}"
1051	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1052		classpath=""
1053		source="6"
1054	<	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
1054	>	target="6"
1055		includeAntRuntime="false"
1056		includeJavaRuntime="false"
1057		executable="${javac7}"
1058		fork="true">
1059
1060		<include name="extra166y/*/.java"/>
860	–	<compilerarg line="${build.args}"/>
1061		<compilerarg value="-XDignore.symbol.file=true"/>
1062		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1063	+	<compilerarg value="-Werror"/>
1064	+	<compilerarg line="${build.args}"/>
1065
1066		</javac>
865	–
1067		</target>
1068
1069
869	–
1070		<target name="extra166yjar"
1071		depends="extra166ycompile"
1072		description="Builds library jar from compiled sources">
1073
1074		<jar destfile="${extra166y.jar}" index="true">
1075	<	<fileset dir="${build.extra166y.dir}"/>
1075	>	<fileset dir="${build.extra166y.classes.dir}"/>
1076	>	<manifest>
1077	>	<attribute name="Built-By" value="${user.name}"/>
1078	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1079	>	</manifest>
1080		</jar>
1081
1082		</target>
1083
1084
881	–
1085		<target name="extra166ydocs"
1086		description="Builds javadocs to build dir">
1087
1088	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
1089	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
1088	>	<delete dir="${extra166ydocs.dir}"/>
1089	>	<mkdir dir="${extra166ydocs.dir}"/>
1090
1091	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
1091	>	<javadoc destdir="${extra166ydocs.dir}"
1092		packagenames="extra166y.*"
1093	<	link="${jdkapidocs.url}"
1094	<	source="6"
1093	>	link="${java.api.url}"
1094	>	access="${build.javadoc.access}"
1095	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1096		bootclasspath="${bootclasspath6}"
1097	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1098	<	executable="${javadoc7}"
1099	<	additionalparam="-XDignore.symbol.file=true" />
1097	>	source="6"
1098	>	executable="${javadoc7}">
1099	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1100	>	<arg value="-XDignore.symbol.file=true"/>
1101
1102	+	</javadoc>
1103		</target>
1104
1105
1106		<target name="extra166ydist"
1107	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
1107	>	depends="extra166ydist-jar, extra166ydist-docs"
1108		description="Puts all distributable products in single hierarchy"/>
1109
1110
905	–
1111		<target name="extra166yclean"
1112		description="Removes all extra166y build products">
1113
#	Line 911 \| Line 1116
1116		</target>
1117
1118
914	–
915	–	<target name="extra166ydist-clean"
916	–	description="Removes all build and distribution products">
917	–
918	–	</target>
919	–
1119		<target name="extra166ydist-jar"
1120		depends="extra166yclean, extra166yjar">
922	–
1121		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1122	+	</target>
1123
1124	+	<target name="extra166ydist-docs"
1125	+	depends="extra166yclean, extra166ydocs">
1126	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1127		</target>
1128
1129		<!-- jsr166e -->
1130
1131	+	<property name="build.jsr166e.java.version" value="6"/>
1132	+	<property name="build.jsr166e.javac" value="${javac6}"/>
1133	+
1134		<target name="jsr166ecompile"
1135		depends="configure-compiler"
1136		description="Compiles jsr166e sources">
1137
1138	<	<mkdir dir="${build.jsr166e.dir}"/>
1138	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
1139
1140		<javac srcdir="${topsrc.dir}"
1141	<	destdir="${build.jsr166e.dir}"
1141	>	destdir="${build.jsr166e.classes.dir}"
1142		debug="${build.debug}"
1143		debuglevel="${build.debuglevel}"
1144		deprecation="${build.deprecation}"
1145	<	source="7"
1145	>	source="${build.jsr166e.java.version}"
1146	>	target="${build.jsr166e.java.version}"
1147		classpath=""
1148		includeAntRuntime="false"
1149		includeJavaRuntime="false"
1150	<	executable="${javac7}"
1150	>	executable="${build.jsr166e.javac}"
1151		fork="true">
1152
1153		<include name="jsr166e/*/.java"/>
948	–	<compilerarg line="${build.args}"/>
1154		<compilerarg value="-XDignore.symbol.file=true"/>
1155		<compilerarg value="-Xlint:all"/>
1156	+	<compilerarg value="-Werror"/>
1157	+	<compilerarg line="${build.args}"/>
1158
1159		</javac>
953	–
1160		</target>
1161
1162	+	<!-- jsr166e: find doclint errors -->
1163	+	<target name="jsr166edoclint">
1164	+
1165	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1166	+
1167	+	<javac srcdir="${topsrc.dir}"
1168	+	destdir="${build.jsr166e.classes.dir}"
1169	+	debug="${build.debug}"
1170	+	debuglevel="${build.debuglevel}"
1171	+	deprecation="${build.deprecation}"
1172	+	source="${build.jsr166e.java.version}"
1173	+	target="${build.jsr166e.java.version}"
1174	+	classpath=""
1175	+	bootclasspath="${bootclasspath6}"
1176	+	includeAntRuntime="false"
1177	+	includeJavaRuntime="false"
1178	+	executable="${javac8}"
1179	+	fork="true">
1180	+
1181	+	<include name="jsr166e/*/.java"/>
1182	+	<compilerarg value="-XDignore.symbol.file=true"/>
1183	+	<compilerarg value="-Xlint:all"/>
1184	+	<compilerarg value="-Werror"/>
1185	+	<compilerarg value="-Xdoclint:all/protected"/>
1186	+
1187	+	</javac>
1188	+	</target>
1189
1190
1191		<target name="jsr166ejar"
#	Line 960 \| Line 1193
1193		description="Builds library jar from compiled sources">
1194
1195		<jar destfile="${jsr166e.jar}" index="true">
1196	<	<fileset dir="${build.jsr166e.dir}"/>
1196	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1197	>	<manifest>
1198	>	<attribute name="Built-By" value="${user.name}"/>
1199	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200	>	</manifest>
1201		</jar>
1202
1203		</target>
1204
1205
969	–
1206		<target name="jsr166edocs"
1207		description="Builds javadocs to build dir">
1208
1209	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1210	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1209	>	<delete dir="${jsr166edocs.dir}"/>
1210	>	<mkdir dir="${jsr166edocs.dir}"/>
1211
1212	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1212	>	<javadoc destdir="${jsr166edocs.dir}"
1213		packagenames="jsr166e.*"
1214	<	link="${jdkapidocs.url}"
1215	<	source="7"
1216	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1217	<	executable="${javadoc7}"
1218	<	additionalparam="-XDignore.symbol.file=true" >
1214	>	link="${java.api.url}"
1215	>	access="${build.javadoc.access}"
1216	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217	>	source="${build.jsr166e.java.version}"
1218	>	executable="${javadoc7}">
1219	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1220	>	<arg value="-XDignore.symbol.file=true"/>
1221	>
1222		</javadoc>
1223	+	</target>
1224
1225	+
1226	+	<target name="jsr166e-tck-one-java-version"
1227	+	depends="jsr166ejar">
1228	+
1229	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1230	+
1231	+	<run-tck-tests
1232	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1233	+	target="${build.jsr166e.java.version}"
1234	+	workdir="${build.jsr166e.dir}"
1235	+	classes="${jsr166e.jar}"/>
1236	+	</target>
1237	+
1238	+	<target name="jsr166e-tck"
1239	+	description="Runs tck tests for jsr166e for multiple java versions">
1240	+
1241	+	<!-- <antcall target="clean"/> -->
1242	+	<!-- <antcall target="jsr166e-tck-one-java-version"> -->
1243	+	<!-- <param name="build.jsr166e.java.version" value="8"/> -->
1244	+	<!-- <param name="build.jsr166e.javac" value="${javac8}"/> -->
1245	+	<!-- </antcall> -->
1246	+
1247	+	<antcall target="clean"/>
1248	+	<antcall target="jsr166e-tck-one-java-version">
1249	+	<param name="build.jsr166e.java.version" value="7"/>
1250	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1251	+	</antcall>
1252	+
1253	+	<antcall target="clean"/>
1254	+	<antcall target="jsr166e-tck-one-java-version">
1255	+	<param name="build.jsr166e.java.version" value="6"/>
1256	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1257	+	</antcall>
1258		</target>
1259
1260
1261	+	<target name="jsr166e-test"
1262	+	depends="jsr166e-tck"
1263	+	description="Runs all tests for jsr166e">
1264	+	</target>
1265	+
1266		<target name="jsr166edist"
1267	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1267	>	depends="jsr166edist-jar, jsr166edist-docs"
1268		description="Puts all distributable products in single hierarchy"/>
1269
1270
993	–
1271		<target name="jsr166eclean"
1272		description="Removes all jsr166e build products">
996	–
1273		<delete dir="${build.jsr166e.dir}"/>
998	–
1274		</target>
1275
1276
1277	<	<target name="jsr166edist-clean"
1278	<	description="Removes all build and distribution products">
1277	>	<target name="jsr166edist-jar"
1278	>	depends="jsr166eclean, jsr166ejar">
1279	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1280	>	</target>
1281
1282	+	<target name="jsr166edist-docs"
1283	+	depends="jsr166eclean, jsr166edocs">
1284	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1285		</target>
1286
1007	–	<target name="jsr166edist-jar"
1008	–	depends="jsr166eclean, jsr166ejar">
1287
1288	<	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1288	>	<!-- Find buglets that can be detected by static build tools -->
1289
1290	+	<target name="lint">
1291	+	<antcall target="dists">
1292	+	<param name="build.javadoc.access" value="public"/>
1293	+	</antcall>
1294		</target>
1295
1296	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1297	+	<target name="lint-private">
1298	+	<antcall target="dist">
1299	+	<param name="build.javadoc.access" value="private"/>
1300	+	</antcall>
1301	+	</target>
1302	+
1303	+
1304		</project>

Diff Legend

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

Comparing jsr166/build.xml (file contents): Revision 1.112 by jsr166, Sun Jan 20 03:44:54 2013 UTC vs. Revision 1.199 by jsr166, Fri Mar 25 03:36:15 2016 UTC

Diff Legend

Comparing jsr166/build.xml (file contents):
Revision 1.112 by jsr166, Sun Jan 20 03:44:54 2013 UTC vs.
Revision 1.199 by jsr166, Fri Mar 25 03:36:15 2016 UTC