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.182 by jsr166, Sun Sep 13 17:46:07 2015 UTC vs.
Revision 1.217 by jsr166, Tue Aug 30 02:41:07 2016 UTC

#	Line 7 | 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 27 | 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 2015-09, there is incomplete hacky support for jigsaw
37	<	Build for jigsaw using something like:
35	<	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36	<	"docs" target is still broken.
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" />
#	Line 57 | Line 58
58		<property name="build.deprecation"    value="false"/>
59		<property name="build.javadoc.access" value="protected"/>
60
60	–	<!-- Tck options; see JSR166TestCase.java
61	–	To profile a single tck test class:
62	–	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
63	–	To stress test a single tck test class:
64	–	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
65	–	-->
66	–	<property name="jsr166.profileTests"     value="false"/>
67	–	<property name="jsr166.profileThreshold" value="100"/>
68	–	<property name="jsr166.runsPerTest"      value="1"/>
69	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
70	–
61		<!-- Build locations -->
62		<property name="build.dir"                   location="build"/>
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 80 | 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 96 | 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"/>
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="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
102	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
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="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
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"/>
#	Line 145 | Line 141
141		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
142		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144	<	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
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 160 | 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 167 | 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 175 | 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 186 | 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 205 | 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>
#	Line 244 | 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="-Xoverride:${build.classes.dir}" if: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 257 | Line 263
263		jvm="${java@{target}}"
264		fork="true">
265		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266	<	<jvmarg value="-Xoverride:${build.classes.dir}" if: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 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
268	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
269	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
270	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
278		<classpath>
279		<pathelement location="${junit.jar}"/>
280		<pathelement location="@{workdir}/tck-classes"/>
#	Line 299 | Line 306
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 -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314		<attribute name="source" default="7"/>
#	Line 309 | Line 319
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"/>
#	Line 316 | Line 329
329
330		<delete dir="@{workdir}/JTwork"   quiet="true"/>
331		<delete dir="@{workdir}/JTreport" quiet="true"/>
319	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
320	–	<mkdir dir="@{workdir}/JTreport"/>
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}" unless:set="modules"/>
338	<	<arg value="-Xoverride:${build.classes.dir}" if: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 350 | 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"
#	Line 398 | 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."/>
#	Line 419 | 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	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
437		<javadoc destdir="${docs.dir}"
438		packagenames="none"
439		link="${java9.api.url}"
440		overview="${src.dir}/intro.html"
441		access="${build.javadoc.access}"
442	<	sourcepath="${src.dir}:${jdk9src.dir}"
442	>	sourcepath="${src.dir}"
443		classpath=""
444		executable="${javadoc9}">
445		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 433 | Line 448
448		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
449		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450		<arg value="-XDignore.symbol.file=true"/>
451	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
451	>	<arg value="-Xmodule:java.base"/>
452		<arg value="-tag"/>
453		<arg value="${javadoc.jls.option}"/>
454		<arg value="-tag"/>
#	Line 442 | Line 457
457		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
458		<arg value="-tag"/>
459		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
460	+	<!-- tags added in jdk9 -->
461	+	<arg value="-tag"/>
462	+	<arg value="revised:X"/>
463	+	<arg value="-tag"/>
464	+	<arg value="spec:X"/>
465		</javadoc>
466		</target>
467
#	Line 502 | Line 522
522
523		<target name="tck"
524		depends="jar"
525	<	description="Runs tck tests for main directly">
525	>	description="Runs tck tests for src/main directly">
526
527		<run-tck-tests
528		target="${build.main.java.version}"
#	Line 511 | Line 531
531		</target>
532
533		<target name="tck-parallelism-1"
534	<	description="Runs tck with given common pool parallelism">
534	>	description="Runs tck with common pool parallelism 1">
535		<antcall target="tck">
536		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
537		</antcall>
538		</target>
539
540		<target name="tck-parallelism-0"
541	<	description="Runs tck with given common pool parallelism">
541	>	description="Runs tck with common pool parallelism 0">
542		<antcall target="tck">
543		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
544		</antcall>
545		</target>
546
547	+	<target name="tck-security-manager"
548	+	description="Runs tck with a security manager">
549	+	<antcall target="tck">
550	+	<param name="jsr166.useSecurityManager" value="true"/>
551	+	</antcall>
552	+	</target>
553	+
554		<target name="jtreg"
555		depends="jar"
556	<	description="Runs jtreg tests for main using the jtreg ant task">
556	>	description="Runs jtreg tests for src/main using the jtreg ant task">
557		<run-jtreg-tests
558		target="${build.main.java.version}"
559		workdir="${build.dir}"
#	Line 534 | Line 561
561		</target>
562
563		<target name="test"
564	<	depends="tck, tck-parallelism-1, jtreg"
565	<	description="Runs tck and jtreg tests for main">
564	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
565	>	description="Runs tck and jtreg tests for src/main">
566		</target>
567
568	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
568	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
569
570	<	<antcall target="jtreg">
571	<	<param name="build.main.java.version" value="8"/>
572	<	<param name="build.main.javac" value="${javac8}"/>
573	<	</antcall>
570	>	<!--     <antcall target="jtreg"> -->
571	>	<!--       <param name="build.main.java.version" value="8"/> -->
572	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
573	>	<!--     </antcall> -->
574
575	<	</target>
575	>	<!--   </target> -->
576
577	<	<target name="test89"
578	<	description="Runs tck and jtreg tests for main for multiple java versions">
577	>	<!--   <target name="test89" -->
578	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
579
580	<	<antcall target="clean"/>
581	<	<antcall target="test">
582	<	<param name="build.main.java.version" value="8"/>
583	<	<param name="build.main.javac" value="${javac8}"/>
584	<	</antcall>
580	>	<!--     <antcall target="clean"/> -->
581	>	<!--     <antcall target="test"> -->
582	>	<!--       <param name="build.main.java.version" value="8"/> -->
583	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
584	>	<!--     </antcall> -->
585
586	<	<antcall target="clean"/>
587	<	<antcall target="test">
588	<	<param name="build.main.java.version" value="9"/>
589	<	<param name="build.main.javac" value="${javac9}"/>
590	<	</antcall>
586	>	<!--     <antcall target="clean"/> -->
587	>	<!--     <antcall target="test"> -->
588	>	<!--       <param name="build.main.java.version" value="9"/> -->
589	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
590	>	<!--     </antcall> -->
591
592	<	</target>
592	>	<!--   </target> -->
593
594
595
#	Line 592 | Line 619
619		<!-- Various demos and test programs -->
620
621
622	<	<target name="loops" depends="configure-compiler"
623	<	description="Benchmark from Doug Lea's AQS paper">
622	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
623	>	<target name="loops" depends="configure-compiler">
624
625		<mkdir dir="${build.loops.dir}"/>
626
#	Line 603 | Line 630
630		debuglevel="${build.debuglevel}"
631		deprecation="${build.deprecation}"
632		source="${build.sourcelevel}"
633	+	target="${build.sourcelevel}"
634		fork="true">
635
636		<compilerarg line="${build.args}"/>
#	Line 644 | Line 672
672		</target>
673
674
675	+	<!-- jsr166 4jdk8 -->
676	+
677	+	<target name="4jdk8compile"
678	+	depends="configure-compiler"
679	+	description="Compiles src/jdk8 sources, targeting jdk8">
680	+
681	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
682	+
683	+	<javac srcdir="${4jdk8src.dir}"
684	+	destdir="${build.4jdk8.classes.dir}"
685	+	debug="${build.debug}"
686	+	debuglevel="${build.debuglevel}"
687	+	deprecation="${build.deprecation}"
688	+	source="8"
689	+	target="8"
690	+	classpath=""
691	+	bootclasspath="${bootclasspath8}"
692	+	includeAntRuntime="false"
693	+	includeJavaRuntime="false"
694	+	executable="${javac8}"
695	+	fork="true">
696	+
697	+	<include name="**/*.java"/>
698	+	<compilerarg value="-Xprefer:source"/>
699	+	<compilerarg value="-XDignore.symbol.file=true"/>
700	+	<compilerarg value="-Xlint:all"/>
701	+	<compilerarg value="-Werror"/>
702	+	<compilerarg line="${build.args}"/>
703	+
704	+	</javac>
705	+	</target>
706	+
707	+	<target name="4jdk8doclint"
708	+	depends="configure-compiler"
709	+	description="Finds doclint warnings">
710	+
711	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
712	+
713	+	<javac srcdir="${4jdk8src.dir}"
714	+	destdir="${build.4jdk8.classes.dir}"
715	+	debug="${build.debug}"
716	+	debuglevel="${build.debuglevel}"
717	+	deprecation="${build.deprecation}"
718	+	source="8"
719	+	target="8"
720	+	classpath=""
721	+	bootclasspath="${bootclasspath8}"
722	+	includeAntRuntime="false"
723	+	includeJavaRuntime="false"
724	+	executable="${javac8}"
725	+	fork="true">
726	+
727	+	<include name="**/*.java"/>
728	+	<compilerarg value="-Xprefer:source"/>
729	+	<compilerarg value="-XDignore.symbol.file=true"/>
730	+	<compilerarg value="-Xlint:all"/>
731	+	<compilerarg value="-Xdoclint:all/protected"/>
732	+	<compilerarg line="${build.args}"/>
733	+
734	+	</javac>
735	+	</target>
736	+
737	+
738	+	<target name="4jdk8jar"
739	+	depends="4jdk8compile"
740	+	description="Builds library jar from compiled sources">
741	+
742	+	<jar destfile="${4jdk8product.jar}">
743	+	<fileset dir="${build.4jdk8.classes.dir}"/>
744	+	<manifest>
745	+	<attribute name="Built-By" value="${user.name}"/>
746	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
747	+	</manifest>
748	+	</jar>
749	+
750	+	</target>
751	+
752	+
753	+	<target name="4jdk8-tck"
754	+	depends="4jdk8jar"
755	+	description="Runs tck tests for jsr166-4jdk8 directly">
756	+
757	+	<run-tck-tests
758	+	target="8"
759	+	workdir="${build.4jdk8.dir}"
760	+	classes="${4jdk8product.jar}">
761	+	<javac-elements>
762	+	<!-- JDK9+ test classes -->
763	+	<exclude name="*9Test.java"/>
764	+	<exclude name="*10Test.java"/>
765	+	</javac-elements>
766	+	</run-tck-tests>
767	+	</target>
768	+
769	+
770	+	<target name="4jdk8-jtreg"
771	+	depends="4jdk8jar"
772	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
773	+	<run-jtreg-tests
774	+	target="8"
775	+	workdir="${build.4jdk8.dir}"
776	+	classes="${4jdk8product.jar}"/>
777	+	</target>
778	+
779	+
780	+	<target name="4jdk8-test"
781	+	depends="4jdk8-tck, 4jdk8-jtreg"
782	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
783	+	</target>
784	+
785	+
786	+	<target name="4jdk8docs"
787	+	description="Builds javadocs for src/jdk8 to dist dir">
788	+
789	+	<delete dir="${4jdk8docs.dir}"/>
790	+	<mkdir dir="${4jdk8docs.dir}"/>
791	+
792	+	<javadoc destdir="${4jdk8docs.dir}"
793	+	packagenames="none"
794	+	link="${java8.api.url}"
795	+	overview="${4jdk8src.dir}/intro.html"
796	+	access="${build.javadoc.access}"
797	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
798	+	classpath=""
799	+	executable="${javadoc8}"
800	+	failonerror = "true">
801	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
802	+	<include name="**/*.java"/>
803	+	</fileset>
804	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
805	+	<arg value="-XDignore.symbol.file=true"/>
806	+	<arg value="-tag"/>
807	+	<arg value="${javadoc.jls.option}"/>
808	+	<arg value="-tag"/>
809	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
810	+	<arg value="-tag"/>
811	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
812	+	<arg value="-tag"/>
813	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
814	+	</javadoc>
815	+	</target>
816	+
817	+
818	+	<target name="4jdk8dist"
819	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
820	+	description="Puts all distributable products in single hierarchy"/>
821	+
822	+
823	+	<target name="4jdk8clean"
824	+	description="Removes all 4jdk8 build products">
825	+
826	+	<delete dir="${build.4jdk8.dir}"/>
827	+
828	+	</target>
829	+
830	+
831	+	<target name="4jdk8dist-jar"
832	+	depends="4jdk8clean, 4jdk8jar">
833	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
834	+	</target>
835	+
836	+
837	+	<target name="4jdk8dist-docs"
838	+	depends="4jdk8clean, 4jdk8docs">
839	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
840	+	</target>
841	+
842	+
843	+
844		<!-- jsr166 4jdk7 -->
845
846		<target name="4jdk7compile"
#	Line 658 | Line 855
855		debuglevel="${build.debuglevel}"
856		deprecation="${build.deprecation}"
857		source="6"
858	+	target="6"
859		classpath=""
860		bootclasspath="${bootclasspath6}"
861		includeAntRuntime="false"
#	Line 687 | Line 885
885		debuglevel="${build.debuglevel}"
886		deprecation="${build.deprecation}"
887		source="6"
888	+	target="6"
889		classpath=""
890	<	bootclasspath="${bootclasspath7}"
890	>	bootclasspath="${bootclasspath6}"
891		includeAntRuntime="false"
892		includeJavaRuntime="false"
893		executable="${javac8}"
#	Line 746 | Line 945
945		</target>
946
947
948	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
949		<target name="4jdk7-tck-junit"
950	<	depends="4jdk7compile"
751	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
950	>	depends="4jdk7compile">
951
952		<junit printsummary="true"
953		showoutput="true"
#	Line 801 | Line 1000
1000		link="${java7.api.url}"
1001		overview="${4jdk7src.dir}/intro.html"
1002		access="${build.javadoc.access}"
1003	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1003	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1004		classpath=""
1005	<	executable="${javadoc7}">
1005	>	executable="${javadoc7}"
1006	>	failonerror = "true">
1007		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1008		<include name="**/*.java"/>
1009		</fileset>
#	Line 854 | Line 1054
1054		classpath=""
1055		bootclasspath="${bootclasspath6}"
1056		source="5"
1057	+	target="5"
1058		includeAntRuntime="false"
1059		includeJavaRuntime="false"
1060		executable="${javac7}"
#	Line 894 | Line 1095
1095		packagenames="jsr166x.*"
1096		link="${java.api.url}"
1097		access="${build.javadoc.access}"
1098	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1098	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1099		bootclasspath="${bootclasspath6}"
1100		source="5"
1101	<	executable="${javadoc7}">
1101	>	executable="${javadoc7}"
1102	>	failonerror = "true">
1103		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1104		<arg value="-XDignore.symbol.file=true"/>
1105
#	Line 943 | Line 1145
1145		debuglevel="${build.debuglevel}"
1146		deprecation="${build.deprecation}"
1147		source="6"
1148	+	target="6"
1149		classpath=""
1150		bootclasspath="${bootclasspath6}"
1151		includeAntRuntime="false"
#	Line 985 | Line 1188
1188		packagenames="jsr166y.*"
1189		link="${java.api.url}"
1190		access="${build.javadoc.access}"
1191	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1191	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1192		bootclasspath="${bootclasspath6}"
1193		source="6"
1194	<	executable="${javadoc7}">
1194	>	executable="${javadoc7}"
1195	>	failonerror = "true">
1196		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1197		<arg value="-XDignore.symbol.file=true"/>
1198
#	Line 1037 | Line 1241
1241		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1242		classpath=""
1243		source="6"
1244	+	target="6"
1245		includeAntRuntime="false"
1246		includeJavaRuntime="false"
1247		executable="${javac7}"
#	Line 1077 | Line 1282
1282		packagenames="extra166y.*"
1283		link="${java.api.url}"
1284		access="${build.javadoc.access}"
1285	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1285	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1286		bootclasspath="${bootclasspath6}"
1287		source="6"
1288		executable="${javadoc7}">
#	Line 1128 | Line 1333
1333		debuglevel="${build.debuglevel}"
1334		deprecation="${build.deprecation}"
1335		source="${build.jsr166e.java.version}"
1336	+	target="${build.jsr166e.java.version}"
1337		classpath=""
1338		includeAntRuntime="false"
1339		includeJavaRuntime="false"
#	Line 1154 | Line 1360
1360		debuglevel="${build.debuglevel}"
1361		deprecation="${build.deprecation}"
1362		source="${build.jsr166e.java.version}"
1363	+	target="${build.jsr166e.java.version}"
1364		classpath=""
1365	<	bootclasspath="${bootclasspath7}"
1365	>	bootclasspath="${bootclasspath6}"
1366		includeAntRuntime="false"
1367		includeJavaRuntime="false"
1368		executable="${javac8}"
#	Line 1196 | Line 1403
1403		packagenames="jsr166e.*"
1404		link="${java.api.url}"
1405		access="${build.javadoc.access}"
1406	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1406	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1407		source="${build.jsr166e.java.version}"
1408	<	executable="${javadoc7}">
1408	>	executable="${javadoc7}"
1409	>	failonerror = "true">
1410		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1411		<arg value="-XDignore.symbol.file=true"/>
1412

Diff Legend

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