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.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC vs.
Revision 1.134 by jsr166, Sun Feb 3 02:25:01 2013 UTC

#	Line 22 | Line 22
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	+	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Advises user to run with -projecthelp">
30	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
29	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<java classname="org.apache.tools.ant.Main">
31	>	<arg value="-projecthelp" />
32	>	</java>
33		</target>
34
35
#	Line 39 | Line 42
42		<property name="build.debug"          value="true"/>
43		<property name="build.debuglevel"     value="source,lines,vars"/>
44		<property name="build.deprecation"    value="false"/>
45	+	<property name="build.javadoc.access" value="protected"/>
46
47		<!-- Build locations -->
48		<property name="build.dir"                   location="build"/>
#	Line 57 | Line 61
61		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
63
64	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
65	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
66	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
67	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68
69		<!-- JDK locations -->
70		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 86 | Line 90
90		</sequential>
91		</macrodef>
92
93	+	<macrodef name="mirror-dir">
94	+	<attribute name="src"/>
95	+	<attribute name="dst"/>
96	+	<sequential>
97	+	<delete dir="@{dst}"/>
98	+	<mkdir dir="@{dst}"/>
99	+	<copy todir="@{dst}" preservelastmodified="true">
100	+	<fileset dir="@{src}"/>
101	+	</copy>
102	+	</sequential>
103	+	</macrodef>
104	+
105		<defjdklocations v="6"/>
106		<defjdklocations v="7"/>
107		<defjdklocations v="8"/>
#	Line 105 | Line 121
121		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
123
124	<	<!-- Distribution locations -->
125	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
126	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
127	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
128	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
129	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
130	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
124	>	<!-- Javadoc locations -->
125	>	<property name="docs.dir"          location="${build.dir}/docs"/>
126	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131	>
132	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138
139		<!-- Jar locations -->
140		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 128 | Line 151
151		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
152
153		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154	<	<!-- The below does not yet exist as of 2012-11 -->
154	>	<!-- The below does not yet exist as of 2013-01 -->
155		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
156
157		<!-- Default jdk api doc location (latest stable release seems best) -->
#	Line 146 | Line 169
169		</path>
170
171		<macrodef name="run-tck-tests">
172	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	+	<attribute name="source" default="6"/>
174		<attribute name="target"/>
175		<attribute name="workdir"/>
176	<	<attribute name="product.jar" default="${product.jar}"/>
176	>	<attribute name="classes"/>
177		<attribute name="jvmflags" default=""/>
178	+	<element name="javac-elements" optional="true"/>
179		<sequential>
180
181		<mkdir dir="@{workdir}/tck-classes"/>
182
183	<	<javac srcdir="${tck.src.dir}"
183	>	<javac srcdir="@{tck.src.dir}"
184		destdir="@{workdir}/tck-classes"
185		debug="${build.debug}"
186		debuglevel="${build.debuglevel}"
187		deprecation="${build.deprecation}"
188	<	source="6"
188	>	source="@{source}"
189		classpath="${junit.jar}"
190	+	bootclasspath="@{classes}:${bootclasspath@{source}}"
191		includeAntRuntime="false"
192		includeJavaRuntime="false"
193		executable="${javac@{target}}"
194		fork="true">
195
196	<	<include name="**/*.java"/>
170	<	<bootclasspath path="@{product.jar}"/>
171	<	<bootclasspath path="${bootclasspath6}"/>
196	>	<include name="*.java"/>
197		<compilerarg value="-XDignore.symbol.file=true"/>
198		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199		<compilerarg line="${build.args}"/>
200	+	<javac-elements/>
201
202		</javac>
203
#	Line 179 | Line 205
205		failonerror="true"
206		jvm="${java@{target}}"
207		fork="true">
208	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
208	>	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
209		<jvmarg line="@{jvmflags}"/>
210		<classpath>
211		<pathelement location="${junit.jar}"/>
#	Line 196 | Line 222
222		</path>
223
224		<!-- Support @jls tag, used in jdk8+ javadoc -->
225	<	<!-- TODO: How do we get &trade to work? -->
200	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
201	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
202	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
225	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
226		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
227
228		<!-- Main targets -->
#	Line 226 | Line 249
249		fork="true">
250
251		<include name="**/*.java"/>
252	+	<compilerarg value="-Xprefer:source"/>
253		<compilerarg value="-XDignore.symbol.file=true"/>
254		<compilerarg value="-Xlint:all"/>
255		<compilerarg line="${build.args}"/>
#	Line 252 | Line 276
276		<target name="docs"
277		description="Builds javadocs for src/main to dist dir">
278
279	<	<delete dir="${dist.javadocs.dir}"/>
280	<	<mkdir dir="${dist.javadocs.dir}"/>
279	>	<delete dir="${docs.dir}"/>
280	>	<mkdir dir="${docs.dir}"/>
281
282		<!-- the packagenames="none" hack below prevents scanning the -->
283		<!-- sourcepath for packages -->
284
285	<	<javadoc destdir="${dist.javadocs.dir}"
285	>	<javadoc destdir="${docs.dir}"
286		packagenames="none"
287		link="${jdkapi8docs.url}"
288		overview="${src.dir}/intro.html"
289	+	access="${build.javadoc.access}"
290	+	sourcepath="${src.dir}:${jdk8src.dir}"
291		classpath=""
292		executable="${javadoc8}">
267	–	<sourcepath path="${src.dir}"/>
268	–	<sourcepath path="${jdk8src.dir}"/>
269	–	<arg value="-XDignore.symbol.file=true"/>
270	–	<arg value="-tag"/>
271	–	<arg value="${javadoc.jls.option}"/>
293		<fileset dir="${src.dir}" defaultexcludes="yes">
294		<include name="**/*.java"/>
295		</fileset>
296	+	<arg value="-XDignore.symbol.file=true"/>
297	+	<arg value="-tag"/>
298	+	<arg value="${javadoc.jls.option}"/>
299		</javadoc>
300		</target>
301
302
303		<target name="dist"
304	<	depends="dist-clean, dist-jar, docs"
304	>	depends="dist-clean, dist-jar, dist-docs"
305		description="Puts all distributable products in single hierarchy"/>
306
307
#	Line 320 | Line 344
344
345		<target name="dist-jar"
346		depends="clean, jar">
323	–
347		<copy file="${product.jar}" todir="${dist.dir}"/>
348	+	</target>
349
350	+	<target name="dist-docs"
351	+	depends="clean, docs">
352	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
353		</target>
354
355
#	Line 338 | Line 365
365		deprecation="${build.deprecation}"
366		source="6"
367		classpath="${junit.jar}"
368	+	bootclasspath="@{product.jar}:${bootclasspath6}"
369		includeAntRuntime="false"
370		includeJavaRuntime="false"
371		executable="${javac8}"
372		fork="true">
373
374		<include name="**/*.java"/>
347	–	<bootclasspath path="@{product.jar}"/>
348	–	<bootclasspath path="${bootclasspath6}"/>
375		<compilerarg value="-XDignore.symbol.file=true"/>
376		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
377		<compilerarg line="${build.args}"/>
#	Line 359 | Line 385
385		deprecation="${build.deprecation}"
386		source="6"
387		classpath=""
388	+	bootclasspath="@{product.jar}:${bootclasspath6}"
389		includeAntRuntime="false"
390		includeJavaRuntime="false"
391		executable="${javac8}"
392		fork="true">
393
394		<include name="jsr166/test/**/*.java"/>
368	–	<bootclasspath path="${product.jar}"/>
369	–	<bootclasspath path="${bootclasspath6}"/>
395		<compilerarg value="-XDignore.symbol.file=true"/>
396		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
397		<compilerarg line="${build.args}"/>
#	Line 391 | Line 416
416
417		</target>
418
419	+	<target name="test-tck"
420	+	depends="jar"
421	+	description="Runs tck tests for main directly">
422	+
423	+	<run-tck-tests
424	+	target="8"
425	+	workdir="${build.dir}"
426	+	classes="${product.jar}"/>
427	+	</target>
428
429		<target name="run-tests"
430		depends="compile-tests">
#	Line 550 | Line 584
584		deprecation="${build.deprecation}"
585		source="6"
586		classpath=""
587	+	bootclasspath="${bootclasspath6}"
588		includeAntRuntime="false"
589		includeJavaRuntime="false"
590		executable="${javac7}"
591		fork="true">
592
593		<include name="**/*.java"/>
594	<	<bootclasspath path="${bootclasspath6}"/>
594	>	<compilerarg value="-Xprefer:source"/>
595		<compilerarg value="-XDignore.symbol.file=true"/>
596		<compilerarg value="-Xlint:all"/>
597		<compilerarg line="${build.args}"/>
#	Line 565 | Line 600
600		</target>
601
602
603	<	<target name="4jdk7-jar"
603	>	<target name="4jdk7jar"
604		depends="4jdk7compile"
605		description="Builds library jar from compiled sources">
606
#	Line 577 | Line 612
612
613
614		<target name="4jdk7-test-tck"
615	<	depends="4jdk7-jar"
615	>	depends="4jdk7jar"
616		description="Runs tck tests for jsr166-4jdk7 directly">
617
618		<run-tck-tests
619		target="7"
620		workdir="${build.4jdk7.dir}"
621	<	product.jar="${4jdk7product.jar}"/>
621	>	classes="${4jdk7product.jar}">
622	>	<javac-elements>
623	>	<!-- JDK8+ test classes -->
624	>	<exclude name="StampedLockTest.java"/>
625	>	</javac-elements>
626	>	</run-tck-tests>
627		</target>
628
629
#	Line 646 | Line 686
686		<target name="4jdk7docs"
687		description="Builds javadocs for src/jdk7 to dist dir">
688
689	<	<delete dir="${dist.4jdk7.docs.dir}"/>
690	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
689	>	<delete dir="${4jdk7docs.dir}"/>
690	>	<mkdir dir="${4jdk7docs.dir}"/>
691
692	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
692	>	<javadoc destdir="${4jdk7docs.dir}"
693		packagenames="none"
694		link="${jdkapi7docs.url}"
695		overview="${4jdk7src.dir}/intro.html"
696	+	access="${build.javadoc.access}"
697	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
698		classpath=""
699		executable="${javadoc7}">
658	–	<sourcepath path="${4jdk7src.dir}"/>
659	–	<sourcepath path="${jdk7src.dir}"/>
660	–	<arg value="-XDignore.symbol.file=true"/>
700		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
701		<include name="**/*.java"/>
702		</fileset>
703	+	<arg value="-XDignore.symbol.file=true"/>
704		</javadoc>
705		</target>
706
707
708		<target name="4jdk7dist"
709	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
709	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
710		description="Puts all distributable products in single hierarchy"/>
711
712
#	Line 684 | Line 724
724		</target>
725
726		<target name="4jdk7dist-jar"
727	<	depends="4jdk7clean, 4jdk7-jar">
688	<
727	>	depends="4jdk7clean, 4jdk7jar">
728		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
729	+	</target>
730	+
731
732	+	<target name="4jdk7dist-docs"
733	+	depends="4jdk7clean, 4jdk7docs">
734	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
735		</target>
736
737
#	Line 705 | Line 749
749		debuglevel="${build.debuglevel}"
750		deprecation="${build.deprecation}"
751		classpath=""
752	+	bootclasspath="${bootclasspath6}"
753		source="5"
754		includeAntRuntime="false"
755		includeJavaRuntime="false"
#	Line 712 | Line 757
757		fork="true">
758
759		<include name="jsr166x/**/*.java"/>
715	–	<bootclasspath path="${bootclasspath6}"/>
760		<compilerarg value="-XDignore.symbol.file=true"/>
761		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
762		<compilerarg line="${build.args}"/>
#	Line 721 | Line 765
765		</target>
766
767
768	<	<target name="jsr166x-jar"
768	>	<target name="jsr166xjar"
769		depends="jsr166xcompile"
770		description="Builds library jar from compiled sources">
771
#	Line 735 | Line 779
779		<target name="jsr166xdocs"
780		description="Builds javadocs to dist dir">
781
782	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
783	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
782	>	<delete dir="${jsr166xdocs.dir}"/>
783	>	<mkdir dir="${jsr166xdocs.dir}"/>
784
785	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
785	>	<javadoc destdir="${jsr166xdocs.dir}"
786		packagenames="jsr166x.*"
787		link="${jdkapidocs.url}"
788	+	access="${build.javadoc.access}"
789	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
790	+	bootclasspath="${bootclasspath6}"
791		source="5"
792		executable="${javadoc7}">
746	–	<sourcepath path="${topsrc.dir}"/>
747	–	<sourcepath path="${jdk6src.dir}"/>
748	–	<bootclasspath path="${bootclasspath6}"/>
793		<arg value="-XDignore.symbol.file=true"/>
794
795		</javadoc>
#	Line 753 | Line 797
797
798
799		<target name="jsr166xdist"
800	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
800	>	depends="jsr166xdist-jar, jsr166xdist-docs"
801		description="Puts all distributable products in single hierarchy"/>
802
803
#	Line 772 | Line 816
816
817
818		<target name="jsr166xdist-jar"
819	<	depends="jsr166xclean, jsr166x-jar">
776	<
819	>	depends="jsr166xclean, jsr166xjar">
820		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
821	+	</target>
822
823	+	<target name="jsr166xdist-docs"
824	+	depends="jsr166xclean, jsr166xdocs">
825	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
826		</target>
827
828		<!-- jsr166y -->
#	Line 794 | Line 841
841		deprecation="${build.deprecation}"
842		source="6"
843		classpath=""
844	+	bootclasspath="${bootclasspath6}"
845		includeAntRuntime="false"
846		includeJavaRuntime="false"
847		executable="${javac7}"
848		fork="true">
849
850		<include name="jsr166y/**/*.java"/>
803	–	<bootclasspath path="${bootclasspath6}"/>
851		<compilerarg value="-XDignore.symbol.file=true"/>
852		<compilerarg value="-Xlint:all"/>
853		<compilerarg line="${build.args}"/>
#	Line 809 | Line 856
856		</target>
857
858
859	<	<target name="jsr166y-jar"
859	>	<target name="jsr166yjar"
860		depends="jsr166ycompile"
861		description="Builds library jar from compiled sources">
862
#	Line 823 | Line 870
870		<target name="jsr166ydocs"
871		description="Builds javadocs to dist dir">
872
873	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
874	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
873	>	<delete dir="${jsr166ydocs.dir}"/>
874	>	<mkdir dir="${jsr166ydocs.dir}"/>
875
876	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
876	>	<javadoc destdir="${jsr166ydocs.dir}"
877		packagenames="jsr166y.*"
878		link="${jdkapidocs.url}"
879	+	access="${build.javadoc.access}"
880	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
881	+	bootclasspath="${bootclasspath6}"
882		source="6"
883		executable="${javadoc7}">
834	–	<sourcepath path="${topsrc.dir}"/>
835	–	<sourcepath path="${jdk6src.dir}"/>
836	–	<bootclasspath path="${bootclasspath6}"/>
884		<arg value="-XDignore.symbol.file=true"/>
885
886		</javadoc>
#	Line 841 | Line 888
888
889
890		<target name="jsr166ydist"
891	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
891	>	depends="jsr166ydist-jar, jsr166ydist-docs"
892		description="Puts all distributable products in single hierarchy"/>
893
894
#	Line 859 | Line 906
906		</target>
907
908		<target name="jsr166ydist-jar"
909	<	depends="jsr166yclean, jsr166y-jar">
863	<
909	>	depends="jsr166yclean, jsr166yjar">
910		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
911	+	</target>
912
913	+	<target name="jsr166ydist-docs"
914	+	depends="jsr166yclean, jsr166ydocs">
915	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
916		</target>
917
918
#	Line 870 | Line 920
920
921
922		<target name="extra166ycompile"
923	<	depends="configure-compiler, jsr166y-jar"
923	>	depends="configure-compiler, jsr166yjar"
924		description="Compiles extra166y sources">
925
926		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 880 | Line 930
930		debug="${build.debug}"
931		debuglevel="${build.debuglevel}"
932		deprecation="${build.deprecation}"
933	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
934		classpath=""
935		source="6"
936		includeAntRuntime="false"
#	Line 888 | Line 939
939		fork="true">
940
941		<include name="extra166y/**/*.java"/>
891	–	<bootclasspath path="${jsr166y.jar}"/>
892	–	<bootclasspath path="${bootclasspath6}"/>
942		<compilerarg value="-XDignore.symbol.file=true"/>
943		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
944		<compilerarg line="${build.args}"/>
#	Line 898 | Line 947
947		</target>
948
949
950	<	<target name="extra166y-jar"
950	>	<target name="extra166yjar"
951		depends="extra166ycompile"
952		description="Builds library jar from compiled sources">
953
#	Line 912 | Line 961
961		<target name="extra166ydocs"
962		description="Builds javadocs to build dir">
963
964	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
965	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
964	>	<delete dir="${extra166ydocs.dir}"/>
965	>	<mkdir dir="${extra166ydocs.dir}"/>
966
967	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
967	>	<javadoc destdir="${extra166ydocs.dir}"
968		packagenames="extra166y.*"
969		link="${jdkapidocs.url}"
970	+	access="${build.javadoc.access}"
971	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
972	+	bootclasspath="${bootclasspath6}"
973		source="6"
974		executable="${javadoc7}">
923	–	<sourcepath path="${topsrc.dir}"/>
924	–	<sourcepath path="${jdk6src.dir}"/>
925	–	<bootclasspath path="${bootclasspath6}"/>
975		<arg value="-XDignore.symbol.file=true"/>
976
977		</javadoc>
#	Line 930 | Line 979
979
980
981		<target name="extra166ydist"
982	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
982	>	depends="extra166ydist-jar, extra166ydist-docs"
983		description="Puts all distributable products in single hierarchy"/>
984
985
#	Line 948 | Line 997
997		</target>
998
999		<target name="extra166ydist-jar"
1000	<	depends="extra166yclean, extra166y-jar">
952	<
1000	>	depends="extra166yclean, extra166yjar">
1001		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1002	+	</target>
1003
1004	+	<target name="extra166ydist-docs"
1005	+	depends="extra166yclean, extra166ydocs">
1006	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1007		</target>
1008
1009		<!-- jsr166e -->
#	Line 983 | Line 1035
1035		</target>
1036
1037
1038	<	<target name="jsr166e-jar"
1038	>	<target name="jsr166ejar"
1039		depends="jsr166ecompile"
1040		description="Builds library jar from compiled sources">
1041
#	Line 997 | Line 1049
1049		<target name="jsr166edocs"
1050		description="Builds javadocs to build dir">
1051
1052	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1053	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1052	>	<delete dir="${jsr166edocs.dir}"/>
1053	>	<mkdir dir="${jsr166edocs.dir}"/>
1054
1055	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1055	>	<javadoc destdir="${jsr166edocs.dir}"
1056		packagenames="jsr166e.*"
1057		link="${jdkapidocs.url}"
1058	+	access="${build.javadoc.access}"
1059	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1060		source="7"
1061		executable="${javadoc7}">
1008	–	<sourcepath path="${topsrc.dir}"/>
1009	–	<sourcepath path="${jdk7src.dir}"/>
1062		<arg value="-XDignore.symbol.file=true"/>
1063
1064		</javadoc>
1065		</target>
1066
1067
1068	+	<target name="jsr166e-test-tck"
1069	+	depends="jsr166ejar"
1070	+	description="Runs tck tests for jsr166e">
1071	+
1072	+	<run-tck-tests
1073	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1074	+	source="7"
1075	+	target="8"
1076	+	workdir="${build.jsr166e.dir}"
1077	+	classes="${jsr166e.jar}"/>
1078	+	</target>
1079	+
1080	+
1081		<target name="jsr166edist"
1082	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1082	>	depends="jsr166edist-jar, jsr166edist-docs"
1083		description="Puts all distributable products in single hierarchy"/>
1084
1085
1086		<target name="jsr166eclean"
1087		description="Removes all jsr166e build products">
1023	–
1088		<delete dir="${build.jsr166e.dir}"/>
1025	–
1089		</target>
1090
1091
#	Line 1032 | Line 1095
1095		</target>
1096
1097		<target name="jsr166edist-jar"
1098	<	depends="jsr166eclean, jsr166e-jar">
1036	<
1098	>	depends="jsr166eclean, jsr166ejar">
1099		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1100	+	</target>
1101
1102	+	<target name="jsr166edist-docs"
1103	+	depends="jsr166eclean, jsr166edocs">
1104	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1105		</target>
1106
1107	+
1108	+	<!-- Find buglets that can be detected by static build tools -->
1109	+
1110	+	<target name="lint">
1111	+	<antcall target="dists">
1112	+	<param name="build.javadoc.access" value="private"/>
1113	+	</antcall>
1114	+	</target>
1115	+
1116	+
1117		</project>

Diff Legend

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