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.109 by jsr166, Sun Jan 20 01:06:24 2013 UTC vs.
Revision 1.131 by jsr166, Fri Feb 1 18:31:17 2013 UTC

#	Line 22 | Line 22
22		$HOME/jdk/src/jdk8
23		where each of the above is a complete JDK source tree
24		(e.g. mercurial forest) or a symlink to same.
25	+	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Advises user to run with -projecthelp">
30	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
29	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<java classname="org.apache.tools.ant.Main">
31	>	<arg value="-projecthelp" />
32	>	</java>
33		</target>
34
35
#	Line 35 | Line 38
38
39
40		<!-- Compilation options -->
41	<	<property name="build.sourcelevel"    value="1.6"/>
41	>	<property name="build.sourcelevel"    value="6"/>
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 49 | Line 53
53
54		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
55		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
56	<	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
56	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
57		<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
58
59		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
#	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	<	<!-- JDK binary locations -->
64	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68	>
69	>	<!-- JDK locations -->
70		<property name="jdks.home"  location="${user.home}/jdk"/>
71
72		<macrodef name="defjdklocations">
#	Line 67 | 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"/>
70	–	<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"/>
80	<
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=""/>
93	>	<macrodef name="mirror-dir">
94	>	<attribute name="src"/>
95	>	<attribute name="dst"/>
96		<sequential>
97	<	<java classname="JSR166TestCase"
98	<	jvm="@{jvm}" fork="true">
99	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
100	<	<jvmarg line="@{jvmflags}"/>
101	<	<classpath>
92	<	<pathelement location="${junit.jar}"/>
93	<	<pathelement location="@{tck.classes}"/>
94	<	</classpath>
95	<	</java>
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 110 | Line 120
120		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
121		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
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 129 | Line 145
145		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
146		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
147
132	–	<!-- Bootclasspath argument -->
133	–	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
134	–
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) -->
158		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
159
160	+	<!-- Define the "jtreg" task -->
161	+	<!-- See the docs in "jtreg -onlineHelp" -->
162	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
163	+	classpath="${lib.dir}/jtreg.jar" />
164	+
165		<!-- Test classpath -->
166		<path id="test.classpath">
167		<pathelement location="${build.testcases.dir}"/>
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	+	<sequential>
179	+
180	+	<mkdir dir="@{workdir}/tck-classes"/>
181	+
182	+	<javac srcdir="@{tck.src.dir}"
183	+	destdir="@{workdir}/tck-classes"
184	+	debug="${build.debug}"
185	+	debuglevel="${build.debuglevel}"
186	+	deprecation="${build.deprecation}"
187	+	source="@{source}"
188	+	classpath="${junit.jar}"
189	+	bootclasspath="@{classes}:${bootclasspath@{source}}"
190	+	includeAntRuntime="false"
191	+	includeJavaRuntime="false"
192	+	executable="${javac@{target}}"
193	+	fork="true">
194	+
195	+	<include name="*.java"/>
196	+	<compilerarg value="-XDignore.symbol.file=true"/>
197	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
198	+	<compilerarg line="${build.args}"/>
199	+
200	+	</javac>
201	+
202	+	<java classname="JSR166TestCase"
203	+	failonerror="true"
204	+	jvm="${java@{target}}"
205	+	fork="true">
206	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
207	+	<jvmarg line="@{jvmflags}"/>
208	+	<classpath>
209	+	<pathelement location="${junit.jar}"/>
210	+	<pathelement location="@{workdir}/tck-classes"/>
211	+	</classpath>
212	+	</java>
213	+
214	+	</sequential>
215	+	</macrodef>
216	+
217		<!-- ALoops classpath -->
218		<path id="loops.classpath">
219		<pathelement location="${build.loops.dir}"/>
220		</path>
221
222		<!-- Support @jls tag, used in jdk8+ javadoc -->
223	<	<!-- 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"/>
223	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
224		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
225
226		<!-- Main targets -->
#	Line 186 | Line 247
247		fork="true">
248
249		<include name="**/*.java"/>
189	–	<compilerarg line="${build.args}"/>
250		<compilerarg value="-XDignore.symbol.file=true"/>
251		<compilerarg value="-Xlint:all"/>
192	–
193	–	<!--
194	–	<exclude name="java/lang/**"/>
252		<compilerarg line="${build.args}"/>
196	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
197	–	-->
253
254		</javac>
200	–
255		</target>
256
257
204	–
258		<target name="jar"
259		depends="compile"
260		description="Builds library jar from compiled sources">
#	Line 209 | Line 262
262		<jar destfile="${product.jar}">
263		<fileset dir="${build.classes.dir}"/>
264		</jar>
212	–
265		</target>
266
267
216	–
268		<target name="test"
269		depends="configure-tests, report-tests"
270		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
271
272
222	–
273		<target name="docs"
274		description="Builds javadocs for src/main to dist dir">
275
276	<	<delete dir="${dist.javadocs.dir}"/>
277	<	<mkdir dir="${dist.javadocs.dir}"/>
276	>	<delete dir="${docs.dir}"/>
277	>	<mkdir dir="${docs.dir}"/>
278
279		<!-- the packagenames="none" hack below prevents scanning the -->
280		<!-- sourcepath for packages -->
281
282	<	<javadoc destdir="${dist.javadocs.dir}"
282	>	<javadoc destdir="${docs.dir}"
283		packagenames="none"
284		link="${jdkapi8docs.url}"
285		overview="${src.dir}/intro.html"
286	+	access="${build.javadoc.access}"
287		sourcepath="${src.dir}:${jdk8src.dir}"
288		classpath=""
289		executable="${javadoc8}">
239	–	<arg value="-XDignore.symbol.file=true"/>
240	–	<arg value="-tag"/>
241	–	<arg value="${javadoc.jls.option}"/>
290		<fileset dir="${src.dir}" defaultexcludes="yes">
291		<include name="**/*.java"/>
292		</fileset>
293	+	<arg value="-XDignore.symbol.file=true"/>
294	+	<arg value="-tag"/>
295	+	<arg value="${javadoc.jls.option}"/>
296		</javadoc>
246	–
297		</target>
298
299
250	–
300		<target name="dist"
301	<	depends="dist-clean, dist-jar, docs"
301	>	depends="dist-clean, dist-jar, dist-docs"
302		description="Puts all distributable products in single hierarchy"/>
303
304
#	Line 268 | Line 317
317		<exclude name="**/SyntaxTest.java"/>
318		<exclude name="**/SuperfluousAbstract.java"/>
319		</jar>
271	–
320		</target>
321
322
275	–
323		<target name="clean"
324		description="Removes all build products">
325
#	Line 281 | Line 328
328		</target>
329
330
284	–
331		<target name="dist-clean"
332		description="Removes all build and distribution products">
333
#	Line 290 | Line 336
336		</target>
337
338
293	–
339		<!-- Internal targets -->
340
341
342		<target name="dist-jar"
343		depends="clean, jar">
299	–
344		<copy file="${product.jar}" todir="${dist.dir}"/>
345	+	</target>
346
347	+	<target name="dist-docs"
348	+	depends="clean, docs">
349	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
350		</target>
351
352
#	Line 308 | Line 356
356		<mkdir dir="${build.testcases.dir}"/>
357
358		<javac srcdir="${tck.src.dir}"
359	<	destdir="${build.testcases.dir}"
360	<	debug="${build.debug}"
361	<	debuglevel="${build.debuglevel}"
362	<	deprecation="${build.deprecation}"
363	<	source="${build.sourcelevel}"
364	<	fork="true">
359	>	destdir="${build.testcases.dir}"
360	>	debug="${build.debug}"
361	>	debuglevel="${build.debuglevel}"
362	>	deprecation="${build.deprecation}"
363	>	source="6"
364	>	classpath="${junit.jar}"
365	>	bootclasspath="@{product.jar}:${bootclasspath6}"
366	>	includeAntRuntime="false"
367	>	includeJavaRuntime="false"
368	>	executable="${javac8}"
369	>	fork="true">
370
371	<	<compilerarg value="${bootclasspath.args}"/>
319	<	<compilerarg line="${build.args}"/>
371	>	<include name="**/*.java"/>
372		<compilerarg value="-XDignore.symbol.file=true"/>
373	<
374	<	<classpath refid="test.classpath"/>
373	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
374	>	<compilerarg line="${build.args}"/>
375
376		</javac>
377
378		<javac srcdir="${test.src.dir}"
379	<	destdir="${build.testcases.dir}"
380	<	debug="${build.debug}"
381	<	debuglevel="${build.debuglevel}"
382	<	deprecation="${build.deprecation}"
383	<	source="${build.sourcelevel}"
384	<	fork="true">
385	<
386	<	<include name="jsr166/test/**"/>
379	>	destdir="${build.testcases.dir}"
380	>	debug="${build.debug}"
381	>	debuglevel="${build.debuglevel}"
382	>	deprecation="${build.deprecation}"
383	>	source="6"
384	>	classpath=""
385	>	bootclasspath="@{product.jar}:${bootclasspath6}"
386	>	includeAntRuntime="false"
387	>	includeJavaRuntime="false"
388	>	executable="${javac8}"
389	>	fork="true">
390
391	<	<compilerarg value="${bootclasspath.args}"/>
337	<	<compilerarg line="${build.args}"/>
391	>	<include name="jsr166/test/**/*.java"/>
392		<compilerarg value="-XDignore.symbol.file=true"/>
393	<
394	<	<classpath refid="test.classpath"/>
393	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
394	>	<compilerarg line="${build.args}"/>
395
396		</javac>
397
#	Line 350 | Line 404
404		source="${build.sourcelevel}"
405		fork="true">
406
407	<	<compilerarg value="${bootclasspath.args}"/>
354	<	<compilerarg line="${build.args}"/>
407	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
408		<compilerarg value="-XDignore.symbol.file=true"/>
409	<
357	<	<classpath refid="test.classpath"/>
409	>	<compilerarg line="${build.args}"/>
410
411		</javac>
412		-->
413
414		</target>
415
416	+	<target name="test-tck"
417	+	depends="jar"
418	+	description="Runs tck tests for main directly">
419	+
420	+	<run-tck-tests
421	+	target="8"
422	+	workdir="${build.dir}"
423	+	classes="${product.jar}"/>
424	+	</target>
425
426		<target name="run-tests"
427		depends="compile-tests">
#	Line 375 | Line 436
436		errorProperty="junit.failed"
437		failureProperty="junit.failed"
438		dir="${build.reports.dir}"
439	+	jvm="${java8}"
440		fork="true">
441
442	<	<jvmarg value="${bootclasspath.args}"/>
442	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
443		<jvmarg value="-server"/>
444		<jvmarg value="-showversion"/>
445
#	Line 506 | Line 568
568
569		<!-- jsr166 4jdk7 -->
570
509	–
571		<target name="4jdk7compile"
572		depends="configure-compiler"
573		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 527 | Line 588
588		fork="true">
589
590		<include name="**/*.java"/>
530	–	<compilerarg line="${build.args}"/>
591		<compilerarg value="-XDignore.symbol.file=true"/>
592		<compilerarg value="-Xlint:all"/>
593	+	<compilerarg line="${build.args}"/>
594
595		</javac>
596	+	</target>
597
536	–	<jar destfile="${4jdk7product.jar}" index="true">
537	–	<fileset dir="${build.4jdk7.classes.dir}"/>
538	–	</jar>
539	–
540	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
541	–
542	–	<javac srcdir="${tck.src.dir}"
543	–	destdir="${build.4jdk7.tck.classes.dir}"
544	–	debug="${build.debug}"
545	–	debuglevel="${build.debuglevel}"
546	–	deprecation="${build.deprecation}"
547	–	source="6"
548	–	classpath="${junit.jar}"
549	–	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
550	–	includeAntRuntime="false"
551	–	includeJavaRuntime="false"
552	–	executable="${javac7}"
553	–	fork="true">
598
599	<	<include name="**/*.java"/>
600	<	<compilerarg line="${build.args}"/>
601	<	<compilerarg value="-XDignore.symbol.file=true"/>
558	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
599	>	<target name="4jdk7jar"
600	>	depends="4jdk7compile"
601	>	description="Builds library jar from compiled sources">
602
603	<	</javac>
603	>	<jar destfile="${4jdk7product.jar}">
604	>	<fileset dir="${build.4jdk7.classes.dir}"/>
605	>	</jar>
606
607		</target>
608
609
610		<target name="4jdk7-test-tck"
611	<	depends="4jdk7compile"
611	>	depends="4jdk7jar"
612		description="Runs tck tests for jsr166-4jdk7 directly">
613	+
614		<run-tck-tests
615	<	jvm="${java7}"
616	<	tck.classes="${build.4jdk7.tck.classes.dir}"
617	<	product.jar="${4jdk7product.jar}"/>
615	>	target="7"
616	>	workdir="${build.4jdk7.dir}"
617	>	classes="${4jdk7product.jar}"/>
618		</target>
619
620
#	Line 600 | Line 646
646		</junit>
647		</target>
648
649	+	<target name="4jdk7-test-jtreg"
650	+	depends="4jdk7compile"
651	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
652	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
653	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
654	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
655	+	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
656	+	<jtreg dir="${jtreg.src.dir}"
657	+	jdk="${jdk7.home}"
658	+	workDir="${build.4jdk7.dir}/JTwork"
659	+	reportDir="${build.4jdk7.dir}/JTreport">
660	+
661	+	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
662	+	<arg value="-agentvm"/>
663	+	<arg value="-v:nopass,fail"/>
664	+	<arg value="-vmoptions:-esa -ea"/>
665	+	<arg value="-automatic"/>
666	+	<arg value="-k:!ignore"/>
667	+	</jtreg>
668	+	</target>
669	+
670	+
671	+	<target name="4jdk7-test"
672	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
673	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
674	+	</target>
675	+
676
677		<target name="4jdk7docs"
678		description="Builds javadocs for src/jdk7 to dist dir">
679
680	<	<delete dir="${dist.4jdk7.docs.dir}"/>
681	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
680	>	<delete dir="${4jdk7docs.dir}"/>
681	>	<mkdir dir="${4jdk7docs.dir}"/>
682
683	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
683	>	<javadoc destdir="${4jdk7docs.dir}"
684		packagenames="none"
685		link="${jdkapi7docs.url}"
686		overview="${4jdk7src.dir}/intro.html"
687	+	access="${build.javadoc.access}"
688		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
689		classpath=""
690		executable="${javadoc7}">
617	–	<arg value="-XDignore.symbol.file=true"/>
691		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
692		<include name="**/*.java"/>
693		</fileset>
694	+	<arg value="-XDignore.symbol.file=true"/>
695		</javadoc>
622	–
696		</target>
697
698
699		<target name="4jdk7dist"
700	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
700	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
701		description="Puts all distributable products in single hierarchy"/>
702
703
631	–
704		<target name="4jdk7clean"
705		description="Removes all 4jdk7 build products">
706
#	Line 637 | Line 709
709		</target>
710
711
640	–
712		<target name="4jdk7dist-clean"
713		description="Removes all build and distribution products">
714
715		</target>
716
717		<target name="4jdk7dist-jar"
718	<	depends="4jdk7clean, 4jdk7compile">
648	<
718	>	depends="4jdk7clean, 4jdk7jar">
719		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
720	+	</target>
721	+
722
723	+	<target name="4jdk7dist-docs"
724	+	depends="4jdk7clean, 4jdk7docs">
725	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
726		</target>
727
728
#	Line 657 | Line 732
732		depends="configure-compiler"
733		description="Compiles jsr166x sources to build dir">
734
735	<	<mkdir dir="${build.jsr166x.dir}"/>
735	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
736
737		<javac srcdir="${topsrc.dir}"
738	<	destdir="${build.jsr166x.dir}"
738	>	destdir="${build.jsr166x.classes.dir}"
739		debug="${build.debug}"
740		debuglevel="${build.debuglevel}"
741		deprecation="${build.deprecation}"
742		classpath=""
668	–	source="5"
743		bootclasspath="${bootclasspath6}"
744	+	source="5"
745		includeAntRuntime="false"
746		includeJavaRuntime="false"
747		executable="${javac7}"
748		fork="true">
749
750		<include name="jsr166x/**/*.java"/>
676	–	<compilerarg line="${build.args}"/>
751		<compilerarg value="-XDignore.symbol.file=true"/>
752		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
753	+	<compilerarg line="${build.args}"/>
754
755		</javac>
681	–
756		</target>
757
758
685	–
759		<target name="jsr166xjar"
760		depends="jsr166xcompile"
761		description="Builds library jar from compiled sources">
762
763		<jar destfile="${jsr166x.jar}">
764	<	<fileset dir="${build.jsr166x.dir}"/>
764	>	<fileset dir="${build.jsr166x.classes.dir}"/>
765		</jar>
766
767		</target>
768
769
697	–
770		<target name="jsr166xdocs"
771		description="Builds javadocs to dist dir">
772
773	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
774	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
773	>	<delete dir="${jsr166xdocs.dir}"/>
774	>	<mkdir dir="${jsr166xdocs.dir}"/>
775
776	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
776	>	<javadoc destdir="${jsr166xdocs.dir}"
777		packagenames="jsr166x.*"
778		link="${jdkapidocs.url}"
779	<	source="5"
708	<	bootclasspath="${bootclasspath6}"
779	>	access="${build.javadoc.access}"
780		sourcepath="${topsrc.dir}:${jdk6src.dir}"
781	<	executable="${javadoc7}"
782	<	additionalparam="-XDignore.symbol.file=true" />
781	>	bootclasspath="${bootclasspath6}"
782	>	source="5"
783	>	executable="${javadoc7}">
784	>	<arg value="-XDignore.symbol.file=true"/>
785
786	+	</javadoc>
787		</target>
788
789
790		<target name="jsr166xdist"
791	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
791	>	depends="jsr166xdist-jar, jsr166xdist-docs"
792		description="Puts all distributable products in single hierarchy"/>
793
794
721	–
795		<target name="jsr166xclean"
796		description="Removes all jsr166x build products">
797
#	Line 727 | Line 800
800		</target>
801
802
730	–
803		<target name="jsr166xdist-clean"
804		description="Removes all build and distribution products">
805
#	Line 736 | Line 808
808
809		<target name="jsr166xdist-jar"
810		depends="jsr166xclean, jsr166xjar">
739	–
811		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
812	+	</target>
813
814	+	<target name="jsr166xdist-docs"
815	+	depends="jsr166xclean, jsr166xdocs">
816	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
817		</target>
818
819		<!-- jsr166y -->
#	Line 748 | Line 823
823		depends="configure-compiler"
824		description="Compiles jsr166y sources">
825
826	<	<mkdir dir="${build.jsr166y.dir}"/>
826	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
827
828		<javac srcdir="${topsrc.dir}"
829	<	destdir="${build.jsr166y.dir}"
829	>	destdir="${build.jsr166y.classes.dir}"
830		debug="${build.debug}"
831		debuglevel="${build.debuglevel}"
832		deprecation="${build.deprecation}"
#	Line 764 | Line 839
839		fork="true">
840
841		<include name="jsr166y/**/*.java"/>
767	–	<compilerarg line="${build.args}"/>
842		<compilerarg value="-XDignore.symbol.file=true"/>
843		<compilerarg value="-Xlint:all"/>
844	+	<compilerarg line="${build.args}"/>
845	+
846		</javac>
847		</target>
848
#	Line 776 | Line 852
852		description="Builds library jar from compiled sources">
853
854		<jar destfile="${jsr166y.jar}" index="true">
855	<	<fileset dir="${build.jsr166y.dir}"/>
855	>	<fileset dir="${build.jsr166y.classes.dir}"/>
856		</jar>
857
858		</target>
859
860
785	–
861		<target name="jsr166ydocs"
862		description="Builds javadocs to dist dir">
863
864	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
865	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
864	>	<delete dir="${jsr166ydocs.dir}"/>
865	>	<mkdir dir="${jsr166ydocs.dir}"/>
866
867	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
867	>	<javadoc destdir="${jsr166ydocs.dir}"
868		packagenames="jsr166y.*"
869		link="${jdkapidocs.url}"
870	<	source="6"
796	<	bootclasspath="${bootclasspath6}"
870	>	access="${build.javadoc.access}"
871		sourcepath="${topsrc.dir}:${jdk6src.dir}"
872	<	executable="${javadoc7}"
873	<	additionalparam="-XDignore.symbol.file=true" />
872	>	bootclasspath="${bootclasspath6}"
873	>	source="6"
874	>	executable="${javadoc7}">
875	>	<arg value="-XDignore.symbol.file=true"/>
876
877	+	</javadoc>
878		</target>
879
880
881		<target name="jsr166ydist"
882	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
882	>	depends="jsr166ydist-jar, jsr166ydist-docs"
883		description="Puts all distributable products in single hierarchy"/>
884
885
809	–
886		<target name="jsr166yclean"
887		description="Removes all jsr166y build products">
888
#	Line 815 | Line 891
891		</target>
892
893
818	–
894		<target name="jsr166ydist-clean"
895		description="Removes all build and distribution products">
896
#	Line 823 | Line 898
898
899		<target name="jsr166ydist-jar"
900		depends="jsr166yclean, jsr166yjar">
826	–
901		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
902	+	</target>
903
904	+	<target name="jsr166ydist-docs"
905	+	depends="jsr166yclean, jsr166ydocs">
906	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
907		</target>
908
909
#	Line 836 | Line 914
914		depends="configure-compiler, jsr166yjar"
915		description="Compiles extra166y sources">
916
917	<	<mkdir dir="${build.extra166y.dir}"/>
917	>	<mkdir dir="${build.extra166y.classes.dir}"/>
918
919		<javac srcdir="${topsrc.dir}"
920	<	destdir="${build.extra166y.dir}"
920	>	destdir="${build.extra166y.classes.dir}"
921		debug="${build.debug}"
922		debuglevel="${build.debuglevel}"
923		deprecation="${build.deprecation}"
924	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
925		classpath=""
926		source="6"
848	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
927		includeAntRuntime="false"
928		includeJavaRuntime="false"
929		executable="${javac7}"
930		fork="true">
931
932		<include name="extra166y/**/*.java"/>
855	–	<compilerarg line="${build.args}"/>
933		<compilerarg value="-XDignore.symbol.file=true"/>
934		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
935	+	<compilerarg line="${build.args}"/>
936
937		</javac>
860	–
938		</target>
939
940
864	–
941		<target name="extra166yjar"
942		depends="extra166ycompile"
943		description="Builds library jar from compiled sources">
944
945		<jar destfile="${extra166y.jar}" index="true">
946	<	<fileset dir="${build.extra166y.dir}"/>
946	>	<fileset dir="${build.extra166y.classes.dir}"/>
947		</jar>
948
949		</target>
950
951
876	–
952		<target name="extra166ydocs"
953		description="Builds javadocs to build dir">
954
955	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
956	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
955	>	<delete dir="${extra166ydocs.dir}"/>
956	>	<mkdir dir="${extra166ydocs.dir}"/>
957
958	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
958	>	<javadoc destdir="${extra166ydocs.dir}"
959		packagenames="extra166y.*"
960		link="${jdkapidocs.url}"
961	<	source="6"
887	<	bootclasspath="${bootclasspath6}"
961	>	access="${build.javadoc.access}"
962		sourcepath="${topsrc.dir}:${jdk6src.dir}"
963	<	executable="${javadoc7}"
964	<	additionalparam="-XDignore.symbol.file=true" />
963	>	bootclasspath="${bootclasspath6}"
964	>	source="6"
965	>	executable="${javadoc7}">
966	>	<arg value="-XDignore.symbol.file=true"/>
967
968	+	</javadoc>
969		</target>
970
971
972		<target name="extra166ydist"
973	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
973	>	depends="extra166ydist-jar, extra166ydist-docs"
974		description="Puts all distributable products in single hierarchy"/>
975
976
900	–
977		<target name="extra166yclean"
978		description="Removes all extra166y build products">
979
#	Line 906 | Line 982
982		</target>
983
984
909	–
985		<target name="extra166ydist-clean"
986		description="Removes all build and distribution products">
987
#	Line 914 | Line 989
989
990		<target name="extra166ydist-jar"
991		depends="extra166yclean, extra166yjar">
917	–
992		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
993	+	</target>
994
995	+	<target name="extra166ydist-docs"
996	+	depends="extra166yclean, extra166ydocs">
997	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
998		</target>
999
1000		<!-- jsr166e -->
#	Line 925 | Line 1003
1003		depends="configure-compiler"
1004		description="Compiles jsr166e sources">
1005
1006	<	<mkdir dir="${build.jsr166e.dir}"/>
1006	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
1007
1008		<javac srcdir="${topsrc.dir}"
1009	<	destdir="${build.jsr166e.dir}"
1009	>	destdir="${build.jsr166e.classes.dir}"
1010		debug="${build.debug}"
1011		debuglevel="${build.debuglevel}"
1012		deprecation="${build.deprecation}"
#	Line 940 | Line 1018
1018		fork="true">
1019
1020		<include name="jsr166e/**/*.java"/>
943	–	<compilerarg line="${build.args}"/>
1021		<compilerarg value="-XDignore.symbol.file=true"/>
1022		<compilerarg value="-Xlint:all"/>
1023	+	<compilerarg line="${build.args}"/>
1024
1025		</javac>
948	–
1026		</target>
1027
1028
952	–
1029		<target name="jsr166ejar"
1030		depends="jsr166ecompile"
1031		description="Builds library jar from compiled sources">
1032
1033		<jar destfile="${jsr166e.jar}" index="true">
1034	<	<fileset dir="${build.jsr166e.dir}"/>
1034	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1035		</jar>
1036
1037		</target>
1038
1039
964	–
1040		<target name="jsr166edocs"
1041		description="Builds javadocs to build dir">
1042
1043	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1044	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1043	>	<delete dir="${jsr166edocs.dir}"/>
1044	>	<mkdir dir="${jsr166edocs.dir}"/>
1045
1046	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1046	>	<javadoc destdir="${jsr166edocs.dir}"
1047		packagenames="jsr166e.*"
1048		link="${jdkapidocs.url}"
1049	<	source="7"
1049	>	access="${build.javadoc.access}"
1050		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1051	<	executable="${javadoc7}"
1052	<	additionalparam="-XDignore.symbol.file=true" >
1051	>	source="7"
1052	>	executable="${javadoc7}">
1053	>	<arg value="-XDignore.symbol.file=true"/>
1054	>
1055		</javadoc>
1056	+	</target>
1057	+
1058
1059	+	<target name="jsr166e-test-tck"
1060	+	depends="jsr166ejar"
1061	+	description="Runs tck tests for jsr166e">
1062	+
1063	+	<run-tck-tests
1064	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1065	+	source="7"
1066	+	target="8"
1067	+	workdir="${build.jsr166e.dir}"
1068	+	classes="${jsr166e.jar}"/>
1069		</target>
1070
1071
1072		<target name="jsr166edist"
1073	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1073	>	depends="jsr166edist-jar, jsr166edist-docs"
1074		description="Puts all distributable products in single hierarchy"/>
1075
1076
988	–
1077		<target name="jsr166eclean"
1078		description="Removes all jsr166e build products">
991	–
1079		<delete dir="${build.jsr166e.dir}"/>
993	–
1080		</target>
1081
1082
#	Line 1001 | Line 1087
1087
1088		<target name="jsr166edist-jar"
1089		depends="jsr166eclean, jsr166ejar">
1004	–
1090		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1091	+	</target>
1092
1093	+	<target name="jsr166edist-docs"
1094	+	depends="jsr166eclean, jsr166edocs">
1095	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1096		</target>
1097
1098	+
1099	+	<!-- Find buglets that can be detected by static build tools -->
1100	+
1101	+	<target name="lint">
1102	+	<antcall target="dists">
1103	+	<param name="build.javadoc.access" value="private"/>
1104	+	</antcall>
1105	+	</target>
1106	+
1107	+
1108		</project>

Diff Legend

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