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.152 by jsr166, Tue Feb 25 16:33:15 2014 UTC vs.
Revision 1.202 by jsr166, Sat Mar 26 15:10:14 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 24 | Line 28
28		$HOME/jdk/src/jdk9
29		where each of the above is a complete JDK source tree
30		(e.g. mercurial forest) or a symlink to same.
31	+
32	+	Alternatively, define ant variables thus:
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 34 | 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 46 | Line 58
58		<property name="build.deprecation"    value="false"/>
59		<property name="build.javadoc.access" value="protected"/>
60
49	–	<!-- Tck options; see JSR166TestCase.java -->
50	–	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51	–	<property name="jsr166.profileTests"     value="false"/>
52	–	<property name="jsr166.profileThreshold" value="100"/>
53	–	<property name="jsr166.runsPerTest"      value="1"/>
54	–	<!-- Allow running an individual tck test class -->
55	–	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57	–
61		<!-- Build locations -->
62		<property name="build.dir"                   location="build"/>
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 67 | 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 83 | 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 123 | 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 136 | 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 143 | 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 151 | 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 161 | Line 185
185		<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
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	<	<!-- The expected canonical location does not yet exist as of 2014-02 -->
189	<	<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
166	<	<property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167	<	<!-- No published jdk9 docs exist as of 2014-02 -->
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 2016-03 -->
190		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191	<	<property name="java9.docroot.url"      value="${java8.docroot.url}"/>
191	>	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
192		<!-- Default jdk doc location (latest stable release seems best) -->
193	<	<property name="java.docroot.url"       value="${java7.docroot.url}"/>
193	>	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
194
195		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
196		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 183 | 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=""/>
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 209 | Line 243
243		source="@{compile-target}"
244		target="@{compile-target}"
245		classpath="${junit.jar}"
212	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
246		includeAntRuntime="false"
247		includeJavaRuntime="false"
248		executable="${javac@{compile-target}}"
#	Line 217 | Line 250
250
251		<include name="*.java"/>
252		<compilerarg value="-XDignore.symbol.file=true"/>
253	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
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 227 | 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	<	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
269	<	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
270	<	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
268	>
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	>
276		<classpath>
277		<pathelement location="${junit.jar}"/>
278		<pathelement location="@{workdir}/tck-classes"/>
#	Line 241 | Line 282
282		</sequential>
283		</macrodef>
284
285	+	<!-- Define jtreg test sets for different jdk versions -->
286	+	<fileset dir="${jtreg9.src.dir}">
287	+	<patternset id="jdk9.jtreg.tests">
288	+	<include name="**/*.java"/>
289	+	</patternset>
290	+	</fileset>
291	+
292	+	<fileset dir="${jtreg8.src.dir}">
293	+	<patternset id="jdk8.jtreg.tests">
294	+	<include name="**/*.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="${jtreg7.src.dir}">
302	+	<patternset id="jdk7.jtreg.tests">
303	+	<include name="**/*.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	<	<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	<
339	<	<arg value="-Xbootclasspath/p:@{classes}"/>
338	>	<patternset refid="jdk@{target}.jtreg.tests"/>
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 284 | 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 305 | 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"/>
404	+	<compilerarg value="-Werror"/>
405		<compilerarg value="-Xdoclint:all/protected"/>
406		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
407		<compilerarg line="${build.args}"/>
408
409		</javac>
410	+
411	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
412	+	<!--
413	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414	+	-->
415		</target>
416
417
#	Line 322 | Line 421
421
422		<jar destfile="${product.jar}">
423		<fileset dir="${build.classes.dir}"/>
424	+	<manifest>
425	+	<attribute name="Built-By" value="${user.name}"/>
426	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
427	+	</manifest>
428		</jar>
429		</target>
430
#	Line 340 | Line 443
443		link="${java9.api.url}"
444		overview="${src.dir}/intro.html"
445		access="${build.javadoc.access}"
446	<	sourcepath="${src.dir}:${jdk9src.dir}"
446	>	sourcepath="${src.dir}:${jdk9.src.dir}"
447		classpath=""
448		executable="${javadoc9}">
449		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 349 | Line 452
452		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
453		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
454		<arg value="-XDignore.symbol.file=true"/>
455	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
456		<arg value="-tag"/>
457		<arg value="${javadoc.jls.option}"/>
458		<arg value="-tag"/>
#	Line 357 | Line 461
461		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
462		<arg value="-tag"/>
463		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
464	+	<!-- tags added in jdk9 -->
465	+	<arg value="-tag"/>
466	+	<arg value="revised:X"/>
467	+	<arg value="-tag"/>
468	+	<arg value="spec:X"/>
469		</javadoc>
470		</target>
471
#	Line 380 | Line 489
489		<exclude name="src/emulation/**"/>
490		<exclude name="**/SyntaxTest.java"/>
491		<exclude name="**/SuperfluousAbstract.java"/>
492	+	<manifest>
493	+	<attribute name="Built-By" value="${user.name}"/>
494	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
495	+	</manifest>
496		</jar>
497		</target>
498
#	Line 411 | Line 524
524		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
525		</target>
526
527	<
415	<	<target name="test-tck"
527	>	<target name="tck"
528		depends="jar"
529		description="Runs tck tests for main directly">
530
#	Line 422 | Line 534
534		classes="${product.jar}"/>
535		</target>
536
537	<	<target name="test-jtreg"
537	>	<target name="tck-parallelism-1"
538	>	description="Runs tck with given common pool parallelism">
539	>	<antcall target="tck">
540	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
541	>	</antcall>
542	>	</target>
543	>
544	>	<target name="tck-parallelism-0"
545	>	description="Runs tck with given common pool parallelism">
546	>	<antcall target="tck">
547	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
548	>	</antcall>
549	>	</target>
550	>
551	>	<target name="jtreg"
552		depends="jar"
553		description="Runs jtreg tests for main using the jtreg ant task">
554		<run-jtreg-tests
#	Line 432 | Line 558
558		</target>
559
560		<target name="test"
561	<	depends="test-tck, test-jtreg"
561	>	depends="tck, tck-parallelism-1, jtreg"
562		description="Runs tck and jtreg tests for main">
563		</target>
564
565	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
566	+
567	+	<antcall target="jtreg">
568	+	<param name="build.main.java.version" value="8"/>
569	+	<param name="build.main.javac" value="${javac8}"/>
570	+	</antcall>
571	+
572	+	</target>
573	+
574		<target name="test89"
575		description="Runs tck and jtreg tests for main for multiple java versions">
576
#	Line 456 | Line 591
591
592
593		<target name="configure-compiler">
594	+	<fail message="ant version too old">
595	+	<condition>
596	+	<not> <antversion atleast="1.9.1"/> </not>
597	+	</condition>
598	+	</fail>
599
600		<property name="unchecked.option" value="-Xlint:unchecked"/>
601
#	Line 487 | Line 627
627		debuglevel="${build.debuglevel}"
628		deprecation="${build.deprecation}"
629		source="${build.sourcelevel}"
630	+	target="${build.sourcelevel}"
631		fork="true">
632
633		<compilerarg line="${build.args}"/>
#	Line 502 | Line 643
643		</target>
644
645
646	+	<target name="compile-test-loops" depends="jar"
647	+	description="compile all the perf tests in src/test/loops">
648	+
649	+	<mkdir dir="${build.dir}/test/loops"/>
650	+
651	+	<javac srcdir="${basedir}/src/test/loops"
652	+	destdir="${build.dir}/test/loops"
653	+	debug="${build.debug}"
654	+	debuglevel="${build.debuglevel}"
655	+	deprecation="${build.deprecation}"
656	+	includeAntRuntime="false"
657	+	includeJavaRuntime="false"
658	+	executable="${javac9}"
659	+	fork="true">
660	+
661	+	<include name="*.java"/>
662	+	<compilerarg value="-XDignore.symbol.file=true"/>
663	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
664	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
665	+	<compilerarg line="${build.args}"/>
666	+
667	+	</javac>
668	+
669	+	</target>
670	+
671	+
672	+	<!-- jsr166 4jdk8 -->
673	+
674	+	<target name="4jdk8compile"
675	+	depends="configure-compiler"
676	+	description="Compiles src/jdk8 sources, targeting jdk8">
677	+
678	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
679	+
680	+	<javac srcdir="${4jdk8src.dir}"
681	+	destdir="${build.4jdk8.classes.dir}"
682	+	debug="${build.debug}"
683	+	debuglevel="${build.debuglevel}"
684	+	deprecation="${build.deprecation}"
685	+	source="8"
686	+	target="8"
687	+	classpath=""
688	+	bootclasspath="${bootclasspath8}"
689	+	includeAntRuntime="false"
690	+	includeJavaRuntime="false"
691	+	executable="${javac8}"
692	+	fork="true">
693	+
694	+	<include name="**/*.java"/>
695	+	<compilerarg value="-Xprefer:source"/>
696	+	<compilerarg value="-XDignore.symbol.file=true"/>
697	+	<compilerarg value="-Xlint:all"/>
698	+	<compilerarg value="-Werror"/>
699	+	<compilerarg line="${build.args}"/>
700	+
701	+	</javac>
702	+	</target>
703	+
704	+	<target name="4jdk8doclint"
705	+	depends="configure-compiler"
706	+	description="Finds doclint warnings">
707	+
708	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
709	+
710	+	<javac srcdir="${4jdk8src.dir}"
711	+	destdir="${build.4jdk8.classes.dir}"
712	+	debug="${build.debug}"
713	+	debuglevel="${build.debuglevel}"
714	+	deprecation="${build.deprecation}"
715	+	source="8"
716	+	target="8"
717	+	classpath=""
718	+	bootclasspath="${bootclasspath8}"
719	+	includeAntRuntime="false"
720	+	includeJavaRuntime="false"
721	+	executable="${javac8}"
722	+	fork="true">
723	+
724	+	<include name="**/*.java"/>
725	+	<compilerarg value="-Xprefer:source"/>
726	+	<compilerarg value="-XDignore.symbol.file=true"/>
727	+	<compilerarg value="-Xlint:all"/>
728	+	<compilerarg value="-Xdoclint:all/protected"/>
729	+	<compilerarg line="${build.args}"/>
730	+
731	+	</javac>
732	+	</target>
733	+
734	+
735	+	<target name="4jdk8jar"
736	+	depends="4jdk8compile"
737	+	description="Builds library jar from compiled sources">
738	+
739	+	<jar destfile="${4jdk8product.jar}">
740	+	<fileset dir="${build.4jdk8.classes.dir}"/>
741	+	<manifest>
742	+	<attribute name="Built-By" value="${user.name}"/>
743	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
744	+	</manifest>
745	+	</jar>
746	+
747	+	</target>
748	+
749	+
750	+	<target name="4jdk8-tck"
751	+	depends="4jdk8jar"
752	+	description="Runs tck tests for jsr166-4jdk8 directly">
753	+
754	+	<run-tck-tests
755	+	target="8"
756	+	workdir="${build.4jdk8.dir}"
757	+	classes="${4jdk8product.jar}">
758	+	<javac-elements>
759	+	<!-- JDK9+ test classes -->
760	+	<exclude name="*9Test.java"/>
761	+	<exclude name="*10Test.java"/>
762	+	</javac-elements>
763	+	</run-tck-tests>
764	+	</target>
765	+
766	+
767	+	<target name="4jdk8-jtreg"
768	+	depends="4jdk8jar"
769	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
770	+	<run-jtreg-tests
771	+	target="8"
772	+	workdir="${build.4jdk8.dir}"
773	+	classes="${4jdk8product.jar}"/>
774	+	</target>
775	+
776	+
777	+	<target name="4jdk8-test"
778	+	depends="4jdk8-tck, 4jdk8-jtreg"
779	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
780	+	</target>
781	+
782	+
783	+	<target name="4jdk8docs"
784	+	description="Builds javadocs for src/jdk8 to dist dir">
785	+
786	+	<delete dir="${4jdk8docs.dir}"/>
787	+	<mkdir dir="${4jdk8docs.dir}"/>
788	+
789	+	<javadoc destdir="${4jdk8docs.dir}"
790	+	packagenames="none"
791	+	link="${java8.api.url}"
792	+	overview="${4jdk8src.dir}/intro.html"
793	+	access="${build.javadoc.access}"
794	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
795	+	classpath=""
796	+	executable="${javadoc8}">
797	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
798	+	<include name="**/*.java"/>
799	+	</fileset>
800	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
801	+	<arg value="-XDignore.symbol.file=true"/>
802	+	<arg value="-tag"/>
803	+	<arg value="${javadoc.jls.option}"/>
804	+	<arg value="-tag"/>
805	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
806	+	<arg value="-tag"/>
807	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808	+	<arg value="-tag"/>
809	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
810	+	</javadoc>
811	+	</target>
812	+
813	+
814	+	<target name="4jdk8dist"
815	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
816	+	description="Puts all distributable products in single hierarchy"/>
817	+
818	+
819	+	<target name="4jdk8clean"
820	+	description="Removes all 4jdk8 build products">
821	+
822	+	<delete dir="${build.4jdk8.dir}"/>
823	+
824	+	</target>
825	+
826	+
827	+	<target name="4jdk8dist-jar"
828	+	depends="4jdk8clean, 4jdk8jar">
829	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
830	+	</target>
831	+
832	+
833	+	<target name="4jdk8dist-docs"
834	+	depends="4jdk8clean, 4jdk8docs">
835	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
836	+	</target>
837	+
838	+
839	+
840		<!-- jsr166 4jdk7 -->
841
842		<target name="4jdk7compile"
#	Line 516 | Line 851
851		debuglevel="${build.debuglevel}"
852		deprecation="${build.deprecation}"
853		source="6"
854	+	target="6"
855		classpath=""
856		bootclasspath="${bootclasspath6}"
857		includeAntRuntime="false"
#	Line 527 | Line 863
863		<compilerarg value="-Xprefer:source"/>
864		<compilerarg value="-XDignore.symbol.file=true"/>
865		<compilerarg value="-Xlint:all"/>
866	+	<compilerarg value="-Werror"/>
867		<compilerarg line="${build.args}"/>
868
869		</javac>
#	Line 544 | Line 881
881		debuglevel="${build.debuglevel}"
882		deprecation="${build.deprecation}"
883		source="6"
884	+	target="6"
885		classpath=""
886	<	bootclasspath="${bootclasspath7}"
886	>	bootclasspath="${bootclasspath6}"
887		includeAntRuntime="false"
888		includeJavaRuntime="false"
889		executable="${javac8}"
#	Line 568 | Line 906
906
907		<jar destfile="${4jdk7product.jar}">
908		<fileset dir="${build.4jdk7.classes.dir}"/>
909	+	<manifest>
910	+	<attribute name="Built-By" value="${user.name}"/>
911	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
912	+	</manifest>
913		</jar>
914
915		</target>
916
917
918	<	<target name="4jdk7-test-tck"
918	>	<target name="4jdk7-tck"
919		depends="4jdk7jar"
920		description="Runs tck tests for jsr166-4jdk7 directly">
921
#	Line 585 | Line 927
927		<!-- JDK8+ test classes -->
928		<exclude name="*8Test.java"/>
929		<exclude name="*9Test.java"/>
930	+	<exclude name="*10Test.java"/>
931		<exclude name="DoubleAccumulatorTest.java"/>
932		<exclude name="DoubleAdderTest.java"/>
933		<exclude name="LongAccumulatorTest.java"/>
#	Line 592 | Line 935
935		<exclude name="CompletableFutureTest.java"/>
936		<exclude name="SplittableRandomTest.java"/>
937		<exclude name="StampedLockTest.java"/>
938	+	<exclude name="SubmissionPublisherTest.java"/>
939		</javac-elements>
940		</run-tck-tests>
941		</target>
942
943
944	<	<target name="4jdk7-test-tck-junit"
944	>	<target name="4jdk7-tck-junit"
945		depends="4jdk7compile"
946		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
947
#	Line 625 | Line 969
969		</junit>
970		</target>
971
972	<	<target name="4jdk7-test-jtreg"
972	>	<target name="4jdk7-jtreg"
973		depends="4jdk7jar"
974		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
975		<run-jtreg-tests
976		target="7"
977		workdir="${build.4jdk7.dir}"
978	<	classes="${4jdk7product.jar}"
635	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
978	>	classes="${4jdk7product.jar}"/>
979		</target>
980
981
982		<target name="4jdk7-test"
983	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
983	>	depends="4jdk7-tck, 4jdk7-jtreg"
984		description="Runs tck and jtreg tests for jsr166-4jdk7">
985		</target>
986
#	Line 653 | Line 996
996		link="${java7.api.url}"
997		overview="${4jdk7src.dir}/intro.html"
998		access="${build.javadoc.access}"
999	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
999	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1000		classpath=""
1001		executable="${javadoc7}">
1002		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
#	Line 706 | Line 1049
1049		classpath=""
1050		bootclasspath="${bootclasspath6}"
1051		source="5"
1052	+	target="5"
1053		includeAntRuntime="false"
1054		includeJavaRuntime="false"
1055		executable="${javac7}"
#	Line 714 | Line 1058
1058		<include name="jsr166x/**/*.java"/>
1059		<compilerarg value="-XDignore.symbol.file=true"/>
1060		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1061	+	<compilerarg value="-Werror"/>
1062		<compilerarg line="${build.args}"/>
1063
1064		</javac>
#	Line 726 | Line 1071
1071
1072		<jar destfile="${jsr166x.jar}">
1073		<fileset dir="${build.jsr166x.classes.dir}"/>
1074	+	<manifest>
1075	+	<attribute name="Built-By" value="${user.name}"/>
1076	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077	+	</manifest>
1078		</jar>
1079
1080		</target>
#	Line 741 | Line 1090
1090		packagenames="jsr166x.*"
1091		link="${java.api.url}"
1092		access="${build.javadoc.access}"
1093	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1093	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1094		bootclasspath="${bootclasspath6}"
1095		source="5"
1096		executable="${javadoc7}">
#	Line 790 | Line 1139
1139		debuglevel="${build.debuglevel}"
1140		deprecation="${build.deprecation}"
1141		source="6"
1142	+	target="6"
1143		classpath=""
1144		bootclasspath="${bootclasspath6}"
1145		includeAntRuntime="false"
#	Line 800 | Line 1150
1150		<include name="jsr166y/**/*.java"/>
1151		<compilerarg value="-XDignore.symbol.file=true"/>
1152		<compilerarg value="-Xlint:all"/>
1153	+	<compilerarg value="-Werror"/>
1154		<compilerarg line="${build.args}"/>
1155
1156		</javac>
#	Line 812 | Line 1163
1163
1164		<jar destfile="${jsr166y.jar}" index="true">
1165		<fileset dir="${build.jsr166y.classes.dir}"/>
1166	+	<manifest>
1167	+	<attribute name="Built-By" value="${user.name}"/>
1168	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1169	+	</manifest>
1170		</jar>
1171
1172		</target>
#	Line 827 | Line 1182
1182		packagenames="jsr166y.*"
1183		link="${java.api.url}"
1184		access="${build.javadoc.access}"
1185	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1185	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1186		bootclasspath="${bootclasspath6}"
1187		source="6"
1188		executable="${javadoc7}">
#	Line 879 | Line 1234
1234		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1235		classpath=""
1236		source="6"
1237	+	target="6"
1238		includeAntRuntime="false"
1239		includeJavaRuntime="false"
1240		executable="${javac7}"
#	Line 887 | Line 1243
1243		<include name="extra166y/**/*.java"/>
1244		<compilerarg value="-XDignore.symbol.file=true"/>
1245		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1246	+	<compilerarg value="-Werror"/>
1247		<compilerarg line="${build.args}"/>
1248
1249		</javac>
#	Line 899 | Line 1256
1256
1257		<jar destfile="${extra166y.jar}" index="true">
1258		<fileset dir="${build.extra166y.classes.dir}"/>
1259	+	<manifest>
1260	+	<attribute name="Built-By" value="${user.name}"/>
1261	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1262	+	</manifest>
1263		</jar>
1264
1265		</target>
#	Line 914 | Line 1275
1275		packagenames="extra166y.*"
1276		link="${java.api.url}"
1277		access="${build.javadoc.access}"
1278	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1278	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1279		bootclasspath="${bootclasspath6}"
1280		source="6"
1281		executable="${javadoc7}">
#	Line 965 | Line 1326
1326		debuglevel="${build.debuglevel}"
1327		deprecation="${build.deprecation}"
1328		source="${build.jsr166e.java.version}"
1329	+	target="${build.jsr166e.java.version}"
1330		classpath=""
1331		includeAntRuntime="false"
1332		includeJavaRuntime="false"
#	Line 974 | Line 1336
1336		<include name="jsr166e/**/*.java"/>
1337		<compilerarg value="-XDignore.symbol.file=true"/>
1338		<compilerarg value="-Xlint:all"/>
1339	+	<compilerarg value="-Werror"/>
1340		<compilerarg line="${build.args}"/>
1341
1342		</javac>
#	Line 990 | Line 1353
1353		debuglevel="${build.debuglevel}"
1354		deprecation="${build.deprecation}"
1355		source="${build.jsr166e.java.version}"
1356	+	target="${build.jsr166e.java.version}"
1357		classpath=""
1358	<	bootclasspath="${bootclasspath7}"
1358	>	bootclasspath="${bootclasspath6}"
1359		includeAntRuntime="false"
1360		includeJavaRuntime="false"
1361		executable="${javac8}"
#	Line 1000 | Line 1364
1364		<include name="jsr166e/**/*.java"/>
1365		<compilerarg value="-XDignore.symbol.file=true"/>
1366		<compilerarg value="-Xlint:all"/>
1367	+	<compilerarg value="-Werror"/>
1368		<compilerarg value="-Xdoclint:all/protected"/>
1369
1370		</javac>
#	Line 1012 | Line 1377
1377
1378		<jar destfile="${jsr166e.jar}" index="true">
1379		<fileset dir="${build.jsr166e.classes.dir}"/>
1380	+	<manifest>
1381	+	<attribute name="Built-By" value="${user.name}"/>
1382	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1383	+	</manifest>
1384		</jar>
1385
1386		</target>
#	Line 1027 | Line 1396
1396		packagenames="jsr166e.*"
1397		link="${java.api.url}"
1398		access="${build.javadoc.access}"
1399	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1399	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1400		source="${build.jsr166e.java.version}"
1401		executable="${javadoc7}">
1402		<arg line="-Xdocrootparent ${java.docroot.url}"/>
#	Line 1037 | Line 1406
1406		</target>
1407
1408
1409	<	<target name="jsr166e-test-tck-one-java-version"
1409	>	<target name="jsr166e-tck-one-java-version"
1410		depends="jsr166ejar">
1411
1412		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1049 | Line 1418
1418		classes="${jsr166e.jar}"/>
1419		</target>
1420
1421	<	<target name="jsr166e-test-tck"
1421	>	<target name="jsr166e-tck"
1422		description="Runs tck tests for jsr166e for multiple java versions">
1423
1424		<!--     <antcall target="clean"/> -->
1425	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1425	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1426		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1427		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1428		<!--     </antcall> -->
1429
1430		<antcall target="clean"/>
1431	<	<antcall target="jsr166e-test-tck-one-java-version">
1431	>	<antcall target="jsr166e-tck-one-java-version">
1432		<param name="build.jsr166e.java.version" value="7"/>
1433		<param name="build.jsr166e.javac" value="${javac7}"/>
1434		</antcall>
1435
1436		<antcall target="clean"/>
1437	<	<antcall target="jsr166e-test-tck-one-java-version">
1437	>	<antcall target="jsr166e-tck-one-java-version">
1438		<param name="build.jsr166e.java.version" value="6"/>
1439		<param name="build.jsr166e.javac" value="${javac6}"/>
1440		</antcall>
#	Line 1073 | Line 1442
1442
1443
1444		<target name="jsr166e-test"
1445	<	depends="jsr166e-test-tck"
1445	>	depends="jsr166e-tck"
1446		description="Runs all tests for jsr166e">
1447		</target>
1448
#	Line 1103 | Line 1472
1472
1473		<target name="lint">
1474		<antcall target="dists">
1475	+	<param name="build.javadoc.access" value="public"/>
1476	+	</antcall>
1477	+	</target>
1478	+
1479	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1480	+	<target name="lint-private">
1481	+	<antcall target="dist">
1482		<param name="build.javadoc.access" value="private"/>
1483		</antcall>
1484		</target>

Diff Legend

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