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.166 by jsr166, Mon Aug 10 06:32:23 2015 UTC vs.
Revision 1.216 by jsr166, Tue Aug 30 00:01:22 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 220 | Line 250
250
251		<include name="*.java"/>
252		<compilerarg value="-XDignore.symbol.file=true"/>
253	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
254	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
253	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255	>	<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256		<compilerarg line="${build.args}"/>
257		<javac-elements/>
258
#	Line 231 | Line 262
262		failonerror="true"
263		jvm="${java@{target}}"
264		fork="true">
265	<	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
265	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266	>	<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267		<jvmarg line="@{jvmflags}"/>
268	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
270
271	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
272	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
271	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272	>	<syspropertyset id="system-properties-used-by-tck">
273		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274	+	<propertyref prefix="jsr166."/>
275	+	<propertyref name="test.timeout.factor"/>
276		</syspropertyset>
277
242	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
278		<classpath>
279		<pathelement location="${junit.jar}"/>
280		<pathelement location="@{workdir}/tck-classes"/>
#	Line 252 | Line 285
285		</macrodef>
286
287		<!-- Define jtreg test sets for different jdk versions -->
288	<	<fileset dir="${jtreg.src.dir}">
288	>	<fileset dir="${jtreg9.src.dir}">
289		<patternset id="jdk9.jtreg.tests">
290		<include name="**/*.java"/>
291		</patternset>
292		</fileset>
293
294	<	<fileset dir="${jtreg.src.dir}">
294	>	<fileset dir="${jtreg8.src.dir}">
295		<patternset id="jdk8.jtreg.tests">
296		<include name="**/*.java"/>
297	<	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
297	>	<exclude name="**/SpliteratorCharacteristics.java"/>
298	>	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
299	>	<exclude name="**/GCDuringIteration.java"/>
300		</patternset>
301		</fileset>
302
303	<	<fileset dir="${jtreg.src.dir}">
303	>	<fileset dir="${jtreg7.src.dir}">
304		<patternset id="jdk7.jtreg.tests">
305		<include name="**/*.java"/>
271	–	<exclude name="util/Collection/CollectionDefaults.java"/>
272	–	<exclude name="util/List/ListDefaults.java"/>
273	–	<exclude name="util/Spliterator/**/*.java"/>
274	–	<exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275	–	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276	–	<exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
306		</patternset>
307		</fileset>
308
309	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
310	+	<property name="jtreg.flags" value=""/>
311	+
312		<macrodef name="run-jtreg-tests">
313	<	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
313	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314		<attribute name="source" default="7"/>
315		<attribute name="target"/>
316		<attribute name="workdir"/>
317		<attribute name="classes"/>
318		<attribute name="jtregflags" default=""/>
319	+
320		<sequential>
321	+
322	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
323	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
324	+
325	+	<local name="modules"/>
326	+	<condition property="modules">
327	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
328	+	</condition>
329	+
330		<delete dir="@{workdir}/JTwork"   quiet="true"/>
331		<delete dir="@{workdir}/JTreport" quiet="true"/>
332	<	<mkdir dir="@{workdir}/JTwork/scratch"/>
292	<	<mkdir dir="@{workdir}/JTreport"/>
293	<	<jtreg dir="@{jtreg.src.dir}"
332	>	<jtreg dir="${jtreg@{target}.src.dir}"
333		jdk="${jdk@{target}.home}"
334		workDir="@{workdir}/JTwork"
335		reportDir="@{workdir}/JTreport">
336		<patternset refid="jdk@{target}.jtreg.tests"/>
337	<	<arg value="-Xbootclasspath/p:@{classes}"/>
337	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338	>	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
339		<arg value="-agentvm"/>
340	<	<arg value="-v:nopass,fail"/>
340	>	<arg value="-verbose:${jtreg.verbose}"/>
341		<arg value="-vmoptions:-esa -ea"/>
342		<arg value="-automatic"/>
343		<arg value="-k:!ignore"/>
344		<arg line="@{jtregflags}"/>
345	+	<arg line="${jtreg.flags}"/>
346		</jtreg>
347		</sequential>
348		</macrodef>
#	Line 321 | Line 362
362		<property name="build.main.javac" value="${javac9}"/>
363
364		<target name="dists"
365	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
365	>	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366		description="Builds all public jars and docs"/>
367
368		<target name="compile"
369		depends="configure-compiler"
370		description="Compiles src/main sources to build dir">
371
372	<	<mkdir dir="${build.classes.dir}"/>
372	>	<local name="modules"/>
373	>	<condition property="modules">
374	>	<and>
375	>	<available file="${jdk9.home}/jmods" type="dir"/>
376	>	<equals arg1="9" arg2="${build.main.java.version}"/>
377	>	</and>
378	>	</condition>
379	>
380	>	<local name="destdir"/>
381	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
383	>
384	>	<mkdir dir="${destdir}"/>
385
386		<javac srcdir="${src.dir}"
387	<	destdir="${build.classes.dir}"
387	>	destdir="${destdir}"
388		debug="${build.debug}"
389		debuglevel="${build.debuglevel}"
390		deprecation="${build.deprecation}"
#	Line 342 | Line 395
395		fork="true">
396
397		<include name="**/*.java"/>
398	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
399		<compilerarg value="-Xprefer:source"/>
400		<compilerarg value="-XDignore.symbol.file=true"/>
401		<compilerarg value="-Xlint:all"/>
#	Line 356 | Line 410
410
411		<target name="jar"
412		depends="compile"
413	<	description="Builds library jar from compiled sources">
414	<
413	>	description="Builds library jar for src/main from compiled sources">
414	>	<local name="subdir"/>
415	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
416		<jar destfile="${product.jar}">
417	<	<fileset dir="${build.classes.dir}"/>
417	>	<fileset dir="${build.classes.dir}${subdir}"/>
418	>	<manifest>
419	>	<attribute name="Built-By" value="${user.name}"/>
420	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
421	>	</manifest>
422		</jar>
423		</target>
424
#	Line 373 | Line 432
432		<!-- the packagenames="none" hack below prevents scanning the -->
433		<!-- sourcepath for packages -->
434
435	+	<!--  TODO:       sourcepath="${src.dir}:${jdk9.src.dir}" -->
436		<javadoc destdir="${docs.dir}"
437		packagenames="none"
438		link="${java9.api.url}"
439		overview="${src.dir}/intro.html"
440		access="${build.javadoc.access}"
441	<	sourcepath="${src.dir}:${jdk9src.dir}"
441	>	sourcepath="${src.dir}"
442		classpath=""
443		executable="${javadoc9}">
444		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 387 | Line 447
447		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
448		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449		<arg value="-XDignore.symbol.file=true"/>
450	+	<arg value="-Xmodule:java.base"/>
451		<arg value="-tag"/>
452		<arg value="${javadoc.jls.option}"/>
453		<arg value="-tag"/>
#	Line 395 | Line 456
456		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
457		<arg value="-tag"/>
458		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
459	+	<!-- tags added in jdk9 -->
460	+	<arg value="-tag"/>
461	+	<arg value="revised:X"/>
462	+	<arg value="-tag"/>
463	+	<arg value="spec:X"/>
464		</javadoc>
465		</target>
466
#	Line 418 | Line 484
484		<exclude name="src/emulation/**"/>
485		<exclude name="**/SyntaxTest.java"/>
486		<exclude name="**/SuperfluousAbstract.java"/>
487	+	<manifest>
488	+	<attribute name="Built-By" value="${user.name}"/>
489	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
490	+	</manifest>
491		</jar>
492		</target>
493
#	Line 449 | Line 519
519		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
520		</target>
521
522	<	<target name="tck" depends="test-tck" description="alias for test-tck"/>
453	<	<target name="test-tck"
522	>	<target name="tck"
523		depends="jar"
524	<	description="Runs tck tests for main directly">
524	>	description="Runs tck tests for src/main directly">
525
526		<run-tck-tests
527		target="${build.main.java.version}"
#	Line 460 | Line 529
529		classes="${product.jar}"/>
530		</target>
531
532	<	<target name="test-tck-parallelism-1"
533	<	description="Runs test-tck with given common pool parallelism">
534	<	<antcall target="test-tck">
532	>	<target name="tck-parallelism-1"
533	>	description="Runs tck with common pool parallelism 1">
534	>	<antcall target="tck">
535		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
536		</antcall>
537		</target>
538
539	<	<target name="test-tck-parallelism-0"
540	<	description="Runs test-tck with given common pool parallelism">
541	<	<antcall target="test-tck">
539	>	<target name="tck-parallelism-0"
540	>	description="Runs tck with common pool parallelism 0">
541	>	<antcall target="tck">
542		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
543		</antcall>
544		</target>
545
546	<	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
547	<	<target name="test-jtreg"
546	>	<target name="tck-security-manager"
547	>	description="Runs tck with a security manager">
548	>	<antcall target="tck">
549	>	<param name="jsr166.useSecurityManager" value="true"/>
550	>	</antcall>
551	>	</target>
552	>
553	>	<target name="jtreg"
554		depends="jar"
555	<	description="Runs jtreg tests for main using the jtreg ant task">
555	>	description="Runs jtreg tests for src/main using the jtreg ant task">
556		<run-jtreg-tests
557		target="${build.main.java.version}"
558		workdir="${build.dir}"
#	Line 485 | Line 560
560		</target>
561
562		<target name="test"
563	<	depends="test-tck, test-tck-parallelism-1, test-jtreg"
564	<	description="Runs tck and jtreg tests for main">
563	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
564	>	description="Runs tck and jtreg tests for src/main">
565		</target>
566
567	<	<target name="test89"
493	<	description="Runs tck and jtreg tests for main for multiple java versions">
567	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
568
569	<	<antcall target="clean"/>
570	<	<antcall target="test">
571	<	<param name="build.main.java.version" value="8"/>
572	<	<param name="build.main.javac" value="${javac8}"/>
499	<	<param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500	<	</antcall>
569	>	<!--     <antcall target="jtreg"> -->
570	>	<!--       <param name="build.main.java.version" value="8"/> -->
571	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
572	>	<!--     </antcall> -->
573
574	<	<antcall target="clean"/>
503	<	<antcall target="test">
504	<	<param name="build.main.java.version" value="9"/>
505	<	<param name="build.main.javac" value="${javac9}"/>
506	<	</antcall>
574	>	<!--   </target> -->
575
576	<	</target>
576	>	<!--   <target name="test89" -->
577	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
578	>
579	>	<!--     <antcall target="clean"/> -->
580	>	<!--     <antcall target="test"> -->
581	>	<!--       <param name="build.main.java.version" value="8"/> -->
582	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
583	>	<!--     </antcall> -->
584	>
585	>	<!--     <antcall target="clean"/> -->
586	>	<!--     <antcall target="test"> -->
587	>	<!--       <param name="build.main.java.version" value="9"/> -->
588	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
589	>	<!--     </antcall> -->
590	>
591	>	<!--   </target> -->
592
593
594
595		<target name="configure-compiler">
596	+	<fail message="ant version too old">
597	+	<condition>
598	+	<not> <antversion atleast="1.9.1"/> </not>
599	+	</condition>
600	+	</fail>
601
602		<property name="unchecked.option" value="-Xlint:unchecked"/>
603
#	Line 530 | Line 618
618		<!-- Various demos and test programs -->
619
620
621	<	<target name="loops" depends="configure-compiler"
622	<	description="Benchmark from Doug Lea's AQS paper">
621	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
622	>	<target name="loops" depends="configure-compiler">
623
624		<mkdir dir="${build.loops.dir}"/>
625
#	Line 541 | Line 629
629		debuglevel="${build.debuglevel}"
630		deprecation="${build.deprecation}"
631		source="${build.sourcelevel}"
632	+	target="${build.sourcelevel}"
633		fork="true">
634
635		<compilerarg line="${build.args}"/>
#	Line 573 | Line 662
662
663		<include name="*.java"/>
664		<compilerarg value="-XDignore.symbol.file=true"/>
665	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
665	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
666		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
667		<compilerarg line="${build.args}"/>
668
#	Line 582 | Line 671
671		</target>
672
673
674	+	<!-- jsr166 4jdk8 -->
675	+
676	+	<target name="4jdk8compile"
677	+	depends="configure-compiler"
678	+	description="Compiles src/jdk8 sources, targeting jdk8">
679	+
680	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
681	+
682	+	<javac srcdir="${4jdk8src.dir}"
683	+	destdir="${build.4jdk8.classes.dir}"
684	+	debug="${build.debug}"
685	+	debuglevel="${build.debuglevel}"
686	+	deprecation="${build.deprecation}"
687	+	source="8"
688	+	target="8"
689	+	classpath=""
690	+	bootclasspath="${bootclasspath8}"
691	+	includeAntRuntime="false"
692	+	includeJavaRuntime="false"
693	+	executable="${javac8}"
694	+	fork="true">
695	+
696	+	<include name="**/*.java"/>
697	+	<compilerarg value="-Xprefer:source"/>
698	+	<compilerarg value="-XDignore.symbol.file=true"/>
699	+	<compilerarg value="-Xlint:all"/>
700	+	<compilerarg value="-Werror"/>
701	+	<compilerarg line="${build.args}"/>
702	+
703	+	</javac>
704	+	</target>
705	+
706	+	<target name="4jdk8doclint"
707	+	depends="configure-compiler"
708	+	description="Finds doclint warnings">
709	+
710	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
711	+
712	+	<javac srcdir="${4jdk8src.dir}"
713	+	destdir="${build.4jdk8.classes.dir}"
714	+	debug="${build.debug}"
715	+	debuglevel="${build.debuglevel}"
716	+	deprecation="${build.deprecation}"
717	+	source="8"
718	+	target="8"
719	+	classpath=""
720	+	bootclasspath="${bootclasspath8}"
721	+	includeAntRuntime="false"
722	+	includeJavaRuntime="false"
723	+	executable="${javac8}"
724	+	fork="true">
725	+
726	+	<include name="**/*.java"/>
727	+	<compilerarg value="-Xprefer:source"/>
728	+	<compilerarg value="-XDignore.symbol.file=true"/>
729	+	<compilerarg value="-Xlint:all"/>
730	+	<compilerarg value="-Xdoclint:all/protected"/>
731	+	<compilerarg line="${build.args}"/>
732	+
733	+	</javac>
734	+	</target>
735	+
736	+
737	+	<target name="4jdk8jar"
738	+	depends="4jdk8compile"
739	+	description="Builds library jar from compiled sources">
740	+
741	+	<jar destfile="${4jdk8product.jar}">
742	+	<fileset dir="${build.4jdk8.classes.dir}"/>
743	+	<manifest>
744	+	<attribute name="Built-By" value="${user.name}"/>
745	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
746	+	</manifest>
747	+	</jar>
748	+
749	+	</target>
750	+
751	+
752	+	<target name="4jdk8-tck"
753	+	depends="4jdk8jar"
754	+	description="Runs tck tests for jsr166-4jdk8 directly">
755	+
756	+	<run-tck-tests
757	+	target="8"
758	+	workdir="${build.4jdk8.dir}"
759	+	classes="${4jdk8product.jar}">
760	+	<javac-elements>
761	+	<!-- JDK9+ test classes -->
762	+	<exclude name="*9Test.java"/>
763	+	<exclude name="*10Test.java"/>
764	+	</javac-elements>
765	+	</run-tck-tests>
766	+	</target>
767	+
768	+
769	+	<target name="4jdk8-jtreg"
770	+	depends="4jdk8jar"
771	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
772	+	<run-jtreg-tests
773	+	target="8"
774	+	workdir="${build.4jdk8.dir}"
775	+	classes="${4jdk8product.jar}"/>
776	+	</target>
777	+
778	+
779	+	<target name="4jdk8-test"
780	+	depends="4jdk8-tck, 4jdk8-jtreg"
781	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
782	+	</target>
783	+
784	+
785	+	<target name="4jdk8docs"
786	+	description="Builds javadocs for src/jdk8 to dist dir">
787	+
788	+	<delete dir="${4jdk8docs.dir}"/>
789	+	<mkdir dir="${4jdk8docs.dir}"/>
790	+
791	+	<javadoc destdir="${4jdk8docs.dir}"
792	+	packagenames="none"
793	+	link="${java8.api.url}"
794	+	overview="${4jdk8src.dir}/intro.html"
795	+	access="${build.javadoc.access}"
796	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
797	+	classpath=""
798	+	executable="${javadoc8}"
799	+	failonerror = "true">
800	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
801	+	<include name="**/*.java"/>
802	+	</fileset>
803	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
804	+	<arg value="-XDignore.symbol.file=true"/>
805	+	<arg value="-tag"/>
806	+	<arg value="${javadoc.jls.option}"/>
807	+	<arg value="-tag"/>
808	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
809	+	<arg value="-tag"/>
810	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
811	+	<arg value="-tag"/>
812	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
813	+	</javadoc>
814	+	</target>
815	+
816	+
817	+	<target name="4jdk8dist"
818	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
819	+	description="Puts all distributable products in single hierarchy"/>
820	+
821	+
822	+	<target name="4jdk8clean"
823	+	description="Removes all 4jdk8 build products">
824	+
825	+	<delete dir="${build.4jdk8.dir}"/>
826	+
827	+	</target>
828	+
829	+
830	+	<target name="4jdk8dist-jar"
831	+	depends="4jdk8clean, 4jdk8jar">
832	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
833	+	</target>
834	+
835	+
836	+	<target name="4jdk8dist-docs"
837	+	depends="4jdk8clean, 4jdk8docs">
838	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
839	+	</target>
840	+
841	+
842	+
843		<!-- jsr166 4jdk7 -->
844
845		<target name="4jdk7compile"
#	Line 596 | Line 854
854		debuglevel="${build.debuglevel}"
855		deprecation="${build.deprecation}"
856		source="6"
857	+	target="6"
858		classpath=""
859		bootclasspath="${bootclasspath6}"
860		includeAntRuntime="false"
#	Line 625 | Line 884
884		debuglevel="${build.debuglevel}"
885		deprecation="${build.deprecation}"
886		source="6"
887	+	target="6"
888		classpath=""
889	<	bootclasspath="${bootclasspath7}"
889	>	bootclasspath="${bootclasspath6}"
890		includeAntRuntime="false"
891		includeJavaRuntime="false"
892		executable="${javac8}"
#	Line 649 | Line 909
909
910		<jar destfile="${4jdk7product.jar}">
911		<fileset dir="${build.4jdk7.classes.dir}"/>
912	+	<manifest>
913	+	<attribute name="Built-By" value="${user.name}"/>
914	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
915	+	</manifest>
916		</jar>
917
918		</target>
919
920
921	<	<target name="4jdk7-test-tck"
921	>	<target name="4jdk7-tck"
922		depends="4jdk7jar"
923		description="Runs tck tests for jsr166-4jdk7 directly">
924
#	Line 666 | Line 930
930		<!-- JDK8+ test classes -->
931		<exclude name="*8Test.java"/>
932		<exclude name="*9Test.java"/>
933	+	<exclude name="*10Test.java"/>
934		<exclude name="DoubleAccumulatorTest.java"/>
935		<exclude name="DoubleAdderTest.java"/>
936		<exclude name="LongAccumulatorTest.java"/>
#	Line 673 | Line 938
938		<exclude name="CompletableFutureTest.java"/>
939		<exclude name="SplittableRandomTest.java"/>
940		<exclude name="StampedLockTest.java"/>
941	+	<exclude name="SubmissionPublisherTest.java"/>
942		</javac-elements>
943		</run-tck-tests>
944		</target>
945
946
947	<	<target name="4jdk7-test-tck-junit"
948	<	depends="4jdk7compile"
949	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
947	>	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
948	>	<target name="4jdk7-tck-junit"
949	>	depends="4jdk7compile">
950
951		<junit printsummary="true"
952		showoutput="true"
#	Line 706 | Line 972
972		</junit>
973		</target>
974
975	<	<target name="4jdk7-test-jtreg"
975	>	<target name="4jdk7-jtreg"
976		depends="4jdk7jar"
977		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
978		<run-jtreg-tests
#	Line 717 | Line 983
983
984
985		<target name="4jdk7-test"
986	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
986	>	depends="4jdk7-tck, 4jdk7-jtreg"
987		description="Runs tck and jtreg tests for jsr166-4jdk7">
988		</target>
989
#	Line 733 | Line 999
999		link="${java7.api.url}"
1000		overview="${4jdk7src.dir}/intro.html"
1001		access="${build.javadoc.access}"
1002	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1002	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1003		classpath=""
1004	<	executable="${javadoc7}">
1004	>	executable="${javadoc7}"
1005	>	failonerror = "true">
1006		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1007		<include name="**/*.java"/>
1008		</fileset>
#	Line 786 | Line 1053
1053		classpath=""
1054		bootclasspath="${bootclasspath6}"
1055		source="5"
1056	+	target="5"
1057		includeAntRuntime="false"
1058		includeJavaRuntime="false"
1059		executable="${javac7}"
#	Line 807 | Line 1075
1075
1076		<jar destfile="${jsr166x.jar}">
1077		<fileset dir="${build.jsr166x.classes.dir}"/>
1078	+	<manifest>
1079	+	<attribute name="Built-By" value="${user.name}"/>
1080	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1081	+	</manifest>
1082		</jar>
1083
1084		</target>
#	Line 822 | Line 1094
1094		packagenames="jsr166x.*"
1095		link="${java.api.url}"
1096		access="${build.javadoc.access}"
1097	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1097	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1098		bootclasspath="${bootclasspath6}"
1099		source="5"
1100	<	executable="${javadoc7}">
1100	>	executable="${javadoc7}"
1101	>	failonerror = "true">
1102		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1103		<arg value="-XDignore.symbol.file=true"/>
1104
#	Line 871 | Line 1144
1144		debuglevel="${build.debuglevel}"
1145		deprecation="${build.deprecation}"
1146		source="6"
1147	+	target="6"
1148		classpath=""
1149		bootclasspath="${bootclasspath6}"
1150		includeAntRuntime="false"
#	Line 894 | Line 1168
1168
1169		<jar destfile="${jsr166y.jar}" index="true">
1170		<fileset dir="${build.jsr166y.classes.dir}"/>
1171	+	<manifest>
1172	+	<attribute name="Built-By" value="${user.name}"/>
1173	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1174	+	</manifest>
1175		</jar>
1176
1177		</target>
#	Line 909 | Line 1187
1187		packagenames="jsr166y.*"
1188		link="${java.api.url}"
1189		access="${build.javadoc.access}"
1190	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1190	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1191		bootclasspath="${bootclasspath6}"
1192		source="6"
1193	<	executable="${javadoc7}">
1193	>	executable="${javadoc7}"
1194	>	failonerror = "true">
1195		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1196		<arg value="-XDignore.symbol.file=true"/>
1197
#	Line 961 | Line 1240
1240		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1241		classpath=""
1242		source="6"
1243	+	target="6"
1244		includeAntRuntime="false"
1245		includeJavaRuntime="false"
1246		executable="${javac7}"
#	Line 982 | Line 1262
1262
1263		<jar destfile="${extra166y.jar}" index="true">
1264		<fileset dir="${build.extra166y.classes.dir}"/>
1265	+	<manifest>
1266	+	<attribute name="Built-By" value="${user.name}"/>
1267	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1268	+	</manifest>
1269		</jar>
1270
1271		</target>
#	Line 997 | Line 1281
1281		packagenames="extra166y.*"
1282		link="${java.api.url}"
1283		access="${build.javadoc.access}"
1284	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1284	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1285		bootclasspath="${bootclasspath6}"
1286		source="6"
1287		executable="${javadoc7}">
#	Line 1048 | Line 1332
1332		debuglevel="${build.debuglevel}"
1333		deprecation="${build.deprecation}"
1334		source="${build.jsr166e.java.version}"
1335	+	target="${build.jsr166e.java.version}"
1336		classpath=""
1337		includeAntRuntime="false"
1338		includeJavaRuntime="false"
#	Line 1074 | Line 1359
1359		debuglevel="${build.debuglevel}"
1360		deprecation="${build.deprecation}"
1361		source="${build.jsr166e.java.version}"
1362	+	target="${build.jsr166e.java.version}"
1363		classpath=""
1364	<	bootclasspath="${bootclasspath7}"
1364	>	bootclasspath="${bootclasspath6}"
1365		includeAntRuntime="false"
1366		includeJavaRuntime="false"
1367		executable="${javac8}"
#	Line 1097 | Line 1383
1383
1384		<jar destfile="${jsr166e.jar}" index="true">
1385		<fileset dir="${build.jsr166e.classes.dir}"/>
1386	+	<manifest>
1387	+	<attribute name="Built-By" value="${user.name}"/>
1388	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1389	+	</manifest>
1390		</jar>
1391
1392		</target>
#	Line 1112 | Line 1402
1402		packagenames="jsr166e.*"
1403		link="${java.api.url}"
1404		access="${build.javadoc.access}"
1405	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1405	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1406		source="${build.jsr166e.java.version}"
1407	<	executable="${javadoc7}">
1407	>	executable="${javadoc7}"
1408	>	failonerror = "true">
1409		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1410		<arg value="-XDignore.symbol.file=true"/>
1411
#	Line 1122 | Line 1413
1413		</target>
1414
1415
1416	<	<target name="jsr166e-test-tck-one-java-version"
1416	>	<target name="jsr166e-tck-one-java-version"
1417		depends="jsr166ejar">
1418
1419		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1134 | Line 1425
1425		classes="${jsr166e.jar}"/>
1426		</target>
1427
1428	<	<target name="jsr166e-test-tck"
1428	>	<target name="jsr166e-tck"
1429		description="Runs tck tests for jsr166e for multiple java versions">
1430
1431		<!--     <antcall target="clean"/> -->
1432	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1432	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1433		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1434		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1435		<!--     </antcall> -->
1436
1437		<antcall target="clean"/>
1438	<	<antcall target="jsr166e-test-tck-one-java-version">
1438	>	<antcall target="jsr166e-tck-one-java-version">
1439		<param name="build.jsr166e.java.version" value="7"/>
1440		<param name="build.jsr166e.javac" value="${javac7}"/>
1441		</antcall>
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="6"/>
1446		<param name="build.jsr166e.javac" value="${javac6}"/>
1447		</antcall>
#	Line 1158 | Line 1449
1449
1450
1451		<target name="jsr166e-test"
1452	<	depends="jsr166e-test-tck"
1452	>	depends="jsr166e-tck"
1453		description="Runs all tests for jsr166e">
1454		</target>
1455

Diff Legend

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