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.110 by jsr166, Sun Jan 20 01:09:12 2013 UTC vs.
Revision 1.120 by jsr166, Mon Jan 21 02:34:44 2013 UTC

#	Line 35 | Line 35
35
36
37		<!-- Compilation options -->
38	<	<property name="build.sourcelevel"    value="1.6"/>
38	>	<property name="build.sourcelevel"    value="6"/>
39		<property name="build.debug"          value="true"/>
40		<property name="build.debuglevel"     value="source,lines,vars"/>
41		<property name="build.deprecation"    value="false"/>
#	Line 49 | Line 49
49
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"/>
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"/>
#	Line 57 | Line 57
57		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59
60	<	<!-- JDK binary locations -->
60	>	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61	>	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62	>	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63	>	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64	>
65	>	<!-- JDK locations -->
66		<property name="jdks.home"  location="${user.home}/jdk"/>
67
68		<macrodef name="defjdklocations">
#	Line 67 | Line 72
72		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
70	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
75		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76	<	<property name="bootclasspath@{v}"
77	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
76	>	<local name="boot.jar.dir"/>
77	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
78	>	<path id="bootclasspath@{v}">
79	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
80	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
81	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
82	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
83	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
84	>	</path>
85	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
86		</sequential>
87		</macrodef>
88
#	Line 78 | Line 90
90		<defjdklocations v="7"/>
91		<defjdklocations v="8"/>
92
81	–	<macrodef name="run-tck-tests">
82	–	<attribute name="jvm"/>
83	–	<attribute name="tck.classes"/>
84	–	<attribute name="product.jar" default="${product.jar}"/>
85	–	<attribute name="jvmflags" default=""/>
86	–	<sequential>
87	–	<java classname="JSR166TestCase"
88	–	jvm="@{jvm}" fork="true">
89	–	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
90	–	<jvmarg line="@{jvmflags}"/>
91	–	<classpath>
92	–	<pathelement location="${junit.jar}"/>
93	–	<pathelement location="@{tck.classes}"/>
94	–	</classpath>
95	–	</java>
96	–	</sequential>
97	–	</macrodef>
98	–
93		<!-- Source locations -->
94		<property name="src.dir"              location="${basedir}/src/main"/>
95		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 128 | Line 122
122		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
123		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
124
131	–	<!-- Bootclasspath argument -->
132	–	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133	–
125		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
126		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
127		<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
#	Line 143 | Line 134
134		<!-- Default jdk api doc location (latest stable release seems best) -->
135		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
136
137	+	<!-- Define the "jtreg" task -->
138	+	<!-- See the docs in "jtreg -onlineHelp" -->
139	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
140	+	classpath="${lib.dir}/jtreg.jar" />
141	+
142		<!-- Test classpath -->
143		<path id="test.classpath">
144		<pathelement location="${build.testcases.dir}"/>
145		<pathelement location="${junit.jar}"/>
146		</path>
147
148	+	<macrodef name="run-tck-tests">
149	+	<attribute name="target"/>
150	+	<attribute name="workdir"/>
151	+	<attribute name="product.jar" default="${product.jar}"/>
152	+	<attribute name="jvmflags" default=""/>
153	+	<sequential>
154	+
155	+	<mkdir dir="@{workdir}/tck-classes"/>
156	+
157	+	<javac srcdir="${tck.src.dir}"
158	+	destdir="@{workdir}/tck-classes"
159	+	debug="${build.debug}"
160	+	debuglevel="${build.debuglevel}"
161	+	deprecation="${build.deprecation}"
162	+	source="6"
163	+	classpath="${junit.jar}"
164	+	bootclasspath="@{product.jar}:${bootclasspath6}"
165	+	includeAntRuntime="false"
166	+	includeJavaRuntime="false"
167	+	executable="${javac@{target}}"
168	+	fork="true">
169	+
170	+	<include name="JSR166TestCase.java"/>
171	+	<compilerarg value="-XDignore.symbol.file=true"/>
172	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
173	+	<compilerarg line="${build.args}"/>
174	+
175	+	</javac>
176	+
177	+	<java classname="JSR166TestCase"
178	+	failonerror="true"
179	+	jvm="${java@{target}}"
180	+	fork="true">
181	+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
182	+	<jvmarg line="@{jvmflags}"/>
183	+	<classpath>
184	+	<pathelement location="${junit.jar}"/>
185	+	<pathelement location="@{workdir}/tck-classes"/>
186	+	</classpath>
187	+	</java>
188	+
189	+	</sequential>
190	+	</macrodef>
191	+
192		<!-- ALoops classpath -->
193		<path id="loops.classpath">
194		<pathelement location="${build.loops.dir}"/>
195		</path>
196
197		<!-- Support @jls tag, used in jdk8+ javadoc -->
198	<	<!-- 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"/>
198	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
199		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
200
201		<!-- Main targets -->
#	Line 185 | Line 222
222		fork="true">
223
224		<include name="**/*.java"/>
188	–	<compilerarg line="${build.args}"/>
225		<compilerarg value="-XDignore.symbol.file=true"/>
226		<compilerarg value="-Xlint:all"/>
191	–
192	–	<!--
193	–	<exclude name="java/lang/**"/>
227		<compilerarg line="${build.args}"/>
195	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
196	–	-->
228
229		</javac>
199	–
230		</target>
231
232
203	–
233		<target name="jar"
234		depends="compile"
235		description="Builds library jar from compiled sources">
#	Line 208 | Line 237
237		<jar destfile="${product.jar}">
238		<fileset dir="${build.classes.dir}"/>
239		</jar>
211	–
240		</target>
241
242
215	–
243		<target name="test"
244		depends="configure-tests, report-tests"
245		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
246
247
221	–
248		<target name="docs"
249		description="Builds javadocs for src/main to dist dir">
250
#	Line 235 | Line 261
261		sourcepath="${src.dir}:${jdk8src.dir}"
262		classpath=""
263		executable="${javadoc8}">
238	–	<arg value="-XDignore.symbol.file=true"/>
239	–	<arg value="-tag"/>
240	–	<arg value="${javadoc.jls.option}"/>
264		<fileset dir="${src.dir}" defaultexcludes="yes">
265		<include name="**/*.java"/>
266		</fileset>
267	+	<arg value="-XDignore.symbol.file=true"/>
268	+	<arg value="-tag"/>
269	+	<arg value="${javadoc.jls.option}"/>
270		</javadoc>
245	–
271		</target>
272
273
249	–
274		<target name="dist"
275		depends="dist-clean, dist-jar, docs"
276		description="Puts all distributable products in single hierarchy"/>
#	Line 267 | Line 291
291		<exclude name="**/SyntaxTest.java"/>
292		<exclude name="**/SuperfluousAbstract.java"/>
293		</jar>
270	–
294		</target>
295
296
274	–
297		<target name="clean"
298		description="Removes all build products">
299
#	Line 280 | Line 302
302		</target>
303
304
283	–
305		<target name="dist-clean"
306		description="Removes all build and distribution products">
307
#	Line 289 | Line 310
310		</target>
311
312
292	–
313		<!-- Internal targets -->
314
315
#	Line 307 | Line 327
327		<mkdir dir="${build.testcases.dir}"/>
328
329		<javac srcdir="${tck.src.dir}"
330	<	destdir="${build.testcases.dir}"
331	<	debug="${build.debug}"
332	<	debuglevel="${build.debuglevel}"
333	<	deprecation="${build.deprecation}"
334	<	source="${build.sourcelevel}"
335	<	fork="true">
330	>	destdir="${build.testcases.dir}"
331	>	debug="${build.debug}"
332	>	debuglevel="${build.debuglevel}"
333	>	deprecation="${build.deprecation}"
334	>	source="6"
335	>	classpath="${junit.jar}"
336	>	bootclasspath="@{product.jar}:${bootclasspath6}"
337	>	includeAntRuntime="false"
338	>	includeJavaRuntime="false"
339	>	executable="${javac8}"
340	>	fork="true">
341
342	<	<compilerarg value="${bootclasspath.args}"/>
318	<	<compilerarg line="${build.args}"/>
342	>	<include name="**/*.java"/>
343		<compilerarg value="-XDignore.symbol.file=true"/>
344	<
345	<	<classpath refid="test.classpath"/>
344	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
345	>	<compilerarg line="${build.args}"/>
346
347		</javac>
348
349		<javac srcdir="${test.src.dir}"
350	<	destdir="${build.testcases.dir}"
351	<	debug="${build.debug}"
352	<	debuglevel="${build.debuglevel}"
353	<	deprecation="${build.deprecation}"
354	<	source="${build.sourcelevel}"
355	<	fork="true">
356	<
357	<	<include name="jsr166/test/**"/>
350	>	destdir="${build.testcases.dir}"
351	>	debug="${build.debug}"
352	>	debuglevel="${build.debuglevel}"
353	>	deprecation="${build.deprecation}"
354	>	source="6"
355	>	classpath=""
356	>	bootclasspath="@{product.jar}:${bootclasspath6}"
357	>	includeAntRuntime="false"
358	>	includeJavaRuntime="false"
359	>	executable="${javac8}"
360	>	fork="true">
361
362	<	<compilerarg value="${bootclasspath.args}"/>
336	<	<compilerarg line="${build.args}"/>
362	>	<include name="jsr166/test/**/*.java"/>
363		<compilerarg value="-XDignore.symbol.file=true"/>
364	<
365	<	<classpath refid="test.classpath"/>
364	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
365	>	<compilerarg line="${build.args}"/>
366
367		</javac>
368
#	Line 349 | Line 375
375		source="${build.sourcelevel}"
376		fork="true">
377
378	<	<compilerarg value="${bootclasspath.args}"/>
353	<	<compilerarg line="${build.args}"/>
378	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
379		<compilerarg value="-XDignore.symbol.file=true"/>
380	<
356	<	<classpath refid="test.classpath"/>
380	>	<compilerarg line="${build.args}"/>
381
382		</javac>
383		-->
#	Line 374 | Line 398
398		errorProperty="junit.failed"
399		failureProperty="junit.failed"
400		dir="${build.reports.dir}"
401	+	jvm="${java8}"
402		fork="true">
403
404	<	<jvmarg value="${bootclasspath.args}"/>
404	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
405		<jvmarg value="-server"/>
406		<jvmarg value="-showversion"/>
407
#	Line 505 | Line 530
530
531		<!-- jsr166 4jdk7 -->
532
508	–
533		<target name="4jdk7compile"
534		depends="configure-compiler"
535		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 526 | Line 550
550		fork="true">
551
552		<include name="**/*.java"/>
529	–	<compilerarg line="${build.args}"/>
553		<compilerarg value="-XDignore.symbol.file=true"/>
554		<compilerarg value="-Xlint:all"/>
555	+	<compilerarg line="${build.args}"/>
556
557		</javac>
558	+	</target>
559
535	–	<jar destfile="${4jdk7product.jar}" index="true">
536	–	<fileset dir="${build.4jdk7.classes.dir}"/>
537	–	</jar>
538	–
539	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
560
561	<	<javac srcdir="${tck.src.dir}"
562	<	destdir="${build.4jdk7.tck.classes.dir}"
563	<	debug="${build.debug}"
544	<	debuglevel="${build.debuglevel}"
545	<	deprecation="${build.deprecation}"
546	<	source="6"
547	<	classpath="${junit.jar}"
548	<	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
549	<	includeAntRuntime="false"
550	<	includeJavaRuntime="false"
551	<	executable="${javac7}"
552	<	fork="true">
553	<
554	<	<include name="**/*.java"/>
555	<	<compilerarg line="${build.args}"/>
556	<	<compilerarg value="-XDignore.symbol.file=true"/>
557	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
561	>	<target name="4jdk7-jar"
562	>	depends="4jdk7compile"
563	>	description="Builds library jar from compiled sources">
564
565	<	</javac>
565	>	<jar destfile="${4jdk7product.jar}">
566	>	<fileset dir="${build.4jdk7.classes.dir}"/>
567	>	</jar>
568
569		</target>
570
571
572		<target name="4jdk7-test-tck"
573	<	depends="4jdk7compile"
573	>	depends="4jdk7-jar"
574		description="Runs tck tests for jsr166-4jdk7 directly">
575	+
576		<run-tck-tests
577	<	jvm="${java7}"
578	<	tck.classes="${build.4jdk7.tck.classes.dir}"
577	>	target="7"
578	>	workdir="${build.4jdk7.dir}"
579		product.jar="${4jdk7product.jar}"/>
580		</target>
581
#	Line 599 | Line 608
608		</junit>
609		</target>
610
611	+	<target name="4jdk7-test-jtreg"
612	+	depends="4jdk7compile"
613	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
614	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
615	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
616	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
617	+	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
618	+	<jtreg dir="${jtreg.src.dir}"
619	+	jdk="${jdk7.home}"
620	+	workDir="${build.4jdk7.dir}/JTwork"
621	+	reportDir="${build.4jdk7.dir}/JTreport">
622	+
623	+	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
624	+	<arg value="-agentvm"/>
625	+	<arg value="-v:nopass,fail"/>
626	+	<arg value="-vmoptions:-esa -ea"/>
627	+	<arg value="-automatic"/>
628	+	<arg value="-k:!ignore"/>
629	+	</jtreg>
630	+	</target>
631	+
632	+
633	+	<target name="4jdk7-test"
634	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
635	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
636	+	</target>
637	+
638
639		<target name="4jdk7docs"
640		description="Builds javadocs for src/jdk7 to dist dir">
#	Line 613 | Line 649
649		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
650		classpath=""
651		executable="${javadoc7}">
616	–	<arg value="-XDignore.symbol.file=true"/>
652		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
653		<include name="**/*.java"/>
654		</fileset>
655	+	<arg value="-XDignore.symbol.file=true"/>
656		</javadoc>
621	–
657		</target>
658
659
#	Line 627 | Line 662
662		description="Puts all distributable products in single hierarchy"/>
663
664
630	–
665		<target name="4jdk7clean"
666		description="Removes all 4jdk7 build products">
667
#	Line 636 | Line 670
670		</target>
671
672
639	–
673		<target name="4jdk7dist-clean"
674		description="Removes all build and distribution products">
675
676		</target>
677
678		<target name="4jdk7dist-jar"
679	<	depends="4jdk7clean, 4jdk7compile">
679	>	depends="4jdk7clean, 4jdk7-jar">
680
681		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
682
#	Line 656 | Line 689
689		depends="configure-compiler"
690		description="Compiles jsr166x sources to build dir">
691
692	<	<mkdir dir="${build.jsr166x.dir}"/>
692	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
693
694		<javac srcdir="${topsrc.dir}"
695	<	destdir="${build.jsr166x.dir}"
695	>	destdir="${build.jsr166x.classes.dir}"
696		debug="${build.debug}"
697		debuglevel="${build.debuglevel}"
698		deprecation="${build.deprecation}"
699		classpath=""
667	–	source="5"
700		bootclasspath="${bootclasspath6}"
701	+	source="5"
702		includeAntRuntime="false"
703		includeJavaRuntime="false"
704		executable="${javac7}"
705		fork="true">
706
707		<include name="jsr166x/**/*.java"/>
675	–	<compilerarg line="${build.args}"/>
708		<compilerarg value="-XDignore.symbol.file=true"/>
709		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
710	+	<compilerarg line="${build.args}"/>
711
712		</javac>
680	–
713		</target>
714
715
716	<
685	<	<target name="jsr166xjar"
716	>	<target name="jsr166x-jar"
717		depends="jsr166xcompile"
718		description="Builds library jar from compiled sources">
719
720		<jar destfile="${jsr166x.jar}">
721	<	<fileset dir="${build.jsr166x.dir}"/>
721	>	<fileset dir="${build.jsr166x.classes.dir}"/>
722		</jar>
723
724		</target>
725
726
696	–
727		<target name="jsr166xdocs"
728		description="Builds javadocs to dist dir">
729
#	Line 703 | Line 733
733		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
734		packagenames="jsr166x.*"
735		link="${jdkapidocs.url}"
706	–	source="5"
707	–	bootclasspath="${bootclasspath6}"
736		sourcepath="${topsrc.dir}:${jdk6src.dir}"
737	<	executable="${javadoc7}"
738	<	additionalparam="-XDignore.symbol.file=true" />
737	>	bootclasspath="${bootclasspath6}"
738	>	source="5"
739	>	executable="${javadoc7}">
740	>	<arg value="-XDignore.symbol.file=true"/>
741
742	+	</javadoc>
743		</target>
744
745
#	Line 717 | Line 748
748		description="Puts all distributable products in single hierarchy"/>
749
750
720	–
751		<target name="jsr166xclean"
752		description="Removes all jsr166x build products">
753
#	Line 726 | Line 756
756		</target>
757
758
729	–
759		<target name="jsr166xdist-clean"
760		description="Removes all build and distribution products">
761
#	Line 734 | Line 763
763
764
765		<target name="jsr166xdist-jar"
766	<	depends="jsr166xclean, jsr166xjar">
766	>	depends="jsr166xclean, jsr166x-jar">
767
768		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
769
#	Line 747 | Line 776
776		depends="configure-compiler"
777		description="Compiles jsr166y sources">
778
779	<	<mkdir dir="${build.jsr166y.dir}"/>
779	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
780
781		<javac srcdir="${topsrc.dir}"
782	<	destdir="${build.jsr166y.dir}"
782	>	destdir="${build.jsr166y.classes.dir}"
783		debug="${build.debug}"
784		debuglevel="${build.debuglevel}"
785		deprecation="${build.deprecation}"
#	Line 763 | Line 792
792		fork="true">
793
794		<include name="jsr166y/**/*.java"/>
766	–	<compilerarg line="${build.args}"/>
795		<compilerarg value="-XDignore.symbol.file=true"/>
796		<compilerarg value="-Xlint:all"/>
797	+	<compilerarg line="${build.args}"/>
798	+
799		</javac>
800		</target>
801
802
803	<	<target name="jsr166yjar"
803	>	<target name="jsr166y-jar"
804		depends="jsr166ycompile"
805		description="Builds library jar from compiled sources">
806
807		<jar destfile="${jsr166y.jar}" index="true">
808	<	<fileset dir="${build.jsr166y.dir}"/>
808	>	<fileset dir="${build.jsr166y.classes.dir}"/>
809		</jar>
810
811		</target>
812
813
784	–
814		<target name="jsr166ydocs"
815		description="Builds javadocs to dist dir">
816
#	Line 791 | Line 820
820		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
821		packagenames="jsr166y.*"
822		link="${jdkapidocs.url}"
794	–	source="6"
795	–	bootclasspath="${bootclasspath6}"
823		sourcepath="${topsrc.dir}:${jdk6src.dir}"
824	<	executable="${javadoc7}"
825	<	additionalparam="-XDignore.symbol.file=true" />
824	>	bootclasspath="${bootclasspath6}"
825	>	source="6"
826	>	executable="${javadoc7}">
827	>	<arg value="-XDignore.symbol.file=true"/>
828
829	+	</javadoc>
830		</target>
831
832
#	Line 805 | Line 835
835		description="Puts all distributable products in single hierarchy"/>
836
837
808	–
838		<target name="jsr166yclean"
839		description="Removes all jsr166y build products">
840
#	Line 814 | Line 843
843		</target>
844
845
817	–
846		<target name="jsr166ydist-clean"
847		description="Removes all build and distribution products">
848
849		</target>
850
851		<target name="jsr166ydist-jar"
852	<	depends="jsr166yclean, jsr166yjar">
852	>	depends="jsr166yclean, jsr166y-jar">
853
854		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
855
#	Line 832 | Line 860
860
861
862		<target name="extra166ycompile"
863	<	depends="configure-compiler, jsr166yjar"
863	>	depends="configure-compiler, jsr166y-jar"
864		description="Compiles extra166y sources">
865
866	<	<mkdir dir="${build.extra166y.dir}"/>
866	>	<mkdir dir="${build.extra166y.classes.dir}"/>
867
868		<javac srcdir="${topsrc.dir}"
869	<	destdir="${build.extra166y.dir}"
869	>	destdir="${build.extra166y.classes.dir}"
870		debug="${build.debug}"
871		debuglevel="${build.debuglevel}"
872		deprecation="${build.deprecation}"
873	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
874		classpath=""
875		source="6"
847	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
876		includeAntRuntime="false"
877		includeJavaRuntime="false"
878		executable="${javac7}"
879		fork="true">
880
881		<include name="extra166y/**/*.java"/>
854	–	<compilerarg line="${build.args}"/>
882		<compilerarg value="-XDignore.symbol.file=true"/>
883		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
884	+	<compilerarg line="${build.args}"/>
885
886		</javac>
859	–
887		</target>
888
889
890	<
864	<	<target name="extra166yjar"
890	>	<target name="extra166y-jar"
891		depends="extra166ycompile"
892		description="Builds library jar from compiled sources">
893
894		<jar destfile="${extra166y.jar}" index="true">
895	<	<fileset dir="${build.extra166y.dir}"/>
895	>	<fileset dir="${build.extra166y.classes.dir}"/>
896		</jar>
897
898		</target>
899
900
875	–
901		<target name="extra166ydocs"
902		description="Builds javadocs to build dir">
903
#	Line 882 | Line 907
907		<javadoc destdir="${dist.extra166yjavadocs.dir}"
908		packagenames="extra166y.*"
909		link="${jdkapidocs.url}"
885	–	source="6"
886	–	bootclasspath="${bootclasspath6}"
910		sourcepath="${topsrc.dir}:${jdk6src.dir}"
911	<	executable="${javadoc7}"
912	<	additionalparam="-XDignore.symbol.file=true" />
911	>	bootclasspath="${bootclasspath6}"
912	>	source="6"
913	>	executable="${javadoc7}">
914	>	<arg value="-XDignore.symbol.file=true"/>
915
916	+	</javadoc>
917		</target>
918
919
#	Line 896 | Line 922
922		description="Puts all distributable products in single hierarchy"/>
923
924
899	–
925		<target name="extra166yclean"
926		description="Removes all extra166y build products">
927
#	Line 905 | Line 930
930		</target>
931
932
908	–
933		<target name="extra166ydist-clean"
934		description="Removes all build and distribution products">
935
936		</target>
937
938		<target name="extra166ydist-jar"
939	<	depends="extra166yclean, extra166yjar">
939	>	depends="extra166yclean, extra166y-jar">
940
941		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
942
#	Line 924 | Line 948
948		depends="configure-compiler"
949		description="Compiles jsr166e sources">
950
951	<	<mkdir dir="${build.jsr166e.dir}"/>
951	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
952
953		<javac srcdir="${topsrc.dir}"
954	<	destdir="${build.jsr166e.dir}"
954	>	destdir="${build.jsr166e.classes.dir}"
955		debug="${build.debug}"
956		debuglevel="${build.debuglevel}"
957		deprecation="${build.deprecation}"
#	Line 939 | Line 963
963		fork="true">
964
965		<include name="jsr166e/**/*.java"/>
942	–	<compilerarg line="${build.args}"/>
966		<compilerarg value="-XDignore.symbol.file=true"/>
967		<compilerarg value="-Xlint:all"/>
968	+	<compilerarg line="${build.args}"/>
969
970		</javac>
947	–
971		</target>
972
973
974	<
952	<	<target name="jsr166ejar"
974	>	<target name="jsr166e-jar"
975		depends="jsr166ecompile"
976		description="Builds library jar from compiled sources">
977
978		<jar destfile="${jsr166e.jar}" index="true">
979	<	<fileset dir="${build.jsr166e.dir}"/>
979	>	<fileset dir="${build.jsr166e.classes.dir}"/>
980		</jar>
981
982		</target>
983
984
963	–
985		<target name="jsr166edocs"
986		description="Builds javadocs to build dir">
987
#	Line 970 | Line 991
991		<javadoc destdir="${dist.jsr166ejavadocs.dir}"
992		packagenames="jsr166e.*"
993		link="${jdkapidocs.url}"
973	–	source="7"
994		sourcepath="${topsrc.dir}:${jdk7src.dir}"
995	<	executable="${javadoc7}"
996	<	additionalparam="-XDignore.symbol.file=true" >
997	<	</javadoc>
995	>	source="7"
996	>	executable="${javadoc7}">
997	>	<arg value="-XDignore.symbol.file=true"/>
998
999	+	</javadoc>
1000		</target>
1001
1002
#	Line 984 | Line 1005
1005		description="Puts all distributable products in single hierarchy"/>
1006
1007
987	–
1008		<target name="jsr166eclean"
1009		description="Removes all jsr166e build products">
1010
#	Line 999 | Line 1019
1019		</target>
1020
1021		<target name="jsr166edist-jar"
1022	<	depends="jsr166eclean, jsr166ejar">
1022	>	depends="jsr166eclean, jsr166e-jar">
1023
1024		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1025

Diff Legend

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