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.131 by jsr166, Fri Feb 1 18:31:17 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		<sequential>
179
180		<mkdir dir="@{workdir}/tck-classes"/>
181
182	<	<javac srcdir="${tck.src.dir}"
182	>	<javac srcdir="@{tck.src.dir}"
183		destdir="@{workdir}/tck-classes"
184		debug="${build.debug}"
185		debuglevel="${build.debuglevel}"
186		deprecation="${build.deprecation}"
187	<	source="6"
187	>	source="@{source}"
188		classpath="${junit.jar}"
189	+	bootclasspath="@{classes}:${bootclasspath@{source}}"
190		includeAntRuntime="false"
191		includeJavaRuntime="false"
192		executable="${javac@{target}}"
193		fork="true">
194
195	<	<include name="**/*.java"/>
170	<	<bootclasspath path="@{product.jar}"/>
171	<	<bootclasspath path="${bootclasspath6}"/>
195	>	<include name="*.java"/>
196		<compilerarg value="-XDignore.symbol.file=true"/>
197		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
198		<compilerarg line="${build.args}"/>
#	Line 179 | Line 203
203		failonerror="true"
204		jvm="${java@{target}}"
205		fork="true">
206	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
206	>	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
207		<jvmarg line="@{jvmflags}"/>
208		<classpath>
209		<pathelement location="${junit.jar}"/>
#	Line 196 | Line 220
220		</path>
221
222		<!-- Support @jls tag, used in jdk8+ javadoc -->
223	<	<!-- 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"/>
223	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
224		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
225
226		<!-- Main targets -->
#	Line 252 | Line 273
273		<target name="docs"
274		description="Builds javadocs for src/main to dist dir">
275
276	<	<delete dir="${dist.javadocs.dir}"/>
277	<	<mkdir dir="${dist.javadocs.dir}"/>
276	>	<delete dir="${docs.dir}"/>
277	>	<mkdir dir="${docs.dir}"/>
278
279		<!-- the packagenames="none" hack below prevents scanning the -->
280		<!-- sourcepath for packages -->
281
282	<	<javadoc destdir="${dist.javadocs.dir}"
282	>	<javadoc destdir="${docs.dir}"
283		packagenames="none"
284		link="${jdkapi8docs.url}"
285		overview="${src.dir}/intro.html"
286	+	access="${build.javadoc.access}"
287	+	sourcepath="${src.dir}:${jdk8src.dir}"
288		classpath=""
289		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}"/>
290		<fileset dir="${src.dir}" defaultexcludes="yes">
291		<include name="**/*.java"/>
292		</fileset>
293	+	<arg value="-XDignore.symbol.file=true"/>
294	+	<arg value="-tag"/>
295	+	<arg value="${javadoc.jls.option}"/>
296		</javadoc>
297		</target>
298
299
300		<target name="dist"
301	<	depends="dist-clean, dist-jar, docs"
301	>	depends="dist-clean, dist-jar, dist-docs"
302		description="Puts all distributable products in single hierarchy"/>
303
304
#	Line 320 | Line 341
341
342		<target name="dist-jar"
343		depends="clean, jar">
323	–
344		<copy file="${product.jar}" todir="${dist.dir}"/>
345	+	</target>
346
347	+	<target name="dist-docs"
348	+	depends="clean, docs">
349	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
350		</target>
351
352
#	Line 338 | Line 362
362		deprecation="${build.deprecation}"
363		source="6"
364		classpath="${junit.jar}"
365	+	bootclasspath="@{product.jar}:${bootclasspath6}"
366		includeAntRuntime="false"
367		includeJavaRuntime="false"
368		executable="${javac8}"
369		fork="true">
370
371		<include name="**/*.java"/>
347	–	<bootclasspath path="@{product.jar}"/>
348	–	<bootclasspath path="${bootclasspath6}"/>
372		<compilerarg value="-XDignore.symbol.file=true"/>
373		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
374		<compilerarg line="${build.args}"/>
#	Line 359 | Line 382
382		deprecation="${build.deprecation}"
383		source="6"
384		classpath=""
385	+	bootclasspath="@{product.jar}:${bootclasspath6}"
386		includeAntRuntime="false"
387		includeJavaRuntime="false"
388		executable="${javac8}"
389		fork="true">
390
391		<include name="jsr166/test/**/*.java"/>
368	–	<bootclasspath path="${product.jar}"/>
369	–	<bootclasspath path="${bootclasspath6}"/>
392		<compilerarg value="-XDignore.symbol.file=true"/>
393		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
394		<compilerarg line="${build.args}"/>
#	Line 391 | Line 413
413
414		</target>
415
416	+	<target name="test-tck"
417	+	depends="jar"
418	+	description="Runs tck tests for main directly">
419	+
420	+	<run-tck-tests
421	+	target="8"
422	+	workdir="${build.dir}"
423	+	classes="${product.jar}"/>
424	+	</target>
425
426		<target name="run-tests"
427		depends="compile-tests">
#	Line 550 | Line 581
581		deprecation="${build.deprecation}"
582		source="6"
583		classpath=""
584	+	bootclasspath="${bootclasspath6}"
585		includeAntRuntime="false"
586		includeJavaRuntime="false"
587		executable="${javac7}"
588		fork="true">
589
590		<include name="**/*.java"/>
559	–	<bootclasspath path="${bootclasspath6}"/>
591		<compilerarg value="-XDignore.symbol.file=true"/>
592		<compilerarg value="-Xlint:all"/>
593		<compilerarg line="${build.args}"/>
#	Line 565 | Line 596
596		</target>
597
598
599	<	<target name="4jdk7-jar"
599	>	<target name="4jdk7jar"
600		depends="4jdk7compile"
601		description="Builds library jar from compiled sources">
602
#	Line 577 | Line 608
608
609
610		<target name="4jdk7-test-tck"
611	<	depends="4jdk7-jar"
611	>	depends="4jdk7jar"
612		description="Runs tck tests for jsr166-4jdk7 directly">
613
614		<run-tck-tests
615		target="7"
616		workdir="${build.4jdk7.dir}"
617	<	product.jar="${4jdk7product.jar}"/>
617	>	classes="${4jdk7product.jar}"/>
618		</target>
619
620
#	Line 646 | Line 677
677		<target name="4jdk7docs"
678		description="Builds javadocs for src/jdk7 to dist dir">
679
680	<	<delete dir="${dist.4jdk7.docs.dir}"/>
681	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
680	>	<delete dir="${4jdk7docs.dir}"/>
681	>	<mkdir dir="${4jdk7docs.dir}"/>
682
683	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
683	>	<javadoc destdir="${4jdk7docs.dir}"
684		packagenames="none"
685		link="${jdkapi7docs.url}"
686		overview="${4jdk7src.dir}/intro.html"
687	+	access="${build.javadoc.access}"
688	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
689		classpath=""
690		executable="${javadoc7}">
658	–	<sourcepath path="${4jdk7src.dir}"/>
659	–	<sourcepath path="${jdk7src.dir}"/>
660	–	<arg value="-XDignore.symbol.file=true"/>
691		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
692		<include name="**/*.java"/>
693		</fileset>
694	+	<arg value="-XDignore.symbol.file=true"/>
695		</javadoc>
696		</target>
697
698
699		<target name="4jdk7dist"
700	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
700	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
701		description="Puts all distributable products in single hierarchy"/>
702
703
#	Line 684 | Line 715
715		</target>
716
717		<target name="4jdk7dist-jar"
718	<	depends="4jdk7clean, 4jdk7-jar">
688	<
718	>	depends="4jdk7clean, 4jdk7jar">
719		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
720	+	</target>
721	+
722
723	+	<target name="4jdk7dist-docs"
724	+	depends="4jdk7clean, 4jdk7docs">
725	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
726		</target>
727
728
#	Line 705 | Line 740
740		debuglevel="${build.debuglevel}"
741		deprecation="${build.deprecation}"
742		classpath=""
743	+	bootclasspath="${bootclasspath6}"
744		source="5"
745		includeAntRuntime="false"
746		includeJavaRuntime="false"
#	Line 712 | Line 748
748		fork="true">
749
750		<include name="jsr166x/**/*.java"/>
715	–	<bootclasspath path="${bootclasspath6}"/>
751		<compilerarg value="-XDignore.symbol.file=true"/>
752		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
753		<compilerarg line="${build.args}"/>
#	Line 721 | Line 756
756		</target>
757
758
759	<	<target name="jsr166x-jar"
759	>	<target name="jsr166xjar"
760		depends="jsr166xcompile"
761		description="Builds library jar from compiled sources">
762
#	Line 735 | Line 770
770		<target name="jsr166xdocs"
771		description="Builds javadocs to dist dir">
772
773	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
774	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
773	>	<delete dir="${jsr166xdocs.dir}"/>
774	>	<mkdir dir="${jsr166xdocs.dir}"/>
775
776	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
776	>	<javadoc destdir="${jsr166xdocs.dir}"
777		packagenames="jsr166x.*"
778		link="${jdkapidocs.url}"
779	+	access="${build.javadoc.access}"
780	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
781	+	bootclasspath="${bootclasspath6}"
782		source="5"
783		executable="${javadoc7}">
746	–	<sourcepath path="${topsrc.dir}"/>
747	–	<sourcepath path="${jdk6src.dir}"/>
748	–	<bootclasspath path="${bootclasspath6}"/>
784		<arg value="-XDignore.symbol.file=true"/>
785
786		</javadoc>
#	Line 753 | Line 788
788
789
790		<target name="jsr166xdist"
791	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
791	>	depends="jsr166xdist-jar, jsr166xdist-docs"
792		description="Puts all distributable products in single hierarchy"/>
793
794
#	Line 772 | Line 807
807
808
809		<target name="jsr166xdist-jar"
810	<	depends="jsr166xclean, jsr166x-jar">
776	<
810	>	depends="jsr166xclean, jsr166xjar">
811		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
812	+	</target>
813
814	+	<target name="jsr166xdist-docs"
815	+	depends="jsr166xclean, jsr166xdocs">
816	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
817		</target>
818
819		<!-- jsr166y -->
#	Line 794 | Line 832
832		deprecation="${build.deprecation}"
833		source="6"
834		classpath=""
835	+	bootclasspath="${bootclasspath6}"
836		includeAntRuntime="false"
837		includeJavaRuntime="false"
838		executable="${javac7}"
839		fork="true">
840
841		<include name="jsr166y/**/*.java"/>
803	–	<bootclasspath path="${bootclasspath6}"/>
842		<compilerarg value="-XDignore.symbol.file=true"/>
843		<compilerarg value="-Xlint:all"/>
844		<compilerarg line="${build.args}"/>
#	Line 809 | Line 847
847		</target>
848
849
850	<	<target name="jsr166y-jar"
850	>	<target name="jsr166yjar"
851		depends="jsr166ycompile"
852		description="Builds library jar from compiled sources">
853
#	Line 823 | Line 861
861		<target name="jsr166ydocs"
862		description="Builds javadocs to dist dir">
863
864	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
865	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
864	>	<delete dir="${jsr166ydocs.dir}"/>
865	>	<mkdir dir="${jsr166ydocs.dir}"/>
866
867	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
867	>	<javadoc destdir="${jsr166ydocs.dir}"
868		packagenames="jsr166y.*"
869		link="${jdkapidocs.url}"
870	+	access="${build.javadoc.access}"
871	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
872	+	bootclasspath="${bootclasspath6}"
873		source="6"
874		executable="${javadoc7}">
834	–	<sourcepath path="${topsrc.dir}"/>
835	–	<sourcepath path="${jdk6src.dir}"/>
836	–	<bootclasspath path="${bootclasspath6}"/>
875		<arg value="-XDignore.symbol.file=true"/>
876
877		</javadoc>
#	Line 841 | Line 879
879
880
881		<target name="jsr166ydist"
882	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
882	>	depends="jsr166ydist-jar, jsr166ydist-docs"
883		description="Puts all distributable products in single hierarchy"/>
884
885
#	Line 859 | Line 897
897		</target>
898
899		<target name="jsr166ydist-jar"
900	<	depends="jsr166yclean, jsr166y-jar">
863	<
900	>	depends="jsr166yclean, jsr166yjar">
901		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
902	+	</target>
903
904	+	<target name="jsr166ydist-docs"
905	+	depends="jsr166yclean, jsr166ydocs">
906	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
907		</target>
908
909
#	Line 870 | Line 911
911
912
913		<target name="extra166ycompile"
914	<	depends="configure-compiler, jsr166y-jar"
914	>	depends="configure-compiler, jsr166yjar"
915		description="Compiles extra166y sources">
916
917		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 880 | Line 921
921		debug="${build.debug}"
922		debuglevel="${build.debuglevel}"
923		deprecation="${build.deprecation}"
924	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
925		classpath=""
926		source="6"
927		includeAntRuntime="false"
#	Line 888 | Line 930
930		fork="true">
931
932		<include name="extra166y/**/*.java"/>
891	–	<bootclasspath path="${jsr166y.jar}"/>
892	–	<bootclasspath path="${bootclasspath6}"/>
933		<compilerarg value="-XDignore.symbol.file=true"/>
934		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
935		<compilerarg line="${build.args}"/>
#	Line 898 | Line 938
938		</target>
939
940
941	<	<target name="extra166y-jar"
941	>	<target name="extra166yjar"
942		depends="extra166ycompile"
943		description="Builds library jar from compiled sources">
944
#	Line 912 | Line 952
952		<target name="extra166ydocs"
953		description="Builds javadocs to build dir">
954
955	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
956	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
955	>	<delete dir="${extra166ydocs.dir}"/>
956	>	<mkdir dir="${extra166ydocs.dir}"/>
957
958	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
958	>	<javadoc destdir="${extra166ydocs.dir}"
959		packagenames="extra166y.*"
960		link="${jdkapidocs.url}"
961	+	access="${build.javadoc.access}"
962	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
963	+	bootclasspath="${bootclasspath6}"
964		source="6"
965		executable="${javadoc7}">
923	–	<sourcepath path="${topsrc.dir}"/>
924	–	<sourcepath path="${jdk6src.dir}"/>
925	–	<bootclasspath path="${bootclasspath6}"/>
966		<arg value="-XDignore.symbol.file=true"/>
967
968		</javadoc>
#	Line 930 | Line 970
970
971
972		<target name="extra166ydist"
973	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
973	>	depends="extra166ydist-jar, extra166ydist-docs"
974		description="Puts all distributable products in single hierarchy"/>
975
976
#	Line 948 | Line 988
988		</target>
989
990		<target name="extra166ydist-jar"
991	<	depends="extra166yclean, extra166y-jar">
952	<
991	>	depends="extra166yclean, extra166yjar">
992		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
993	+	</target>
994
995	+	<target name="extra166ydist-docs"
996	+	depends="extra166yclean, extra166ydocs">
997	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
998		</target>
999
1000		<!-- jsr166e -->
#	Line 983 | Line 1026
1026		</target>
1027
1028
1029	<	<target name="jsr166e-jar"
1029	>	<target name="jsr166ejar"
1030		depends="jsr166ecompile"
1031		description="Builds library jar from compiled sources">
1032
#	Line 997 | Line 1040
1040		<target name="jsr166edocs"
1041		description="Builds javadocs to build dir">
1042
1043	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1044	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1043	>	<delete dir="${jsr166edocs.dir}"/>
1044	>	<mkdir dir="${jsr166edocs.dir}"/>
1045
1046	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1046	>	<javadoc destdir="${jsr166edocs.dir}"
1047		packagenames="jsr166e.*"
1048		link="${jdkapidocs.url}"
1049	+	access="${build.javadoc.access}"
1050	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1051		source="7"
1052		executable="${javadoc7}">
1008	–	<sourcepath path="${topsrc.dir}"/>
1009	–	<sourcepath path="${jdk7src.dir}"/>
1053		<arg value="-XDignore.symbol.file=true"/>
1054
1055		</javadoc>
1056		</target>
1057
1058
1059	+	<target name="jsr166e-test-tck"
1060	+	depends="jsr166ejar"
1061	+	description="Runs tck tests for jsr166e">
1062	+
1063	+	<run-tck-tests
1064	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1065	+	source="7"
1066	+	target="8"
1067	+	workdir="${build.jsr166e.dir}"
1068	+	classes="${jsr166e.jar}"/>
1069	+	</target>
1070	+
1071	+
1072		<target name="jsr166edist"
1073	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1073	>	depends="jsr166edist-jar, jsr166edist-docs"
1074		description="Puts all distributable products in single hierarchy"/>
1075
1076
1077		<target name="jsr166eclean"
1078		description="Removes all jsr166e build products">
1023	–
1079		<delete dir="${build.jsr166e.dir}"/>
1025	–
1080		</target>
1081
1082
#	Line 1032 | Line 1086
1086		</target>
1087
1088		<target name="jsr166edist-jar"
1089	<	depends="jsr166eclean, jsr166e-jar">
1036	<
1089	>	depends="jsr166eclean, jsr166ejar">
1090		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1091	+	</target>
1092
1093	+	<target name="jsr166edist-docs"
1094	+	depends="jsr166eclean, jsr166edocs">
1095	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1096		</target>
1097
1098	+
1099	+	<!-- Find buglets that can be detected by static build tools -->
1100	+
1101	+	<target name="lint">
1102	+	<antcall target="dists">
1103	+	<param name="build.javadoc.access" value="private"/>
1104	+	</antcall>
1105	+	</target>
1106	+
1107	+
1108		</project>

Diff Legend

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