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.196 by jsr166, Sat Jan 2 21:02:44 2016 UTC vs.
Revision 1.213 by jsr166, Sat Jun 4 23:49:29 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 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 2015-11 -->
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://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 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="-Xpatch:${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 249 | Line 263
263		jvm="${java@{target}}"
264		fork="true">
265		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266	<	<jvmarg value="-Xpatch:${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
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 312 | Line 327
327
328		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329		<delete dir="@{workdir}/JTreport" quiet="true"/>
315	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
316	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
317	–	<mkdir dir="@{workdir}/JTreport/html"/>
318	–	<mkdir dir="@{workdir}/JTreport/text"/>
330		<jtreg dir="${jtreg@{target}.src.dir}"
331		jdk="${jdk@{target}.home}"
332		workDir="@{workdir}/JTwork"
333		reportDir="@{workdir}/JTreport">
334		<patternset refid="jdk@{target}.jtreg.tests"/>
335		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
336	>	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
337		<arg value="-agentvm"/>
338		<arg value="-verbose:${jtreg.verbose}"/>
339		<arg value="-vmoptions:-esa -ea"/>
#	Line 349 | Line 360
360		<property name="build.main.javac" value="${javac9}"/>
361
362		<target name="dists"
363	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
363	>	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
364		description="Builds all public jars and docs"/>
365
366		<target name="compile"
#	Line 392 | Line 403
403		<compilerarg line="${build.args}"/>
404
405		</javac>
395	–
396	–	<!-- We need jdk9's Contended annotation, but at compile time only -->
397	–	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
406		</target>
407
408
409		<target name="jar"
410		depends="compile"
411	<	description="Builds library jar from compiled sources">
412	<
411	>	description="Builds library jar for src/main from compiled sources">
412	>	<local name="subdir"/>
413	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
414		<jar destfile="${product.jar}">
415	<	<fileset dir="${build.classes.dir}"/>
415	>	<fileset dir="${build.classes.dir}${subdir}"/>
416		<manifest>
417		<attribute name="Built-By" value="${user.name}"/>
418		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 426 | Line 435
435		link="${java9.api.url}"
436		overview="${src.dir}/intro.html"
437		access="${build.javadoc.access}"
438	<	sourcepath="${src.dir}:${jdk9src.dir}"
438	>	sourcepath="${src.dir}:${jdk9.src.dir}"
439		classpath=""
440		executable="${javadoc9}">
441		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 444 | Line 453
453		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
454		<arg value="-tag"/>
455		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
456	+	<!-- tags added in jdk9 -->
457	+	<arg value="-tag"/>
458	+	<arg value="revised:X"/>
459	+	<arg value="-tag"/>
460	+	<arg value="spec:X"/>
461		</javadoc>
462		</target>
463
#	Line 504 | Line 518
518
519		<target name="tck"
520		depends="jar"
521	<	description="Runs tck tests for main directly">
521	>	description="Runs tck tests for src/main directly">
522
523		<run-tck-tests
524		target="${build.main.java.version}"
#	Line 513 | Line 527
527		</target>
528
529		<target name="tck-parallelism-1"
530	<	description="Runs tck with given common pool parallelism">
530	>	description="Runs tck with common pool parallelism 1">
531		<antcall target="tck">
532		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
533		</antcall>
534		</target>
535
536		<target name="tck-parallelism-0"
537	<	description="Runs tck with given common pool parallelism">
537	>	description="Runs tck with common pool parallelism 0">
538		<antcall target="tck">
539		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
540		</antcall>
541		</target>
542
543	+	<target name="tck-security-manager"
544	+	description="Runs tck with a security manager">
545	+	<antcall target="tck">
546	+	<param name="jsr166.useSecurityManager" value="true"/>
547	+	</antcall>
548	+	</target>
549	+
550		<target name="jtreg"
551		depends="jar"
552	<	description="Runs jtreg tests for main using the jtreg ant task">
552	>	description="Runs jtreg tests for src/main using the jtreg ant task">
553		<run-jtreg-tests
554		target="${build.main.java.version}"
555		workdir="${build.dir}"
#	Line 536 | Line 557
557		</target>
558
559		<target name="test"
560	<	depends="tck, tck-parallelism-1, jtreg"
561	<	description="Runs tck and jtreg tests for main">
560	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
561	>	description="Runs tck and jtreg tests for src/main">
562		</target>
563
564	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
564	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
565
566	<	<antcall target="jtreg">
567	<	<param name="build.main.java.version" value="8"/>
568	<	<param name="build.main.javac" value="${javac8}"/>
569	<	</antcall>
566	>	<!--     <antcall target="jtreg"> -->
567	>	<!--       <param name="build.main.java.version" value="8"/> -->
568	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
569	>	<!--     </antcall> -->
570
571	<	</target>
571	>	<!--   </target> -->
572
573	<	<target name="test89"
574	<	description="Runs tck and jtreg tests for main for multiple java versions">
573	>	<!--   <target name="test89" -->
574	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
575
576	<	<antcall target="clean"/>
577	<	<antcall target="test">
578	<	<param name="build.main.java.version" value="8"/>
579	<	<param name="build.main.javac" value="${javac8}"/>
580	<	</antcall>
576	>	<!--     <antcall target="clean"/> -->
577	>	<!--     <antcall target="test"> -->
578	>	<!--       <param name="build.main.java.version" value="8"/> -->
579	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
580	>	<!--     </antcall> -->
581
582	<	<antcall target="clean"/>
583	<	<antcall target="test">
584	<	<param name="build.main.java.version" value="9"/>
585	<	<param name="build.main.javac" value="${javac9}"/>
586	<	</antcall>
582	>	<!--     <antcall target="clean"/> -->
583	>	<!--     <antcall target="test"> -->
584	>	<!--       <param name="build.main.java.version" value="9"/> -->
585	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
586	>	<!--     </antcall> -->
587
588	<	</target>
588	>	<!--   </target> -->
589
590
591
#	Line 594 | Line 615
615		<!-- Various demos and test programs -->
616
617
618	<	<target name="loops" depends="configure-compiler"
619	<	description="Benchmark from Doug Lea's AQS paper">
618	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
619	>	<target name="loops" depends="configure-compiler">
620
621		<mkdir dir="${build.loops.dir}"/>
622
#	Line 647 | 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	+	failonerror = "true">
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 751 | Line 941
941		</target>
942
943
944	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
945		<target name="4jdk7-tck-junit"
946	<	depends="4jdk7compile"
756	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
946	>	depends="4jdk7compile">
947
948		<junit printsummary="true"
949		showoutput="true"
#	Line 806 | 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}">
1001	>	executable="${javadoc7}"
1002	>	failonerror = "true">
1003		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1004		<include name="**/*.java"/>
1005		</fileset>
#	Line 900 | Line 1091
1091		packagenames="jsr166x.*"
1092		link="${java.api.url}"
1093		access="${build.javadoc.access}"
1094	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1094	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1095		bootclasspath="${bootclasspath6}"
1096		source="5"
1097	<	executable="${javadoc7}">
1097	>	executable="${javadoc7}"
1098	>	failonerror = "true">
1099		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1100		<arg value="-XDignore.symbol.file=true"/>
1101
#	Line 992 | Line 1184
1184		packagenames="jsr166y.*"
1185		link="${java.api.url}"
1186		access="${build.javadoc.access}"
1187	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1187	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1188		bootclasspath="${bootclasspath6}"
1189		source="6"
1190	<	executable="${javadoc7}">
1190	>	executable="${javadoc7}"
1191	>	failonerror = "true">
1192		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1193		<arg value="-XDignore.symbol.file=true"/>
1194
#	Line 1085 | Line 1278
1278		packagenames="extra166y.*"
1279		link="${java.api.url}"
1280		access="${build.javadoc.access}"
1281	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1281	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1282		bootclasspath="${bootclasspath6}"
1283		source="6"
1284		executable="${javadoc7}">
#	Line 1206 | Line 1399
1399		packagenames="jsr166e.*"
1400		link="${java.api.url}"
1401		access="${build.javadoc.access}"
1402	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1402	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1403		source="${build.jsr166e.java.version}"
1404	<	executable="${javadoc7}">
1404	>	executable="${javadoc7}"
1405	>	failonerror = "true">
1406		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1407		<arg value="-XDignore.symbol.file=true"/>
1408

Diff Legend

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