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.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC vs.
Revision 1.135 by jsr166, Mon Feb 4 19:37:52 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 binary locations -->
69	>	<!-- JDK locations -->
70		<property name="jdks.home"  location="${user.home}/jdk"/>
71
72		<macrodef name="defjdklocations">
#	Line 72 | Line 76
76		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
77		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
78		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
79		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
80	<	<property name="bootclasspath@{v}"
81	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
80	>	<local name="boot.jar.dir"/>
81	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
82	>	<path id="bootclasspath@{v}">
83	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
84	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
85	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
86	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
87	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
88	>	</path>
89	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
90		</sequential>
91		</macrodef>
92
93	<	<defjdklocations v="6"/>
94	<	<defjdklocations v="7"/>
95	<	<defjdklocations v="8"/>
85	<
86	<	<macrodef name="run-tck-tests">
87	<	<attribute name="target"/>
88	<	<attribute name="workdir"/>
89	<	<attribute name="product.jar" default="${product.jar}"/>
90	<	<attribute name="jvmflags" default=""/>
93	>	<macrodef name="mirror-dir">
94	>	<attribute name="src"/>
95	>	<attribute name="dst"/>
96		<sequential>
97	<
98	<	<mkdir dir="@{workdir}/tck-classes"/>
99	<
100	<	<javac srcdir="${tck.src.dir}"
101	<	destdir="@{workdir}/tck-classes"
97	<	debug="${build.debug}"
98	<	debuglevel="${build.debuglevel}"
99	<	deprecation="${build.deprecation}"
100	<	source="6"
101	<	classpath="${junit.jar}"
102	<	bootclasspath="@{product.jar}:${bootclasspath6}"
103	<	includeAntRuntime="false"
104	<	includeJavaRuntime="false"
105	<	executable="${javac@{target}}"
106	<	fork="true">
107	<
108	<	<include name="**/*.java"/>
109	<	<compilerarg value="-XDignore.symbol.file=true"/>
110	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111	<	<compilerarg line="${build.args}"/>
112	<	</javac>
113	<
114	<	<java classname="JSR166TestCase"
115	<	failonerror="true"
116	<	jvm="${java@{target}}"
117	<	fork="true">
118	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
119	<	<jvmarg line="@{jvmflags}"/>
120	<	<classpath>
121	<	<pathelement location="${junit.jar}"/>
122	<	<pathelement location="@{workdir}/tck-classes"/>
123	<	</classpath>
124	<	</java>
125	<
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"/>
108	+
109		<!-- Source locations -->
110		<property name="src.dir"              location="${basedir}/src/main"/>
111		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 141 | 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 158 | Line 145
145		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
146		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
147
161	–	<!-- Bootclasspath argument -->
162	–	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
163	–
148		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
149		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
150		<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
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 184 | Line 168
168		<pathelement location="${junit.jar}"/>
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="classes"/>
177	+	<attribute name="jvmflags" default=""/>
178	+	<element name="javac-elements" optional="true"/>
179	+	<sequential>
180	+
181	+	<mkdir dir="@{workdir}/tck-classes"/>
182	+
183	+	<javac srcdir="@{tck.src.dir}"
184	+	destdir="@{workdir}/tck-classes"
185	+	debug="${build.debug}"
186	+	debuglevel="${build.debuglevel}"
187	+	deprecation="${build.deprecation}"
188	+	source="@{source}"
189	+	classpath="${junit.jar}"
190	+	bootclasspath="@{classes}:${bootclasspath@{source}}"
191	+	includeAntRuntime="false"
192	+	includeJavaRuntime="false"
193	+	executable="${javac@{target}}"
194	+	fork="true">
195	+
196	+	<include name="*.java"/>
197	+	<compilerarg value="-XDignore.symbol.file=true"/>
198	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199	+	<compilerarg line="${build.args}"/>
200	+	<javac-elements/>
201	+
202	+	</javac>
203	+
204	+	<java classname="JSR166TestCase"
205	+	failonerror="true"
206	+	jvm="${java@{target}}"
207	+	fork="true">
208	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
209	+	<jvmarg line="@{jvmflags}"/>
210	+	<classpath>
211	+	<pathelement location="${junit.jar}"/>
212	+	<pathelement location="@{workdir}/tck-classes"/>
213	+	</classpath>
214	+	</java>
215	+
216	+	</sequential>
217	+	</macrodef>
218	+
219	+	<macrodef name="run-jtreg-tests">
220	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221	+	<attribute name="source" default="7"/>
222	+	<attribute name="target"/>
223	+	<attribute name="workdir"/>
224	+	<attribute name="classes"/>
225	+	<attribute name="jtregflags" default=""/>
226	+	<sequential>
227	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
228	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
229	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
230	+	<mkdir dir="@{workdir}/JTreport"/>
231	+	<jtreg dir="@{jtreg.src.dir}"
232	+	jdk="${jdk@{target}.home}"
233	+	workDir="@{workdir}/JTwork"
234	+	reportDir="@{workdir}/JTreport">
235	+
236	+	<arg value="-Xbootclasspath/p:@{classes}"/>
237	+	<arg value="-agentvm"/>
238	+	<arg value="-v:nopass,fail"/>
239	+	<arg value="-vmoptions:-esa -ea"/>
240	+	<arg value="-automatic"/>
241	+	<arg value="-k:!ignore"/>
242	+	<arg line="@{jtregflags}"/>
243	+	</jtreg>
244	+	</sequential>
245	+	</macrodef>
246	+
247		<!-- ALoops classpath -->
248		<path id="loops.classpath">
249		<pathelement location="${build.loops.dir}"/>
250		</path>
251
252		<!-- Support @jls tag, used in jdk8+ javadoc -->
253	<	<!-- TODO: How do we get &trade to work? -->
194	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
195	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
196	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
253	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
254		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
255
256		<!-- Main targets -->
#	Line 220 | Line 277
277		fork="true">
278
279		<include name="**/*.java"/>
280	<	<compilerarg line="${build.args}"/>
280	>	<compilerarg value="-Xprefer:source"/>
281		<compilerarg value="-XDignore.symbol.file=true"/>
282		<compilerarg value="-Xlint:all"/>
226	–
227	–	<!--
228	–	<exclude name="java/lang/**"/>
283		<compilerarg line="${build.args}"/>
230	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
231	–	-->
284
285		</javac>
234	–
286		</target>
287
288
238	–
289		<target name="jar"
290		depends="compile"
291		description="Builds library jar from compiled sources">
#	Line 243 | Line 293
293		<jar destfile="${product.jar}">
294		<fileset dir="${build.classes.dir}"/>
295		</jar>
246	–
296		</target>
297
298
250	–
299		<target name="test"
300		depends="configure-tests, report-tests"
301		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
302
303
256	–
304		<target name="docs"
305		description="Builds javadocs for src/main to dist dir">
306
307	<	<delete dir="${dist.javadocs.dir}"/>
308	<	<mkdir dir="${dist.javadocs.dir}"/>
307	>	<delete dir="${docs.dir}"/>
308	>	<mkdir dir="${docs.dir}"/>
309
310		<!-- the packagenames="none" hack below prevents scanning the -->
311		<!-- sourcepath for packages -->
312
313	<	<javadoc destdir="${dist.javadocs.dir}"
313	>	<javadoc destdir="${docs.dir}"
314		packagenames="none"
315		link="${jdkapi8docs.url}"
316		overview="${src.dir}/intro.html"
317	+	access="${build.javadoc.access}"
318		sourcepath="${src.dir}:${jdk8src.dir}"
319		classpath=""
320		executable="${javadoc8}">
273	–	<arg value="-XDignore.symbol.file=true"/>
274	–	<arg value="-tag"/>
275	–	<arg value="${javadoc.jls.option}"/>
321		<fileset dir="${src.dir}" defaultexcludes="yes">
322		<include name="**/*.java"/>
323		</fileset>
324	+	<arg value="-XDignore.symbol.file=true"/>
325	+	<arg value="-tag"/>
326	+	<arg value="${javadoc.jls.option}"/>
327		</javadoc>
280	–
328		</target>
329
330
284	–
331		<target name="dist"
332	<	depends="dist-clean, dist-jar, docs"
332	>	depends="dist-clean, dist-jar, dist-docs"
333		description="Puts all distributable products in single hierarchy"/>
334
335
#	Line 302 | Line 348
348		<exclude name="**/SyntaxTest.java"/>
349		<exclude name="**/SuperfluousAbstract.java"/>
350		</jar>
305	–
351		</target>
352
353
309	–
354		<target name="clean"
355		description="Removes all build products">
356
#	Line 315 | Line 359
359		</target>
360
361
318	–
362		<target name="dist-clean"
363		description="Removes all build and distribution products">
364
#	Line 324 | Line 367
367		</target>
368
369
327	–
370		<!-- Internal targets -->
371
372
373		<target name="dist-jar"
374		depends="clean, jar">
333	–
375		<copy file="${product.jar}" todir="${dist.dir}"/>
376	+	</target>
377
378	+	<target name="dist-docs"
379	+	depends="clean, docs">
380	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
381		</target>
382
383
#	Line 348 | Line 393
393		deprecation="${build.deprecation}"
394		source="6"
395		classpath="${junit.jar}"
396	<	bootclasspath="${product.jar}:${bootclasspath6}"
396	>	bootclasspath="@{product.jar}:${bootclasspath6}"
397		includeAntRuntime="false"
398		includeJavaRuntime="false"
399		executable="${javac8}"
400		fork="true">
401
402		<include name="**/*.java"/>
358	–	<compilerarg line="${build.args}"/>
403		<compilerarg value="-XDignore.symbol.file=true"/>
404		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
405	+	<compilerarg line="${build.args}"/>
406
407		</javac>
408
#	Line 368 | Line 413
413		deprecation="${build.deprecation}"
414		source="6"
415		classpath=""
416	<	bootclasspath="${product.jar}:${bootclasspath6}"
416	>	bootclasspath="@{product.jar}:${bootclasspath6}"
417		includeAntRuntime="false"
418		includeJavaRuntime="false"
419		executable="${javac8}"
420		fork="true">
421
422		<include name="jsr166/test/**/*.java"/>
378	–
379	–	<compilerarg line="${build.args}"/>
423		<compilerarg value="-XDignore.symbol.file=true"/>
424		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
425	+	<compilerarg line="${build.args}"/>
426
427		</javac>
428
#	Line 391 | Line 435
435		source="${build.sourcelevel}"
436		fork="true">
437
438	<	<compilerarg value="${bootclasspath.args}"/>
395	<	<compilerarg line="${build.args}"/>
438	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
439		<compilerarg value="-XDignore.symbol.file=true"/>
440	+	<compilerarg line="${build.args}"/>
441
442		</javac>
443		-->
444
445		</target>
446
447	+	<target name="test-tck"
448	+	depends="jar"
449	+	description="Runs tck tests for main directly">
450	+
451	+	<run-tck-tests
452	+	target="8"
453	+	workdir="${build.dir}"
454	+	classes="${product.jar}"/>
455	+	</target>
456	+
457	+	<target name="test-jtreg"
458	+	depends="jar"
459	+	description="Runs jtreg tests for main using the jtreg ant task">
460	+	<run-jtreg-tests
461	+	target="8"
462	+	workdir="${build.dir}"
463	+	classes="${product.jar}"/>
464	+	</target>
465	+
466	+	<target name="test-ng"
467	+	depends="test-tck, test-jtreg"
468	+	description="Runs tck and jtreg tests for main">
469	+	</target>
470
471		<target name="run-tests"
472		depends="compile-tests">
#	Line 546 | Line 613
613
614		<!-- jsr166 4jdk7 -->
615
549	–
616		<target name="4jdk7compile"
617		depends="configure-compiler"
618		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 567 | Line 633
633		fork="true">
634
635		<include name="**/*.java"/>
636	<	<compilerarg line="${build.args}"/>
636	>	<compilerarg value="-Xprefer:source"/>
637		<compilerarg value="-XDignore.symbol.file=true"/>
638		<compilerarg value="-Xlint:all"/>
639	+	<compilerarg line="${build.args}"/>
640
641		</javac>
575	–
642		</target>
643
644	<	<target name="4jdk7-jar"
644	>
645	>	<target name="4jdk7jar"
646		depends="4jdk7compile"
647		description="Builds library jar from compiled sources">
648
#	Line 587 | Line 654
654
655
656		<target name="4jdk7-test-tck"
657	<	depends="4jdk7-jar"
657	>	depends="4jdk7jar"
658		description="Runs tck tests for jsr166-4jdk7 directly">
659
660		<run-tck-tests
661		target="7"
662		workdir="${build.4jdk7.dir}"
663	<	product.jar="${4jdk7product.jar}"/>
663	>	classes="${4jdk7product.jar}">
664	>	<javac-elements>
665	>	<!-- JDK8+ test classes -->
666	>	<exclude name="StampedLockTest.java"/>
667	>	</javac-elements>
668	>	</run-tck-tests>
669		</target>
670
671
#	Line 626 | Line 698
698		</target>
699
700		<target name="4jdk7-test-jtreg"
701	<	depends="4jdk7compile"
701	>	depends="4jdk7jar"
702		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
703	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
704	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
705	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
706	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
635	<	<jtreg dir="${jtreg.src.dir}"
636	<	jdk="${jdk7.home}"
637	<	workDir="${build.4jdk7.dir}/JTwork"
638	<	reportDir="${build.4jdk7.dir}/JTreport">
639	<
640	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641	<	<arg value="-agentvm"/>
642	<	<arg value="-v:nopass,fail"/>
643	<	<arg value="-vmoptions:-esa -ea"/>
644	<	<arg value="-automatic"/>
645	<	<arg value="-k:!ignore"/>
646	<	</jtreg>
703	>	<run-jtreg-tests
704	>	target="7"
705	>	workdir="${build.4jdk7.dir}"
706	>	classes="${4jdk7product.jar}"/>
707		</target>
708
709
#	Line 656 | Line 716
716		<target name="4jdk7docs"
717		description="Builds javadocs for src/jdk7 to dist dir">
718
719	<	<delete dir="${dist.4jdk7.docs.dir}"/>
720	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
719	>	<delete dir="${4jdk7docs.dir}"/>
720	>	<mkdir dir="${4jdk7docs.dir}"/>
721
722	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
722	>	<javadoc destdir="${4jdk7docs.dir}"
723		packagenames="none"
724		link="${jdkapi7docs.url}"
725		overview="${4jdk7src.dir}/intro.html"
726	+	access="${build.javadoc.access}"
727		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
728		classpath=""
729		executable="${javadoc7}">
669	–	<arg value="-XDignore.symbol.file=true"/>
730		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
731		<include name="**/*.java"/>
732		</fileset>
733	+	<arg value="-XDignore.symbol.file=true"/>
734		</javadoc>
674	–
735		</target>
736
737
738		<target name="4jdk7dist"
739	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
739	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
740		description="Puts all distributable products in single hierarchy"/>
741
742
683	–
743		<target name="4jdk7clean"
744		description="Removes all 4jdk7 build products">
745
#	Line 689 | Line 748
748		</target>
749
750
692	–
751		<target name="4jdk7dist-clean"
752		description="Removes all build and distribution products">
753
754		</target>
755
756		<target name="4jdk7dist-jar"
757	<	depends="4jdk7clean, 4jdk7compile">
700	<
757	>	depends="4jdk7clean, 4jdk7jar">
758		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
759	+	</target>
760	+
761
762	+	<target name="4jdk7dist-docs"
763	+	depends="4jdk7clean, 4jdk7docs">
764	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
765		</target>
766
767
#	Line 717 | Line 779
779		debuglevel="${build.debuglevel}"
780		deprecation="${build.deprecation}"
781		classpath=""
720	–	source="5"
782		bootclasspath="${bootclasspath6}"
783	+	source="5"
784		includeAntRuntime="false"
785		includeJavaRuntime="false"
786		executable="${javac7}"
787		fork="true">
788
789		<include name="jsr166x/**/*.java"/>
728	–	<compilerarg line="${build.args}"/>
790		<compilerarg value="-XDignore.symbol.file=true"/>
791		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
792	+	<compilerarg line="${build.args}"/>
793
794		</javac>
733	–
795		</target>
796
797
737	–
798		<target name="jsr166xjar"
799		depends="jsr166xcompile"
800		description="Builds library jar from compiled sources">
#	Line 746 | Line 806
806		</target>
807
808
749	–
809		<target name="jsr166xdocs"
810		description="Builds javadocs to dist dir">
811
812	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
813	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
812	>	<delete dir="${jsr166xdocs.dir}"/>
813	>	<mkdir dir="${jsr166xdocs.dir}"/>
814
815	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
815	>	<javadoc destdir="${jsr166xdocs.dir}"
816		packagenames="jsr166x.*"
817		link="${jdkapidocs.url}"
818	<	source="5"
760	<	bootclasspath="${bootclasspath6}"
818	>	access="${build.javadoc.access}"
819		sourcepath="${topsrc.dir}:${jdk6src.dir}"
820	<	executable="${javadoc7}"
821	<	additionalparam="-XDignore.symbol.file=true"/>
820	>	bootclasspath="${bootclasspath6}"
821	>	source="5"
822	>	executable="${javadoc7}">
823	>	<arg value="-XDignore.symbol.file=true"/>
824
825	+	</javadoc>
826		</target>
827
828
829		<target name="jsr166xdist"
830	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
830	>	depends="jsr166xdist-jar, jsr166xdist-docs"
831		description="Puts all distributable products in single hierarchy"/>
832
833
773	–
834		<target name="jsr166xclean"
835		description="Removes all jsr166x build products">
836
#	Line 779 | Line 839
839		</target>
840
841
782	–
842		<target name="jsr166xdist-clean"
843		description="Removes all build and distribution products">
844
#	Line 788 | Line 847
847
848		<target name="jsr166xdist-jar"
849		depends="jsr166xclean, jsr166xjar">
791	–
850		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
851	+	</target>
852
853	+	<target name="jsr166xdist-docs"
854	+	depends="jsr166xclean, jsr166xdocs">
855	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
856		</target>
857
858		<!-- jsr166y -->
#	Line 816 | Line 878
878		fork="true">
879
880		<include name="jsr166y/**/*.java"/>
819	–	<compilerarg line="${build.args}"/>
881		<compilerarg value="-XDignore.symbol.file=true"/>
882		<compilerarg value="-Xlint:all"/>
883	+	<compilerarg line="${build.args}"/>
884	+
885		</javac>
886		</target>
887
#	Line 834 | Line 897
897		</target>
898
899
837	–
900		<target name="jsr166ydocs"
901		description="Builds javadocs to dist dir">
902
903	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
904	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
903	>	<delete dir="${jsr166ydocs.dir}"/>
904	>	<mkdir dir="${jsr166ydocs.dir}"/>
905
906	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
906	>	<javadoc destdir="${jsr166ydocs.dir}"
907		packagenames="jsr166y.*"
908		link="${jdkapidocs.url}"
909	<	source="6"
848	<	bootclasspath="${bootclasspath6}"
909	>	access="${build.javadoc.access}"
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
920		<target name="jsr166ydist"
921	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
921	>	depends="jsr166ydist-jar, jsr166ydist-docs"
922		description="Puts all distributable products in single hierarchy"/>
923
924
861	–
925		<target name="jsr166yclean"
926		description="Removes all jsr166y build products">
927
#	Line 867 | Line 930
930		</target>
931
932
870	–
933		<target name="jsr166ydist-clean"
934		description="Removes all build and distribution products">
935
#	Line 875 | Line 937
937
938		<target name="jsr166ydist-jar"
939		depends="jsr166yclean, jsr166yjar">
878	–
940		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
941	+	</target>
942
943	+	<target name="jsr166ydist-docs"
944	+	depends="jsr166yclean, jsr166ydocs">
945	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
946		</target>
947
948
#	Line 895 | Line 960
960		debug="${build.debug}"
961		debuglevel="${build.debuglevel}"
962		deprecation="${build.deprecation}"
963	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
964		classpath=""
965		source="6"
900	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
966		includeAntRuntime="false"
967		includeJavaRuntime="false"
968		executable="${javac7}"
969		fork="true">
970
971		<include name="extra166y/**/*.java"/>
907	–	<compilerarg line="${build.args}"/>
972		<compilerarg value="-XDignore.symbol.file=true"/>
973		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
974	+	<compilerarg line="${build.args}"/>
975
976		</javac>
912	–
977		</target>
978
979
916	–
980		<target name="extra166yjar"
981		depends="extra166ycompile"
982		description="Builds library jar from compiled sources">
#	Line 925 | Line 988
988		</target>
989
990
928	–
991		<target name="extra166ydocs"
992		description="Builds javadocs to build dir">
993
994	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
995	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
994	>	<delete dir="${extra166ydocs.dir}"/>
995	>	<mkdir dir="${extra166ydocs.dir}"/>
996
997	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
997	>	<javadoc destdir="${extra166ydocs.dir}"
998		packagenames="extra166y.*"
999		link="${jdkapidocs.url}"
1000	<	source="6"
939	<	bootclasspath="${bootclasspath6}"
1000	>	access="${build.javadoc.access}"
1001		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002	<	executable="${javadoc7}"
1003	<	additionalparam="-XDignore.symbol.file=true"/>
1002	>	bootclasspath="${bootclasspath6}"
1003	>	source="6"
1004	>	executable="${javadoc7}">
1005	>	<arg value="-XDignore.symbol.file=true"/>
1006
1007	+	</javadoc>
1008		</target>
1009
1010
1011		<target name="extra166ydist"
1012	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
1012	>	depends="extra166ydist-jar, extra166ydist-docs"
1013		description="Puts all distributable products in single hierarchy"/>
1014
1015
952	–
1016		<target name="extra166yclean"
1017		description="Removes all extra166y build products">
1018
#	Line 958 | Line 1021
1021		</target>
1022
1023
961	–
1024		<target name="extra166ydist-clean"
1025		description="Removes all build and distribution products">
1026
#	Line 966 | Line 1028
1028
1029		<target name="extra166ydist-jar"
1030		depends="extra166yclean, extra166yjar">
969	–
1031		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1032	+	</target>
1033
1034	+	<target name="extra166ydist-docs"
1035	+	depends="extra166yclean, extra166ydocs">
1036	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1037		</target>
1038
1039		<!-- jsr166e -->
#	Line 992 | Line 1057
1057		fork="true">
1058
1059		<include name="jsr166e/**/*.java"/>
995	–	<compilerarg line="${build.args}"/>
1060		<compilerarg value="-XDignore.symbol.file=true"/>
1061		<compilerarg value="-Xlint:all"/>
1062	+	<compilerarg line="${build.args}"/>
1063
1064		</javac>
1000	–
1065		</target>
1066
1067
1004	–
1068		<target name="jsr166ejar"
1069		depends="jsr166ecompile"
1070		description="Builds library jar from compiled sources">
#	Line 1013 | Line 1076
1076		</target>
1077
1078
1016	–
1079		<target name="jsr166edocs"
1080		description="Builds javadocs to build dir">
1081
1082	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1083	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1082	>	<delete dir="${jsr166edocs.dir}"/>
1083	>	<mkdir dir="${jsr166edocs.dir}"/>
1084
1085	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1085	>	<javadoc destdir="${jsr166edocs.dir}"
1086		packagenames="jsr166e.*"
1087		link="${jdkapidocs.url}"
1088	<	source="7"
1088	>	access="${build.javadoc.access}"
1089		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1090	<	executable="${javadoc7}"
1091	<	additionalparam="-XDignore.symbol.file=true" >
1090	>	source="7"
1091	>	executable="${javadoc7}">
1092	>	<arg value="-XDignore.symbol.file=true"/>
1093	>
1094		</javadoc>
1095	+	</target>
1096	+
1097
1098	+	<target name="jsr166e-test-tck"
1099	+	depends="jsr166ejar"
1100	+	description="Runs tck tests for jsr166e">
1101	+
1102	+	<run-tck-tests
1103	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1104	+	source="7"
1105	+	target="8"
1106	+	workdir="${build.jsr166e.dir}"
1107	+	classes="${jsr166e.jar}"/>
1108		</target>
1109
1110
1111		<target name="jsr166edist"
1112	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1112	>	depends="jsr166edist-jar, jsr166edist-docs"
1113		description="Puts all distributable products in single hierarchy"/>
1114
1115
1040	–
1116		<target name="jsr166eclean"
1117		description="Removes all jsr166e build products">
1043	–
1118		<delete dir="${build.jsr166e.dir}"/>
1045	–
1119		</target>
1120
1121
#	Line 1053 | Line 1126
1126
1127		<target name="jsr166edist-jar"
1128		depends="jsr166eclean, jsr166ejar">
1056	–
1129		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1130	+	</target>
1131
1132	+	<target name="jsr166edist-docs"
1133	+	depends="jsr166eclean, jsr166edocs">
1134	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1135		</target>
1136
1137	+
1138	+	<!-- Find buglets that can be detected by static build tools -->
1139	+
1140	+	<target name="lint">
1141	+	<antcall target="dists">
1142	+	<param name="build.javadoc.access" value="private"/>
1143	+	</antcall>
1144	+	</target>
1145	+
1146	+
1147		</project>

Diff Legend

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