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.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC vs.
Revision 1.219 by jsr166, Sat Sep 17 21:02:01 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 6 | Line 7
7
8		Usage: ant [target]
9
10	+	See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11	+	more details.
12	+
13		User-specific settings are read from user.properties.
14		See user.properties.sample for an explanation of some useful settings.
15
#	Line 26 | Line 30
30		(e.g. mercurial forest) or a symlink to same.
31
32		Alternatively, define ant variables thus:
33	<	ant -Djdk$N.home=...
33	>	ant -Djdk$N.home=... -Djdk$N.src.home=...
34		for $N in 6 7 8 9 ...
35	+
36	+	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	+	target is currently broken.
38		------------------------------------------------------------------------------
39		</description>
40
41	<	<!-- Display main targets by running 'ant -projecthelp' -->
41	>	<!-- Run 'ant -projecthelp' (default target) -->
42		<target name="usage">
43		<java classname="org.apache.tools.ant.Main">
44		<arg value="-projecthelp" />
45		</java>
46		</target>
47
48	+	<!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
49
50		<!-- User-specific settings -->
51		<property file="user.properties"/>
#	Line 50 | Line 58
58		<property name="build.deprecation"    value="false"/>
59		<property name="build.javadoc.access" value="protected"/>
60
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	–
61		<!-- Build locations -->
62		<property name="build.dir"                   location="build"/>
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 73 | Line 70
70		<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71		<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72
73	+	<property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74	+	<property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75	+	<property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76	+	<property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77	+
78		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
#	Line 89 | Line 91
91		<macrodef name="defjdklocations">
92		<attribute name="v"/>
93		<sequential>
94	<	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
95	<	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96	<	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97	<	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
94	>	<property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
95	>	<property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
96	>	<property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
97	>	<property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
98	>	<property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99	>	<local name="have.java.base"/>
100	>	<available property="have.java.base"
101	>	file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103	>	if:set="have.java.base"/>
104	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105	>	unless:set="have.java.base"/>
106	>	<local name="modules"/>
107	>	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108		<local name="boot.jar.dir"/>
109	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
110	<	<path id="bootclasspath@{v}">
109	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110	>	<path id="bootclasspath@{v}" unless:set="modules">
111		<pathelement path="${boot.jar.dir}/resources.jar"/>
112		<pathelement path="${boot.jar.dir}/rt.jar"/>
113		<pathelement path="${boot.jar.dir}/jsse.jar"/>
114		<pathelement path="${boot.jar.dir}/jce.jar"/>
115		<pathelement path="${boot.jar.dir}/charsets.jar"/>
116		</path>
117	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
117	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118		</sequential>
119		</macrodef>
120
#	Line 129 | Line 140
140		<property name="test.src.dir"         location="${basedir}/src/test"/>
141		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
142		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143	<	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
143	>	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145	>	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146	>	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147		<property name="lib.dir"              location="${basedir}/lib"/>
148		<property name="dist.dir"             location="${basedir}/dist"/>
149		<property name="topsrc.dir"           location="${basedir}/src"/>
150		<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151	+	<property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
#	Line 142 | Line 157
157		<!-- Javadoc locations -->
158		<property name="docs.dir"          location="${build.dir}/docs"/>
159		<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160	+	<property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161		<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162		<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163		<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
#	Line 149 | Line 165
165
166		<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167		<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168	+	<property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169		<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170		<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171		<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
#	Line 157 | Line 174
174		<!-- Jar locations -->
175		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176		<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177	+	<property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178		<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179		<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180		<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
#	Line 168 | Line 186
186		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
189	>	<!-- The expected canonical location does not yet exist as of 2016-04 -->
190		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
191	>	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192		<!-- Default jdk doc location (latest stable release seems best) -->
193		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
194
#	Line 187 | Line 205
205		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
206		classpath="${lib.dir}/jtreg.jar" />
207
208	<	<!-- Test classpath -->
209	<	<path id="test.classpath">
210	<	<pathelement location="${build.testcases.dir}"/>
211	<	<pathelement location="${junit.jar}"/>
212	<	</path>
213	<
208	>	<!-- Tck options; see JSR166TestCase.java
209	>	To profile a single tck test class:
210	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
211	>	To stress test a single tck test class:
212	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
213	>	To stress test a single tck test method:
214	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
215	>	-->
216	>	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
217		<macrodef name="run-tck-tests">
218		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
219		<attribute name="target"/>
220		<attribute name="compile-target" default="@{target}"/>
221		<attribute name="workdir"/>
222		<attribute name="classes"/>
223	<	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
223	>	<!--
224	>	<attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225	>	-->
226	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227		<element name="javac-elements" optional="true"/>
228	+
229		<sequential>
230
231	+	<local name="modules"/>
232	+	<condition property="modules">
233	+	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234	+	</condition>
235	+
236		<mkdir dir="@{workdir}/tck-classes"/>
237
238		<javac srcdir="@{tck.src.dir}"
#	Line 215 | Line 245
245		classpath="${junit.jar}"
246		includeAntRuntime="false"
247		includeJavaRuntime="false"
248	+	encoding="ASCII"
249		executable="${javac@{compile-target}}"
250		fork="true">
251
252		<include name="*.java"/>
253		<compilerarg value="-XDignore.symbol.file=true"/>
254	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
255	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
254	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256	>	<compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257		<compilerarg line="${build.args}"/>
258		<javac-elements/>
259
#	Line 231 | Line 263
263		failonerror="true"
264		jvm="${java@{target}}"
265		fork="true">
266	<	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
266	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267	>	<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268		<jvmarg line="@{jvmflags}"/>
269	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
271
272	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
273	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
272	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273	>	<syspropertyset id="system-properties-used-by-tck">
274		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
275	+	<propertyref prefix="jsr166."/>
276	+	<propertyref name="test.timeout.factor"/>
277		</syspropertyset>
278
242	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
279		<classpath>
280		<pathelement location="${junit.jar}"/>
281		<pathelement location="@{workdir}/tck-classes"/>
#	Line 252 | Line 286
286		</macrodef>
287
288		<!-- Define jtreg test sets for different jdk versions -->
289	<	<fileset dir="${jtreg.src.dir}">
289	>	<fileset dir="${jtreg9.src.dir}">
290		<patternset id="jdk9.jtreg.tests">
291		<include name="**/*.java"/>
292		</patternset>
293		</fileset>
294
295	<	<fileset dir="${jtreg.src.dir}">
295	>	<fileset dir="${jtreg8.src.dir}">
296		<patternset id="jdk8.jtreg.tests">
297		<include name="**/*.java"/>
298	<	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
298	>	<exclude name="**/SpliteratorCharacteristics.java"/>
299		<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
300	<	<exclude name="util/WeakHashMap/GCDuringIteration.java"/>
300	>	<exclude name="**/GCDuringIteration.java"/>
301		</patternset>
302		</fileset>
303
304	<	<fileset dir="${jtreg.src.dir}">
304	>	<fileset dir="${jtreg7.src.dir}">
305		<patternset id="jdk7.jtreg.tests">
306		<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="util/concurrent/CompletableFuture/**/*.java"/>
277	–	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278	–	<exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
307		</patternset>
308		</fileset>
309
310	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
311	+	<property name="jtreg.flags" value=""/>
312	+
313		<macrodef name="run-jtreg-tests">
314	<	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
314	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315		<attribute name="source" default="7"/>
316		<attribute name="target"/>
317		<attribute name="workdir"/>
318		<attribute name="classes"/>
319		<attribute name="jtregflags" default=""/>
320	+
321		<sequential>
322	+
323	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
324	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
325	+
326	+	<local name="modules"/>
327	+	<condition property="modules">
328	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
329	+	</condition>
330	+
331		<delete dir="@{workdir}/JTwork"   quiet="true"/>
332		<delete dir="@{workdir}/JTreport" quiet="true"/>
333	<	<mkdir dir="@{workdir}/JTwork/scratch"/>
294	<	<mkdir dir="@{workdir}/JTreport"/>
295	<	<jtreg dir="@{jtreg.src.dir}"
333	>	<jtreg dir="${jtreg@{target}.src.dir}"
334		jdk="${jdk@{target}.home}"
335		workDir="@{workdir}/JTwork"
336		reportDir="@{workdir}/JTreport">
337		<patternset refid="jdk@{target}.jtreg.tests"/>
338	<	<arg value="-Xbootclasspath/p:@{classes}"/>
338	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339	>	<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340		<arg value="-agentvm"/>
341	<	<arg value="-v:nopass,fail"/>
341	>	<arg value="-verbose:${jtreg.verbose}"/>
342		<arg value="-vmoptions:-esa -ea"/>
343		<arg value="-automatic"/>
344		<arg value="-k:!ignore"/>
345		<arg line="@{jtregflags}"/>
346	+	<arg line="${jtreg.flags}"/>
347		</jtreg>
348		</sequential>
349		</macrodef>
#	Line 323 | Line 363
363		<property name="build.main.javac" value="${javac9}"/>
364
365		<target name="dists"
366	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366	>	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367		description="Builds all public jars and docs"/>
368
369		<target name="compile"
370		depends="configure-compiler"
371		description="Compiles src/main sources to build dir">
372
373	<	<mkdir dir="${build.classes.dir}"/>
373	>	<local name="modules"/>
374	>	<condition property="modules">
375	>	<and>
376	>	<available file="${jdk9.home}/jmods" type="dir"/>
377	>	<equals arg1="9" arg2="${build.main.java.version}"/>
378	>	</and>
379	>	</condition>
380	>
381	>	<local name="destdir"/>
382	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
384	>
385	>	<mkdir dir="${destdir}"/>
386
387		<javac srcdir="${src.dir}"
388	<	destdir="${build.classes.dir}"
388	>	destdir="${destdir}"
389		debug="${build.debug}"
390		debuglevel="${build.debuglevel}"
391		deprecation="${build.deprecation}"
392		classpath=""
393		includeAntRuntime="false"
394		includeJavaRuntime="false"
395	+	encoding="ASCII"
396		executable="${build.main.javac}"
397		fork="true">
398
399		<include name="**/*.java"/>
400	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
401		<compilerarg value="-Xprefer:source"/>
402		<compilerarg value="-XDignore.symbol.file=true"/>
403		<compilerarg value="-Xlint:all"/>
#	Line 358 | Line 412
412
413		<target name="jar"
414		depends="compile"
415	<	description="Builds library jar from compiled sources">
416	<
415	>	description="Builds library jar for src/main from compiled sources">
416	>	<local name="subdir"/>
417	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
418		<jar destfile="${product.jar}">
419	<	<fileset dir="${build.classes.dir}"/>
419	>	<fileset dir="${build.classes.dir}${subdir}"/>
420	>	<manifest>
421	>	<attribute name="Built-By" value="${user.name}"/>
422	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
423	>	</manifest>
424		</jar>
425		</target>
426
#	Line 375 | Line 434
434		<!-- the packagenames="none" hack below prevents scanning the -->
435		<!-- sourcepath for packages -->
436
437	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
439		<javadoc destdir="${docs.dir}"
440		packagenames="none"
441		link="${java9.api.url}"
442		overview="${src.dir}/intro.html"
443		access="${build.javadoc.access}"
444	<	sourcepath="${src.dir}:${jdk9src.dir}"
444	>	sourcepath="${src.dir}"
445		classpath=""
446		executable="${javadoc9}">
447		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 389 | Line 450
450		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
451		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
452		<arg value="-XDignore.symbol.file=true"/>
453	+	<arg value="-Xmodule:java.base"/>
454		<arg value="-tag"/>
455		<arg value="${javadoc.jls.option}"/>
456		<arg value="-tag"/>
#	Line 397 | Line 459
459		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
460		<arg value="-tag"/>
461		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
462	+	<!-- tags added in jdk9 -->
463	+	<arg value="-tag"/>
464	+	<arg value="revised:X"/>
465	+	<arg value="-tag"/>
466	+	<arg value="spec:X"/>
467		</javadoc>
468		</target>
469
#	Line 420 | Line 487
487		<exclude name="src/emulation/**"/>
488		<exclude name="**/SyntaxTest.java"/>
489		<exclude name="**/SuperfluousAbstract.java"/>
490	+	<manifest>
491	+	<attribute name="Built-By" value="${user.name}"/>
492	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
493	+	</manifest>
494		</jar>
495		</target>
496
#	Line 451 | Line 522
522		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
523		</target>
524
525	<	<target name="tck" depends="test-tck" description="alias for test-tck"/>
455	<	<target name="test-tck"
525	>	<target name="tck"
526		depends="jar"
527	<	description="Runs tck tests for main directly">
527	>	description="Runs tck tests for src/main directly">
528
529		<run-tck-tests
530		target="${build.main.java.version}"
#	Line 462 | Line 532
532		classes="${product.jar}"/>
533		</target>
534
535	<	<target name="test-tck-parallelism-1"
536	<	description="Runs test-tck with given common pool parallelism">
537	<	<antcall target="test-tck">
535	>	<target name="tck-parallelism-1"
536	>	description="Runs tck with common pool parallelism 1">
537	>	<antcall target="tck">
538		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
539		</antcall>
540		</target>
541
542	<	<target name="test-tck-parallelism-0"
543	<	description="Runs test-tck with given common pool parallelism">
544	<	<antcall target="test-tck">
542	>	<target name="tck-parallelism-0"
543	>	description="Runs tck with common pool parallelism 0">
544	>	<antcall target="tck">
545		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
546		</antcall>
547		</target>
548
549	<	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
550	<	<target name="test-jtreg"
549	>	<target name="tck-security-manager"
550	>	description="Runs tck with a security manager">
551	>	<antcall target="tck">
552	>	<param name="jsr166.useSecurityManager" value="true"/>
553	>	</antcall>
554	>	</target>
555	>
556	>	<target name="jtreg"
557		depends="jar"
558	<	description="Runs jtreg tests for main using the jtreg ant task">
558	>	description="Runs jtreg tests for src/main using the jtreg ant task">
559		<run-jtreg-tests
560		target="${build.main.java.version}"
561		workdir="${build.dir}"
#	Line 487 | Line 563
563		</target>
564
565		<target name="test"
566	<	depends="test-tck, test-tck-parallelism-1, test-jtreg"
567	<	description="Runs tck and jtreg tests for main">
566	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
567	>	description="Runs tck and jtreg tests for src/main">
568		</target>
569
570	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
570	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
571
572	<	<antcall target="jtreg">
573	<	<param name="build.main.java.version" value="8"/>
574	<	<param name="build.main.javac" value="${javac8}"/>
575	<	</antcall>
572	>	<!--     <antcall target="jtreg"> -->
573	>	<!--       <param name="build.main.java.version" value="8"/> -->
574	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
575	>	<!--     </antcall> -->
576
577	<	</target>
577	>	<!--   </target> -->
578
579	<	<target name="test89"
580	<	description="Runs tck and jtreg tests for main for multiple java versions">
579	>	<!--   <target name="test89" -->
580	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
581
582	<	<antcall target="clean"/>
583	<	<antcall target="test">
584	<	<param name="build.main.java.version" value="8"/>
585	<	<param name="build.main.javac" value="${javac8}"/>
586	<	</antcall>
582	>	<!--     <antcall target="clean"/> -->
583	>	<!--     <antcall target="test"> -->
584	>	<!--       <param name="build.main.java.version" value="8"/> -->
585	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
586	>	<!--     </antcall> -->
587
588	<	<antcall target="clean"/>
589	<	<antcall target="test">
590	<	<param name="build.main.java.version" value="9"/>
591	<	<param name="build.main.javac" value="${javac9}"/>
592	<	</antcall>
588	>	<!--     <antcall target="clean"/> -->
589	>	<!--     <antcall target="test"> -->
590	>	<!--       <param name="build.main.java.version" value="9"/> -->
591	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
592	>	<!--     </antcall> -->
593
594	<	</target>
594	>	<!--   </target> -->
595
596
597
598		<target name="configure-compiler">
599	+	<fail message="ant version too old">
600	+	<condition>
601	+	<not> <antversion atleast="1.9.1"/> </not>
602	+	</condition>
603	+	</fail>
604
605		<property name="unchecked.option" value="-Xlint:unchecked"/>
606
#	Line 540 | Line 621
621		<!-- Various demos and test programs -->
622
623
624	<	<target name="loops" depends="configure-compiler"
625	<	description="Benchmark from Doug Lea's AQS paper">
624	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
625	>	<target name="loops" depends="configure-compiler">
626
627		<mkdir dir="${build.loops.dir}"/>
628
#	Line 551 | Line 632
632		debuglevel="${build.debuglevel}"
633		deprecation="${build.deprecation}"
634		source="${build.sourcelevel}"
635	+	target="${build.sourcelevel}"
636	+	encoding="ASCII"
637		fork="true">
638
639		<compilerarg line="${build.args}"/>
#	Line 578 | Line 661
661		deprecation="${build.deprecation}"
662		includeAntRuntime="false"
663		includeJavaRuntime="false"
664	+	encoding="ASCII"
665		executable="${javac9}"
666		fork="true">
667
#	Line 592 | Line 676
676		</target>
677
678
679	+	<!-- jsr166 4jdk8 -->
680	+
681	+	<target name="4jdk8compile"
682	+	depends="configure-compiler"
683	+	description="Compiles src/jdk8 sources, targeting jdk8">
684	+
685	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
686	+
687	+	<javac srcdir="${4jdk8src.dir}"
688	+	destdir="${build.4jdk8.classes.dir}"
689	+	debug="${build.debug}"
690	+	debuglevel="${build.debuglevel}"
691	+	deprecation="${build.deprecation}"
692	+	source="8"
693	+	target="8"
694	+	classpath=""
695	+	bootclasspath="${bootclasspath8}"
696	+	includeAntRuntime="false"
697	+	includeJavaRuntime="false"
698	+	encoding="ASCII"
699	+	executable="${javac8}"
700	+	fork="true">
701	+
702	+	<include name="**/*.java"/>
703	+	<compilerarg value="-Xprefer:source"/>
704	+	<compilerarg value="-XDignore.symbol.file=true"/>
705	+	<compilerarg value="-Xlint:all"/>
706	+	<compilerarg value="-Werror"/>
707	+	<compilerarg line="${build.args}"/>
708	+
709	+	</javac>
710	+	</target>
711	+
712	+	<target name="4jdk8doclint"
713	+	depends="configure-compiler"
714	+	description="Finds doclint warnings">
715	+
716	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
717	+
718	+	<javac srcdir="${4jdk8src.dir}"
719	+	destdir="${build.4jdk8.classes.dir}"
720	+	debug="${build.debug}"
721	+	debuglevel="${build.debuglevel}"
722	+	deprecation="${build.deprecation}"
723	+	source="8"
724	+	target="8"
725	+	classpath=""
726	+	bootclasspath="${bootclasspath8}"
727	+	includeAntRuntime="false"
728	+	includeJavaRuntime="false"
729	+	encoding="ASCII"
730	+	executable="${javac8}"
731	+	fork="true">
732	+
733	+	<include name="**/*.java"/>
734	+	<compilerarg value="-Xprefer:source"/>
735	+	<compilerarg value="-XDignore.symbol.file=true"/>
736	+	<compilerarg value="-Xlint:all"/>
737	+	<compilerarg value="-Xdoclint:all/protected"/>
738	+	<compilerarg line="${build.args}"/>
739	+
740	+	</javac>
741	+	</target>
742	+
743	+
744	+	<target name="4jdk8jar"
745	+	depends="4jdk8compile"
746	+	description="Builds library jar from compiled sources">
747	+
748	+	<jar destfile="${4jdk8product.jar}">
749	+	<fileset dir="${build.4jdk8.classes.dir}"/>
750	+	<manifest>
751	+	<attribute name="Built-By" value="${user.name}"/>
752	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
753	+	</manifest>
754	+	</jar>
755	+
756	+	</target>
757	+
758	+
759	+	<target name="4jdk8-tck"
760	+	depends="4jdk8jar"
761	+	description="Runs tck tests for jsr166-4jdk8 directly">
762	+
763	+	<run-tck-tests
764	+	target="8"
765	+	workdir="${build.4jdk8.dir}"
766	+	classes="${4jdk8product.jar}">
767	+	<javac-elements>
768	+	<!-- JDK9+ test classes -->
769	+	<exclude name="*9Test.java"/>
770	+	<exclude name="*10Test.java"/>
771	+	</javac-elements>
772	+	</run-tck-tests>
773	+	</target>
774	+
775	+
776	+	<target name="4jdk8-jtreg"
777	+	depends="4jdk8jar"
778	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
779	+	<run-jtreg-tests
780	+	target="8"
781	+	workdir="${build.4jdk8.dir}"
782	+	classes="${4jdk8product.jar}"/>
783	+	</target>
784	+
785	+
786	+	<target name="4jdk8-test"
787	+	depends="4jdk8-tck, 4jdk8-jtreg"
788	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
789	+	</target>
790	+
791	+
792	+	<target name="4jdk8docs"
793	+	description="Builds javadocs for src/jdk8 to dist dir">
794	+
795	+	<delete dir="${4jdk8docs.dir}"/>
796	+	<mkdir dir="${4jdk8docs.dir}"/>
797	+
798	+	<javadoc destdir="${4jdk8docs.dir}"
799	+	packagenames="none"
800	+	link="${java8.api.url}"
801	+	overview="${4jdk8src.dir}/intro.html"
802	+	access="${build.javadoc.access}"
803	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
804	+	classpath=""
805	+	executable="${javadoc8}"
806	+	failonerror = "true">
807	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
808	+	<include name="**/*.java"/>
809	+	</fileset>
810	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
811	+	<arg value="-XDignore.symbol.file=true"/>
812	+	<arg value="-tag"/>
813	+	<arg value="${javadoc.jls.option}"/>
814	+	<arg value="-tag"/>
815	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
816	+	<arg value="-tag"/>
817	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
818	+	<arg value="-tag"/>
819	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
820	+	</javadoc>
821	+	</target>
822	+
823	+
824	+	<target name="4jdk8dist"
825	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
826	+	description="Puts all distributable products in single hierarchy"/>
827	+
828	+
829	+	<target name="4jdk8clean"
830	+	description="Removes all 4jdk8 build products">
831	+
832	+	<delete dir="${build.4jdk8.dir}"/>
833	+
834	+	</target>
835	+
836	+
837	+	<target name="4jdk8dist-jar"
838	+	depends="4jdk8clean, 4jdk8jar">
839	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
840	+	</target>
841	+
842	+
843	+	<target name="4jdk8dist-docs"
844	+	depends="4jdk8clean, 4jdk8docs">
845	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
846	+	</target>
847	+
848	+
849	+
850		<!-- jsr166 4jdk7 -->
851
852		<target name="4jdk7compile"
#	Line 606 | Line 861
861		debuglevel="${build.debuglevel}"
862		deprecation="${build.deprecation}"
863		source="6"
864	+	target="6"
865		classpath=""
866		bootclasspath="${bootclasspath6}"
867		includeAntRuntime="false"
868		includeJavaRuntime="false"
869	+	encoding="ASCII"
870		executable="${javac7}"
871		fork="true">
872
#	Line 635 | Line 892
892		debuglevel="${build.debuglevel}"
893		deprecation="${build.deprecation}"
894		source="6"
895	+	target="6"
896		classpath=""
897	<	bootclasspath="${bootclasspath7}"
897	>	bootclasspath="${bootclasspath6}"
898		includeAntRuntime="false"
899		includeJavaRuntime="false"
900	+	encoding="ASCII"
901		executable="${javac8}"
902		fork="true">
903
#	Line 659 | Line 918
918
919		<jar destfile="${4jdk7product.jar}">
920		<fileset dir="${build.4jdk7.classes.dir}"/>
921	+	<manifest>
922	+	<attribute name="Built-By" value="${user.name}"/>
923	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
924	+	</manifest>
925		</jar>
926
927		</target>
928
929
930	<	<target name="4jdk7-test-tck"
930	>	<target name="4jdk7-tck"
931		depends="4jdk7jar"
932		description="Runs tck tests for jsr166-4jdk7 directly">
933
#	Line 676 | Line 939
939		<!-- JDK8+ test classes -->
940		<exclude name="*8Test.java"/>
941		<exclude name="*9Test.java"/>
942	+	<exclude name="*10Test.java"/>
943		<exclude name="DoubleAccumulatorTest.java"/>
944		<exclude name="DoubleAdderTest.java"/>
945		<exclude name="LongAccumulatorTest.java"/>
#	Line 683 | Line 947
947		<exclude name="CompletableFutureTest.java"/>
948		<exclude name="SplittableRandomTest.java"/>
949		<exclude name="StampedLockTest.java"/>
950	+	<exclude name="SubmissionPublisherTest.java"/>
951		</javac-elements>
952		</run-tck-tests>
953		</target>
954
955
956	<	<target name="4jdk7-test-tck-junit"
957	<	depends="4jdk7compile"
958	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
956	>	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
957	>	<target name="4jdk7-tck-junit"
958	>	depends="4jdk7compile">
959
960		<junit printsummary="true"
961		showoutput="true"
#	Line 716 | Line 981
981		</junit>
982		</target>
983
984	<	<target name="4jdk7-test-jtreg"
984	>	<target name="4jdk7-jtreg"
985		depends="4jdk7jar"
986		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
987		<run-jtreg-tests
#	Line 727 | Line 992
992
993
994		<target name="4jdk7-test"
995	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
995	>	depends="4jdk7-tck, 4jdk7-jtreg"
996		description="Runs tck and jtreg tests for jsr166-4jdk7">
997		</target>
998
#	Line 743 | Line 1008
1008		link="${java7.api.url}"
1009		overview="${4jdk7src.dir}/intro.html"
1010		access="${build.javadoc.access}"
1011	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1011	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1012		classpath=""
1013	<	executable="${javadoc7}">
1013	>	executable="${javadoc7}"
1014	>	failonerror = "true">
1015		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1016		<include name="**/*.java"/>
1017		</fileset>
#	Line 796 | Line 1062
1062		classpath=""
1063		bootclasspath="${bootclasspath6}"
1064		source="5"
1065	+	target="5"
1066		includeAntRuntime="false"
1067		includeJavaRuntime="false"
1068	+	encoding="ASCII"
1069		executable="${javac7}"
1070		fork="true">
1071
#	Line 817 | Line 1085
1085
1086		<jar destfile="${jsr166x.jar}">
1087		<fileset dir="${build.jsr166x.classes.dir}"/>
1088	+	<manifest>
1089	+	<attribute name="Built-By" value="${user.name}"/>
1090	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1091	+	</manifest>
1092		</jar>
1093
1094		</target>
#	Line 832 | Line 1104
1104		packagenames="jsr166x.*"
1105		link="${java.api.url}"
1106		access="${build.javadoc.access}"
1107	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1107	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1108		bootclasspath="${bootclasspath6}"
1109		source="5"
1110	<	executable="${javadoc7}">
1110	>	executable="${javadoc7}"
1111	>	failonerror = "true">
1112		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1113		<arg value="-XDignore.symbol.file=true"/>
1114
#	Line 881 | Line 1154
1154		debuglevel="${build.debuglevel}"
1155		deprecation="${build.deprecation}"
1156		source="6"
1157	+	target="6"
1158		classpath=""
1159		bootclasspath="${bootclasspath6}"
1160		includeAntRuntime="false"
1161		includeJavaRuntime="false"
1162	+	encoding="ASCII"
1163		executable="${javac7}"
1164		fork="true">
1165
#	Line 904 | Line 1179
1179
1180		<jar destfile="${jsr166y.jar}" index="true">
1181		<fileset dir="${build.jsr166y.classes.dir}"/>
1182	+	<manifest>
1183	+	<attribute name="Built-By" value="${user.name}"/>
1184	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1185	+	</manifest>
1186		</jar>
1187
1188		</target>
#	Line 919 | Line 1198
1198		packagenames="jsr166y.*"
1199		link="${java.api.url}"
1200		access="${build.javadoc.access}"
1201	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1201	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1202		bootclasspath="${bootclasspath6}"
1203		source="6"
1204	<	executable="${javadoc7}">
1204	>	executable="${javadoc7}"
1205	>	failonerror = "true">
1206		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1207		<arg value="-XDignore.symbol.file=true"/>
1208
#	Line 971 | Line 1251
1251		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1252		classpath=""
1253		source="6"
1254	+	target="6"
1255		includeAntRuntime="false"
1256		includeJavaRuntime="false"
1257	+	encoding="ASCII"
1258		executable="${javac7}"
1259		fork="true">
1260
#	Line 992 | Line 1274
1274
1275		<jar destfile="${extra166y.jar}" index="true">
1276		<fileset dir="${build.extra166y.classes.dir}"/>
1277	+	<manifest>
1278	+	<attribute name="Built-By" value="${user.name}"/>
1279	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1280	+	</manifest>
1281		</jar>
1282
1283		</target>
#	Line 1007 | Line 1293
1293		packagenames="extra166y.*"
1294		link="${java.api.url}"
1295		access="${build.javadoc.access}"
1296	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1296	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1297		bootclasspath="${bootclasspath6}"
1298		source="6"
1299		executable="${javadoc7}">
#	Line 1058 | Line 1344
1344		debuglevel="${build.debuglevel}"
1345		deprecation="${build.deprecation}"
1346		source="${build.jsr166e.java.version}"
1347	+	target="${build.jsr166e.java.version}"
1348		classpath=""
1349		includeAntRuntime="false"
1350		includeJavaRuntime="false"
#	Line 1084 | Line 1371
1371		debuglevel="${build.debuglevel}"
1372		deprecation="${build.deprecation}"
1373		source="${build.jsr166e.java.version}"
1374	+	target="${build.jsr166e.java.version}"
1375		classpath=""
1376	<	bootclasspath="${bootclasspath7}"
1376	>	bootclasspath="${bootclasspath6}"
1377		includeAntRuntime="false"
1378		includeJavaRuntime="false"
1379		executable="${javac8}"
#	Line 1107 | Line 1395
1395
1396		<jar destfile="${jsr166e.jar}" index="true">
1397		<fileset dir="${build.jsr166e.classes.dir}"/>
1398	+	<manifest>
1399	+	<attribute name="Built-By" value="${user.name}"/>
1400	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1401	+	</manifest>
1402		</jar>
1403
1404		</target>
#	Line 1122 | Line 1414
1414		packagenames="jsr166e.*"
1415		link="${java.api.url}"
1416		access="${build.javadoc.access}"
1417	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1417	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1418		source="${build.jsr166e.java.version}"
1419	<	executable="${javadoc7}">
1419	>	executable="${javadoc7}"
1420	>	failonerror = "true">
1421		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1422		<arg value="-XDignore.symbol.file=true"/>
1423
#	Line 1132 | Line 1425
1425		</target>
1426
1427
1428	<	<target name="jsr166e-test-tck-one-java-version"
1428	>	<target name="jsr166e-tck-one-java-version"
1429		depends="jsr166ejar">
1430
1431		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1144 | Line 1437
1437		classes="${jsr166e.jar}"/>
1438		</target>
1439
1440	<	<target name="jsr166e-test-tck"
1440	>	<target name="jsr166e-tck"
1441		description="Runs tck tests for jsr166e for multiple java versions">
1442
1443		<!--     <antcall target="clean"/> -->
1444	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1444	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1445		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1446		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1447		<!--     </antcall> -->
1448
1449		<antcall target="clean"/>
1450	<	<antcall target="jsr166e-test-tck-one-java-version">
1450	>	<antcall target="jsr166e-tck-one-java-version">
1451		<param name="build.jsr166e.java.version" value="7"/>
1452		<param name="build.jsr166e.javac" value="${javac7}"/>
1453		</antcall>
1454
1455		<antcall target="clean"/>
1456	<	<antcall target="jsr166e-test-tck-one-java-version">
1456	>	<antcall target="jsr166e-tck-one-java-version">
1457		<param name="build.jsr166e.java.version" value="6"/>
1458		<param name="build.jsr166e.javac" value="${javac6}"/>
1459		</antcall>
#	Line 1168 | Line 1461
1461
1462
1463		<target name="jsr166e-test"
1464	<	depends="jsr166e-test-tck"
1464	>	depends="jsr166e-tck"
1465		description="Runs all tests for jsr166e">
1466		</target>
1467

Diff Legend

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