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.100 by jsr166, Sat Jan 19 17:15:44 2013 UTC vs.
Revision 1.111 by jsr166, Sun Jan 20 03:34:23 2013 UTC

#	Line 45 | Line 45
45		<property name="build.classes.dir"           location="${build.dir}/classes"/>
46		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47		<property name="build.loops.dir"             location="${build.dir}/loops"/>
48	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
49	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
48		<property name="build.reports.dir"           location="${build.dir}/reports"/>
49
50	<	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
51	<	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
52	<	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
53	<	<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"/>
50	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
53	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54
55		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61	–
56		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65	–
57		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69	–
58		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72	–	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
59
60		<!-- JDK binary locations -->
61		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 124 | Line 110
110		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
113
114		<!-- Distribution locations -->
115	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
116	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
117	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
118	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
119	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
120	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
115	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121
122		<!-- Jar locations -->
123	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
125	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
126	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
127	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
128	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
129	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
123	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130
131		<!-- Bootclasspath argument -->
132		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 154 | Line 139
139		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140		<!-- The below does not yet exist as of 2012-11 -->
141		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142	+
143	+	<!-- Default jdk api doc location (latest stable release seems best) -->
144		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145
146		<!-- Test classpath -->
#	Line 169 | Line 156
156
157		<!-- Support @jls tag, used in jdk8+ javadoc -->
158		<!-- TODO: How do we get &trade to work? -->
159	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
160		<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161		<property name="javadoc.jls.cite" value="The Java Language Specification"/>
162		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
#	Line 176 | Line 164
164		<!-- Main targets -->
165
166		<target name="dists"
167	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
167	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168		description="Builds all public jars and docs"/>
169
170		<target name="compile"
171		depends="configure-compiler"
172	<	description="Compiles src/main sources to build folder">
172	>	description="Compiles src/main sources to build dir">
173
174		<mkdir dir="${build.classes.dir}"/>
175
#	Line 217 | Line 205
205		depends="compile"
206		description="Builds library jar from compiled sources">
207
220	–	<mkdir dir="${build.lib.dir}"/>
221	–
208		<jar destfile="${product.jar}">
209		<fileset dir="${build.classes.dir}"/>
210		</jar>
#	Line 228 | Line 214
214
215
216		<target name="test"
217	<	depends="init, configure-tests, report-tests"
217	>	depends="configure-tests, report-tests"
218		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219
220
221
222		<target name="docs"
223	<	description="Builds javadocs for src/main">
223	>	description="Builds javadocs for src/main to dist dir">
224
225		<delete dir="${dist.javadocs.dir}"/>
226		<mkdir dir="${dist.javadocs.dir}"/>
#	Line 262 | Line 248
248
249
250		<target name="dist"
251	<	depends="init, dist-clean, dist-jar, docs"
251	>	depends="dist-clean, dist-jar, docs"
252		description="Puts all distributable products in single hierarchy"/>
253
254
#	Line 290 | Line 276
276		description="Removes all build products">
277
278		<delete dir="${build.dir}"/>
293	–	<delete dir="${build.classes.dir}"/>
294	–	<delete dir="${build.lib.dir}"/>
279
280		</target>
281
#	Line 309 | Line 293
293		<!-- Internal targets -->
294
295
312	–	<target name="init">
313	–
314	–	<!-- Version is kept in a separate file -->
315	–	<loadfile property="version" srcFile="version.properties"/>
316	–	<echo>Building JSR-166 version ${version}</echo>
317	–	<echo>java.home is ${java.home}</echo>
318	–
319	–	</target>
320	–
321	–
296		<target name="dist-jar"
297		depends="clean, jar">
298
#	Line 333 | Line 307
307		<mkdir dir="${build.testcases.dir}"/>
308
309		<javac srcdir="${tck.src.dir}"
310	<	destdir="${build.testcases.dir}"
311	<	debug="${build.debug}"
312	<	debuglevel="${build.debuglevel}"
313	<	deprecation="${build.deprecation}"
314	<	source="${build.sourcelevel}"
315	<	fork="true">
310	>	destdir="${build.testcases.dir}"
311	>	debug="${build.debug}"
312	>	debuglevel="${build.debuglevel}"
313	>	deprecation="${build.deprecation}"
314	>	source="6"
315	>	classpath="${junit.jar}"
316	>	bootclasspath="${product.jar}:${bootclasspath6}"
317	>	includeAntRuntime="false"
318	>	includeJavaRuntime="false"
319	>	executable="${javac8}"
320	>	fork="true">
321
322	<	<compilerarg value="${bootclasspath.args}"/>
322	>	<include name="**/*.java"/>
323		<compilerarg line="${build.args}"/>
324		<compilerarg value="-XDignore.symbol.file=true"/>
325	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326
327		<classpath refid="test.classpath"/>
328
329		</javac>
330
331		<javac srcdir="${test.src.dir}"
332	<	destdir="${build.testcases.dir}"
333	<	debug="${build.debug}"
334	<	debuglevel="${build.debuglevel}"
335	<	deprecation="${build.deprecation}"
336	<	source="${build.sourcelevel}"
337	<	fork="true">
332	>	destdir="${build.testcases.dir}"
333	>	debug="${build.debug}"
334	>	debuglevel="${build.debuglevel}"
335	>	deprecation="${build.deprecation}"
336	>	source="6"
337	>	classpath="${junit.jar}"
338	>	bootclasspath="${product.jar}:${bootclasspath6}"
339	>	includeAntRuntime="false"
340	>	includeJavaRuntime="false"
341	>	executable="${javac8}"
342	>	fork="true">
343
344	<	<include name="jsr166/test/**"/>
344	>	<include name="jsr166/test/**/*.java"/>
345
361	–	<compilerarg value="${bootclasspath.args}"/>
346		<compilerarg line="${build.args}"/>
347		<compilerarg value="-XDignore.symbol.file=true"/>
348	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
349
350		<classpath refid="test.classpath"/>
351
#	Line 400 | Line 385
385		errorProperty="junit.failed"
386		failureProperty="junit.failed"
387		dir="${build.reports.dir}"
388	+	jvm="${java8}"
389		fork="true">
390
391	<	<jvmarg value="${bootclasspath.args}"/>
391	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
392		<jvmarg value="-server"/>
393		<jvmarg value="-showversion"/>
394
#	Line 503 | Line 489
489		<!-- Various demos and test programs -->
490
491
492	<	<target name="loops" depends="init, configure-compiler"
492	>	<target name="loops" depends="configure-compiler"
493		description="Benchmark from Doug Lea's AQS paper">
494
495		<mkdir dir="${build.loops.dir}"/>
#	Line 543 | Line 529
529		debug="${build.debug}"
530		debuglevel="${build.debuglevel}"
531		deprecation="${build.deprecation}"
532	<	source="1.6"
532	>	source="6"
533		classpath=""
534		bootclasspath="${bootclasspath6}"
535		includeAntRuntime="false"
#	Line 558 | Line 544
544
545		</javac>
546
561	–	<mkdir dir="${build.4jdk7.lib.dir}"/>
562	–
547		<jar destfile="${4jdk7product.jar}" index="true">
548		<fileset dir="${build.4jdk7.classes.dir}"/>
549		</jar>
#	Line 571 | Line 555
555		debug="${build.debug}"
556		debuglevel="${build.debuglevel}"
557		deprecation="${build.deprecation}"
558	<	source="1.6"
558	>	source="6"
559		classpath="${junit.jar}"
560		bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
561		includeAntRuntime="false"
#	Line 629 | Line 613
613
614
615		<target name="4jdk7docs"
616	<	description="Builds javadocs with custom tags to build folder">
616	>	description="Builds javadocs for src/jdk7 to dist dir">
617
618	<	<delete dir="${build.4jdk7.docs.dir}"/>
619	<	<mkdir dir="${build.4jdk7.docs.dir}"/>
618	>	<delete dir="${dist.4jdk7.docs.dir}"/>
619	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
620
621	<	<javadoc destdir="${build.4jdk7.docs.dir}"
621	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
622		packagenames="none"
623		link="${jdkapi7docs.url}"
624		overview="${4jdk7src.dir}/intro.html"
#	Line 651 | Line 635
635
636
637		<target name="4jdk7dist"
638	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
638	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
639		description="Puts all distributable products in single hierarchy"/>
640
641
642
643		<target name="4jdk7clean"
644	<	description="Removes all build products">
644	>	description="Removes all 4jdk7 build products">
645
646		<delete dir="${build.4jdk7.dir}"/>
647
#	Line 670 | Line 654
654
655		</target>
656
673	–	<target name="4jdk7dist-docs"
674	–	description="Builds javadocs without custom tags to dist folder">
675	–
676	–	<delete dir="${dist.4jdk7.docs.dir}"/>
677	–	<mkdir dir="${dist.4jdk7.docs.dir}"/>
678	–
679	–	<javadoc destdir="${dist.4jdk7.docs.dir}"
680	–	packagenames="none"
681	–	link="${jdkapi7docs.url}"
682	–	overview="${4jdk7src.dir}/intro.html"
683	–	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
684	–	classpath=""
685	–	executable="${javadoc7}">
686	–	<arg value="-XDignore.symbol.file=true"/>
687	–	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
688	–	<include name="**/*.java"/>
689	–	</fileset>
690	–	</javadoc>
691	–
692	–	</target>
693	–
657		<target name="4jdk7dist-jar"
658		depends="4jdk7clean, 4jdk7compile">
659
#	Line 698 | Line 661
661
662		</target>
663
701	–	<!-- jsr166x -->
664
665	+	<!-- jsr166x -->
666
667		<target name="jsr166xcompile"
668	<	depends="init, configure-compiler"
669	<	description="Compiles jsr166x sources">
668	>	depends="configure-compiler"
669	>	description="Compiles jsr166x sources to build dir">
670
671		<mkdir dir="${build.jsr166x.dir}"/>
672
673	<	<javac srcdir="${jsr166xsrc.dir}"
674	<	destdir="${build.jsr166x.dir}"
675	<	debug="${build.debug}"
676	<	debuglevel="${build.debuglevel}"
677	<	deprecation="${build.deprecation}"
678	<	source="${build.sourcelevel}"
679	<	fork="true">
673	>	<javac srcdir="${topsrc.dir}"
674	>	destdir="${build.jsr166x.dir}"
675	>	debug="${build.debug}"
676	>	debuglevel="${build.debuglevel}"
677	>	deprecation="${build.deprecation}"
678	>	classpath=""
679	>	source="5"
680	>	bootclasspath="${bootclasspath6}"
681	>	includeAntRuntime="false"
682	>	includeJavaRuntime="false"
683	>	executable="${javac7}"
684	>	fork="true">
685
686	<	<include name="**/*.java"/>
686	>	<include name="jsr166x/**/*.java"/>
687		<compilerarg line="${build.args}"/>
688		<compilerarg value="-XDignore.symbol.file=true"/>
689	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
690
691		</javac>
692
#	Line 729 | Line 698
698		depends="jsr166xcompile"
699		description="Builds library jar from compiled sources">
700
701	<	<mkdir dir="${build.jsr166xlib.dir}"/>
733	<
734	<	<jar destfile="${jsr166xproduct.jar}">
701	>	<jar destfile="${jsr166x.jar}">
702		<fileset dir="${build.jsr166x.dir}"/>
703		</jar>
704
#	Line 740 | Line 707
707
708
709		<target name="jsr166xdocs"
710	<	description="Builds javadocs with custom tags to build folder">
710	>	description="Builds javadocs to dist dir">
711
712	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
713	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
712	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
713	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
714
715	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
716	<	packagenames="jsr166x"
715	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
716	>	packagenames="jsr166x.*"
717		link="${jdkapidocs.url}"
718	<	source="${build.sourcelevel}"
719	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
718	>	source="5"
719	>	bootclasspath="${bootclasspath6}"
720	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
721	>	executable="${javadoc7}"
722		additionalparam="-XDignore.symbol.file=true" />
723
724		</target>
725
726
727		<target name="jsr166xdist"
728	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
728	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
729		description="Puts all distributable products in single hierarchy"/>
730
731
732
733		<target name="jsr166xclean"
734	<	description="Removes all build products">
734	>	description="Removes all jsr166x build products">
735
736		<delete dir="${build.jsr166x.dir}"/>
768	–	<delete dir="${build.jsr166xlib.dir}"/>
737
738		</target>
739
#	Line 777 | Line 745
745		</target>
746
747
780	–
781	–	<target name="jsr166xdist-docs"
782	–	description="Builds javadocs without custom tags to dist folder">
783	–
784	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
785	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
786	–
787	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
788	–	packagenames="jsr166x"
789	–	link="${jdkapidocs.url}"
790	–	source="${build.sourcelevel}"
791	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
792	–	additionalparam="-XDignore.symbol.file=true" />
793	–
794	–	</target>
795	–
748		<target name="jsr166xdist-jar"
749		depends="jsr166xclean, jsr166xjar">
750
751	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
751	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
752
753		</target>
754
#	Line 804 | Line 756
756
757
758		<target name="jsr166ycompile"
759	<	depends="init, configure-compiler"
759	>	depends="configure-compiler"
760		description="Compiles jsr166y sources">
761
762		<mkdir dir="${build.jsr166y.dir}"/>
763
764	<	<javac srcdir="${jsr166ysrc.dir}"
765	<	destdir="${build.jsr166y.dir}"
766	<	debug="${build.debug}"
767	<	debuglevel="${build.debuglevel}"
768	<	deprecation="${build.deprecation}"
769	<	source="${build.sourcelevel}"
770	<	fork="true">
764	>	<javac srcdir="${topsrc.dir}"
765	>	destdir="${build.jsr166y.dir}"
766	>	debug="${build.debug}"
767	>	debuglevel="${build.debuglevel}"
768	>	deprecation="${build.deprecation}"
769	>	source="6"
770	>	classpath=""
771	>	bootclasspath="${bootclasspath6}"
772	>	includeAntRuntime="false"
773	>	includeJavaRuntime="false"
774	>	executable="${javac7}"
775	>	fork="true">
776
777	<	<include name="**/*.java"/>
777	>	<include name="jsr166y/**/*.java"/>
778		<compilerarg line="${build.args}"/>
779		<compilerarg value="-XDignore.symbol.file=true"/>
780	<	<compilerarg value="${bootclasspath.args}"/>
824	<
825	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
826	<
780	>	<compilerarg value="-Xlint:all"/>
781		</javac>
828	–
782		</target>
783
784
832	–
785		<target name="jsr166yjar"
786		depends="jsr166ycompile"
787		description="Builds library jar from compiled sources">
788
789	<	<mkdir dir="${build.jsr166ylib.dir}"/>
838	<
839	<	<jar destfile="${jsr166yproduct.jar}" index="true">
789	>	<jar destfile="${jsr166y.jar}" index="true">
790		<fileset dir="${build.jsr166y.dir}"/>
791		</jar>
792
#	Line 845 | Line 795
795
796
797		<target name="jsr166ydocs"
798	<	description="Builds javadocs with custom tags to build folder">
798	>	description="Builds javadocs to dist dir">
799
800	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
801	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
800	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
801	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
802
803	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
804	<	packagenames="jsr166y"
803	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
804	>	packagenames="jsr166y.*"
805		link="${jdkapidocs.url}"
806	<	source="${build.sourcelevel}"
807	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
806	>	source="6"
807	>	bootclasspath="${bootclasspath6}"
808	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
809	>	executable="${javadoc7}"
810		additionalparam="-XDignore.symbol.file=true" />
811
812		</target>
813
814
815		<target name="jsr166ydist"
816	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
816	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
817		description="Puts all distributable products in single hierarchy"/>
818
819
820
821		<target name="jsr166yclean"
822	<	description="Removes all build products">
822	>	description="Removes all jsr166y build products">
823
824		<delete dir="${build.jsr166y.dir}"/>
873	–	<delete dir="${build.jsr166ylib.dir}"/>
825
826		</target>
827
#	Line 881 | Line 832
832
833		</target>
834
884	–	<target name="jsr166ydist-docs"
885	–	description="Builds javadocs without custom tags to dist folder">
886	–
887	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
888	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
889	–
890	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
891	–	packagenames="jsr166y"
892	–	link="${jdkapidocs.url}"
893	–	source="${build.sourcelevel}"
894	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
895	–	additionalparam="-XDignore.symbol.file=true" />
896	–
897	–	</target>
898	–
835		<target name="jsr166ydist-jar"
836		depends="jsr166yclean, jsr166yjar">
837
838	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
838	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
839
840		</target>
841
#	Line 908 | Line 844
844
845
846		<target name="extra166ycompile"
847	<	depends="init, configure-compiler, jsr166ycompile"
847	>	depends="configure-compiler, jsr166yjar"
848		description="Compiles extra166y sources">
849
850		<mkdir dir="${build.extra166y.dir}"/>
851
852	<	<javac srcdir="${extra166ysrc.dir}"
853	<	destdir="${build.extra166y.dir}"
854	<	debug="${build.debug}"
855	<	classpath="${jsr166yproduct.jar}"
856	<	debuglevel="${build.debuglevel}"
857	<	deprecation="${build.deprecation}"
858	<	source="${build.sourcelevel}"
859	<	fork="true">
852	>	<javac srcdir="${topsrc.dir}"
853	>	destdir="${build.extra166y.dir}"
854	>	debug="${build.debug}"
855	>	debuglevel="${build.debuglevel}"
856	>	deprecation="${build.deprecation}"
857	>	classpath=""
858	>	source="6"
859	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
860	>	includeAntRuntime="false"
861	>	includeJavaRuntime="false"
862	>	executable="${javac7}"
863	>	fork="true">
864
865	<	<include name="**/*.java"/>
865	>	<include name="extra166y/**/*.java"/>
866		<compilerarg line="${build.args}"/>
867		<compilerarg value="-XDignore.symbol.file=true"/>
868	<	<compilerarg value="${bootclasspath.args}"/>
929	<
930	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
868	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
869
870		</javac>
871
#	Line 939 | Line 877
877		depends="extra166ycompile"
878		description="Builds library jar from compiled sources">
879
880	<	<mkdir dir="${build.extra166ylib.dir}"/>
943	<
944	<	<jar destfile="${extra166yproduct.jar}" index="true">
880	>	<jar destfile="${extra166y.jar}" index="true">
881		<fileset dir="${build.extra166y.dir}"/>
882		</jar>
883
#	Line 950 | Line 886
886
887
888		<target name="extra166ydocs"
889	<	description="Builds javadocs with custom tags to build folder">
889	>	description="Builds javadocs to build dir">
890
891	<	<delete dir="${build.extra166yjavadocs.dir}"/>
892	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
891	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
892	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
893
894	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
895	<	packagenames="extra166y"
894	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
895	>	packagenames="extra166y.*"
896		link="${jdkapidocs.url}"
897	<	source="${build.sourcelevel}"
898	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
897	>	source="6"
898	>	bootclasspath="${bootclasspath6}"
899	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
900	>	executable="${javadoc7}"
901		additionalparam="-XDignore.symbol.file=true" />
902
903		</target>
904
905
906		<target name="extra166ydist"
907	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
907	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
908		description="Puts all distributable products in single hierarchy"/>
909
910
911
912		<target name="extra166yclean"
913	<	description="Removes all build products">
913	>	description="Removes all extra166y build products">
914
915		<delete dir="${build.extra166y.dir}"/>
978	–	<delete dir="${build.extra166ylib.dir}"/>
916
917		</target>
918
#	Line 986 | Line 923
923
924		</target>
925
989	–	<target name="extra166ydist-docs"
990	–	description="Builds javadocs without custom tags to dist folder">
991	–
992	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
993	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
994	–
995	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
996	–	packagenames="extra166y"
997	–	link="${jdkapidocs.url}"
998	–	source="${build.sourcelevel}"
999	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1000	–	additionalparam="-XDignore.symbol.file=true" />
1001	–
1002	–	</target>
1003	–
926		<target name="extra166ydist-jar"
927		depends="extra166yclean, extra166yjar">
928
929	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
929	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
930
931		</target>
932
#	Line 1021 | Line 943
943		debug="${build.debug}"
944		debuglevel="${build.debuglevel}"
945		deprecation="${build.deprecation}"
946	<	source="1.7"
946	>	source="7"
947		classpath=""
948		includeAntRuntime="false"
949		includeJavaRuntime="false"
#	Line 1043 | Line 965
965		depends="jsr166ecompile"
966		description="Builds library jar from compiled sources">
967
968	<	<mkdir dir="${build.jsr166elib.dir}"/>
1047	<
1048	<	<jar destfile="${jsr166eproduct.jar}" index="true">
968	>	<jar destfile="${jsr166e.jar}" index="true">
969		<fileset dir="${build.jsr166e.dir}"/>
970		</jar>
971
#	Line 1054 | Line 974
974
975
976		<target name="jsr166edocs"
977	<	description="Builds javadocs with custom tags to build folder">
977	>	description="Builds javadocs to build dir">
978
979	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
980	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
979	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
980	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
981
982	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
983	<	packagenames="jsr166e,jsr166e.extra"
984	<	link="${jdkapi7docs.url}"
985	<	source="1.7"
982	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
983	>	packagenames="jsr166e.*"
984	>	link="${jdkapidocs.url}"
985	>	source="7"
986		sourcepath="${topsrc.dir}:${jdk7src.dir}"
987		executable="${javadoc7}"
988		additionalparam="-XDignore.symbol.file=true" >
1069	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1070	–	<include name="jsr166e/**/*.java"/>
1071	–	</fileset>
989		</javadoc>
990
991		</target>
992
993
994		<target name="jsr166edist"
995	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
995	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
996		description="Puts all distributable products in single hierarchy"/>
997
998
999
1000		<target name="jsr166eclean"
1001	<	description="Removes all build products">
1001	>	description="Removes all jsr166e build products">
1002
1003		<delete dir="${build.jsr166e.dir}"/>
1087	–	<delete dir="${build.jsr166elib.dir}"/>
1004
1005		</target>
1006
1007
1092	–
1008		<target name="jsr166edist-clean"
1009		description="Removes all build and distribution products">
1010
1011		</target>
1012
1098	–	<target name="jsr166edist-docs"
1099	–	description="Builds javadocs without custom tags to dist folder">
1100	–
1101	–	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1102	–	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1103	–
1104	–	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1105	–	packagenames="jsr166e,jsr166e.extra"
1106	–	link="${jdkapidocs.url}"
1107	–	source="1.7"
1108	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1109	–	additionalparam="-XDignore.symbol.file=true" />
1110	–
1111	–	</target>
1112	–
1013		<target name="jsr166edist-jar"
1014		depends="jsr166eclean, jsr166ejar">
1015
1016	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1016	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1017
1018		</target>
1019

Diff Legend

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