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.92 by jsr166, Mon Jan 14 07:08:06 2013 UTC vs.
Revision 1.104 by jsr166, Sat Jan 19 21:40:04 2013 UTC

#	Line 8 | Line 8
8
9		User-specific settings are read from user.properties.
10		See user.properties.sample for an explanation of some useful settings.
11	+
12	+	The repository contains all dependencies except for ant and the JDK
13	+	itself.  Because the JDK version matters and because different
14	+	targets require different JDKs, we assume that users have created a
15	+	hierarchy containing:
16	+	$HOME/jdk/jdk6
17	+	$HOME/jdk/jdk7
18	+	$HOME/jdk/jdk8
19	+	where each of the above is a JDK or a symlink to same, and
20	+	$HOME/jdk/src/jdk6
21	+	$HOME/jdk/src/jdk7
22	+	$HOME/jdk/src/jdk8
23	+	where each of the above is a complete JDK source tree
24	+	(e.g. mercurial forest) or a symlink to same.
25		------------------------------------------------------------------------------
26		</description>
27
#	Line 35 | Line 49
49		<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50		<property name="build.reports.dir"           location="${build.dir}/reports"/>
51
52	<	<property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
53	<	<property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
54	<	<property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
55	<	<property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
52	>	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53	>	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54	>	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55	>	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56	>	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57
58		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59		<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
#	Line 58 | Line 73
73
74		<!-- JDK binary locations -->
75		<property name="jdks.home"  location="${user.home}/jdk"/>
76	<	<property name="jdk6.home"  location="${jdks.home}/jdk1.6.0"/>
77	<	<property name="jdk7.home"  location="${jdks.home}/jdk1.7.0"/>
78	<	<property name="jdk8.home"  location="${jdks.home}/jdk1.8.0"/>
79	<	<property name="javac6"     location="${jdk6.home}/bin/javac"/>
80	<	<property name="javac7"     location="${jdk7.home}/bin/javac"/>
81	<	<property name="javac8"     location="${jdk8.home}/bin/javac"/>
82	<	<property name="javadoc6"   location="${jdk6.home}/bin/javadoc"/>
83	<	<property name="javadoc7"   location="${jdk7.home}/bin/javadoc"/>
84	<	<property name="javadoc8"   location="${jdk8.home}/bin/javadoc"/>
85	<	<property name="bootdir6"   location="${jdk6.home}/jre/lib"/>
86	<	<property name="bootdir7"   location="${jdk7.home}/jre/lib"/>
87	<	<property name="bootdir8"   location="${jdk8.home}/jre/lib"/>
88	<	<property name="bootclasspath6"   value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/>
89	<	<property name="bootclasspath7"   value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/>
90	<	<property name="bootclasspath8"   value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/>
76	>
77	>	<macrodef name="defjdklocations">
78	>	<attribute name="v"/>
79	>	<sequential>
80	>	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81	>	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82	>	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83	>	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84	>	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86	>	<property name="bootclasspath@{v}"
87	>	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88	>	</sequential>
89	>	</macrodef>
90	>
91	>	<defjdklocations v="6"/>
92	>	<defjdklocations v="7"/>
93	>	<defjdklocations v="8"/>
94	>
95	>	<macrodef name="run-tck-tests">
96	>	<attribute name="jvm"/>
97	>	<attribute name="tck.classes"/>
98	>	<attribute name="product.jar" default="${product.jar}"/>
99	>	<attribute name="jvmflags" default=""/>
100	>	<sequential>
101	>	<java classname="JSR166TestCase"
102	>	jvm="@{jvm}" fork="true">
103	>	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104	>	<jvmarg line="@{jvmflags}"/>
105	>	<classpath>
106	>	<pathelement location="${junit.jar}"/>
107	>	<pathelement location="@{tck.classes}"/>
108	>	</classpath>
109	>	</java>
110	>	</sequential>
111	>	</macrodef>
112
113		<!-- Source locations -->
114		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 83 | Line 119
119		<property name="lib.dir"              location="${basedir}/lib"/>
120		<property name="dist.dir"             location="${basedir}/dist"/>
121		<property name="topsrc.dir"           location="${basedir}/src"/>
122	<	<property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
122	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
#	Line 92 | Line 128
128
129		<!-- Distribution locations -->
130		<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131	<	<property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
131	>	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132		<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133		<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134		<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
#	Line 100 | Line 136
136
137		<!-- Jar locations -->
138		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139	<	<property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
139	>	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140		<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141		<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142		<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
#	Line 131 | Line 167
167		<pathelement location="${build.loops.dir}"/>
168		</path>
169
170	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
171	+	<!-- TODO: How do we get &trade to work? -->
172	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
173	+	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174	+	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
175	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176
177		<!-- Main targets -->
178
#	Line 139 | Line 181
181		description="Builds all public jars and docs"/>
182
183		<target name="compile"
184	<	depends="init, configure-compiler"
185	<	description="Compiles main sources to build folder">
184	>	depends="configure-compiler"
185	>	description="Compiles src/main sources to build dir">
186
187		<mkdir dir="${build.classes.dir}"/>
188
189		<javac srcdir="${src.dir}"
190	<	destdir="${build.classes.dir}"
191	<	debug="${build.debug}"
192	<	debuglevel="${build.debuglevel}"
193	<	deprecation="${build.deprecation}"
194	<	source="${build.sourcelevel}"
195	<	fork="true">
190	>	destdir="${build.classes.dir}"
191	>	debug="${build.debug}"
192	>	debuglevel="${build.debuglevel}"
193	>	deprecation="${build.deprecation}"
194	>	classpath=""
195	>	includeAntRuntime="false"
196	>	includeJavaRuntime="false"
197	>	executable="${javac8}"
198	>	fork="true">
199
200		<include name="**/*.java"/>
201	+	<compilerarg line="${build.args}"/>
202		<compilerarg value="-XDignore.symbol.file=true"/>
203	+	<compilerarg value="-Xlint:all"/>
204
205		<!--
206		<exclude name="java/lang/**"/>
#	Line 182 | Line 229
229
230
231		<target name="test"
232	<	depends="init, configure-tests, report-tests"
232	>	depends="configure-tests, report-tests"
233		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234
235
236
237		<target name="docs"
238	<	description="Builds javadocs with custom tags to build folder">
238	>	description="Builds javadocs for src/main to dist dir">
239
240	<	<delete dir="${build.javadocs.dir}"/>
241	<	<mkdir dir="${build.javadocs.dir}"/>
240	>	<delete dir="${dist.javadocs.dir}"/>
241	>	<mkdir dir="${dist.javadocs.dir}"/>
242
243		<!-- the packagenames="none" hack below prevents scanning the -->
244		<!-- sourcepath for packages -->
245
246	<	<javadoc destdir="${build.javadocs.dir}"
246	>	<javadoc destdir="${dist.javadocs.dir}"
247		packagenames="none"
248	<	link="${jdkapidocs.url}"
248	>	link="${jdkapi8docs.url}"
249		overview="${src.dir}/intro.html"
250	<	sourcepath="${src.dir}:${jdksrc.dir}"
251	<	additionalparam="-XDignore.symbol.file=true" >
250	>	sourcepath="${src.dir}:${jdk8src.dir}"
251	>	classpath=""
252	>	executable="${javadoc8}">
253	>	<arg value="-XDignore.symbol.file=true"/>
254	>	<arg value="-tag"/>
255	>	<arg value="${javadoc.jls.option}"/>
256		<fileset dir="${src.dir}" defaultexcludes="yes">
257		<include name="**/*.java"/>
258		</fileset>
#	Line 212 | Line 263
263
264
265		<target name="dist"
266	<	depends="init, dist-clean, dist-jar, dist-docs"
266	>	depends="dist-clean, dist-jar, docs"
267		description="Puts all distributable products in single hierarchy"/>
268
269
#	Line 256 | Line 307
307
308
309
259	–	<target name="dist-docs"
260	–	description="Builds javadocs without custom tags to dist folder">
261	–
262	–	<delete dir="${dist.javadocs.dir}"/>
263	–	<mkdir dir="${dist.javadocs.dir}"/>
264	–
265	–	<!-- the packagenames="none" hack below prevents scanning the -->
266	–	<!-- sourcepath for packages -->
267	–
268	–	<javadoc destdir="${dist.javadocs.dir}"
269	–	packagenames="none"
270	–	link="${jdkapidocs.url}"
271	–	overview="${src.dir}/intro.html"
272	–	sourcepath="${src.dir}:${jdksrc.dir}"
273	–	additionalparam="-XDignore.symbol.file=true" >
274	–	<fileset dir="${src.dir}" defaultexcludes="yes">
275	–	<include name="**/*.java"/>
276	–	</fileset>
277	–	</javadoc>
278	–
279	–	</target>
280	–
281	–
282	–
310		<!-- Internal targets -->
311
312
286	–	<target name="init">
287	–
288	–	<!-- Version is kept in a separate file -->
289	–	<loadfile property="version" srcFile="version.properties"/>
290	–	<echo>Building JSR-166 version ${version}</echo>
291	–	<echo>java.home is ${java.home}</echo>
292	–
293	–	</target>
294	–
295	–
313		<target name="dist-jar"
314		depends="clean, jar">
315
#	Line 477 | Line 494
494		<!-- Various demos and test programs -->
495
496
497	<	<target name="loops" depends="init, configure-compiler"
497	>	<target name="loops" depends="configure-compiler"
498		description="Benchmark from Doug Lea's AQS paper">
499
500		<mkdir dir="${build.loops.dir}"/>
#	Line 503 | Line 520
520		</target>
521
522
523	<	<!-- jdk7 -->
523	>	<!-- jsr166 4jdk7 -->
524
525
526	<	<target name="jdk7compile"
526	>	<target name="4jdk7compile"
527		depends="configure-compiler"
528	<	description="Compiles src/jdk7 sources">
528	>	description="Compiles src/jdk7 sources, targeting jdk7">
529
530	<	<mkdir dir="${build.jdk7.classes.dir}"/>
530	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
531
532	<	<javac srcdir="${jdk7src.dir}"
533	<	destdir="${build.jdk7.classes.dir}"
532	>	<javac srcdir="${4jdk7src.dir}"
533	>	destdir="${build.4jdk7.classes.dir}"
534		debug="${build.debug}"
535		debuglevel="${build.debuglevel}"
536		deprecation="${build.deprecation}"
#	Line 522 | Line 539
539		bootclasspath="${bootclasspath6}"
540		includeAntRuntime="false"
541		includeJavaRuntime="false"
542	<	executable="${javac6}"
542	>	executable="${javac7}"
543		fork="true">
544
545		<include name="**/*.java"/>
#	Line 532 | Line 549
549
550		</javac>
551
552	<	</target>
552	>	<mkdir dir="${build.4jdk7.lib.dir}"/>
553
554	+	<jar destfile="${4jdk7product.jar}" index="true">
555	+	<fileset dir="${build.4jdk7.classes.dir}"/>
556	+	</jar>
557
558	+	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
559
560	<	<target name="jdk7jar"
561	<	depends="jdk7compile"
562	<	description="Builds library jar from compiled sources">
560	>	<javac srcdir="${tck.src.dir}"
561	>	destdir="${build.4jdk7.tck.classes.dir}"
562	>	debug="${build.debug}"
563	>	debuglevel="${build.debuglevel}"
564	>	deprecation="${build.deprecation}"
565	>	source="1.6"
566	>	classpath="${junit.jar}"
567	>	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
568	>	includeAntRuntime="false"
569	>	includeJavaRuntime="false"
570	>	executable="${javac7}"
571	>	fork="true">
572
573	<	<mkdir dir="${build.jdk7.lib.dir}"/>
573	>	<include name="**/*.java"/>
574	>	<compilerarg line="${build.args}"/>
575	>	<compilerarg value="-XDignore.symbol.file=true"/>
576	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577
578	<	<jar destfile="${jdk7product.jar}" index="true">
546	<	<fileset dir="${build.jdk7.classes.dir}"/>
547	<	</jar>
578	>	</javac>
579
580		</target>
581
582
583	+	<target name="4jdk7-test-tck"
584	+	depends="4jdk7compile"
585	+	description="Runs tck tests for jsr166-4jdk7 directly">
586	+	<run-tck-tests
587	+	jvm="${java7}"
588	+	tck.classes="${build.4jdk7.tck.classes.dir}"
589	+	product.jar="${4jdk7product.jar}"/>
590	+	</target>
591	+
592	+
593	+	<target name="4jdk7-test-tck-junit"
594	+	depends="4jdk7compile"
595	+	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
596	+
597	+	<junit printsummary="true"
598	+	showoutput="true"
599	+	errorProperty="junit.failed"
600	+	failureProperty="junit.failed"
601	+	includeantruntime="true"
602	+	jvm="${java7}"
603	+	fork="true">
604	+
605	+	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
606	+	<jvmarg value="-server"/>
607	+
608	+	<classpath>
609	+	<pathelement location="${junit.jar}"/>
610	+	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
611	+	</classpath>
612	+
613	+	<formatter type="brief"/>
614	+
615	+	<test name="JSR166TestCase" haltonfailure="no">
616	+	</test>
617	+
618	+	</junit>
619	+	</target>
620	+
621
622	<	<target name="jdk7docs"
623	<	description="Builds javadocs with custom tags to build folder">
622	>	<target name="4jdk7docs"
623	>	description="Builds javadocs for src/jdk7 to dist dir">
624
625	<	<delete dir="${build.jdk7.docs.dir}"/>
626	<	<mkdir dir="${build.jdk7.docs.dir}"/>
625	>	<delete dir="${dist.4jdk7.docs.dir}"/>
626	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
627
628	<	<javadoc destdir="${build.jdk7.docs.dir}"
628	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
629		packagenames="none"
630		link="${jdkapi7docs.url}"
631	<	overview="${jdk7src.dir}/intro.html"
632	<	sourcepath="${jdk7src.dir}"
564	<	bootclasspath="${bootclasspath6}"
631	>	overview="${4jdk7src.dir}/intro.html"
632	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
633		classpath=""
634	<	source="1.6"
635	<	executable="${javadoc7}"
636	<	additionalparam="-XDignore.symbol.file=true" >
569	<	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
634	>	executable="${javadoc7}">
635	>	<arg value="-XDignore.symbol.file=true"/>
636	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
637		<include name="**/*.java"/>
638		</fileset>
639		</javadoc>
#	Line 574 | Line 641
641		</target>
642
643
644	<	<target name="jdk7dist"
645	<	depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
644	>	<target name="4jdk7dist"
645	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
646		description="Puts all distributable products in single hierarchy"/>
647
648
649
650	<	<target name="jdk7clean"
650	>	<target name="4jdk7clean"
651		description="Removes all build products">
652
653	<	<delete dir="${build.jdk7.dir}"/>
653	>	<delete dir="${build.4jdk7.dir}"/>
654
655		</target>
656
657
658
659	<	<target name="jdk7dist-clean"
659	>	<target name="4jdk7dist-clean"
660		description="Removes all build and distribution products">
661
662		</target>
663
664	<	<target name="jdk7dist-docs"
665	<	description="Builds javadocs without custom tags to dist folder">
664	>	<target name="4jdk7dist-jar"
665	>	depends="4jdk7clean, 4jdk7compile">
666
667	<	<delete dir="${dist.jdk7.docs.dir}"/>
601	<	<mkdir dir="${dist.jdk7.docs.dir}"/>
602	<
603	<	<javadoc destdir="${dist.jdk7.docs.dir}"
604	<	packagenames="none"
605	<	link="${jdkapi7docs.url}"
606	<	overview="${jdk7src.dir}/intro.html"
607	<	sourcepath="${jdk7src.dir}"
608	<	classpath=""
609	<	executable="${javadoc7}"
610	<	bootclasspath="${bootclasspath6}"
611	<	source="1.6">
612	<	<arg value="-XDignore.symbol.file=true"/>
613	<	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
614	<	<include name="**/*.java"/>
615	<	</fileset>
616	<	</javadoc>
617	<
618	<	</target>
619	<
620	<	<target name="jdk7dist-jar"
621	<	depends="jdk7clean, jdk7jar">
622	<
623	<	<copy file="${jdk7product.jar}" todir="${dist.dir}"/>
667	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
668
669		</target>
670
#	Line 628 | Line 672
672
673
674		<target name="jsr166xcompile"
675	<	depends="init, configure-compiler"
675	>	depends="configure-compiler"
676		description="Compiles jsr166x sources">
677
678		<mkdir dir="${build.jsr166x.dir}"/>
#	Line 666 | Line 710
710
711
712		<target name="jsr166xdocs"
713	<	description="Builds javadocs with custom tags to build folder">
713	>	description="Builds javadocs to dist dir">
714
715		<delete dir="${build.jsr166xjavadocs.dir}"/>
716		<mkdir dir="${build.jsr166xjavadocs.dir}"/>
#	Line 705 | Line 749
749
750
751		<target name="jsr166xdist-docs"
752	<	description="Builds javadocs without custom tags to dist folder">
752	>	description="Builds javadocs to dist dir">
753
754		<delete dir="${dist.jsr166xjavadocs.dir}"/>
755		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
#	Line 730 | Line 774
774
775
776		<target name="jsr166ycompile"
777	<	depends="init, configure-compiler"
777	>	depends="configure-compiler"
778		description="Compiles jsr166y sources">
779
780		<mkdir dir="${build.jsr166y.dir}"/>
781
782	<	<javac srcdir="${jsr166ysrc.dir}"
783	<	destdir="${build.jsr166y.dir}"
784	<	debug="${build.debug}"
785	<	debuglevel="${build.debuglevel}"
786	<	deprecation="${build.deprecation}"
787	<	source="${build.sourcelevel}"
788	<	fork="true">
782	>	<javac srcdir="${topsrc.dir}"
783	>	destdir="${build.jsr166y.dir}"
784	>	debug="${build.debug}"
785	>	debuglevel="${build.debuglevel}"
786	>	deprecation="${build.deprecation}"
787	>	source="1.6"
788	>	classpath=""
789	>	bootclasspath="${bootclasspath6}"
790	>	includeAntRuntime="false"
791	>	includeJavaRuntime="false"
792	>	executable="${javac7}"
793	>	fork="true">
794
795	<	<include name="**/*.java"/>
795	>	<include name="jsr166y/**/*.java"/>
796		<compilerarg line="${build.args}"/>
797		<compilerarg value="-XDignore.symbol.file=true"/>
798	<	<compilerarg value="${bootclasspath.args}"/>
750	<
751	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
752	<
798	>	<compilerarg value="-Xlint:all"/>
799		</javac>
754	–
800		</target>
801
802
758	–
803		<target name="jsr166yjar"
804		depends="jsr166ycompile"
805		description="Builds library jar from compiled sources">
#	Line 771 | Line 815
815
816
817		<target name="jsr166ydocs"
818	<	description="Builds javadocs with custom tags to build folder">
818	>	description="Builds javadocs to dist dir">
819
820		<delete dir="${build.jsr166yjavadocs.dir}"/>
821		<mkdir dir="${build.jsr166yjavadocs.dir}"/>
#	Line 808 | Line 852
852		</target>
853
854		<target name="jsr166ydist-docs"
855	<	description="Builds javadocs without custom tags to dist folder">
855	>	description="Builds javadocs to dist dir">
856
857		<delete dir="${dist.jsr166yjavadocs.dir}"/>
858		<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
#	Line 834 | Line 878
878
879
880		<target name="extra166ycompile"
881	<	depends="init, configure-compiler, jsr166ycompile"
881	>	depends="configure-compiler, jsr166yjar"
882		description="Compiles extra166y sources">
883
884		<mkdir dir="${build.extra166y.dir}"/>
885
886	<	<javac srcdir="${extra166ysrc.dir}"
887	<	destdir="${build.extra166y.dir}"
888	<	debug="${build.debug}"
889	<	classpath="${jsr166yproduct.jar}"
890	<	debuglevel="${build.debuglevel}"
891	<	deprecation="${build.deprecation}"
892	<	source="${build.sourcelevel}"
893	<	fork="true">
886	>	<javac srcdir="${topsrc.dir}"
887	>	destdir="${build.extra166y.dir}"
888	>	debug="${build.debug}"
889	>	classpath=""
890	>	debuglevel="${build.debuglevel}"
891	>	deprecation="${build.deprecation}"
892	>	source="1.6"
893	>	bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
894	>	includeAntRuntime="false"
895	>	includeJavaRuntime="false"
896	>	executable="${javac7}"
897	>	fork="true">
898
899	<	<include name="**/*.java"/>
899	>	<include name="extra166y/**/*.java"/>
900		<compilerarg line="${build.args}"/>
901		<compilerarg value="-XDignore.symbol.file=true"/>
902	<	<compilerarg value="${bootclasspath.args}"/>
855	<
856	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
902	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
903
904		</javac>
905
#	Line 876 | Line 922
922
923
924		<target name="extra166ydocs"
925	<	description="Builds javadocs with custom tags to build folder">
925	>	description="Builds javadocs with custom tags to build dir">
926
927		<delete dir="${build.extra166yjavadocs.dir}"/>
928		<mkdir dir="${build.extra166yjavadocs.dir}"/>
#	Line 913 | Line 959
959		</target>
960
961		<target name="extra166ydist-docs"
962	<	description="Builds javadocs without custom tags to dist folder">
962	>	description="Builds javadocs to dist dir">
963
964		<delete dir="${dist.extra166yjavadocs.dir}"/>
965		<mkdir dir="${dist.extra166yjavadocs.dir}"/>
#	Line 936 | Line 982
982
983		<!-- jsr166e -->
984
939	–
985		<target name="jsr166ecompile"
986	<	depends="init, configure-compiler"
986	>	depends="configure-compiler"
987		description="Compiles jsr166e sources">
988
989		<mkdir dir="${build.jsr166e.dir}"/>
990
991	<	<javac srcdir="${jsr166esrc.dir}"
992	<	destdir="${build.jsr166e.dir}"
993	<	debug="${build.debug}"
994	<	debuglevel="${build.debuglevel}"
995	<	deprecation="${build.deprecation}"
991	>	<javac srcdir="${topsrc.dir}"
992	>	destdir="${build.jsr166e.dir}"
993	>	debug="${build.debug}"
994	>	debuglevel="${build.debuglevel}"
995	>	deprecation="${build.deprecation}"
996		source="1.7"
997	<	fork="true">
997	>	classpath=""
998	>	includeAntRuntime="false"
999	>	includeJavaRuntime="false"
1000	>	executable="${javac7}"
1001	>	fork="true">
1002
1003	<	<include name="**/*.java"/>
1003	>	<include name="jsr166e/**/*.java"/>
1004		<compilerarg line="${build.args}"/>
1005		<compilerarg value="-XDignore.symbol.file=true"/>
1006	<	<compilerarg value="${bootclasspath.args}"/>
958	<
959	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
1006	>	<compilerarg value="-Xlint:all"/>
1007
1008		</javac>
1009
#	Line 979 | Line 1026
1026
1027
1028		<target name="jsr166edocs"
1029	<	description="Builds javadocs with custom tags to build folder">
1029	>	description="Builds javadocs with custom tags to build dir">
1030
1031		<delete dir="${build.jsr166ejavadocs.dir}"/>
1032		<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1033
1034		<javadoc destdir="${build.jsr166ejavadocs.dir}"
1035		packagenames="jsr166e,jsr166e.extra"
1036	<	link="${jdkapidocs.url}"
1036	>	link="${jdkapi7docs.url}"
1037		source="1.7"
1038	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1039	<	additionalparam="-XDignore.symbol.file=true" />
1038	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1039	>	executable="${javadoc7}"
1040	>	additionalparam="-XDignore.symbol.file=true" >
1041	>	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1042	>	<include name="jsr166e/**/*.java"/>
1043	>	</fileset>
1044	>	</javadoc>
1045
1046		</target>
1047
#	Line 1016 | Line 1068
1068		</target>
1069
1070		<target name="jsr166edist-docs"
1071	<	description="Builds javadocs without custom tags to dist folder">
1071	>	description="Builds javadocs to dist dir">
1072
1073		<delete dir="${dist.jsr166ejavadocs.dir}"/>
1074		<mkdir dir="${dist.jsr166ejavadocs.dir}"/>

Diff Legend

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