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.99 by jsr166, Sat Jan 19 01:37:44 2013 UTC vs.
Revision 1.109 by jsr166, Sun Jan 20 01:06:24 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 127 | Line 113
113		<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
114
115		<!-- Distribution locations -->
116	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
117	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
118	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
119	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
120	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
121	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
116	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
117	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
118	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
119	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
120	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
121	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
122
123		<!-- Jar locations -->
124	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
125	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
126	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
127	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
128	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
129	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
130	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
124	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
125	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
126	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
127	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
128	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
129	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
130	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
131
132		<!-- Bootclasspath argument -->
133		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 154 | Line 140
140		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
141		<!-- The below does not yet exist as of 2012-11 -->
142		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
143	+
144	+	<!-- Default jdk api doc location (latest stable release seems best) -->
145		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
146
147		<!-- Test classpath -->
#	Line 167 | Line 155
155		<pathelement location="${build.loops.dir}"/>
156		</path>
157
158	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
159	+	<!-- TODO: How do we get &trade to work? -->
160	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
161	+	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
162	+	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
163	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
164
165		<!-- Main targets -->
166
167		<target name="dists"
168	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
168	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
169		description="Builds all public jars and docs"/>
170
171		<target name="compile"
172	<	depends="init, configure-compiler"
173	<	description="Compiles main sources to build folder">
172	>	depends="configure-compiler"
173	>	description="Compiles src/main sources to build dir">
174
175		<mkdir dir="${build.classes.dir}"/>
176
177		<javac srcdir="${src.dir}"
178	<	destdir="${build.classes.dir}"
179	<	debug="${build.debug}"
180	<	debuglevel="${build.debuglevel}"
181	<	deprecation="${build.deprecation}"
182	<	source="${build.sourcelevel}"
183	<	fork="true">
178	>	destdir="${build.classes.dir}"
179	>	debug="${build.debug}"
180	>	debuglevel="${build.debuglevel}"
181	>	deprecation="${build.deprecation}"
182	>	classpath=""
183	>	includeAntRuntime="false"
184	>	includeJavaRuntime="false"
185	>	executable="${javac8}"
186	>	fork="true">
187
188		<include name="**/*.java"/>
189	+	<compilerarg line="${build.args}"/>
190		<compilerarg value="-XDignore.symbol.file=true"/>
191	+	<compilerarg value="-Xlint:all"/>
192
193		<!--
194		<exclude name="java/lang/**"/>
#	Line 207 | Line 206
206		depends="compile"
207		description="Builds library jar from compiled sources">
208
210	–	<mkdir dir="${build.lib.dir}"/>
211	–
209		<jar destfile="${product.jar}">
210		<fileset dir="${build.classes.dir}"/>
211		</jar>
#	Line 218 | Line 215
215
216
217		<target name="test"
218	<	depends="init, configure-tests, report-tests"
218	>	depends="configure-tests, report-tests"
219		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
220
221
222
223		<target name="docs"
224	<	description="Builds javadocs with custom tags to build folder">
224	>	description="Builds javadocs for src/main to dist dir">
225
226	<	<delete dir="${build.javadocs.dir}"/>
227	<	<mkdir dir="${build.javadocs.dir}"/>
226	>	<delete dir="${dist.javadocs.dir}"/>
227	>	<mkdir dir="${dist.javadocs.dir}"/>
228
229		<!-- the packagenames="none" hack below prevents scanning the -->
230		<!-- sourcepath for packages -->
231
232	<	<javadoc destdir="${build.javadocs.dir}"
232	>	<javadoc destdir="${dist.javadocs.dir}"
233		packagenames="none"
234	<	link="${jdkapidocs.url}"
234	>	link="${jdkapi8docs.url}"
235		overview="${src.dir}/intro.html"
236	<	sourcepath="${src.dir}:${jdksrc.dir}"
237	<	additionalparam="-XDignore.symbol.file=true" >
236	>	sourcepath="${src.dir}:${jdk8src.dir}"
237	>	classpath=""
238	>	executable="${javadoc8}">
239	>	<arg value="-XDignore.symbol.file=true"/>
240	>	<arg value="-tag"/>
241	>	<arg value="${javadoc.jls.option}"/>
242		<fileset dir="${src.dir}" defaultexcludes="yes">
243		<include name="**/*.java"/>
244		</fileset>
#	Line 248 | Line 249
249
250
251		<target name="dist"
252	<	depends="init, dist-clean, dist-jar, dist-docs"
252	>	depends="dist-clean, dist-jar, docs"
253		description="Puts all distributable products in single hierarchy"/>
254
255
#	Line 276 | Line 277
277		description="Removes all build products">
278
279		<delete dir="${build.dir}"/>
279	–	<delete dir="${build.classes.dir}"/>
280	–	<delete dir="${build.lib.dir}"/>
280
281		</target>
282
#	Line 292 | Line 291
291
292
293
295	–	<target name="dist-docs"
296	–	description="Builds javadocs without custom tags to dist folder">
297	–
298	–	<delete dir="${dist.javadocs.dir}"/>
299	–	<mkdir dir="${dist.javadocs.dir}"/>
300	–
301	–	<!-- the packagenames="none" hack below prevents scanning the -->
302	–	<!-- sourcepath for packages -->
303	–
304	–	<javadoc destdir="${dist.javadocs.dir}"
305	–	packagenames="none"
306	–	link="${jdkapidocs.url}"
307	–	overview="${src.dir}/intro.html"
308	–	sourcepath="${src.dir}:${jdksrc.dir}"
309	–	additionalparam="-XDignore.symbol.file=true" >
310	–	<fileset dir="${src.dir}" defaultexcludes="yes">
311	–	<include name="**/*.java"/>
312	–	</fileset>
313	–	</javadoc>
314	–
315	–	</target>
316	–
317	–
318	–
294		<!-- Internal targets -->
295
296
322	–	<target name="init">
323	–
324	–	<!-- Version is kept in a separate file -->
325	–	<loadfile property="version" srcFile="version.properties"/>
326	–	<echo>Building JSR-166 version ${version}</echo>
327	–	<echo>java.home is ${java.home}</echo>
328	–
329	–	</target>
330	–
331	–
297		<target name="dist-jar"
298		depends="clean, jar">
299
#	Line 513 | Line 478
478		<!-- Various demos and test programs -->
479
480
481	<	<target name="loops" depends="init, configure-compiler"
481	>	<target name="loops" depends="configure-compiler"
482		description="Benchmark from Doug Lea's AQS paper">
483
484		<mkdir dir="${build.loops.dir}"/>
#	Line 553 | Line 518
518		debug="${build.debug}"
519		debuglevel="${build.debuglevel}"
520		deprecation="${build.deprecation}"
521	<	source="1.6"
521	>	source="6"
522		classpath=""
523		bootclasspath="${bootclasspath6}"
524		includeAntRuntime="false"
#	Line 568 | Line 533
533
534		</javac>
535
571	–	<mkdir dir="${build.4jdk7.lib.dir}"/>
572	–
536		<jar destfile="${4jdk7product.jar}" index="true">
537		<fileset dir="${build.4jdk7.classes.dir}"/>
538		</jar>
#	Line 581 | Line 544
544		debug="${build.debug}"
545		debuglevel="${build.debuglevel}"
546		deprecation="${build.deprecation}"
547	<	source="1.6"
547	>	source="6"
548		classpath="${junit.jar}"
549		bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
550		includeAntRuntime="false"
#	Line 639 | Line 602
602
603
604		<target name="4jdk7docs"
605	<	description="Builds javadocs with custom tags to build folder">
605	>	description="Builds javadocs for src/jdk7 to dist dir">
606
607	<	<delete dir="${build.4jdk7.docs.dir}"/>
608	<	<mkdir dir="${build.4jdk7.docs.dir}"/>
607	>	<delete dir="${dist.4jdk7.docs.dir}"/>
608	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
609
610	<	<javadoc destdir="${build.4jdk7.docs.dir}"
610	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
611		packagenames="none"
612		link="${jdkapi7docs.url}"
613		overview="${4jdk7src.dir}/intro.html"
#	Line 661 | Line 624
624
625
626		<target name="4jdk7dist"
627	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
627	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
628		description="Puts all distributable products in single hierarchy"/>
629
630
631
632		<target name="4jdk7clean"
633	<	description="Removes all build products">
633	>	description="Removes all 4jdk7 build products">
634
635		<delete dir="${build.4jdk7.dir}"/>
636
#	Line 680 | Line 643
643
644		</target>
645
683	–	<target name="4jdk7dist-docs"
684	–	description="Builds javadocs without custom tags to dist folder">
685	–
686	–	<delete dir="${dist.4jdk7.docs.dir}"/>
687	–	<mkdir dir="${dist.4jdk7.docs.dir}"/>
688	–
689	–	<javadoc destdir="${dist.4jdk7.docs.dir}"
690	–	packagenames="none"
691	–	link="${jdkapi7docs.url}"
692	–	overview="${4jdk7src.dir}/intro.html"
693	–	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
694	–	classpath=""
695	–	executable="${javadoc7}">
696	–	<arg value="-XDignore.symbol.file=true"/>
697	–	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
698	–	<include name="**/*.java"/>
699	–	</fileset>
700	–	</javadoc>
701	–
702	–	</target>
703	–
646		<target name="4jdk7dist-jar"
647		depends="4jdk7clean, 4jdk7compile">
648
#	Line 708 | Line 650
650
651		</target>
652
711	–	<!-- jsr166x -->
653
654	+	<!-- jsr166x -->
655
656		<target name="jsr166xcompile"
657	<	depends="init, configure-compiler"
658	<	description="Compiles jsr166x sources">
657	>	depends="configure-compiler"
658	>	description="Compiles jsr166x sources to build dir">
659
660		<mkdir dir="${build.jsr166x.dir}"/>
661
662	<	<javac srcdir="${jsr166xsrc.dir}"
663	<	destdir="${build.jsr166x.dir}"
664	<	debug="${build.debug}"
665	<	debuglevel="${build.debuglevel}"
666	<	deprecation="${build.deprecation}"
667	<	source="${build.sourcelevel}"
668	<	fork="true">
662	>	<javac srcdir="${topsrc.dir}"
663	>	destdir="${build.jsr166x.dir}"
664	>	debug="${build.debug}"
665	>	debuglevel="${build.debuglevel}"
666	>	deprecation="${build.deprecation}"
667	>	classpath=""
668	>	source="5"
669	>	bootclasspath="${bootclasspath6}"
670	>	includeAntRuntime="false"
671	>	includeJavaRuntime="false"
672	>	executable="${javac7}"
673	>	fork="true">
674
675	<	<include name="**/*.java"/>
675	>	<include name="jsr166x/**/*.java"/>
676		<compilerarg line="${build.args}"/>
677		<compilerarg value="-XDignore.symbol.file=true"/>
678	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
679
680		</javac>
681
#	Line 739 | Line 687
687		depends="jsr166xcompile"
688		description="Builds library jar from compiled sources">
689
690	<	<mkdir dir="${build.jsr166xlib.dir}"/>
743	<
744	<	<jar destfile="${jsr166xproduct.jar}">
690	>	<jar destfile="${jsr166x.jar}">
691		<fileset dir="${build.jsr166x.dir}"/>
692		</jar>
693
#	Line 750 | Line 696
696
697
698		<target name="jsr166xdocs"
699	<	description="Builds javadocs with custom tags to build folder">
699	>	description="Builds javadocs to dist dir">
700
701	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
702	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
701	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
702	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
703
704	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
705	<	packagenames="jsr166x"
704	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
705	>	packagenames="jsr166x.*"
706		link="${jdkapidocs.url}"
707	<	source="${build.sourcelevel}"
708	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
707	>	source="5"
708	>	bootclasspath="${bootclasspath6}"
709	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
710	>	executable="${javadoc7}"
711		additionalparam="-XDignore.symbol.file=true" />
712
713		</target>
714
715
716		<target name="jsr166xdist"
717	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
717	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
718		description="Puts all distributable products in single hierarchy"/>
719
720
721
722		<target name="jsr166xclean"
723	<	description="Removes all build products">
723	>	description="Removes all jsr166x build products">
724
725		<delete dir="${build.jsr166x.dir}"/>
778	–	<delete dir="${build.jsr166xlib.dir}"/>
726
727		</target>
728
#	Line 787 | Line 734
734		</target>
735
736
790	–
791	–	<target name="jsr166xdist-docs"
792	–	description="Builds javadocs without custom tags to dist folder">
793	–
794	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
795	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
796	–
797	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
798	–	packagenames="jsr166x"
799	–	link="${jdkapidocs.url}"
800	–	source="${build.sourcelevel}"
801	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
802	–	additionalparam="-XDignore.symbol.file=true" />
803	–
804	–	</target>
805	–
737		<target name="jsr166xdist-jar"
738		depends="jsr166xclean, jsr166xjar">
739
740	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
740	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
741
742		</target>
743
#	Line 814 | Line 745
745
746
747		<target name="jsr166ycompile"
748	<	depends="init, configure-compiler"
748	>	depends="configure-compiler"
749		description="Compiles jsr166y sources">
750
751		<mkdir dir="${build.jsr166y.dir}"/>
752
753	<	<javac srcdir="${jsr166ysrc.dir}"
754	<	destdir="${build.jsr166y.dir}"
755	<	debug="${build.debug}"
756	<	debuglevel="${build.debuglevel}"
757	<	deprecation="${build.deprecation}"
758	<	source="${build.sourcelevel}"
759	<	fork="true">
753	>	<javac srcdir="${topsrc.dir}"
754	>	destdir="${build.jsr166y.dir}"
755	>	debug="${build.debug}"
756	>	debuglevel="${build.debuglevel}"
757	>	deprecation="${build.deprecation}"
758	>	source="6"
759	>	classpath=""
760	>	bootclasspath="${bootclasspath6}"
761	>	includeAntRuntime="false"
762	>	includeJavaRuntime="false"
763	>	executable="${javac7}"
764	>	fork="true">
765
766	<	<include name="**/*.java"/>
766	>	<include name="jsr166y/**/*.java"/>
767		<compilerarg line="${build.args}"/>
768		<compilerarg value="-XDignore.symbol.file=true"/>
769	<	<compilerarg value="${bootclasspath.args}"/>
834	<
835	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
836	<
769	>	<compilerarg value="-Xlint:all"/>
770		</javac>
838	–
771		</target>
772
773
842	–
774		<target name="jsr166yjar"
775		depends="jsr166ycompile"
776		description="Builds library jar from compiled sources">
777
778	<	<mkdir dir="${build.jsr166ylib.dir}"/>
848	<
849	<	<jar destfile="${jsr166yproduct.jar}" index="true">
778	>	<jar destfile="${jsr166y.jar}" index="true">
779		<fileset dir="${build.jsr166y.dir}"/>
780		</jar>
781
#	Line 855 | Line 784
784
785
786		<target name="jsr166ydocs"
787	<	description="Builds javadocs with custom tags to build folder">
787	>	description="Builds javadocs to dist dir">
788
789	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
790	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
789	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
790	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
791
792	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
793	<	packagenames="jsr166y"
792	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
793	>	packagenames="jsr166y.*"
794		link="${jdkapidocs.url}"
795	<	source="${build.sourcelevel}"
796	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
795	>	source="6"
796	>	bootclasspath="${bootclasspath6}"
797	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
798	>	executable="${javadoc7}"
799		additionalparam="-XDignore.symbol.file=true" />
800
801		</target>
802
803
804		<target name="jsr166ydist"
805	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
805	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
806		description="Puts all distributable products in single hierarchy"/>
807
808
809
810		<target name="jsr166yclean"
811	<	description="Removes all build products">
811	>	description="Removes all jsr166y build products">
812
813		<delete dir="${build.jsr166y.dir}"/>
883	–	<delete dir="${build.jsr166ylib.dir}"/>
814
815		</target>
816
#	Line 891 | Line 821
821
822		</target>
823
894	–	<target name="jsr166ydist-docs"
895	–	description="Builds javadocs without custom tags to dist folder">
896	–
897	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
898	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
899	–
900	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
901	–	packagenames="jsr166y"
902	–	link="${jdkapidocs.url}"
903	–	source="${build.sourcelevel}"
904	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
905	–	additionalparam="-XDignore.symbol.file=true" />
906	–
907	–	</target>
908	–
824		<target name="jsr166ydist-jar"
825		depends="jsr166yclean, jsr166yjar">
826
827	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
827	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
828
829		</target>
830
#	Line 918 | Line 833
833
834
835		<target name="extra166ycompile"
836	<	depends="init, configure-compiler, jsr166ycompile"
836	>	depends="configure-compiler, jsr166yjar"
837		description="Compiles extra166y sources">
838
839		<mkdir dir="${build.extra166y.dir}"/>
840
841	<	<javac srcdir="${extra166ysrc.dir}"
842	<	destdir="${build.extra166y.dir}"
843	<	debug="${build.debug}"
844	<	classpath="${jsr166yproduct.jar}"
845	<	debuglevel="${build.debuglevel}"
846	<	deprecation="${build.deprecation}"
847	<	source="${build.sourcelevel}"
848	<	fork="true">
841	>	<javac srcdir="${topsrc.dir}"
842	>	destdir="${build.extra166y.dir}"
843	>	debug="${build.debug}"
844	>	debuglevel="${build.debuglevel}"
845	>	deprecation="${build.deprecation}"
846	>	classpath=""
847	>	source="6"
848	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
849	>	includeAntRuntime="false"
850	>	includeJavaRuntime="false"
851	>	executable="${javac7}"
852	>	fork="true">
853
854	<	<include name="**/*.java"/>
854	>	<include name="extra166y/**/*.java"/>
855		<compilerarg line="${build.args}"/>
856		<compilerarg value="-XDignore.symbol.file=true"/>
857	<	<compilerarg value="${bootclasspath.args}"/>
939	<
940	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
857	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
858
859		</javac>
860
#	Line 949 | Line 866
866		depends="extra166ycompile"
867		description="Builds library jar from compiled sources">
868
869	<	<mkdir dir="${build.extra166ylib.dir}"/>
953	<
954	<	<jar destfile="${extra166yproduct.jar}" index="true">
869	>	<jar destfile="${extra166y.jar}" index="true">
870		<fileset dir="${build.extra166y.dir}"/>
871		</jar>
872
#	Line 960 | Line 875
875
876
877		<target name="extra166ydocs"
878	<	description="Builds javadocs with custom tags to build folder">
878	>	description="Builds javadocs to build dir">
879
880	<	<delete dir="${build.extra166yjavadocs.dir}"/>
881	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
880	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
881	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
882
883	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
884	<	packagenames="extra166y"
883	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
884	>	packagenames="extra166y.*"
885		link="${jdkapidocs.url}"
886	<	source="${build.sourcelevel}"
887	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
886	>	source="6"
887	>	bootclasspath="${bootclasspath6}"
888	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
889	>	executable="${javadoc7}"
890		additionalparam="-XDignore.symbol.file=true" />
891
892		</target>
893
894
895		<target name="extra166ydist"
896	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
896	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
897		description="Puts all distributable products in single hierarchy"/>
898
899
900
901		<target name="extra166yclean"
902	<	description="Removes all build products">
902	>	description="Removes all extra166y build products">
903
904		<delete dir="${build.extra166y.dir}"/>
988	–	<delete dir="${build.extra166ylib.dir}"/>
905
906		</target>
907
#	Line 996 | Line 912
912
913		</target>
914
999	–	<target name="extra166ydist-docs"
1000	–	description="Builds javadocs without custom tags to dist folder">
1001	–
1002	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
1003	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
1004	–
1005	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
1006	–	packagenames="extra166y"
1007	–	link="${jdkapidocs.url}"
1008	–	source="${build.sourcelevel}"
1009	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1010	–	additionalparam="-XDignore.symbol.file=true" />
1011	–
1012	–	</target>
1013	–
915		<target name="extra166ydist-jar"
916		depends="extra166yclean, extra166yjar">
917
918	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
918	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
919
920		</target>
921
#	Line 1031 | Line 932
932		debug="${build.debug}"
933		debuglevel="${build.debuglevel}"
934		deprecation="${build.deprecation}"
935	<	source="1.7"
935	>	source="7"
936		classpath=""
937		includeAntRuntime="false"
938		includeJavaRuntime="false"
#	Line 1053 | Line 954
954		depends="jsr166ecompile"
955		description="Builds library jar from compiled sources">
956
957	<	<mkdir dir="${build.jsr166elib.dir}"/>
1057	<
1058	<	<jar destfile="${jsr166eproduct.jar}" index="true">
957	>	<jar destfile="${jsr166e.jar}" index="true">
958		<fileset dir="${build.jsr166e.dir}"/>
959		</jar>
960
#	Line 1064 | Line 963
963
964
965		<target name="jsr166edocs"
966	<	description="Builds javadocs with custom tags to build folder">
966	>	description="Builds javadocs to build dir">
967
968	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
969	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
968	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
969	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
970
971	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
972	<	packagenames="jsr166e,jsr166e.extra"
973	<	link="${jdkapi7docs.url}"
974	<	source="1.7"
971	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
972	>	packagenames="jsr166e.*"
973	>	link="${jdkapidocs.url}"
974	>	source="7"
975		sourcepath="${topsrc.dir}:${jdk7src.dir}"
976		executable="${javadoc7}"
977		additionalparam="-XDignore.symbol.file=true" >
1079	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1080	–	<include name="jsr166e/**/*.java"/>
1081	–	</fileset>
978		</javadoc>
979
980		</target>
981
982
983		<target name="jsr166edist"
984	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
984	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
985		description="Puts all distributable products in single hierarchy"/>
986
987
988
989		<target name="jsr166eclean"
990	<	description="Removes all build products">
990	>	description="Removes all jsr166e build products">
991
992		<delete dir="${build.jsr166e.dir}"/>
1097	–	<delete dir="${build.jsr166elib.dir}"/>
993
994		</target>
995
996
1102	–
997		<target name="jsr166edist-clean"
998		description="Removes all build and distribution products">
999
1000		</target>
1001
1108	–	<target name="jsr166edist-docs"
1109	–	description="Builds javadocs without custom tags to dist folder">
1110	–
1111	–	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1112	–	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1113	–
1114	–	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1115	–	packagenames="jsr166e,jsr166e.extra"
1116	–	link="${jdkapidocs.url}"
1117	–	source="1.7"
1118	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1119	–	additionalparam="-XDignore.symbol.file=true" />
1120	–
1121	–	</target>
1122	–
1002		<target name="jsr166edist-jar"
1003		depends="jsr166eclean, jsr166ejar">
1004
1005	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1005	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1006
1007		</target>
1008

Diff Legend

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