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.81 by jsr166, Sun Aug 2 00:11:59 2009 UTC vs.
Revision 1.111 by jsr166, Sun Jan 20 03:34:23 2013 UTC

#	Line 8 | Line 8
8
9		User-specific settings are read from user.properties.
10		See user.properties.sample for an explanation of some useful settings.
11	+
12	+	The repository contains all dependencies except for ant and the JDK
13	+	itself.  Because the JDK version matters and because different
14	+	targets require different JDKs, we assume that users have created a
15	+	hierarchy containing:
16	+	$HOME/jdk/jdk6
17	+	$HOME/jdk/jdk7
18	+	$HOME/jdk/jdk8
19	+	where each of the above is a JDK or a symlink to same, and
20	+	$HOME/jdk/src/jdk6
21	+	$HOME/jdk/src/jdk7
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		------------------------------------------------------------------------------
26		</description>
27
#	Line 31 | 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"/>
34	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
35	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
48		<property name="build.reports.dir"           location="${build.dir}/reports"/>
37	–	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
49
50	<	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
51	<	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
52	<	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
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"/>
56	+	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57	+	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59	<	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
60	<	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
59	>
60	>	<!-- JDK binary locations -->
61	>	<property name="jdks.home"  location="${user.home}/jdk"/>
62	>
63	>	<macrodef name="defjdklocations">
64	>	<attribute name="v"/>
65	>	<sequential>
66	>	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
67	>	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
68	>	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
69	>	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
70	>	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
71	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
72	>	<property name="bootclasspath@{v}"
73	>	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
74	>	</sequential>
75	>	</macrodef>
76	>
77	>	<defjdklocations v="6"/>
78	>	<defjdklocations v="7"/>
79	>	<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=""/>
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
99		<!-- Source locations -->
100		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 55 | Line 105
105		<property name="lib.dir"              location="${basedir}/lib"/>
106		<property name="dist.dir"             location="${basedir}/dist"/>
107		<property name="topsrc.dir"           location="${basedir}/src"/>
108	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
109	<	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
110	<	<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
111	<	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
108	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
109	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
110	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113	>
114		<!-- Distribution locations -->
115	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
116	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
117	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
118	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
115	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121
122		<!-- Jar locations -->
123	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
125	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
126	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
127	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
123	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130
131		<!-- Bootclasspath argument -->
132		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133
134	+	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135	+	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136	+	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137	+	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138	+
139	+	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140	+	<!-- The below does not yet exist as of 2012-11 -->
141	+	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142	+
143	+	<!-- Default jdk api doc location (latest stable release seems best) -->
144	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145	+
146		<!-- Test classpath -->
147		<path id="test.classpath">
148		<pathelement location="${build.testcases.dir}"/>
#	Line 86 | Line 154
154		<pathelement location="${build.loops.dir}"/>
155		</path>
156
157	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
158	+	<!-- TODO: How do we get &trade to work? -->
159	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
160	+	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161	+	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
162	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
163
164		<!-- Main targets -->
165
166		<target name="dists"
167	<	depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
167	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168		description="Builds all public jars and docs"/>
169
170		<target name="compile"
171	<	depends="init, configure-compiler"
172	<	description="Compiles main sources to build folder">
171	>	depends="configure-compiler"
172	>	description="Compiles src/main sources to build dir">
173
174		<mkdir dir="${build.classes.dir}"/>
175
176		<javac srcdir="${src.dir}"
177	<	destdir="${build.classes.dir}"
178	<	debug="${build.debug}"
179	<	debuglevel="${build.debuglevel}"
180	<	deprecation="${build.deprecation}"
181	<	source="${build.sourcelevel}"
182	<	fork="true">
177	>	destdir="${build.classes.dir}"
178	>	debug="${build.debug}"
179	>	debuglevel="${build.debuglevel}"
180	>	deprecation="${build.deprecation}"
181	>	classpath=""
182	>	includeAntRuntime="false"
183	>	includeJavaRuntime="false"
184	>	executable="${javac8}"
185	>	fork="true">
186
187		<include name="**/*.java"/>
188	<	<compilerarg value="-XDignore.symbol.file"/>
188	>	<compilerarg line="${build.args}"/>
189	>	<compilerarg value="-XDignore.symbol.file=true"/>
190	>	<compilerarg value="-Xlint:all"/>
191
192		<!--
193		<exclude name="java/lang/**"/>
#	Line 126 | Line 205
205		depends="compile"
206		description="Builds library jar from compiled sources">
207
129	–	<mkdir dir="${build.lib.dir}"/>
130	–
208		<jar destfile="${product.jar}">
209		<fileset dir="${build.classes.dir}"/>
210		</jar>
#	Line 137 | Line 214
214
215
216		<target name="test"
217	<	depends="init, configure-tests, report-tests"
217	>	depends="configure-tests, report-tests"
218		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219
220
221
222		<target name="docs"
223	<	description="Builds javadocs with custom tags to build folder">
147	<
148	<	<delete dir="${build.javadocs.dir}"/>
149	<	<mkdir dir="${build.javadocs.dir}"/>
223	>	description="Builds javadocs for src/main to dist dir">
224
225	<	<javadoc destdir="${build.javadocs.dir}"
226	<	link="http://java.sun.com/javase/6/docs/api/"
153	<	overview="${src.dir}/intro.html"
154	<	sourcepath="${src.dir}:${jdksrc.dir}"
155	<	>
225	>	<delete dir="${dist.javadocs.dir}"/>
226	>	<mkdir dir="${dist.javadocs.dir}"/>
227
228	<	<packageset dir="${src.dir}"/>
228	>	<!-- the packagenames="none" hack below prevents scanning the -->
229	>	<!-- sourcepath for packages -->
230
231	+	<javadoc destdir="${dist.javadocs.dir}"
232	+	packagenames="none"
233	+	link="${jdkapi8docs.url}"
234	+	overview="${src.dir}/intro.html"
235	+	sourcepath="${src.dir}:${jdk8src.dir}"
236	+	classpath=""
237	+	executable="${javadoc8}">
238	+	<arg value="-XDignore.symbol.file=true"/>
239	+	<arg value="-tag"/>
240	+	<arg value="${javadoc.jls.option}"/>
241	+	<fileset dir="${src.dir}" defaultexcludes="yes">
242	+	<include name="**/*.java"/>
243	+	</fileset>
244		</javadoc>
245
246		</target>
#	Line 163 | Line 248
248
249
250		<target name="dist"
251	<	depends="init, dist-clean, dist-jar, dist-docs"
251	>	depends="dist-clean, dist-jar, docs"
252		description="Puts all distributable products in single hierarchy"/>
253
254
#	Line 191 | Line 276
276		description="Removes all build products">
277
278		<delete dir="${build.dir}"/>
194	–	<delete dir="${build.classes.dir}"/>
195	–	<delete dir="${build.lib.dir}"/>
279
280		</target>
281
#	Line 207 | Line 290
290
291
292
210	–	<target name="dist-docs"
211	–	description="Builds javadocs without custom tags to dist folder">
212	–
213	–	<delete dir="${dist.javadocs.dir}"/>
214	–	<mkdir dir="${dist.javadocs.dir}"/>
215	–
216	–	<javadoc destdir="${dist.javadocs.dir}"
217	–	link="http://java.sun.com/javase/6/docs/api/"
218	–	overview="${src.dir}/intro.html"
219	–
220	–	sourcepath="${src.dir}:${jdksrc.dir}"
221	–	>
222	–	<!--
223	–	<packageset dir="${src.dir}" defaultexcludes="yes">
224	–	<include name="java/util/concurrent"/>
225	–	<include name="java/util/concurrent/atomic"/>
226	–	<include name="java/util/concurrent/locks"/>
227	–	</packageset>
228	–	-->
229	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
230	–	<include name="main/java/util/concurrent/*.java"/>
231	–	<include name="main/java/util/concurrent/atomic/*.java"/>
232	–	<include name="main/java/util/concurrent/locks/*.java"/>
233	–	<include name="main/java/util/*.java"/>
234	–	<!--
235	–	<include name="main/java/util/concurrent/*.html"/>
236	–	<include name="main/java/util/concurrent/atomic/*.html"/>
237	–	<include name="main/java/util/concurrent/locks/*.html"/>
238	–	<include name="main/java/util/*.html"/>
239	–	-->
240	–	<!--      <include name="jsr166x/*.java"/> -->
241	–	</fileset>
242	–	</javadoc>
243	–
244	–	</target>
245	–
246	–
247	–
293		<!-- Internal targets -->
294
295
251	–	<target name="init">
252	–
253	–	<!-- Version is kept in a separate file -->
254	–	<loadfile property="version" srcFile="version.properties"/>
255	–	<echo>Building JSR-166 version ${version}</echo>
256	–	<echo>java.home is ${java.home}</echo>
257	–
258	–	</target>
259	–
260	–
296		<target name="dist-jar"
297		depends="clean, jar">
298
#	Line 272 | Line 307
307		<mkdir dir="${build.testcases.dir}"/>
308
309		<javac srcdir="${tck.src.dir}"
310	<	destdir="${build.testcases.dir}"
311	<	debug="${build.debug}"
312	<	debuglevel="${build.debuglevel}"
313	<	deprecation="${build.deprecation}"
314	<	source="${build.sourcelevel}"
315	<	fork="true">
310	>	destdir="${build.testcases.dir}"
311	>	debug="${build.debug}"
312	>	debuglevel="${build.debuglevel}"
313	>	deprecation="${build.deprecation}"
314	>	source="6"
315	>	classpath="${junit.jar}"
316	>	bootclasspath="${product.jar}:${bootclasspath6}"
317	>	includeAntRuntime="false"
318	>	includeJavaRuntime="false"
319	>	executable="${javac8}"
320	>	fork="true">
321
322	<	<compilerarg value="${bootclasspath.args}"/>
322	>	<include name="**/*.java"/>
323		<compilerarg line="${build.args}"/>
324	+	<compilerarg value="-XDignore.symbol.file=true"/>
325	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326
327		<classpath refid="test.classpath"/>
328
329		</javac>
330
331		<javac srcdir="${test.src.dir}"
332	<	destdir="${build.testcases.dir}"
333	<	debug="${build.debug}"
334	<	debuglevel="${build.debuglevel}"
335	<	deprecation="${build.deprecation}"
336	<	source="${build.sourcelevel}"
337	<	fork="true">
332	>	destdir="${build.testcases.dir}"
333	>	debug="${build.debug}"
334	>	debuglevel="${build.debuglevel}"
335	>	deprecation="${build.deprecation}"
336	>	source="6"
337	>	classpath="${junit.jar}"
338	>	bootclasspath="${product.jar}:${bootclasspath6}"
339	>	includeAntRuntime="false"
340	>	includeJavaRuntime="false"
341	>	executable="${javac8}"
342	>	fork="true">
343
344	<	<include name="jsr166/test/**"/>
344	>	<include name="jsr166/test/**/*.java"/>
345
299	–	<compilerarg value="${bootclasspath.args}"/>
346		<compilerarg line="${build.args}"/>
347	+	<compilerarg value="-XDignore.symbol.file=true"/>
348	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
349
350		<classpath refid="test.classpath"/>
351
#	Line 314 | Line 362
362
363		<compilerarg value="${bootclasspath.args}"/>
364		<compilerarg line="${build.args}"/>
365	+	<compilerarg value="-XDignore.symbol.file=true"/>
366
367		<classpath refid="test.classpath"/>
368
#	Line 336 | Line 385
385		errorProperty="junit.failed"
386		failureProperty="junit.failed"
387		dir="${build.reports.dir}"
388	+	jvm="${java8}"
389		fork="true">
390
391	<	<jvmarg value="${bootclasspath.args}"/>
391	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
392		<jvmarg value="-server"/>
393		<jvmarg value="-showversion"/>
394
#	Line 439 | Line 489
489		<!-- Various demos and test programs -->
490
491
492	<	<target name="loops" depends="init, configure-compiler"
492	>	<target name="loops" depends="configure-compiler"
493		description="Benchmark from Doug Lea's AQS paper">
494
495		<mkdir dir="${build.loops.dir}"/>
#	Line 454 | Line 504
504
505		<compilerarg line="${build.args}"/>
506		<classpath refid="loops.classpath"/>
507	+	<compilerarg value="-XDignore.symbol.file=true"/>
508
509		</javac>
510
#	Line 464 | Line 515
515		</target>
516
517
518	<	<!-- jsr166x -->
518	>	<!-- jsr166 4jdk7 -->
519
520
521	<	<target name="jsr166xcompile"
522	<	depends="init, configure-compiler"
523	<	description="Compiles jsr166x sources">
521	>	<target name="4jdk7compile"
522	>	depends="configure-compiler"
523	>	description="Compiles src/jdk7 sources, targeting jdk7">
524	>
525	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
526	>
527	>	<javac srcdir="${4jdk7src.dir}"
528	>	destdir="${build.4jdk7.classes.dir}"
529	>	debug="${build.debug}"
530	>	debuglevel="${build.debuglevel}"
531	>	deprecation="${build.deprecation}"
532	>	source="6"
533	>	classpath=""
534	>	bootclasspath="${bootclasspath6}"
535	>	includeAntRuntime="false"
536	>	includeJavaRuntime="false"
537	>	executable="${javac7}"
538	>	fork="true">
539
540	<	<mkdir dir="${build.jsr166x.dir}"/>
540	>	<include name="**/*.java"/>
541	>	<compilerarg line="${build.args}"/>
542	>	<compilerarg value="-XDignore.symbol.file=true"/>
543	>	<compilerarg value="-Xlint:all"/>
544
545	<	<javac srcdir="${jsr166xsrc.dir}"
546	<	destdir="${build.jsr166x.dir}"
547	<	debug="${build.debug}"
548	<	debuglevel="${build.debuglevel}"
549	<	deprecation="${build.deprecation}"
550	<	source="${build.sourcelevel}"
551	<	fork="true">
545	>	</javac>
546	>
547	>	<jar destfile="${4jdk7product.jar}" index="true">
548	>	<fileset dir="${build.4jdk7.classes.dir}"/>
549	>	</jar>
550	>
551	>	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
552	>
553	>	<javac srcdir="${tck.src.dir}"
554	>	destdir="${build.4jdk7.tck.classes.dir}"
555	>	debug="${build.debug}"
556	>	debuglevel="${build.debuglevel}"
557	>	deprecation="${build.deprecation}"
558	>	source="6"
559	>	classpath="${junit.jar}"
560	>	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
561	>	includeAntRuntime="false"
562	>	includeJavaRuntime="false"
563	>	executable="${javac7}"
564	>	fork="true">
565
566		<include name="**/*.java"/>
567		<compilerarg line="${build.args}"/>
568	+	<compilerarg value="-XDignore.symbol.file=true"/>
569	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
570
571		</javac>
572
573		</target>
574
575
576	+	<target name="4jdk7-test-tck"
577	+	depends="4jdk7compile"
578	+	description="Runs tck tests for jsr166-4jdk7 directly">
579	+	<run-tck-tests
580	+	jvm="${java7}"
581	+	tck.classes="${build.4jdk7.tck.classes.dir}"
582	+	product.jar="${4jdk7product.jar}"/>
583	+	</target>
584
493	–	<target name="jsr166xjar"
494	–	depends="jsr166xcompile"
495	–	description="Builds library jar from compiled sources">
585
586	<	<mkdir dir="${build.jsr166xlib.dir}"/>
586	>	<target name="4jdk7-test-tck-junit"
587	>	depends="4jdk7compile"
588	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
589
590	<	<jar destfile="${jsr166xproduct.jar}">
591	<	<fileset dir="${build.jsr166x.dir}"/>
592	<	</jar>
590	>	<junit printsummary="true"
591	>	showoutput="true"
592	>	errorProperty="junit.failed"
593	>	failureProperty="junit.failed"
594	>	includeantruntime="true"
595	>	jvm="${java7}"
596	>	fork="true">
597
598	<	</target>
598	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
599	>	<jvmarg value="-server"/>
600
601	+	<classpath>
602	+	<pathelement location="${junit.jar}"/>
603	+	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
604	+	</classpath>
605
606	+	<formatter type="brief"/>
607
608	<	<target name="jsr166xdocs"
609	<	description="Builds javadocs with custom tags to build folder">
608	>	<test name="JSR166TestCase" haltonfailure="no">
609	>	</test>
610	>
611	>	</junit>
612	>	</target>
613
510	–	<delete dir="${build.jsr166xjavadocs.dir}"/>
511	–	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
614
615	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
616	<	link="http://java.sun.com/javase/6/docs/api/"
515	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
516	<	>
517	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
518	<	<include name="jsr166x"/>
519	<	</packageset>
615	>	<target name="4jdk7docs"
616	>	description="Builds javadocs for src/jdk7 to dist dir">
617
618	+	<delete dir="${dist.4jdk7.docs.dir}"/>
619	+	<mkdir dir="${dist.4jdk7.docs.dir}"/>
620
621	+	<javadoc destdir="${dist.4jdk7.docs.dir}"
622	+	packagenames="none"
623	+	link="${jdkapi7docs.url}"
624	+	overview="${4jdk7src.dir}/intro.html"
625	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
626	+	classpath=""
627	+	executable="${javadoc7}">
628	+	<arg value="-XDignore.symbol.file=true"/>
629	+	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
630	+	<include name="**/*.java"/>
631	+	</fileset>
632		</javadoc>
633
634		</target>
635
636
637	<	<target name="jsr166xdist"
638	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
637	>	<target name="4jdk7dist"
638	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
639		description="Puts all distributable products in single hierarchy"/>
640
641
642
643	<	<target name="jsr166xclean"
644	<	description="Removes all build products">
643	>	<target name="4jdk7clean"
644	>	description="Removes all 4jdk7 build products">
645
646	<	<delete dir="${build.jsr166x.dir}"/>
537	<	<delete dir="${build.jsr166xlib.dir}"/>
646	>	<delete dir="${build.4jdk7.dir}"/>
647
648		</target>
649
650
651
652	<	<target name="jsr166xdist-clean"
652	>	<target name="4jdk7dist-clean"
653		description="Removes all build and distribution products">
654
655		</target>
656
657	+	<target name="4jdk7dist-jar"
658	+	depends="4jdk7clean, 4jdk7compile">
659	+
660	+	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
661	+
662	+	</target>
663	+
664	+
665	+	<!-- jsr166x -->
666	+
667	+	<target name="jsr166xcompile"
668	+	depends="configure-compiler"
669	+	description="Compiles jsr166x sources to build dir">
670	+
671	+	<mkdir dir="${build.jsr166x.dir}"/>
672	+
673	+	<javac srcdir="${topsrc.dir}"
674	+	destdir="${build.jsr166x.dir}"
675	+	debug="${build.debug}"
676	+	debuglevel="${build.debuglevel}"
677	+	deprecation="${build.deprecation}"
678	+	classpath=""
679	+	source="5"
680	+	bootclasspath="${bootclasspath6}"
681	+	includeAntRuntime="false"
682	+	includeJavaRuntime="false"
683	+	executable="${javac7}"
684	+	fork="true">
685	+
686	+	<include name="jsr166x/**/*.java"/>
687	+	<compilerarg line="${build.args}"/>
688	+	<compilerarg value="-XDignore.symbol.file=true"/>
689	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
690	+
691	+	</javac>
692	+
693	+	</target>
694	+
695	+
696	+
697	+	<target name="jsr166xjar"
698	+	depends="jsr166xcompile"
699	+	description="Builds library jar from compiled sources">
700	+
701	+	<jar destfile="${jsr166x.jar}">
702	+	<fileset dir="${build.jsr166x.dir}"/>
703	+	</jar>
704	+
705	+	</target>
706	+
707
708
709	<	<target name="jsr166xdist-docs"
710	<	description="Builds javadocs without custom tags to dist folder">
709	>	<target name="jsr166xdocs"
710	>	description="Builds javadocs to dist dir">
711
712		<delete dir="${dist.jsr166xjavadocs.dir}"/>
713		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
714
715		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
716	<	link="http://java.sun.com/javase/6/docs/api/"
717	<	source="${build.sourcelevel}">
716	>	packagenames="jsr166x.*"
717	>	link="${jdkapidocs.url}"
718	>	source="5"
719	>	bootclasspath="${bootclasspath6}"
720	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
721	>	executable="${javadoc7}"
722	>	additionalparam="-XDignore.symbol.file=true" />
723	>
724	>	</target>
725	>
726	>
727	>	<target name="jsr166xdist"
728	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
729	>	description="Puts all distributable products in single hierarchy"/>
730
560	–	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
561	–	<include name="jsr166x"/>
562	–	</packageset>
731
732	<	</javadoc>
732	>
733	>	<target name="jsr166xclean"
734	>	description="Removes all jsr166x build products">
735	>
736	>	<delete dir="${build.jsr166x.dir}"/>
737
738		</target>
739
740	+
741	+
742	+	<target name="jsr166xdist-clean"
743	+	description="Removes all build and distribution products">
744	+
745	+	</target>
746	+
747	+
748		<target name="jsr166xdist-jar"
749		depends="jsr166xclean, jsr166xjar">
750
751	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
751	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
752
753		</target>
754
#	Line 576 | Line 756
756
757
758		<target name="jsr166ycompile"
759	<	depends="init, configure-compiler"
759	>	depends="configure-compiler"
760		description="Compiles jsr166y sources">
761
762		<mkdir dir="${build.jsr166y.dir}"/>
763
764	<	<javac srcdir="${jsr166ysrc.dir}"
765	<	destdir="${build.jsr166y.dir}"
766	<	debug="${build.debug}"
767	<	debuglevel="${build.debuglevel}"
768	<	deprecation="${build.deprecation}"
769	<	source="${build.sourcelevel}"
770	<	fork="true">
764	>	<javac srcdir="${topsrc.dir}"
765	>	destdir="${build.jsr166y.dir}"
766	>	debug="${build.debug}"
767	>	debuglevel="${build.debuglevel}"
768	>	deprecation="${build.deprecation}"
769	>	source="6"
770	>	classpath=""
771	>	bootclasspath="${bootclasspath6}"
772	>	includeAntRuntime="false"
773	>	includeJavaRuntime="false"
774	>	executable="${javac7}"
775	>	fork="true">
776
777	<	<include name="**/*.java"/>
777	>	<include name="jsr166y/**/*.java"/>
778		<compilerarg line="${build.args}"/>
779	<	<compilerarg value="${bootclasspath.args}"/>
780	<
596	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597	<
779	>	<compilerarg value="-XDignore.symbol.file=true"/>
780	>	<compilerarg value="-Xlint:all"/>
781		</javac>
599	–
782		</target>
783
784
603	–
785		<target name="jsr166yjar"
786		depends="jsr166ycompile"
787		description="Builds library jar from compiled sources">
788
789	<	<mkdir dir="${build.jsr166ylib.dir}"/>
609	<
610	<	<jar destfile="${jsr166yproduct.jar}" index="true">
789	>	<jar destfile="${jsr166y.jar}" index="true">
790		<fileset dir="${build.jsr166y.dir}"/>
791		</jar>
792
#	Line 616 | Line 795
795
796
797		<target name="jsr166ydocs"
798	<	description="Builds javadocs with custom tags to build folder">
620	<
621	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
622	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
623	<
624	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
625	<	link="http://java.sun.com/javase/6/docs/api/"
626	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
627	<	>
628	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
629	<	<include name="jsr166y"/>
630	<	</packageset>
798	>	description="Builds javadocs to dist dir">
799
800	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
801	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
802
803	<	</javadoc>
803	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
804	>	packagenames="jsr166y.*"
805	>	link="${jdkapidocs.url}"
806	>	source="6"
807	>	bootclasspath="${bootclasspath6}"
808	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
809	>	executable="${javadoc7}"
810	>	additionalparam="-XDignore.symbol.file=true" />
811
812		</target>
813
814
815		<target name="jsr166ydist"
816	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
816	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
817		description="Puts all distributable products in single hierarchy"/>
818
819
820
821		<target name="jsr166yclean"
822	<	description="Removes all build products">
822	>	description="Removes all jsr166y build products">
823
824		<delete dir="${build.jsr166y.dir}"/>
648	–	<delete dir="${build.jsr166ylib.dir}"/>
825
826		</target>
827
#	Line 656 | Line 832
832
833		</target>
834
659	–	<target name="jsr166ydist-docs"
660	–	description="Builds javadocs without custom tags to dist folder">
661	–
662	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
663	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
664	–
665	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
666	–	link="http://java.sun.com/javase/6/docs/api/"
667	–	source="${build.sourcelevel}"
668	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
669	–	>
670	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
671	–	<include name="jsr166y/*.java"/>
672	–	</fileset>
673	–	</javadoc>
674	–
675	–	</target>
676	–
835		<target name="jsr166ydist-jar"
836		depends="jsr166yclean, jsr166yjar">
837
838	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
838	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
839
840		</target>
841
842	+
843		<!-- extra166y -->
844
845
846		<target name="extra166ycompile"
847	<	depends="init, configure-compiler, jsr166ycompile"
847	>	depends="configure-compiler, jsr166yjar"
848		description="Compiles extra166y sources">
849
850		<mkdir dir="${build.extra166y.dir}"/>
851
852	<	<javac srcdir="${extra166ysrc.dir}"
853	<	destdir="${build.extra166y.dir}"
854	<	debug="${build.debug}"
855	<	classpath="${jsr166yproduct.jar}"
856	<	debuglevel="${build.debuglevel}"
857	<	deprecation="${build.deprecation}"
858	<	source="${build.sourcelevel}"
859	<	fork="true">
852	>	<javac srcdir="${topsrc.dir}"
853	>	destdir="${build.extra166y.dir}"
854	>	debug="${build.debug}"
855	>	debuglevel="${build.debuglevel}"
856	>	deprecation="${build.deprecation}"
857	>	classpath=""
858	>	source="6"
859	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
860	>	includeAntRuntime="false"
861	>	includeJavaRuntime="false"
862	>	executable="${javac7}"
863	>	fork="true">
864
865	<	<include name="**/*.java"/>
865	>	<include name="extra166y/**/*.java"/>
866		<compilerarg line="${build.args}"/>
867	<	<compilerarg value="${bootclasspath.args}"/>
868	<
706	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
867	>	<compilerarg value="-XDignore.symbol.file=true"/>
868	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
869
870		</javac>
871
#	Line 715 | Line 877
877		depends="extra166ycompile"
878		description="Builds library jar from compiled sources">
879
880	<	<mkdir dir="${build.extra166ylib.dir}"/>
719	<
720	<	<jar destfile="${extra166yproduct.jar}" index="true">
880	>	<jar destfile="${extra166y.jar}" index="true">
881		<fileset dir="${build.extra166y.dir}"/>
882		</jar>
883
#	Line 726 | Line 886
886
887
888		<target name="extra166ydocs"
889	<	description="Builds javadocs with custom tags to build folder">
730	<
731	<	<delete dir="${build.extra166yjavadocs.dir}"/>
732	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
733	<
734	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
735	<	link="http://java.sun.com/javase/6/docs/api/"
736	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
737	<	>
738	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
739	<	<include name="extra166y"/>
740	<	</packageset>
889	>	description="Builds javadocs to build dir">
890
891	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
892	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
893
894	<	</javadoc>
894	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
895	>	packagenames="extra166y.*"
896	>	link="${jdkapidocs.url}"
897	>	source="6"
898	>	bootclasspath="${bootclasspath6}"
899	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
900	>	executable="${javadoc7}"
901	>	additionalparam="-XDignore.symbol.file=true" />
902
903		</target>
904
905
906		<target name="extra166ydist"
907	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
907	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
908		description="Puts all distributable products in single hierarchy"/>
909
910
911
912		<target name="extra166yclean"
913	<	description="Removes all build products">
913	>	description="Removes all extra166y build products">
914
915		<delete dir="${build.extra166y.dir}"/>
758	–	<delete dir="${build.extra166ylib.dir}"/>
916
917		</target>
918
#	Line 766 | Line 923
923
924		</target>
925
926	<	<target name="extra166ydist-docs"
927	<	description="Builds javadocs without custom tags to dist folder">
926	>	<target name="extra166ydist-jar"
927	>	depends="extra166yclean, extra166yjar">
928
929	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
773	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
929	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
930
931	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
932	<	link="http://java.sun.com/javase/6/docs/api/"
933	<	source="${build.sourcelevel}"
934	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
935	<	>
936	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
937	<	<include name="extra166y/*.java"/>
938	<	</fileset>
931	>	</target>
932	>
933	>	<!-- jsr166e -->
934	>
935	>	<target name="jsr166ecompile"
936	>	depends="configure-compiler"
937	>	description="Compiles jsr166e sources">
938	>
939	>	<mkdir dir="${build.jsr166e.dir}"/>
940	>
941	>	<javac srcdir="${topsrc.dir}"
942	>	destdir="${build.jsr166e.dir}"
943	>	debug="${build.debug}"
944	>	debuglevel="${build.debuglevel}"
945	>	deprecation="${build.deprecation}"
946	>	source="7"
947	>	classpath=""
948	>	includeAntRuntime="false"
949	>	includeJavaRuntime="false"
950	>	executable="${javac7}"
951	>	fork="true">
952	>
953	>	<include name="jsr166e/**/*.java"/>
954	>	<compilerarg line="${build.args}"/>
955	>	<compilerarg value="-XDignore.symbol.file=true"/>
956	>	<compilerarg value="-Xlint:all"/>
957	>
958	>	</javac>
959	>
960	>	</target>
961	>
962	>
963	>
964	>	<target name="jsr166ejar"
965	>	depends="jsr166ecompile"
966	>	description="Builds library jar from compiled sources">
967	>
968	>	<jar destfile="${jsr166e.jar}" index="true">
969	>	<fileset dir="${build.jsr166e.dir}"/>
970	>	</jar>
971	>
972	>	</target>
973	>
974	>
975	>
976	>	<target name="jsr166edocs"
977	>	description="Builds javadocs to build dir">
978	>
979	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
980	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
981	>
982	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
983	>	packagenames="jsr166e.*"
984	>	link="${jdkapidocs.url}"
985	>	source="7"
986	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
987	>	executable="${javadoc7}"
988	>	additionalparam="-XDignore.symbol.file=true" >
989		</javadoc>
990
991		</target>
992
787	–	<target name="extra166ydist-jar"
788	–	depends="extra166yclean, extra166yjar">
993
994	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
994	>	<target name="jsr166edist"
995	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
996	>	description="Puts all distributable products in single hierarchy"/>
997	>
998	>
999	>
1000	>	<target name="jsr166eclean"
1001	>	description="Removes all jsr166e build products">
1002	>
1003	>	<delete dir="${build.jsr166e.dir}"/>
1004	>
1005	>	</target>
1006	>
1007	>
1008	>	<target name="jsr166edist-clean"
1009	>	description="Removes all build and distribution products">
1010	>
1011	>	</target>
1012	>
1013	>	<target name="jsr166edist-jar"
1014	>	depends="jsr166eclean, jsr166ejar">
1015	>
1016	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1017
1018		</target>
1019

Diff Legend

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