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.204 by jsr166, Sat Mar 26 17:21:13 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
#	Line 38 | Line 45
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-03 -->
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"/>
192		<!-- Default jdk doc location (latest stable release seems best) -->
#	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:${build.classes.dir}" 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:${build.classes.dir}" if:set="modules"/>
267		<jvmarg line="@{jvmflags}"/>
268
269	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
270	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
269	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
270	>	<syspropertyset id="system-properties-used-by-tck">
271		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
272	+	<propertyref prefix="jsr166."/>
273	+	<propertyref name="test.timeout.factor"/>
274		</syspropertyset>
275
242	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
276		<classpath>
277		<pathelement location="${junit.jar}"/>
278		<pathelement location="@{workdir}/tck-classes"/>
#	Line 252 | Line 283
283		</macrodef>
284
285		<!-- Define jtreg test sets for different jdk versions -->
286	<	<fileset dir="${jtreg.src.dir}">
286	>	<fileset dir="${jtreg9.src.dir}">
287		<patternset id="jdk9.jtreg.tests">
288		<include name="**/*.java"/>
289		</patternset>
290		</fileset>
291
292	<	<fileset dir="${jtreg.src.dir}">
292	>	<fileset dir="${jtreg8.src.dir}">
293		<patternset id="jdk8.jtreg.tests">
294		<include name="**/*.java"/>
295	<	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
295	>	<exclude name="**/SpliteratorCharacteristics.java"/>
296	>	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297	>	<exclude name="**/GCDuringIteration.java"/>
298		</patternset>
299		</fileset>
300
301	<	<fileset dir="${jtreg.src.dir}">
301	>	<fileset dir="${jtreg7.src.dir}">
302		<patternset id="jdk7.jtreg.tests">
303		<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"/>
304		</patternset>
305		</fileset>
306
307	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
308	+	<property name="jtreg.flags" value=""/>
309	+
310		<macrodef name="run-jtreg-tests">
311	<	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
311	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312		<attribute name="source" default="7"/>
313		<attribute name="target"/>
314		<attribute name="workdir"/>
315		<attribute name="classes"/>
316		<attribute name="jtregflags" default=""/>
317	+
318		<sequential>
319	+
320	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
321	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
322	+
323	+	<local name="modules"/>
324	+	<condition property="modules">
325	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
326	+	</condition>
327	+
328		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329		<delete dir="@{workdir}/JTreport" quiet="true"/>
330		<mkdir dir="@{workdir}/JTwork/scratch"/>
331	<	<mkdir dir="@{workdir}/JTreport"/>
332	<	<jtreg dir="@{jtreg.src.dir}"
331	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332	>	<mkdir dir="@{workdir}/JTreport/html"/>
333	>	<mkdir dir="@{workdir}/JTreport/text"/>
334	>	<jtreg dir="${jtreg@{target}.src.dir}"
335		jdk="${jdk@{target}.home}"
336		workDir="@{workdir}/JTwork"
337		reportDir="@{workdir}/JTreport">
338		<patternset refid="jdk@{target}.jtreg.tests"/>
339	<	<arg value="-Xbootclasspath/p:@{classes}"/>
339	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
340	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
341		<arg value="-agentvm"/>
342	<	<arg value="-v:nopass,fail"/>
342	>	<arg value="-verbose:${jtreg.verbose}"/>
343		<arg value="-vmoptions:-esa -ea"/>
344		<arg value="-automatic"/>
345		<arg value="-k:!ignore"/>
346		<arg line="@{jtregflags}"/>
347	+	<arg line="${jtreg.flags}"/>
348		</jtreg>
349		</sequential>
350		</macrodef>
#	Line 321 | Line 364
364		<property name="build.main.javac" value="${javac9}"/>
365
366		<target name="dists"
367	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367	>	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
368		description="Builds all public jars and docs"/>
369
370		<target name="compile"
371		depends="configure-compiler"
372		description="Compiles src/main sources to build dir">
373
374	<	<mkdir dir="${build.classes.dir}"/>
374	>	<local name="modules"/>
375	>	<condition property="modules">
376	>	<and>
377	>	<available file="${jdk9.home}/jmods" type="dir"/>
378	>	<equals arg1="9" arg2="${build.main.java.version}"/>
379	>	</and>
380	>	</condition>
381	>
382	>	<local name="destdir"/>
383	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
385	>
386	>	<mkdir dir="${destdir}"/>
387
388		<javac srcdir="${src.dir}"
389	<	destdir="${build.classes.dir}"
389	>	destdir="${destdir}"
390		debug="${build.debug}"
391		debuglevel="${build.debuglevel}"
392		deprecation="${build.deprecation}"
#	Line 342 | Line 397
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 360 | Line 416
416
417		<jar destfile="${product.jar}">
418		<fileset dir="${build.classes.dir}"/>
419	+	<manifest>
420	+	<attribute name="Built-By" value="${user.name}"/>
421	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
422	+	</manifest>
423		</jar>
424		</target>
425
#	Line 378 | Line 438
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}:${jdk9.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	+	<!--  TODO     <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">
525
#	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 given common pool parallelism">
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 given common pool parallelism">
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"/>
478	<	<target name="test-jtreg"
546	>	<target name="jtreg"
547		depends="jar"
548		description="Runs jtreg tests for main using the jtreg ant task">
549		<run-jtreg-tests
#	Line 485 | Line 553
553		</target>
554
555		<target name="test"
556	<	depends="test-tck, test-tck-parallelism-1, test-jtreg"
556	>	depends="tck, tck-parallelism-1, jtreg"
557		description="Runs tck and jtreg tests for main">
558		</target>
559
560	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
561	+
562	+	<antcall target="jtreg">
563	+	<param name="build.main.java.version" value="8"/>
564	+	<param name="build.main.javac" value="${javac8}"/>
565	+	</antcall>
566	+
567	+	</target>
568	+
569		<target name="test89"
570		description="Runs tck and jtreg tests for main for multiple java versions">
571
#	Line 496 | Line 573
573		<antcall target="test">
574		<param name="build.main.java.version" value="8"/>
575		<param name="build.main.javac" value="${javac8}"/>
499	–	<param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
576		</antcall>
577
578		<antcall target="clean"/>
#	Line 510 | Line 586
586
587
588		<target name="configure-compiler">
589	+	<fail message="ant version too old">
590	+	<condition>
591	+	<not> <antversion atleast="1.9.1"/> </not>
592	+	</condition>
593	+	</fail>
594
595		<property name="unchecked.option" value="-Xlint:unchecked"/>
596
#	Line 530 | Line 611
611		<!-- Various demos and test programs -->
612
613
614	<	<target name="loops" depends="configure-compiler"
615	<	description="Benchmark from Doug Lea's AQS paper">
614	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
615	>	<target name="loops" depends="configure-compiler">
616
617		<mkdir dir="${build.loops.dir}"/>
618
#	Line 541 | Line 622
622		debuglevel="${build.debuglevel}"
623		deprecation="${build.deprecation}"
624		source="${build.sourcelevel}"
625	+	target="${build.sourcelevel}"
626		fork="true">
627
628		<compilerarg line="${build.args}"/>
#	Line 573 | Line 655
655
656		<include name="*.java"/>
657		<compilerarg value="-XDignore.symbol.file=true"/>
658	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
658	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
659		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
660		<compilerarg line="${build.args}"/>
661
#	Line 582 | Line 664
664		</target>
665
666
667	+	<!-- jsr166 4jdk8 -->
668	+
669	+	<target name="4jdk8compile"
670	+	depends="configure-compiler"
671	+	description="Compiles src/jdk8 sources, targeting jdk8">
672	+
673	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
674	+
675	+	<javac srcdir="${4jdk8src.dir}"
676	+	destdir="${build.4jdk8.classes.dir}"
677	+	debug="${build.debug}"
678	+	debuglevel="${build.debuglevel}"
679	+	deprecation="${build.deprecation}"
680	+	source="8"
681	+	target="8"
682	+	classpath=""
683	+	bootclasspath="${bootclasspath8}"
684	+	includeAntRuntime="false"
685	+	includeJavaRuntime="false"
686	+	executable="${javac8}"
687	+	fork="true">
688	+
689	+	<include name="**/*.java"/>
690	+	<compilerarg value="-Xprefer:source"/>
691	+	<compilerarg value="-XDignore.symbol.file=true"/>
692	+	<compilerarg value="-Xlint:all"/>
693	+	<compilerarg value="-Werror"/>
694	+	<compilerarg line="${build.args}"/>
695	+
696	+	</javac>
697	+	</target>
698	+
699	+	<target name="4jdk8doclint"
700	+	depends="configure-compiler"
701	+	description="Finds doclint warnings">
702	+
703	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
704	+
705	+	<javac srcdir="${4jdk8src.dir}"
706	+	destdir="${build.4jdk8.classes.dir}"
707	+	debug="${build.debug}"
708	+	debuglevel="${build.debuglevel}"
709	+	deprecation="${build.deprecation}"
710	+	source="8"
711	+	target="8"
712	+	classpath=""
713	+	bootclasspath="${bootclasspath8}"
714	+	includeAntRuntime="false"
715	+	includeJavaRuntime="false"
716	+	executable="${javac8}"
717	+	fork="true">
718	+
719	+	<include name="**/*.java"/>
720	+	<compilerarg value="-Xprefer:source"/>
721	+	<compilerarg value="-XDignore.symbol.file=true"/>
722	+	<compilerarg value="-Xlint:all"/>
723	+	<compilerarg value="-Xdoclint:all/protected"/>
724	+	<compilerarg line="${build.args}"/>
725	+
726	+	</javac>
727	+	</target>
728	+
729	+
730	+	<target name="4jdk8jar"
731	+	depends="4jdk8compile"
732	+	description="Builds library jar from compiled sources">
733	+
734	+	<jar destfile="${4jdk8product.jar}">
735	+	<fileset dir="${build.4jdk8.classes.dir}"/>
736	+	<manifest>
737	+	<attribute name="Built-By" value="${user.name}"/>
738	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
739	+	</manifest>
740	+	</jar>
741	+
742	+	</target>
743	+
744	+
745	+	<target name="4jdk8-tck"
746	+	depends="4jdk8jar"
747	+	description="Runs tck tests for jsr166-4jdk8 directly">
748	+
749	+	<run-tck-tests
750	+	target="8"
751	+	workdir="${build.4jdk8.dir}"
752	+	classes="${4jdk8product.jar}">
753	+	<javac-elements>
754	+	<!-- JDK9+ test classes -->
755	+	<exclude name="*9Test.java"/>
756	+	<exclude name="*10Test.java"/>
757	+	</javac-elements>
758	+	</run-tck-tests>
759	+	</target>
760	+
761	+
762	+	<target name="4jdk8-jtreg"
763	+	depends="4jdk8jar"
764	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
765	+	<run-jtreg-tests
766	+	target="8"
767	+	workdir="${build.4jdk8.dir}"
768	+	classes="${4jdk8product.jar}"/>
769	+	</target>
770	+
771	+
772	+	<target name="4jdk8-test"
773	+	depends="4jdk8-tck, 4jdk8-jtreg"
774	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
775	+	</target>
776	+
777	+
778	+	<target name="4jdk8docs"
779	+	description="Builds javadocs for src/jdk8 to dist dir">
780	+
781	+	<delete dir="${4jdk8docs.dir}"/>
782	+	<mkdir dir="${4jdk8docs.dir}"/>
783	+
784	+	<javadoc destdir="${4jdk8docs.dir}"
785	+	packagenames="none"
786	+	link="${java8.api.url}"
787	+	overview="${4jdk8src.dir}/intro.html"
788	+	access="${build.javadoc.access}"
789	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
790	+	classpath=""
791	+	executable="${javadoc8}">
792	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
793	+	<include name="**/*.java"/>
794	+	</fileset>
795	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
796	+	<arg value="-XDignore.symbol.file=true"/>
797	+	<arg value="-tag"/>
798	+	<arg value="${javadoc.jls.option}"/>
799	+	<arg value="-tag"/>
800	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
801	+	<arg value="-tag"/>
802	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
803	+	<arg value="-tag"/>
804	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
805	+	</javadoc>
806	+	</target>
807	+
808	+
809	+	<target name="4jdk8dist"
810	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
811	+	description="Puts all distributable products in single hierarchy"/>
812	+
813	+
814	+	<target name="4jdk8clean"
815	+	description="Removes all 4jdk8 build products">
816	+
817	+	<delete dir="${build.4jdk8.dir}"/>
818	+
819	+	</target>
820	+
821	+
822	+	<target name="4jdk8dist-jar"
823	+	depends="4jdk8clean, 4jdk8jar">
824	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
825	+	</target>
826	+
827	+
828	+	<target name="4jdk8dist-docs"
829	+	depends="4jdk8clean, 4jdk8docs">
830	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
831	+	</target>
832	+
833	+
834	+
835		<!-- jsr166 4jdk7 -->
836
837		<target name="4jdk7compile"
#	Line 596 | Line 846
846		debuglevel="${build.debuglevel}"
847		deprecation="${build.deprecation}"
848		source="6"
849	+	target="6"
850		classpath=""
851		bootclasspath="${bootclasspath6}"
852		includeAntRuntime="false"
#	Line 625 | Line 876
876		debuglevel="${build.debuglevel}"
877		deprecation="${build.deprecation}"
878		source="6"
879	+	target="6"
880		classpath=""
881	<	bootclasspath="${bootclasspath7}"
881	>	bootclasspath="${bootclasspath6}"
882		includeAntRuntime="false"
883		includeJavaRuntime="false"
884		executable="${javac8}"
#	Line 649 | Line 901
901
902		<jar destfile="${4jdk7product.jar}">
903		<fileset dir="${build.4jdk7.classes.dir}"/>
904	+	<manifest>
905	+	<attribute name="Built-By" value="${user.name}"/>
906	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
907	+	</manifest>
908		</jar>
909
910		</target>
911
912
913	<	<target name="4jdk7-test-tck"
913	>	<target name="4jdk7-tck"
914		depends="4jdk7jar"
915		description="Runs tck tests for jsr166-4jdk7 directly">
916
#	Line 666 | Line 922
922		<!-- JDK8+ test classes -->
923		<exclude name="*8Test.java"/>
924		<exclude name="*9Test.java"/>
925	+	<exclude name="*10Test.java"/>
926		<exclude name="DoubleAccumulatorTest.java"/>
927		<exclude name="DoubleAdderTest.java"/>
928		<exclude name="LongAccumulatorTest.java"/>
#	Line 673 | Line 930
930		<exclude name="CompletableFutureTest.java"/>
931		<exclude name="SplittableRandomTest.java"/>
932		<exclude name="StampedLockTest.java"/>
933	+	<exclude name="SubmissionPublisherTest.java"/>
934		</javac-elements>
935		</run-tck-tests>
936		</target>
937
938
939	<	<target name="4jdk7-test-tck-junit"
940	<	depends="4jdk7compile"
941	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
939	>	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
940	>	<target name="4jdk7-tck-junit"
941	>	depends="4jdk7compile">
942
943		<junit printsummary="true"
944		showoutput="true"
#	Line 706 | Line 964
964		</junit>
965		</target>
966
967	<	<target name="4jdk7-test-jtreg"
967	>	<target name="4jdk7-jtreg"
968		depends="4jdk7jar"
969		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
970		<run-jtreg-tests
#	Line 717 | Line 975
975
976
977		<target name="4jdk7-test"
978	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
978	>	depends="4jdk7-tck, 4jdk7-jtreg"
979		description="Runs tck and jtreg tests for jsr166-4jdk7">
980		</target>
981
#	Line 733 | Line 991
991		link="${java7.api.url}"
992		overview="${4jdk7src.dir}/intro.html"
993		access="${build.javadoc.access}"
994	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
994	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
995		classpath=""
996		executable="${javadoc7}">
997		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
#	Line 786 | Line 1044
1044		classpath=""
1045		bootclasspath="${bootclasspath6}"
1046		source="5"
1047	+	target="5"
1048		includeAntRuntime="false"
1049		includeJavaRuntime="false"
1050		executable="${javac7}"
#	Line 807 | Line 1066
1066
1067		<jar destfile="${jsr166x.jar}">
1068		<fileset dir="${build.jsr166x.classes.dir}"/>
1069	+	<manifest>
1070	+	<attribute name="Built-By" value="${user.name}"/>
1071	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1072	+	</manifest>
1073		</jar>
1074
1075		</target>
#	Line 822 | Line 1085
1085		packagenames="jsr166x.*"
1086		link="${java.api.url}"
1087		access="${build.javadoc.access}"
1088	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1088	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1089		bootclasspath="${bootclasspath6}"
1090		source="5"
1091		executable="${javadoc7}">
#	Line 871 | Line 1134
1134		debuglevel="${build.debuglevel}"
1135		deprecation="${build.deprecation}"
1136		source="6"
1137	+	target="6"
1138		classpath=""
1139		bootclasspath="${bootclasspath6}"
1140		includeAntRuntime="false"
#	Line 894 | Line 1158
1158
1159		<jar destfile="${jsr166y.jar}" index="true">
1160		<fileset dir="${build.jsr166y.classes.dir}"/>
1161	+	<manifest>
1162	+	<attribute name="Built-By" value="${user.name}"/>
1163	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1164	+	</manifest>
1165		</jar>
1166
1167		</target>
#	Line 909 | Line 1177
1177		packagenames="jsr166y.*"
1178		link="${java.api.url}"
1179		access="${build.javadoc.access}"
1180	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1180	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181		bootclasspath="${bootclasspath6}"
1182		source="6"
1183		executable="${javadoc7}">
#	Line 961 | Line 1229
1229		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1230		classpath=""
1231		source="6"
1232	+	target="6"
1233		includeAntRuntime="false"
1234		includeJavaRuntime="false"
1235		executable="${javac7}"
#	Line 982 | Line 1251
1251
1252		<jar destfile="${extra166y.jar}" index="true">
1253		<fileset dir="${build.extra166y.classes.dir}"/>
1254	+	<manifest>
1255	+	<attribute name="Built-By" value="${user.name}"/>
1256	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1257	+	</manifest>
1258		</jar>
1259
1260		</target>
#	Line 997 | Line 1270
1270		packagenames="extra166y.*"
1271		link="${java.api.url}"
1272		access="${build.javadoc.access}"
1273	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1273	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1274		bootclasspath="${bootclasspath6}"
1275		source="6"
1276		executable="${javadoc7}">
#	Line 1048 | Line 1321
1321		debuglevel="${build.debuglevel}"
1322		deprecation="${build.deprecation}"
1323		source="${build.jsr166e.java.version}"
1324	+	target="${build.jsr166e.java.version}"
1325		classpath=""
1326		includeAntRuntime="false"
1327		includeJavaRuntime="false"
#	Line 1074 | Line 1348
1348		debuglevel="${build.debuglevel}"
1349		deprecation="${build.deprecation}"
1350		source="${build.jsr166e.java.version}"
1351	+	target="${build.jsr166e.java.version}"
1352		classpath=""
1353	<	bootclasspath="${bootclasspath7}"
1353	>	bootclasspath="${bootclasspath6}"
1354		includeAntRuntime="false"
1355		includeJavaRuntime="false"
1356		executable="${javac8}"
#	Line 1097 | Line 1372
1372
1373		<jar destfile="${jsr166e.jar}" index="true">
1374		<fileset dir="${build.jsr166e.classes.dir}"/>
1375	+	<manifest>
1376	+	<attribute name="Built-By" value="${user.name}"/>
1377	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1378	+	</manifest>
1379		</jar>
1380
1381		</target>
#	Line 1112 | Line 1391
1391		packagenames="jsr166e.*"
1392		link="${java.api.url}"
1393		access="${build.javadoc.access}"
1394	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1394	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395		source="${build.jsr166e.java.version}"
1396		executable="${javadoc7}">
1397		<arg line="-Xdocrootparent ${java.docroot.url}"/>
#	Line 1122 | Line 1401
1401		</target>
1402
1403
1404	<	<target name="jsr166e-test-tck-one-java-version"
1404	>	<target name="jsr166e-tck-one-java-version"
1405		depends="jsr166ejar">
1406
1407		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1134 | Line 1413
1413		classes="${jsr166e.jar}"/>
1414		</target>
1415
1416	<	<target name="jsr166e-test-tck"
1416	>	<target name="jsr166e-tck"
1417		description="Runs tck tests for jsr166e for multiple java versions">
1418
1419		<!--     <antcall target="clean"/> -->
1420	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1420	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1421		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1422		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1423		<!--     </antcall> -->
1424
1425		<antcall target="clean"/>
1426	<	<antcall target="jsr166e-test-tck-one-java-version">
1426	>	<antcall target="jsr166e-tck-one-java-version">
1427		<param name="build.jsr166e.java.version" value="7"/>
1428		<param name="build.jsr166e.javac" value="${javac7}"/>
1429		</antcall>
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="6"/>
1434		<param name="build.jsr166e.javac" value="${javac6}"/>
1435		</antcall>
#	Line 1158 | Line 1437
1437
1438
1439		<target name="jsr166e-test"
1440	<	depends="jsr166e-test-tck"
1440	>	depends="jsr166e-tck"
1441		description="Runs all tests for jsr166e">
1442		</target>
1443

Diff Legend

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