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.193 by jsr166, Fri Dec 11 23:58:52 2015 UTC vs.
Revision 1.216 by jsr166, Tue Aug 30 00:01:22 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://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="-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 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: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 -->
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
278		<classpath>
#	Line 289 | 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 329
329
330		<delete dir="@{workdir}/JTwork"   quiet="true"/>
331		<delete dir="@{workdir}/JTreport" quiet="true"/>
312	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
313	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314	–	<mkdir dir="@{workdir}/JTreport/html"/>
315	–	<mkdir dir="@{workdir}/JTreport/text"/>
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="-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 345 | 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 393 | 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 414 | 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		<javadoc destdir="${docs.dir}"
437		packagenames="none"
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}"
442		classpath=""
443		executable="${javadoc9}">
444		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 428 | Line 447
447		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
448		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449		<arg value="-XDignore.symbol.file=true"/>
450	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
450	>	<arg value="-Xmodule:java.base"/>
451		<arg value="-tag"/>
452		<arg value="${javadoc.jls.option}"/>
453		<arg value="-tag"/>
#	Line 437 | 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 497 | 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 506 | Line 530
530		</target>
531
532		<target name="tck-parallelism-1"
533	<	description="Runs tck with given common pool parallelism">
533	>	description="Runs tck with common pool parallelism 1">
534		<antcall target="tck">
535		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
536		</antcall>
537		</target>
538
539		<target name="tck-parallelism-0"
540	<	description="Runs tck with given common pool parallelism">
540	>	description="Runs tck with common pool parallelism 0">
541		<antcall target="tck">
542		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
543		</antcall>
544		</target>
545
546	+	<target name="tck-security-manager"
547	+	description="Runs tck with a security manager">
548	+	<antcall target="tck">
549	+	<param name="jsr166.useSecurityManager" value="true"/>
550	+	</antcall>
551	+	</target>
552	+
553		<target name="jtreg"
554		depends="jar"
555	<	description="Runs jtreg tests for main using the jtreg ant task">
555	>	description="Runs jtreg tests for src/main using the jtreg ant task">
556		<run-jtreg-tests
557		target="${build.main.java.version}"
558		workdir="${build.dir}"
#	Line 529 | Line 560
560		</target>
561
562		<target name="test"
563	<	depends="tck, tck-parallelism-1, jtreg"
564	<	description="Runs tck and jtreg tests for main">
563	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
564	>	description="Runs tck and jtreg tests for src/main">
565		</target>
566
567	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
567	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
568
569	<	<antcall target="jtreg">
570	<	<param name="build.main.java.version" value="8"/>
571	<	<param name="build.main.javac" value="${javac8}"/>
572	<	</antcall>
569	>	<!--     <antcall target="jtreg"> -->
570	>	<!--       <param name="build.main.java.version" value="8"/> -->
571	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
572	>	<!--     </antcall> -->
573
574	<	</target>
574	>	<!--   </target> -->
575
576	<	<target name="test89"
577	<	description="Runs tck and jtreg tests for main for multiple java versions">
576	>	<!--   <target name="test89" -->
577	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
578
579	<	<antcall target="clean"/>
580	<	<antcall target="test">
581	<	<param name="build.main.java.version" value="8"/>
582	<	<param name="build.main.javac" value="${javac8}"/>
583	<	</antcall>
579	>	<!--     <antcall target="clean"/> -->
580	>	<!--     <antcall target="test"> -->
581	>	<!--       <param name="build.main.java.version" value="8"/> -->
582	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
583	>	<!--     </antcall> -->
584
585	<	<antcall target="clean"/>
586	<	<antcall target="test">
587	<	<param name="build.main.java.version" value="9"/>
588	<	<param name="build.main.javac" value="${javac9}"/>
589	<	</antcall>
585	>	<!--     <antcall target="clean"/> -->
586	>	<!--     <antcall target="test"> -->
587	>	<!--       <param name="build.main.java.version" value="9"/> -->
588	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
589	>	<!--     </antcall> -->
590
591	<	</target>
591	>	<!--   </target> -->
592
593
594
#	Line 587 | Line 618
618		<!-- Various demos and test programs -->
619
620
621	<	<target name="loops" depends="configure-compiler"
622	<	description="Benchmark from Doug Lea's AQS paper">
621	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
622	>	<target name="loops" depends="configure-compiler">
623
624		<mkdir dir="${build.loops.dir}"/>
625
#	Line 640 | Line 671
671		</target>
672
673
674	+	<!-- jsr166 4jdk8 -->
675	+
676	+	<target name="4jdk8compile"
677	+	depends="configure-compiler"
678	+	description="Compiles src/jdk8 sources, targeting jdk8">
679	+
680	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
681	+
682	+	<javac srcdir="${4jdk8src.dir}"
683	+	destdir="${build.4jdk8.classes.dir}"
684	+	debug="${build.debug}"
685	+	debuglevel="${build.debuglevel}"
686	+	deprecation="${build.deprecation}"
687	+	source="8"
688	+	target="8"
689	+	classpath=""
690	+	bootclasspath="${bootclasspath8}"
691	+	includeAntRuntime="false"
692	+	includeJavaRuntime="false"
693	+	executable="${javac8}"
694	+	fork="true">
695	+
696	+	<include name="**/*.java"/>
697	+	<compilerarg value="-Xprefer:source"/>
698	+	<compilerarg value="-XDignore.symbol.file=true"/>
699	+	<compilerarg value="-Xlint:all"/>
700	+	<compilerarg value="-Werror"/>
701	+	<compilerarg line="${build.args}"/>
702	+
703	+	</javac>
704	+	</target>
705	+
706	+	<target name="4jdk8doclint"
707	+	depends="configure-compiler"
708	+	description="Finds doclint warnings">
709	+
710	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
711	+
712	+	<javac srcdir="${4jdk8src.dir}"
713	+	destdir="${build.4jdk8.classes.dir}"
714	+	debug="${build.debug}"
715	+	debuglevel="${build.debuglevel}"
716	+	deprecation="${build.deprecation}"
717	+	source="8"
718	+	target="8"
719	+	classpath=""
720	+	bootclasspath="${bootclasspath8}"
721	+	includeAntRuntime="false"
722	+	includeJavaRuntime="false"
723	+	executable="${javac8}"
724	+	fork="true">
725	+
726	+	<include name="**/*.java"/>
727	+	<compilerarg value="-Xprefer:source"/>
728	+	<compilerarg value="-XDignore.symbol.file=true"/>
729	+	<compilerarg value="-Xlint:all"/>
730	+	<compilerarg value="-Xdoclint:all/protected"/>
731	+	<compilerarg line="${build.args}"/>
732	+
733	+	</javac>
734	+	</target>
735	+
736	+
737	+	<target name="4jdk8jar"
738	+	depends="4jdk8compile"
739	+	description="Builds library jar from compiled sources">
740	+
741	+	<jar destfile="${4jdk8product.jar}">
742	+	<fileset dir="${build.4jdk8.classes.dir}"/>
743	+	<manifest>
744	+	<attribute name="Built-By" value="${user.name}"/>
745	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
746	+	</manifest>
747	+	</jar>
748	+
749	+	</target>
750	+
751	+
752	+	<target name="4jdk8-tck"
753	+	depends="4jdk8jar"
754	+	description="Runs tck tests for jsr166-4jdk8 directly">
755	+
756	+	<run-tck-tests
757	+	target="8"
758	+	workdir="${build.4jdk8.dir}"
759	+	classes="${4jdk8product.jar}">
760	+	<javac-elements>
761	+	<!-- JDK9+ test classes -->
762	+	<exclude name="*9Test.java"/>
763	+	<exclude name="*10Test.java"/>
764	+	</javac-elements>
765	+	</run-tck-tests>
766	+	</target>
767	+
768	+
769	+	<target name="4jdk8-jtreg"
770	+	depends="4jdk8jar"
771	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
772	+	<run-jtreg-tests
773	+	target="8"
774	+	workdir="${build.4jdk8.dir}"
775	+	classes="${4jdk8product.jar}"/>
776	+	</target>
777	+
778	+
779	+	<target name="4jdk8-test"
780	+	depends="4jdk8-tck, 4jdk8-jtreg"
781	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
782	+	</target>
783	+
784	+
785	+	<target name="4jdk8docs"
786	+	description="Builds javadocs for src/jdk8 to dist dir">
787	+
788	+	<delete dir="${4jdk8docs.dir}"/>
789	+	<mkdir dir="${4jdk8docs.dir}"/>
790	+
791	+	<javadoc destdir="${4jdk8docs.dir}"
792	+	packagenames="none"
793	+	link="${java8.api.url}"
794	+	overview="${4jdk8src.dir}/intro.html"
795	+	access="${build.javadoc.access}"
796	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
797	+	classpath=""
798	+	executable="${javadoc8}"
799	+	failonerror = "true">
800	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
801	+	<include name="**/*.java"/>
802	+	</fileset>
803	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
804	+	<arg value="-XDignore.symbol.file=true"/>
805	+	<arg value="-tag"/>
806	+	<arg value="${javadoc.jls.option}"/>
807	+	<arg value="-tag"/>
808	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
809	+	<arg value="-tag"/>
810	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
811	+	<arg value="-tag"/>
812	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
813	+	</javadoc>
814	+	</target>
815	+
816	+
817	+	<target name="4jdk8dist"
818	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
819	+	description="Puts all distributable products in single hierarchy"/>
820	+
821	+
822	+	<target name="4jdk8clean"
823	+	description="Removes all 4jdk8 build products">
824	+
825	+	<delete dir="${build.4jdk8.dir}"/>
826	+
827	+	</target>
828	+
829	+
830	+	<target name="4jdk8dist-jar"
831	+	depends="4jdk8clean, 4jdk8jar">
832	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
833	+	</target>
834	+
835	+
836	+	<target name="4jdk8dist-docs"
837	+	depends="4jdk8clean, 4jdk8docs">
838	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
839	+	</target>
840	+
841	+
842	+
843		<!-- jsr166 4jdk7 -->
844
845		<target name="4jdk7compile"
#	Line 744 | Line 944
944		</target>
945
946
947	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
948		<target name="4jdk7-tck-junit"
949	<	depends="4jdk7compile"
749	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
949	>	depends="4jdk7compile">
950
951		<junit printsummary="true"
952		showoutput="true"
#	Line 799 | Line 999
999		link="${java7.api.url}"
1000		overview="${4jdk7src.dir}/intro.html"
1001		access="${build.javadoc.access}"
1002	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1002	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1003		classpath=""
1004	<	executable="${javadoc7}">
1004	>	executable="${javadoc7}"
1005	>	failonerror = "true">
1006		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1007		<include name="**/*.java"/>
1008		</fileset>
#	Line 893 | Line 1094
1094		packagenames="jsr166x.*"
1095		link="${java.api.url}"
1096		access="${build.javadoc.access}"
1097	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1097	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1098		bootclasspath="${bootclasspath6}"
1099		source="5"
1100	<	executable="${javadoc7}">
1100	>	executable="${javadoc7}"
1101	>	failonerror = "true">
1102		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1103		<arg value="-XDignore.symbol.file=true"/>
1104
#	Line 985 | Line 1187
1187		packagenames="jsr166y.*"
1188		link="${java.api.url}"
1189		access="${build.javadoc.access}"
1190	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1190	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1191		bootclasspath="${bootclasspath6}"
1192		source="6"
1193	<	executable="${javadoc7}">
1193	>	executable="${javadoc7}"
1194	>	failonerror = "true">
1195		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1196		<arg value="-XDignore.symbol.file=true"/>
1197
#	Line 1078 | Line 1281
1281		packagenames="extra166y.*"
1282		link="${java.api.url}"
1283		access="${build.javadoc.access}"
1284	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1284	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1285		bootclasspath="${bootclasspath6}"
1286		source="6"
1287		executable="${javadoc7}">
#	Line 1199 | Line 1402
1402		packagenames="jsr166e.*"
1403		link="${java.api.url}"
1404		access="${build.javadoc.access}"
1405	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1405	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1406		source="${build.jsr166e.java.version}"
1407	<	executable="${javadoc7}">
1407	>	executable="${javadoc7}"
1408	>	failonerror = "true">
1409		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1410		<arg value="-XDignore.symbol.file=true"/>
1411

Diff Legend

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