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.187 by jsr166, Sun Oct 4 05:22:26 2015 UTC vs.
Revision 1.205 by jsr166, Sat Mar 26 17:35:47 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
#	Line 69 | 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 85 | 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 134 | 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 149 | 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 156 | 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 164 | 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 175 | Line 186
186		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
189	>	<!-- The expected canonical location does not yet exist as of 2016-03 -->
190		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191		<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
192		<!-- Default jdk doc location (latest stable release seems best) -->
#	Line 209 | Line 220
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 238 | Line 252
252		<compilerarg value="-XDignore.symbol.file=true"/>
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:${build.classes.dir}" if:set="modules"/>
256		<compilerarg line="${build.args}"/>
257		<javac-elements/>
258
#	Line 249 | 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:${build.classes.dir}" if:set="modules"/>
267		<jvmarg line="@{jvmflags}"/>
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>
#	Line 289 | Line 304
304		</patternset>
305		</fileset>
306
307	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
308	+	<property name="jtreg.flags" value=""/>
309	+
310		<macrodef name="run-jtreg-tests">
311		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312		<attribute name="source" default="7"/>
#	Line 299 | Line 317
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"/>
#	Line 307 | Line 328
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"/>
331	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332	>	<mkdir dir="@{workdir}/JTreport/html"/>
333	>	<mkdir dir="@{workdir}/JTreport/text"/>
334		<jtreg dir="${jtreg@{target}.src.dir}"
335		jdk="${jdk@{target}.home}"
336		workDir="@{workdir}/JTwork"
337		reportDir="@{workdir}/JTreport">
338		<patternset refid="jdk@{target}.jtreg.tests"/>
339		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
340	<	<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
340	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
341		<arg value="-agentvm"/>
342	<	<arg value="-verbose:nopass,fail,error"/>
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 340 | 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"
#	Line 388 | Line 412
412
413		<target name="jar"
414		depends="compile"
415	<	description="Builds library jar from compiled sources">
415	>	description="Builds library jar for src/main from compiled sources">
416
417		<jar destfile="${product.jar}">
418		<fileset dir="${build.classes.dir}"/>
#	Line 414 | Line 438
438		link="${java9.api.url}"
439		overview="${src.dir}/intro.html"
440		access="${build.javadoc.access}"
441	<	sourcepath="${src.dir}:${jdk9src.dir}"
441	>	sourcepath="${src.dir}:${jdk9.src.dir}"
442		classpath=""
443		executable="${javadoc9}">
444		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 432 | Line 456
456		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
457		<arg value="-tag"/>
458		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
459	+	<!-- tags added in jdk9 -->
460	+	<arg value="-tag"/>
461	+	<arg value="revised:X"/>
462	+	<arg value="-tag"/>
463	+	<arg value="spec:X"/>
464		</javadoc>
465		</target>
466
#	Line 492 | Line 521
521
522		<target name="tck"
523		depends="jar"
524	<	description="Runs tck tests for main directly">
524	>	description="Runs tck tests for src/main directly">
525
526		<run-tck-tests
527		target="${build.main.java.version}"
#	Line 516 | Line 545
545
546		<target name="jtreg"
547		depends="jar"
548	<	description="Runs jtreg tests for main using the jtreg ant task">
548	>	description="Runs jtreg tests for src/main using the jtreg ant task">
549		<run-jtreg-tests
550		target="${build.main.java.version}"
551		workdir="${build.dir}"
#	Line 525 | Line 554
554
555		<target name="test"
556		depends="tck, tck-parallelism-1, jtreg"
557	<	description="Runs tck and jtreg tests for main">
557	>	description="Runs tck and jtreg tests for src/main">
558		</target>
559
560	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
560	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
561
562	<	<antcall target="jtreg">
563	<	<param name="build.main.java.version" value="8"/>
564	<	<param name="build.main.javac" value="${javac8}"/>
565	<	</antcall>
562	>	<!--     <antcall target="jtreg"> -->
563	>	<!--       <param name="build.main.java.version" value="8"/> -->
564	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
565	>	<!--     </antcall> -->
566
567	<	</target>
567	>	<!--   </target> -->
568
569	<	<target name="test89"
570	<	description="Runs tck and jtreg tests for main for multiple java versions">
569	>	<!--   <target name="test89" -->
570	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
571
572	<	<antcall target="clean"/>
573	<	<antcall target="test">
574	<	<param name="build.main.java.version" value="8"/>
575	<	<param name="build.main.javac" value="${javac8}"/>
576	<	</antcall>
572	>	<!--     <antcall target="clean"/> -->
573	>	<!--     <antcall target="test"> -->
574	>	<!--       <param name="build.main.java.version" value="8"/> -->
575	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
576	>	<!--     </antcall> -->
577
578	<	<antcall target="clean"/>
579	<	<antcall target="test">
580	<	<param name="build.main.java.version" value="9"/>
581	<	<param name="build.main.javac" value="${javac9}"/>
582	<	</antcall>
578	>	<!--     <antcall target="clean"/> -->
579	>	<!--     <antcall target="test"> -->
580	>	<!--       <param name="build.main.java.version" value="9"/> -->
581	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
582	>	<!--     </antcall> -->
583
584	<	</target>
584	>	<!--   </target> -->
585
586
587
#	Line 582 | Line 611
611		<!-- Various demos and test programs -->
612
613
614	<	<target name="loops" depends="configure-compiler"
615	<	description="Benchmark from Doug Lea's AQS paper">
614	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
615	>	<target name="loops" depends="configure-compiler">
616
617		<mkdir dir="${build.loops.dir}"/>
618
#	Line 593 | Line 622
622		debuglevel="${build.debuglevel}"
623		deprecation="${build.deprecation}"
624		source="${build.sourcelevel}"
625	+	target="${build.sourcelevel}"
626		fork="true">
627
628		<compilerarg line="${build.args}"/>
#	Line 634 | Line 664
664		</target>
665
666
667	+	<!-- jsr166 4jdk8 -->
668	+
669	+	<target name="4jdk8compile"
670	+	depends="configure-compiler"
671	+	description="Compiles src/jdk8 sources, targeting jdk8">
672	+
673	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
674	+
675	+	<javac srcdir="${4jdk8src.dir}"
676	+	destdir="${build.4jdk8.classes.dir}"
677	+	debug="${build.debug}"
678	+	debuglevel="${build.debuglevel}"
679	+	deprecation="${build.deprecation}"
680	+	source="8"
681	+	target="8"
682	+	classpath=""
683	+	bootclasspath="${bootclasspath8}"
684	+	includeAntRuntime="false"
685	+	includeJavaRuntime="false"
686	+	executable="${javac8}"
687	+	fork="true">
688	+
689	+	<include name="**/*.java"/>
690	+	<compilerarg value="-Xprefer:source"/>
691	+	<compilerarg value="-XDignore.symbol.file=true"/>
692	+	<compilerarg value="-Xlint:all"/>
693	+	<compilerarg value="-Werror"/>
694	+	<compilerarg line="${build.args}"/>
695	+
696	+	</javac>
697	+	</target>
698	+
699	+	<target name="4jdk8doclint"
700	+	depends="configure-compiler"
701	+	description="Finds doclint warnings">
702	+
703	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
704	+
705	+	<javac srcdir="${4jdk8src.dir}"
706	+	destdir="${build.4jdk8.classes.dir}"
707	+	debug="${build.debug}"
708	+	debuglevel="${build.debuglevel}"
709	+	deprecation="${build.deprecation}"
710	+	source="8"
711	+	target="8"
712	+	classpath=""
713	+	bootclasspath="${bootclasspath8}"
714	+	includeAntRuntime="false"
715	+	includeJavaRuntime="false"
716	+	executable="${javac8}"
717	+	fork="true">
718	+
719	+	<include name="**/*.java"/>
720	+	<compilerarg value="-Xprefer:source"/>
721	+	<compilerarg value="-XDignore.symbol.file=true"/>
722	+	<compilerarg value="-Xlint:all"/>
723	+	<compilerarg value="-Xdoclint:all/protected"/>
724	+	<compilerarg line="${build.args}"/>
725	+
726	+	</javac>
727	+	</target>
728	+
729	+
730	+	<target name="4jdk8jar"
731	+	depends="4jdk8compile"
732	+	description="Builds library jar from compiled sources">
733	+
734	+	<jar destfile="${4jdk8product.jar}">
735	+	<fileset dir="${build.4jdk8.classes.dir}"/>
736	+	<manifest>
737	+	<attribute name="Built-By" value="${user.name}"/>
738	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
739	+	</manifest>
740	+	</jar>
741	+
742	+	</target>
743	+
744	+
745	+	<target name="4jdk8-tck"
746	+	depends="4jdk8jar"
747	+	description="Runs tck tests for jsr166-4jdk8 directly">
748	+
749	+	<run-tck-tests
750	+	target="8"
751	+	workdir="${build.4jdk8.dir}"
752	+	classes="${4jdk8product.jar}">
753	+	<javac-elements>
754	+	<!-- JDK9+ test classes -->
755	+	<exclude name="*9Test.java"/>
756	+	<exclude name="*10Test.java"/>
757	+	</javac-elements>
758	+	</run-tck-tests>
759	+	</target>
760	+
761	+
762	+	<target name="4jdk8-jtreg"
763	+	depends="4jdk8jar"
764	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
765	+	<run-jtreg-tests
766	+	target="8"
767	+	workdir="${build.4jdk8.dir}"
768	+	classes="${4jdk8product.jar}"/>
769	+	</target>
770	+
771	+
772	+	<target name="4jdk8-test"
773	+	depends="4jdk8-tck, 4jdk8-jtreg"
774	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
775	+	</target>
776	+
777	+
778	+	<target name="4jdk8docs"
779	+	description="Builds javadocs for src/jdk8 to dist dir">
780	+
781	+	<delete dir="${4jdk8docs.dir}"/>
782	+	<mkdir dir="${4jdk8docs.dir}"/>
783	+
784	+	<javadoc destdir="${4jdk8docs.dir}"
785	+	packagenames="none"
786	+	link="${java8.api.url}"
787	+	overview="${4jdk8src.dir}/intro.html"
788	+	access="${build.javadoc.access}"
789	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
790	+	classpath=""
791	+	executable="${javadoc8}">
792	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
793	+	<include name="**/*.java"/>
794	+	</fileset>
795	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
796	+	<arg value="-XDignore.symbol.file=true"/>
797	+	<arg value="-tag"/>
798	+	<arg value="${javadoc.jls.option}"/>
799	+	<arg value="-tag"/>
800	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
801	+	<arg value="-tag"/>
802	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
803	+	<arg value="-tag"/>
804	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
805	+	</javadoc>
806	+	</target>
807	+
808	+
809	+	<target name="4jdk8dist"
810	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
811	+	description="Puts all distributable products in single hierarchy"/>
812	+
813	+
814	+	<target name="4jdk8clean"
815	+	description="Removes all 4jdk8 build products">
816	+
817	+	<delete dir="${build.4jdk8.dir}"/>
818	+
819	+	</target>
820	+
821	+
822	+	<target name="4jdk8dist-jar"
823	+	depends="4jdk8clean, 4jdk8jar">
824	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
825	+	</target>
826	+
827	+
828	+	<target name="4jdk8dist-docs"
829	+	depends="4jdk8clean, 4jdk8docs">
830	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
831	+	</target>
832	+
833	+
834	+
835		<!-- jsr166 4jdk7 -->
836
837		<target name="4jdk7compile"
#	Line 648 | Line 846
846		debuglevel="${build.debuglevel}"
847		deprecation="${build.deprecation}"
848		source="6"
849	+	target="6"
850		classpath=""
851		bootclasspath="${bootclasspath6}"
852		includeAntRuntime="false"
#	Line 677 | Line 876
876		debuglevel="${build.debuglevel}"
877		deprecation="${build.deprecation}"
878		source="6"
879	+	target="6"
880		classpath=""
881	<	bootclasspath="${bootclasspath7}"
881	>	bootclasspath="${bootclasspath6}"
882		includeAntRuntime="false"
883		includeJavaRuntime="false"
884		executable="${javac8}"
#	Line 736 | Line 936
936		</target>
937
938
939	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
940		<target name="4jdk7-tck-junit"
941	<	depends="4jdk7compile"
741	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
941	>	depends="4jdk7compile">
942
943		<junit printsummary="true"
944		showoutput="true"
#	Line 791 | Line 991
991		link="${java7.api.url}"
992		overview="${4jdk7src.dir}/intro.html"
993		access="${build.javadoc.access}"
994	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
994	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
995		classpath=""
996		executable="${javadoc7}">
997		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
#	Line 844 | Line 1044
1044		classpath=""
1045		bootclasspath="${bootclasspath6}"
1046		source="5"
1047	+	target="5"
1048		includeAntRuntime="false"
1049		includeJavaRuntime="false"
1050		executable="${javac7}"
#	Line 884 | Line 1085
1085		packagenames="jsr166x.*"
1086		link="${java.api.url}"
1087		access="${build.javadoc.access}"
1088	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1088	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1089		bootclasspath="${bootclasspath6}"
1090		source="5"
1091		executable="${javadoc7}">
#	Line 933 | Line 1134
1134		debuglevel="${build.debuglevel}"
1135		deprecation="${build.deprecation}"
1136		source="6"
1137	+	target="6"
1138		classpath=""
1139		bootclasspath="${bootclasspath6}"
1140		includeAntRuntime="false"
#	Line 975 | Line 1177
1177		packagenames="jsr166y.*"
1178		link="${java.api.url}"
1179		access="${build.javadoc.access}"
1180	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1180	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181		bootclasspath="${bootclasspath6}"
1182		source="6"
1183		executable="${javadoc7}">
#	Line 1027 | Line 1229
1229		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1230		classpath=""
1231		source="6"
1232	+	target="6"
1233		includeAntRuntime="false"
1234		includeJavaRuntime="false"
1235		executable="${javac7}"
#	Line 1067 | Line 1270
1270		packagenames="extra166y.*"
1271		link="${java.api.url}"
1272		access="${build.javadoc.access}"
1273	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1273	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1274		bootclasspath="${bootclasspath6}"
1275		source="6"
1276		executable="${javadoc7}">
#	Line 1118 | Line 1321
1321		debuglevel="${build.debuglevel}"
1322		deprecation="${build.deprecation}"
1323		source="${build.jsr166e.java.version}"
1324	+	target="${build.jsr166e.java.version}"
1325		classpath=""
1326		includeAntRuntime="false"
1327		includeJavaRuntime="false"
#	Line 1144 | Line 1348
1348		debuglevel="${build.debuglevel}"
1349		deprecation="${build.deprecation}"
1350		source="${build.jsr166e.java.version}"
1351	+	target="${build.jsr166e.java.version}"
1352		classpath=""
1353	<	bootclasspath="${bootclasspath7}"
1353	>	bootclasspath="${bootclasspath6}"
1354		includeAntRuntime="false"
1355		includeJavaRuntime="false"
1356		executable="${javac8}"
#	Line 1186 | Line 1391
1391		packagenames="jsr166e.*"
1392		link="${java.api.url}"
1393		access="${build.javadoc.access}"
1394	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1394	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395		source="${build.jsr166e.java.version}"
1396		executable="${javadoc7}">
1397		<arg line="-Xdocrootparent ${java.docroot.url}"/>

Diff Legend

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