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.180 by jsr166, Sun Sep 13 03:41:53 2015 UTC vs.
Revision 1.201 by dl, Sat Mar 26 12:35:25 2016 UTC

#	Line 27 | Line 27
27		(e.g. mercurial forest) or a symlink to same.
28
29		Alternatively, define ant variables thus:
30	<	ant -Djdk$N.home=...
30	>	ant -Djdk$N.home=... -Djdk$N.src.home=...
31		for $N in 6 7 8 9 ...
32	+
33	+	As of 2015-09, there is incomplete hacky support for jigsaw
34	+	Build for jigsaw using something like:
35	+	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36	+	"docs" target is still broken.
37		------------------------------------------------------------------------------
38		</description>
39
#	Line 52 | Line 57
57		<property name="build.deprecation"    value="false"/>
58		<property name="build.javadoc.access" value="protected"/>
59
55	–	<!-- Tck options; see JSR166TestCase.java
56	–	To profile a single tck test class:
57	–	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58	–	To stress test a single tck test class:
59	–	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60	–	-->
61	–	<property name="jsr166.profileTests"     value="false"/>
62	–	<property name="jsr166.profileThreshold" value="100"/>
63	–	<property name="jsr166.runsPerTest"      value="1"/>
64	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65	–
60		<!-- Build locations -->
61		<property name="build.dir"                   location="build"/>
62		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 75 | Line 69
69		<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70		<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72	+	<property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73	+	<property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74	+	<property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75	+	<property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76	+
77		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
#	Line 91 | Line 90
90		<macrodef name="defjdklocations">
91		<attribute name="v"/>
92		<sequential>
93	<	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
94	<	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
95	<	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
96	<	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
97	<	<available property="jdk@{v}.have.java.base"
98	<	file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
99	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
100	<	if:set="jdk@{v}.have.java.base"/>
101	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
102	<	unless:set="jdk@{v}.have.java.base"/>
93	>	<property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
94	>	<property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
95	>	<property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
96	>	<property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
97	>	<property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98	>	<local name="have.java.base"/>
99	>	<available property="have.java.base"
100	>	file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102	>	if:set="have.java.base"/>
103	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104	>	unless:set="have.java.base"/>
105	>	<local name="modules"/>
106	>	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107		<local name="boot.jar.dir"/>
108	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
109	<	<path id="bootclasspath@{v}">
108	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109	>	<path id="bootclasspath@{v}" unless:set="modules">
110		<pathelement path="${boot.jar.dir}/resources.jar"/>
111		<pathelement path="${boot.jar.dir}/rt.jar"/>
112		<pathelement path="${boot.jar.dir}/jsse.jar"/>
113		<pathelement path="${boot.jar.dir}/jce.jar"/>
114		<pathelement path="${boot.jar.dir}/charsets.jar"/>
115		</path>
116	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
116	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
117		</sequential>
118		</macrodef>
119
#	Line 137 | Line 140
140		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
141		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143	<	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
143	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146		<property name="lib.dir"              location="${basedir}/lib"/>
147		<property name="dist.dir"             location="${basedir}/dist"/>
148		<property name="topsrc.dir"           location="${basedir}/src"/>
149		<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150	+	<property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
#	Line 152 | Line 156
156		<!-- Javadoc locations -->
157		<property name="docs.dir"          location="${build.dir}/docs"/>
158		<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159	+	<property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160		<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161		<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162		<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
#	Line 159 | Line 164
164
165		<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166		<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167	+	<property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168		<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169		<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170		<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
#	Line 167 | Line 173
173		<!-- Jar locations -->
174		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175		<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176	+	<property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177		<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178		<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179		<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
#	Line 178 | Line 185
185		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
188	>	<!-- The expected canonical location does not yet exist as of 2016-03 -->
189		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190		<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
191		<!-- Default jdk doc location (latest stable release seems best) -->
#	Line 197 | Line 204
204		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205		classpath="${lib.dir}/jtreg.jar" />
206
207	<	<!-- Test classpath -->
208	<	<path id="test.classpath">
209	<	<pathelement location="${build.testcases.dir}"/>
210	<	<pathelement location="${junit.jar}"/>
211	<	</path>
212	<
207	>	<!-- Tck options; see JSR166TestCase.java
208	>	To profile a single tck test class:
209	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210	>	To stress test a single tck test class:
211	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212	>	To stress test a single tck test method:
213	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214	>	-->
215	>	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216		<macrodef name="run-tck-tests">
217		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
218		<attribute name="target"/>
219		<attribute name="compile-target" default="@{target}"/>
220		<attribute name="workdir"/>
221		<attribute name="classes"/>
222	<	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
222	>	<!--
223	>	<attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224	>	-->
225	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226		<element name="javac-elements" optional="true"/>
227	+
228		<sequential>
229
230	+	<local name="modules"/>
231	+	<condition property="modules">
232	+	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233	+	</condition>
234	+
235		<mkdir dir="@{workdir}/tck-classes"/>
236
237		<javac srcdir="@{tck.src.dir}"
#	Line 230 | Line 249
249
250		<include name="*.java"/>
251		<compilerarg value="-XDignore.symbol.file=true"/>
252	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
253	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
252	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
253	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
254	>	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
255		<compilerarg line="${build.args}"/>
256		<javac-elements/>
257
#	Line 241 | Line 261
261		failonerror="true"
262		jvm="${java@{target}}"
263		fork="true">
264	<	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
264	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
265	>	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
266		<jvmarg line="@{jvmflags}"/>
267
268		<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
269	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
269	>	<syspropertyset id="system-properties-used-by-tck">
270		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
271	+	<propertyref prefix="jsr166."/>
272	+	<propertyref name="test.timeout.factor"/>
273		</syspropertyset>
274
252	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
275		<classpath>
276		<pathelement location="${junit.jar}"/>
277		<pathelement location="@{workdir}/tck-classes"/>
#	Line 283 | Line 303
303		</patternset>
304		</fileset>
305
306	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
307	+	<property name="jtreg.flags" value=""/>
308	+
309		<macrodef name="run-jtreg-tests">
310		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
311		<attribute name="source" default="7"/>
#	Line 290 | Line 313
313		<attribute name="workdir"/>
314		<attribute name="classes"/>
315		<attribute name="jtregflags" default=""/>
316	+
317		<sequential>
318	+
319	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
320	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
321	+
322	+	<local name="modules"/>
323	+	<condition property="modules">
324	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
325	+	</condition>
326	+
327		<delete dir="@{workdir}/JTwork"   quiet="true"/>
328		<delete dir="@{workdir}/JTreport" quiet="true"/>
329		<mkdir dir="@{workdir}/JTwork/scratch"/>
330	<	<mkdir dir="@{workdir}/JTreport"/>
330	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331	>	<mkdir dir="@{workdir}/JTreport/html"/>
332	>	<mkdir dir="@{workdir}/JTreport/text"/>
333		<jtreg dir="${jtreg@{target}.src.dir}"
334		jdk="${jdk@{target}.home}"
335		workDir="@{workdir}/JTwork"
336		reportDir="@{workdir}/JTreport">
337		<patternset refid="jdk@{target}.jtreg.tests"/>
338	<	<arg value="-Xbootclasspath/p:@{classes}"/>
338	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
340		<arg value="-agentvm"/>
341	<	<arg value="-v:nopass,fail"/>
341	>	<arg value="-verbose:${jtreg.verbose}"/>
342		<arg value="-vmoptions:-esa -ea"/>
343		<arg value="-automatic"/>
344		<arg value="-k:!ignore"/>
345		<arg line="@{jtregflags}"/>
346	+	<arg line="${jtreg.flags}"/>
347		</jtreg>
348		</sequential>
349		</macrodef>
#	Line 326 | Line 363
363		<property name="build.main.javac" value="${javac9}"/>
364
365		<target name="dists"
366	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366	>	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367		description="Builds all public jars and docs"/>
368
369		<target name="compile"
370		depends="configure-compiler"
371		description="Compiles src/main sources to build dir">
372
373	<	<mkdir dir="${build.classes.dir}"/>
373	>	<local name="modules"/>
374	>	<condition property="modules">
375	>	<and>
376	>	<available file="${jdk9.home}/jmods" type="dir"/>
377	>	<equals arg1="9" arg2="${build.main.java.version}"/>
378	>	</and>
379	>	</condition>
380	>
381	>	<local name="destdir"/>
382	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
384	>
385	>	<mkdir dir="${destdir}"/>
386
387		<javac srcdir="${src.dir}"
388	<	destdir="${build.classes.dir}"
388	>	destdir="${destdir}"
389		debug="${build.debug}"
390		debuglevel="${build.debuglevel}"
391		deprecation="${build.deprecation}"
#	Line 347 | Line 396
396		fork="true">
397
398		<include name="**/*.java"/>
399	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
400		<compilerarg value="-Xprefer:source"/>
401		<compilerarg value="-XDignore.symbol.file=true"/>
402		<compilerarg value="-Xlint:all"/>
#	Line 356 | Line 406
406		<compilerarg line="${build.args}"/>
407
408		</javac>
409	+
410	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
411	+	<!--
412	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413	+	-->
414		</target>
415
416
#	Line 387 | Line 442
442		link="${java9.api.url}"
443		overview="${src.dir}/intro.html"
444		access="${build.javadoc.access}"
445	<	sourcepath="${src.dir}:${jdk9src.dir}"
445	>	sourcepath="${src.dir}:${jdk9.src.dir}"
446		classpath=""
447		executable="${javadoc9}">
448		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 396 | Line 451
451		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
452		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
453		<arg value="-XDignore.symbol.file=true"/>
454	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
455		<arg value="-tag"/>
456		<arg value="${javadoc.jls.option}"/>
457		<arg value="-tag"/>
#	Line 404 | Line 460
460		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
461		<arg value="-tag"/>
462		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
463	+	<!-- tags added in jdk9 -->
464	+	<arg value="-tag"/>
465	+	<arg value="revised:X"/>
466	+	<arg value="-tag"/>
467	+	<arg value="spec:X"/>
468		</javadoc>
469		</target>
470
#	Line 565 | Line 626
626		debuglevel="${build.debuglevel}"
627		deprecation="${build.deprecation}"
628		source="${build.sourcelevel}"
629	+	target="${build.sourcelevel}"
630		fork="true">
631
632		<compilerarg line="${build.args}"/>
#	Line 606 | Line 668
668		</target>
669
670
671	+	<!-- jsr166 4jdk8 -->
672	+
673	+	<target name="4jdk8compile"
674	+	depends="configure-compiler"
675	+	description="Compiles src/jdk8 sources, targeting jdk8">
676	+
677	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
678	+
679	+	<javac srcdir="${4jdk8src.dir}"
680	+	destdir="${build.4jdk8.classes.dir}"
681	+	debug="${build.debug}"
682	+	debuglevel="${build.debuglevel}"
683	+	deprecation="${build.deprecation}"
684	+	source="8"
685	+	target="8"
686	+	classpath=""
687	+	bootclasspath="${bootclasspath8}"
688	+	includeAntRuntime="false"
689	+	includeJavaRuntime="false"
690	+	executable="${javac8}"
691	+	fork="true">
692	+
693	+	<include name="**/*.java"/>
694	+	<compilerarg value="-Xprefer:source"/>
695	+	<compilerarg value="-XDignore.symbol.file=true"/>
696	+	<compilerarg value="-Xlint:all"/>
697	+	<compilerarg value="-Werror"/>
698	+	<compilerarg line="${build.args}"/>
699	+
700	+	</javac>
701	+	</target>
702	+
703	+	<target name="4jdk8doclint"
704	+	depends="configure-compiler"
705	+	description="Finds doclint warnings">
706	+
707	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
708	+
709	+	<javac srcdir="${4jdk8src.dir}"
710	+	destdir="${build.4jdk8.classes.dir}"
711	+	debug="${build.debug}"
712	+	debuglevel="${build.debuglevel}"
713	+	deprecation="${build.deprecation}"
714	+	source="8"
715	+	target="8"
716	+	classpath=""
717	+	bootclasspath="${bootclasspath8}"
718	+	includeAntRuntime="false"
719	+	includeJavaRuntime="false"
720	+	executable="${javac8}"
721	+	fork="true">
722	+
723	+	<include name="**/*.java"/>
724	+	<compilerarg value="-Xprefer:source"/>
725	+	<compilerarg value="-XDignore.symbol.file=true"/>
726	+	<compilerarg value="-Xlint:all"/>
727	+	<compilerarg value="-Xdoclint:all/protected"/>
728	+	<compilerarg line="${build.args}"/>
729	+
730	+	</javac>
731	+	</target>
732	+
733	+
734	+	<target name="4jdk8jar"
735	+	depends="4jdk8compile"
736	+	description="Builds library jar from compiled sources">
737	+
738	+	<jar destfile="${4jdk8product.jar}">
739	+	<fileset dir="${build.4jdk8.classes.dir}"/>
740	+	<manifest>
741	+	<attribute name="Built-By" value="${user.name}"/>
742	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
743	+	</manifest>
744	+	</jar>
745	+
746	+	</target>
747	+
748	+
749	+	<target name="4jdk8-tck"
750	+	depends="4jdk8jar"
751	+	description="Runs tck tests for jsr166-4jdk8 directly">
752	+
753	+	<run-tck-tests
754	+	target="8"
755	+	workdir="${build.4jdk8.dir}"
756	+	classes="${4jdk8product.jar}">
757	+	<javac-elements>
758	+	<!-- JDK9+ test classes -->
759	+	<exclude name="*9Test.java"/>
760	+	<exclude name="*10Test.java"/>
761	+	</javac-elements>
762	+	</run-tck-tests>
763	+	</target>
764	+
765	+
766	+	<target name="4jdk8-jtreg"
767	+	depends="4jdk8jar"
768	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
769	+	<run-jtreg-tests
770	+	target="8"
771	+	workdir="${build.4jdk8.dir}"
772	+	classes="${4jdk8product.jar}"/>
773	+	</target>
774	+
775	+
776	+	<target name="4jdk8-test"
777	+	depends="4jdk8-tck, 4jdk8-jtreg"
778	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
779	+	</target>
780	+
781	+
782	+	<target name="4jdk8docs"
783	+	description="Builds javadocs for src/jdk8 to dist dir">
784	+
785	+	<delete dir="${4jdk8docs.dir}"/>
786	+	<mkdir dir="${4jdk8docs.dir}"/>
787	+
788	+	<javadoc destdir="${4jdk8docs.dir}"
789	+	packagenames="none"
790	+	link="${java8.api.url}"
791	+	overview="${4jdk8src.dir}/intro.html"
792	+	access="${build.javadoc.access}"
793	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
794	+	classpath=""
795	+	executable="${javadoc8}">
796	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
797	+	<include name="**/*.java"/>
798	+	</fileset>
799	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
800	+	<arg value="-XDignore.symbol.file=true"/>
801	+	<arg value="-tag"/>
802	+	<arg value="${javadoc.jls.option}"/>
803	+	<arg value="-tag"/>
804	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
805	+	<arg value="-tag"/>
806	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
807	+	<arg value="-tag"/>
808	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
809	+	</javadoc>
810	+	</target>
811	+
812	+
813	+	<target name="4jdk8dist"
814	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
815	+	description="Puts all distributable products in single hierarchy"/>
816	+
817	+
818	+	<target name="4jdk8clean"
819	+	description="Removes all 4jdk8 build products">
820	+
821	+	<delete dir="${build.4jdk8.dir}"/>
822	+
823	+	</target>
824	+
825	+
826	+	<target name="4jdk8dist-jar"
827	+	depends="4jdk8clean, 4jdk8jar">
828	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
829	+	</target>
830	+
831	+
832	+	<target name="4jdk8dist-docs"
833	+	depends="4jdk8clean, 4jdk8docs">
834	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
835	+	</target>
836	+
837	+
838	+
839		<!-- jsr166 4jdk7 -->
840
841		<target name="4jdk7compile"
#	Line 620 | Line 850
850		debuglevel="${build.debuglevel}"
851		deprecation="${build.deprecation}"
852		source="6"
853	+	target="6"
854		classpath=""
855		bootclasspath="${bootclasspath6}"
856		includeAntRuntime="false"
#	Line 649 | Line 880
880		debuglevel="${build.debuglevel}"
881		deprecation="${build.deprecation}"
882		source="6"
883	+	target="6"
884		classpath=""
885	<	bootclasspath="${bootclasspath7}"
885	>	bootclasspath="${bootclasspath6}"
886		includeAntRuntime="false"
887		includeJavaRuntime="false"
888		executable="${javac8}"
#	Line 763 | Line 995
995		link="${java7.api.url}"
996		overview="${4jdk7src.dir}/intro.html"
997		access="${build.javadoc.access}"
998	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
998	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
999		classpath=""
1000		executable="${javadoc7}">
1001		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
#	Line 816 | Line 1048
1048		classpath=""
1049		bootclasspath="${bootclasspath6}"
1050		source="5"
1051	+	target="5"
1052		includeAntRuntime="false"
1053		includeJavaRuntime="false"
1054		executable="${javac7}"
#	Line 856 | Line 1089
1089		packagenames="jsr166x.*"
1090		link="${java.api.url}"
1091		access="${build.javadoc.access}"
1092	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1092	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1093		bootclasspath="${bootclasspath6}"
1094		source="5"
1095		executable="${javadoc7}">
#	Line 905 | Line 1138
1138		debuglevel="${build.debuglevel}"
1139		deprecation="${build.deprecation}"
1140		source="6"
1141	+	target="6"
1142		classpath=""
1143		bootclasspath="${bootclasspath6}"
1144		includeAntRuntime="false"
#	Line 947 | Line 1181
1181		packagenames="jsr166y.*"
1182		link="${java.api.url}"
1183		access="${build.javadoc.access}"
1184	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1184	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1185		bootclasspath="${bootclasspath6}"
1186		source="6"
1187		executable="${javadoc7}">
#	Line 999 | Line 1233
1233		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1234		classpath=""
1235		source="6"
1236	+	target="6"
1237		includeAntRuntime="false"
1238		includeJavaRuntime="false"
1239		executable="${javac7}"
#	Line 1039 | Line 1274
1274		packagenames="extra166y.*"
1275		link="${java.api.url}"
1276		access="${build.javadoc.access}"
1277	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1277	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1278		bootclasspath="${bootclasspath6}"
1279		source="6"
1280		executable="${javadoc7}">
#	Line 1090 | Line 1325
1325		debuglevel="${build.debuglevel}"
1326		deprecation="${build.deprecation}"
1327		source="${build.jsr166e.java.version}"
1328	+	target="${build.jsr166e.java.version}"
1329		classpath=""
1330		includeAntRuntime="false"
1331		includeJavaRuntime="false"
#	Line 1116 | Line 1352
1352		debuglevel="${build.debuglevel}"
1353		deprecation="${build.deprecation}"
1354		source="${build.jsr166e.java.version}"
1355	+	target="${build.jsr166e.java.version}"
1356		classpath=""
1357	<	bootclasspath="${bootclasspath7}"
1357	>	bootclasspath="${bootclasspath6}"
1358		includeAntRuntime="false"
1359		includeJavaRuntime="false"
1360		executable="${javac8}"
#	Line 1158 | Line 1395
1395		packagenames="jsr166e.*"
1396		link="${java.api.url}"
1397		access="${build.javadoc.access}"
1398	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1398	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1399		source="${build.jsr166e.java.version}"
1400		executable="${javadoc7}">
1401		<arg line="-Xdocrootparent ${java.docroot.url}"/>

Diff Legend

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