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.117 by jsr166, Sun Jan 20 07:43:30 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 21 | Line 35
35
36
37		<!-- Compilation options -->
38	<	<property name="build.sourcelevel"    value="1.6"/>
38	>	<property name="build.sourcelevel"    value="6"/>
39		<property name="build.debug"          value="true"/>
40		<property name="build.debuglevel"     value="source,lines,vars"/>
41		<property name="build.deprecation"    value="false"/>
#	Line 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	>	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61	>	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62	>	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63	>	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64	>
65	>	<!-- JDK binary locations -->
66	>	<property name="jdks.home"  location="${user.home}/jdk"/>
67	>
68	>	<macrodef name="defjdklocations">
69	>	<attribute name="v"/>
70	>	<sequential>
71	>	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
72	>	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73	>	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74	>	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75	>	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
76	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
77	>	<property name="bootclasspath@{v}"
78	>	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
79	>	</sequential>
80	>	</macrodef>
81	>
82	>	<defjdklocations v="6"/>
83	>	<defjdklocations v="7"/>
84	>	<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=""/>
91	>	<sequential>
92	>
93	>	<mkdir dir="@{workdir}/tck-classes"/>
94	>
95	>	<javac srcdir="${tck.src.dir}"
96	>	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	>
126	>	</sequential>
127	>	</macrodef>
128
129		<!-- Source locations -->
130		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 55 | Line 135
135		<property name="lib.dir"              location="${basedir}/lib"/>
136		<property name="dist.dir"             location="${basedir}/dist"/>
137		<property name="topsrc.dir"           location="${basedir}/src"/>
138	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
139	<	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
140	<	<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
141	<	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
138	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
139	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
140	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
141	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
142	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
143	>
144		<!-- Distribution locations -->
145	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
146	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
147	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
148	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
145	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
146	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
147	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
148	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
149	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
150	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
151
152		<!-- Jar locations -->
153	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
154	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
155	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
156	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
157	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
153	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
154	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
155	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
156	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
157	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
158	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
159	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
160
161		<!-- Bootclasspath argument -->
162		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
163
164	+	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
165	+	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
166	+	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
167	+	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
168	+
169	+	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
170	+	<!-- The below does not yet exist as of 2012-11 -->
171	+	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
172	+
173	+	<!-- Default jdk api doc location (latest stable release seems best) -->
174	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
175	+
176	+	<!-- Define the "jtreg" task -->
177	+	<!-- See the docs in "jtreg -onlineHelp" -->
178	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
179	+	classpath="${lib.dir}/jtreg.jar" />
180	+
181		<!-- Test classpath -->
182		<path id="test.classpath">
183		<pathelement location="${build.testcases.dir}"/>
#	Line 86 | Line 189
189		<pathelement location="${build.loops.dir}"/>
190		</path>
191
192	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
193	+	<!-- 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"/>
197	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
198
199		<!-- Main targets -->
200
201		<target name="dists"
202	<	depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
202	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
203		description="Builds all public jars and docs"/>
204
205		<target name="compile"
206	<	depends="init, configure-compiler"
207	<	description="Compiles main sources to build folder">
206	>	depends="configure-compiler"
207	>	description="Compiles src/main sources to build dir">
208
209		<mkdir dir="${build.classes.dir}"/>
210
211		<javac srcdir="${src.dir}"
212	<	destdir="${build.classes.dir}"
213	<	debug="${build.debug}"
214	<	debuglevel="${build.debuglevel}"
215	<	deprecation="${build.deprecation}"
216	<	source="${build.sourcelevel}"
217	<	fork="true">
212	>	destdir="${build.classes.dir}"
213	>	debug="${build.debug}"
214	>	debuglevel="${build.debuglevel}"
215	>	deprecation="${build.deprecation}"
216	>	classpath=""
217	>	includeAntRuntime="false"
218	>	includeJavaRuntime="false"
219	>	executable="${javac8}"
220	>	fork="true">
221
222		<include name="**/*.java"/>
223	<	<compilerarg value="-XDignore.symbol.file"/>
223	>	<compilerarg line="${build.args}"/>
224	>	<compilerarg value="-XDignore.symbol.file=true"/>
225	>	<compilerarg value="-Xlint:all"/>
226
227		<!--
228		<exclude name="java/lang/**"/>
#	Line 126 | Line 240
240		depends="compile"
241		description="Builds library jar from compiled sources">
242
129	–	<mkdir dir="${build.lib.dir}"/>
130	–
243		<jar destfile="${product.jar}">
244		<fileset dir="${build.classes.dir}"/>
245		</jar>
#	Line 137 | Line 249
249
250
251		<target name="test"
252	<	depends="init, configure-tests, report-tests"
252	>	depends="configure-tests, report-tests"
253		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
254
255
256
257		<target name="docs"
258	<	description="Builds javadocs with custom tags to build folder">
147	<
148	<	<delete dir="${build.javadocs.dir}"/>
149	<	<mkdir dir="${build.javadocs.dir}"/>
258	>	description="Builds javadocs for src/main to dist dir">
259
260	<	<javadoc destdir="${build.javadocs.dir}"
261	<	link="http://java.sun.com/javase/6/docs/api/"
153	<	overview="${src.dir}/intro.html"
154	<	sourcepath="${src.dir}:${jdksrc.dir}"
155	<	>
260	>	<delete dir="${dist.javadocs.dir}"/>
261	>	<mkdir dir="${dist.javadocs.dir}"/>
262
263	<	<packageset dir="${src.dir}"/>
263	>	<!-- the packagenames="none" hack below prevents scanning the -->
264	>	<!-- sourcepath for packages -->
265
266	+	<javadoc destdir="${dist.javadocs.dir}"
267	+	packagenames="none"
268	+	link="${jdkapi8docs.url}"
269	+	overview="${src.dir}/intro.html"
270	+	sourcepath="${src.dir}:${jdk8src.dir}"
271	+	classpath=""
272	+	executable="${javadoc8}">
273	+	<arg value="-XDignore.symbol.file=true"/>
274	+	<arg value="-tag"/>
275	+	<arg value="${javadoc.jls.option}"/>
276	+	<fileset dir="${src.dir}" defaultexcludes="yes">
277	+	<include name="**/*.java"/>
278	+	</fileset>
279		</javadoc>
280
281		</target>
#	Line 163 | Line 283
283
284
285		<target name="dist"
286	<	depends="init, dist-clean, dist-jar, dist-docs"
286	>	depends="dist-clean, dist-jar, docs"
287		description="Puts all distributable products in single hierarchy"/>
288
289
#	Line 191 | Line 311
311		description="Removes all build products">
312
313		<delete dir="${build.dir}"/>
194	–	<delete dir="${build.classes.dir}"/>
195	–	<delete dir="${build.lib.dir}"/>
314
315		</target>
316
#	Line 207 | Line 325
325
326
327
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	–
328		<!-- Internal targets -->
329
330
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	–
331		<target name="dist-jar"
332		depends="clean, jar">
333
#	Line 272 | Line 342
342		<mkdir dir="${build.testcases.dir}"/>
343
344		<javac srcdir="${tck.src.dir}"
345	<	destdir="${build.testcases.dir}"
346	<	debug="${build.debug}"
347	<	debuglevel="${build.debuglevel}"
348	<	deprecation="${build.deprecation}"
349	<	source="${build.sourcelevel}"
350	<	fork="true">
345	>	destdir="${build.testcases.dir}"
346	>	debug="${build.debug}"
347	>	debuglevel="${build.debuglevel}"
348	>	deprecation="${build.deprecation}"
349	>	source="6"
350	>	classpath="${junit.jar}"
351	>	bootclasspath="${product.jar}:${bootclasspath6}"
352	>	includeAntRuntime="false"
353	>	includeJavaRuntime="false"
354	>	executable="${javac8}"
355	>	fork="true">
356
357	<	<compilerarg value="${bootclasspath.args}"/>
357	>	<include name="**/*.java"/>
358		<compilerarg line="${build.args}"/>
359	<
360	<	<classpath refid="test.classpath"/>
359	>	<compilerarg value="-XDignore.symbol.file=true"/>
360	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
361
362		</javac>
363
364		<javac srcdir="${test.src.dir}"
365	<	destdir="${build.testcases.dir}"
366	<	debug="${build.debug}"
367	<	debuglevel="${build.debuglevel}"
368	<	deprecation="${build.deprecation}"
369	<	source="${build.sourcelevel}"
370	<	fork="true">
365	>	destdir="${build.testcases.dir}"
366	>	debug="${build.debug}"
367	>	debuglevel="${build.debuglevel}"
368	>	deprecation="${build.deprecation}"
369	>	source="6"
370	>	classpath=""
371	>	bootclasspath="${product.jar}:${bootclasspath6}"
372	>	includeAntRuntime="false"
373	>	includeJavaRuntime="false"
374	>	executable="${javac8}"
375	>	fork="true">
376
377	<	<include name="jsr166/test/**"/>
377	>	<include name="jsr166/test/**/*.java"/>
378
299	–	<compilerarg value="${bootclasspath.args}"/>
379		<compilerarg line="${build.args}"/>
380	<
381	<	<classpath refid="test.classpath"/>
380	>	<compilerarg value="-XDignore.symbol.file=true"/>
381	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
382
383		</javac>
384
#	Line 314 | Line 393
393
394		<compilerarg value="${bootclasspath.args}"/>
395		<compilerarg line="${build.args}"/>
396	<
318	<	<classpath refid="test.classpath"/>
396	>	<compilerarg value="-XDignore.symbol.file=true"/>
397
398		</javac>
399		-->
#	Line 336 | Line 414
414		errorProperty="junit.failed"
415		failureProperty="junit.failed"
416		dir="${build.reports.dir}"
417	+	jvm="${java8}"
418		fork="true">
419
420	<	<jvmarg value="${bootclasspath.args}"/>
420	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
421		<jvmarg value="-server"/>
422		<jvmarg value="-showversion"/>
423
#	Line 439 | Line 518
518		<!-- Various demos and test programs -->
519
520
521	<	<target name="loops" depends="init, configure-compiler"
521	>	<target name="loops" depends="configure-compiler"
522		description="Benchmark from Doug Lea's AQS paper">
523
524		<mkdir dir="${build.loops.dir}"/>
#	Line 454 | Line 533
533
534		<compilerarg line="${build.args}"/>
535		<classpath refid="loops.classpath"/>
536	+	<compilerarg value="-XDignore.symbol.file=true"/>
537
538		</javac>
539
#	Line 464 | Line 544
544		</target>
545
546
547	<	<!-- jsr166x -->
468	<
547	>	<!-- jsr166 4jdk7 -->
548
470	–	<target name="jsr166xcompile"
471	–	depends="init, configure-compiler"
472	–	description="Compiles jsr166x sources">
549
550	<	<mkdir dir="${build.jsr166x.dir}"/>
551	<
552	<	<javac srcdir="${jsr166xsrc.dir}"
553	<	destdir="${build.jsr166x.dir}"
554	<	debug="${build.debug}"
555	<	debuglevel="${build.debuglevel}"
556	<	deprecation="${build.deprecation}"
557	<	source="${build.sourcelevel}"
558	<	fork="true">
550	>	<target name="4jdk7compile"
551	>	depends="configure-compiler"
552	>	description="Compiles src/jdk7 sources, targeting jdk7">
553	>
554	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
555	>
556	>	<javac srcdir="${4jdk7src.dir}"
557	>	destdir="${build.4jdk7.classes.dir}"
558	>	debug="${build.debug}"
559	>	debuglevel="${build.debuglevel}"
560	>	deprecation="${build.deprecation}"
561	>	source="6"
562	>	classpath=""
563	>	bootclasspath="${bootclasspath6}"
564	>	includeAntRuntime="false"
565	>	includeJavaRuntime="false"
566	>	executable="${javac7}"
567	>	fork="true">
568
569		<include name="**/*.java"/>
570		<compilerarg line="${build.args}"/>
571	+	<compilerarg value="-XDignore.symbol.file=true"/>
572	+	<compilerarg value="-Xlint:all"/>
573
574		</javac>
575
576		</target>
577
578	+	<target name="4jdk7-jar"
579	+	depends="4jdk7compile"
580	+	description="Builds library jar from compiled sources">
581
582	+	<jar destfile="${4jdk7product.jar}">
583	+	<fileset dir="${build.4jdk7.classes.dir}"/>
584	+	</jar>
585
586	<	<target name="jsr166xjar"
494	<	depends="jsr166xcompile"
495	<	description="Builds library jar from compiled sources">
586	>	</target>
587
497	–	<mkdir dir="${build.jsr166xlib.dir}"/>
588
589	<	<jar destfile="${jsr166xproduct.jar}">
590	<	<fileset dir="${build.jsr166x.dir}"/>
591	<	</jar>
589	>	<target name="4jdk7-test-tck"
590	>	depends="4jdk7-jar"
591	>	description="Runs tck tests for jsr166-4jdk7 directly">
592
593	+	<run-tck-tests
594	+	target="7"
595	+	workdir="${build.4jdk7.dir}"
596	+	product.jar="${4jdk7product.jar}"/>
597		</target>
598
599
600	+	<target name="4jdk7-test-tck-junit"
601	+	depends="4jdk7compile"
602	+	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
603
604	<	<target name="jsr166xdocs"
605	<	description="Builds javadocs with custom tags to build folder">
604	>	<junit printsummary="true"
605	>	showoutput="true"
606	>	errorProperty="junit.failed"
607	>	failureProperty="junit.failed"
608	>	includeantruntime="true"
609	>	jvm="${java7}"
610	>	fork="true">
611	>
612	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
613	>	<jvmarg value="-server"/>
614
615	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
616	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
615	>	<classpath>
616	>	<pathelement location="${junit.jar}"/>
617	>	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
618	>	</classpath>
619
620	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
514	<	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>
620	>	<formatter type="brief"/>
621
622	+	<test name="JSR166TestCase" haltonfailure="no">
623	+	</test>
624
625	+	</junit>
626	+	</target>
627	+
628	+	<target name="4jdk7-test-jtreg"
629	+	depends="4jdk7compile"
630	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
632	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
633	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
634	+	<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>
647	+	</target>
648	+
649	+
650	+	<target name="4jdk7-test"
651	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
652	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
653	+	</target>
654	+
655	+
656	+	<target name="4jdk7docs"
657	+	description="Builds javadocs for src/jdk7 to dist dir">
658	+
659	+	<delete dir="${dist.4jdk7.docs.dir}"/>
660	+	<mkdir dir="${dist.4jdk7.docs.dir}"/>
661	+
662	+	<javadoc destdir="${dist.4jdk7.docs.dir}"
663	+	packagenames="none"
664	+	link="${jdkapi7docs.url}"
665	+	overview="${4jdk7src.dir}/intro.html"
666	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
667	+	classpath=""
668	+	executable="${javadoc7}">
669	+	<arg value="-XDignore.symbol.file=true"/>
670	+	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
671	+	<include name="**/*.java"/>
672	+	</fileset>
673		</javadoc>
674
675		</target>
676
677
678	<	<target name="jsr166xdist"
679	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
678	>	<target name="4jdk7dist"
679	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
680		description="Puts all distributable products in single hierarchy"/>
681
682
683
684	<	<target name="jsr166xclean"
685	<	description="Removes all build products">
684	>	<target name="4jdk7clean"
685	>	description="Removes all 4jdk7 build products">
686
687	<	<delete dir="${build.jsr166x.dir}"/>
537	<	<delete dir="${build.jsr166xlib.dir}"/>
687	>	<delete dir="${build.4jdk7.dir}"/>
688
689		</target>
690
691
692
693	<	<target name="jsr166xdist-clean"
693	>	<target name="4jdk7dist-clean"
694		description="Removes all build and distribution products">
695
696		</target>
697
698	+	<target name="4jdk7dist-jar"
699	+	depends="4jdk7clean, 4jdk7compile">
700
701	+	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
702	+
703	+	</target>
704	+
705	+
706	+	<!-- jsr166x -->
707	+
708	+	<target name="jsr166xcompile"
709	+	depends="configure-compiler"
710	+	description="Compiles jsr166x sources to build dir">
711	+
712	+	<mkdir dir="${build.jsr166x.classes.dir}"/>
713	+
714	+	<javac srcdir="${topsrc.dir}"
715	+	destdir="${build.jsr166x.classes.dir}"
716	+	debug="${build.debug}"
717	+	debuglevel="${build.debuglevel}"
718	+	deprecation="${build.deprecation}"
719	+	classpath=""
720	+	source="5"
721	+	bootclasspath="${bootclasspath6}"
722	+	includeAntRuntime="false"
723	+	includeJavaRuntime="false"
724	+	executable="${javac7}"
725	+	fork="true">
726	+
727	+	<include name="jsr166x/**/*.java"/>
728	+	<compilerarg line="${build.args}"/>
729	+	<compilerarg value="-XDignore.symbol.file=true"/>
730	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
731	+
732	+	</javac>
733	+
734	+	</target>
735
736	<	<target name="jsr166xdist-docs"
737	<	description="Builds javadocs without custom tags to dist folder">
736	>
737	>
738	>	<target name="jsr166xjar"
739	>	depends="jsr166xcompile"
740	>	description="Builds library jar from compiled sources">
741	>
742	>	<jar destfile="${jsr166x.jar}">
743	>	<fileset dir="${build.jsr166x.classes.dir}"/>
744	>	</jar>
745	>
746	>	</target>
747	>
748	>
749	>
750	>	<target name="jsr166xdocs"
751	>	description="Builds javadocs to dist dir">
752
753		<delete dir="${dist.jsr166xjavadocs.dir}"/>
754		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
755
756		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
757	<	link="http://java.sun.com/javase/6/docs/api/"
758	<	source="${build.sourcelevel}">
757	>	packagenames="jsr166x.*"
758	>	link="${jdkapidocs.url}"
759	>	source="5"
760	>	bootclasspath="${bootclasspath6}"
761	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
762	>	executable="${javadoc7}"
763	>	additionalparam="-XDignore.symbol.file=true"/>
764	>
765	>	</target>
766
560	–	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
561	–	<include name="jsr166x"/>
562	–	</packageset>
767
768	<	</javadoc>
768	>	<target name="jsr166xdist"
769	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
770	>	description="Puts all distributable products in single hierarchy"/>
771	>
772	>
773	>
774	>	<target name="jsr166xclean"
775	>	description="Removes all jsr166x build products">
776	>
777	>	<delete dir="${build.jsr166x.dir}"/>
778	>
779	>	</target>
780	>
781	>
782	>
783	>	<target name="jsr166xdist-clean"
784	>	description="Removes all build and distribution products">
785
786		</target>
787
788	+
789		<target name="jsr166xdist-jar"
790		depends="jsr166xclean, jsr166xjar">
791
792	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
792	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
793
794		</target>
795
#	Line 576 | Line 797
797
798
799		<target name="jsr166ycompile"
800	<	depends="init, configure-compiler"
800	>	depends="configure-compiler"
801		description="Compiles jsr166y sources">
802
803	<	<mkdir dir="${build.jsr166y.dir}"/>
803	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
804
805	<	<javac srcdir="${jsr166ysrc.dir}"
806	<	destdir="${build.jsr166y.dir}"
807	<	debug="${build.debug}"
808	<	debuglevel="${build.debuglevel}"
809	<	deprecation="${build.deprecation}"
810	<	source="${build.sourcelevel}"
811	<	fork="true">
805	>	<javac srcdir="${topsrc.dir}"
806	>	destdir="${build.jsr166y.classes.dir}"
807	>	debug="${build.debug}"
808	>	debuglevel="${build.debuglevel}"
809	>	deprecation="${build.deprecation}"
810	>	source="6"
811	>	classpath=""
812	>	bootclasspath="${bootclasspath6}"
813	>	includeAntRuntime="false"
814	>	includeJavaRuntime="false"
815	>	executable="${javac7}"
816	>	fork="true">
817
818	<	<include name="**/*.java"/>
818	>	<include name="jsr166y/**/*.java"/>
819		<compilerarg line="${build.args}"/>
820	<	<compilerarg value="${bootclasspath.args}"/>
821	<
596	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597	<
820	>	<compilerarg value="-XDignore.symbol.file=true"/>
821	>	<compilerarg value="-Xlint:all"/>
822		</javac>
599	–
823		</target>
824
825
603	–
826		<target name="jsr166yjar"
827		depends="jsr166ycompile"
828		description="Builds library jar from compiled sources">
829
830	<	<mkdir dir="${build.jsr166ylib.dir}"/>
831	<
610	<	<jar destfile="${jsr166yproduct.jar}" index="true">
611	<	<fileset dir="${build.jsr166y.dir}"/>
830	>	<jar destfile="${jsr166y.jar}" index="true">
831	>	<fileset dir="${build.jsr166y.classes.dir}"/>
832		</jar>
833
834		</target>
#	Line 616 | Line 836
836
837
838		<target name="jsr166ydocs"
839	<	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>
839	>	description="Builds javadocs to dist dir">
840
841	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
842	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
843
844	<	</javadoc>
844	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
845	>	packagenames="jsr166y.*"
846	>	link="${jdkapidocs.url}"
847	>	source="6"
848	>	bootclasspath="${bootclasspath6}"
849	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
850	>	executable="${javadoc7}"
851	>	additionalparam="-XDignore.symbol.file=true"/>
852
853		</target>
854
855
856		<target name="jsr166ydist"
857	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
857	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
858		description="Puts all distributable products in single hierarchy"/>
859
860
861
862		<target name="jsr166yclean"
863	<	description="Removes all build products">
863	>	description="Removes all jsr166y build products">
864
865		<delete dir="${build.jsr166y.dir}"/>
648	–	<delete dir="${build.jsr166ylib.dir}"/>
866
867		</target>
868
#	Line 656 | Line 873
873
874		</target>
875
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	–
876		<target name="jsr166ydist-jar"
877		depends="jsr166yclean, jsr166yjar">
878
879	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
879	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
880
881		</target>
882
883	+
884		<!-- extra166y -->
885
886
887		<target name="extra166ycompile"
888	<	depends="init, configure-compiler, jsr166ycompile"
888	>	depends="configure-compiler, jsr166yjar"
889		description="Compiles extra166y sources">
890
891	<	<mkdir dir="${build.extra166y.dir}"/>
891	>	<mkdir dir="${build.extra166y.classes.dir}"/>
892
893	<	<javac srcdir="${extra166ysrc.dir}"
894	<	destdir="${build.extra166y.dir}"
895	<	debug="${build.debug}"
896	<	classpath="${jsr166yproduct.jar}"
897	<	debuglevel="${build.debuglevel}"
898	<	deprecation="${build.deprecation}"
899	<	source="${build.sourcelevel}"
900	<	fork="true">
893	>	<javac srcdir="${topsrc.dir}"
894	>	destdir="${build.extra166y.classes.dir}"
895	>	debug="${build.debug}"
896	>	debuglevel="${build.debuglevel}"
897	>	deprecation="${build.deprecation}"
898	>	classpath=""
899	>	source="6"
900	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
901	>	includeAntRuntime="false"
902	>	includeJavaRuntime="false"
903	>	executable="${javac7}"
904	>	fork="true">
905
906	<	<include name="**/*.java"/>
906	>	<include name="extra166y/**/*.java"/>
907		<compilerarg line="${build.args}"/>
908	<	<compilerarg value="${bootclasspath.args}"/>
909	<
706	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
908	>	<compilerarg value="-XDignore.symbol.file=true"/>
909	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
910
911		</javac>
912
#	Line 715 | Line 918
918		depends="extra166ycompile"
919		description="Builds library jar from compiled sources">
920
921	<	<mkdir dir="${build.extra166ylib.dir}"/>
922	<
720	<	<jar destfile="${extra166yproduct.jar}" index="true">
721	<	<fileset dir="${build.extra166y.dir}"/>
921	>	<jar destfile="${extra166y.jar}" index="true">
922	>	<fileset dir="${build.extra166y.classes.dir}"/>
923		</jar>
924
925		</target>
#	Line 726 | Line 927
927
928
929		<target name="extra166ydocs"
930	<	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>
930	>	description="Builds javadocs to build dir">
931
932	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
933	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
934
935	<	</javadoc>
935	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
936	>	packagenames="extra166y.*"
937	>	link="${jdkapidocs.url}"
938	>	source="6"
939	>	bootclasspath="${bootclasspath6}"
940	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
941	>	executable="${javadoc7}"
942	>	additionalparam="-XDignore.symbol.file=true"/>
943
944		</target>
945
946
947		<target name="extra166ydist"
948	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
948	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
949		description="Puts all distributable products in single hierarchy"/>
950
951
952
953		<target name="extra166yclean"
954	<	description="Removes all build products">
954	>	description="Removes all extra166y build products">
955
956		<delete dir="${build.extra166y.dir}"/>
758	–	<delete dir="${build.extra166ylib.dir}"/>
957
958		</target>
959
#	Line 766 | Line 964
964
965		</target>
966
967	<	<target name="extra166ydist-docs"
968	<	description="Builds javadocs without custom tags to dist folder">
967	>	<target name="extra166ydist-jar"
968	>	depends="extra166yclean, extra166yjar">
969
970	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
773	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
970	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
971
972	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
973	<	link="http://java.sun.com/javase/6/docs/api/"
974	<	source="${build.sourcelevel}"
975	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
976	<	>
977	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
978	<	<include name="extra166y/*.java"/>
979	<	</fileset>
972	>	</target>
973	>
974	>	<!-- jsr166e -->
975	>
976	>	<target name="jsr166ecompile"
977	>	depends="configure-compiler"
978	>	description="Compiles jsr166e sources">
979	>
980	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
981	>
982	>	<javac srcdir="${topsrc.dir}"
983	>	destdir="${build.jsr166e.classes.dir}"
984	>	debug="${build.debug}"
985	>	debuglevel="${build.debuglevel}"
986	>	deprecation="${build.deprecation}"
987	>	source="7"
988	>	classpath=""
989	>	includeAntRuntime="false"
990	>	includeJavaRuntime="false"
991	>	executable="${javac7}"
992	>	fork="true">
993	>
994	>	<include name="jsr166e/**/*.java"/>
995	>	<compilerarg line="${build.args}"/>
996	>	<compilerarg value="-XDignore.symbol.file=true"/>
997	>	<compilerarg value="-Xlint:all"/>
998	>
999	>	</javac>
1000	>
1001	>	</target>
1002	>
1003	>
1004	>
1005	>	<target name="jsr166ejar"
1006	>	depends="jsr166ecompile"
1007	>	description="Builds library jar from compiled sources">
1008	>
1009	>	<jar destfile="${jsr166e.jar}" index="true">
1010	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1011	>	</jar>
1012	>
1013	>	</target>
1014	>
1015	>
1016	>
1017	>	<target name="jsr166edocs"
1018	>	description="Builds javadocs to build dir">
1019	>
1020	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1021	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1022	>
1023	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1024	>	packagenames="jsr166e.*"
1025	>	link="${jdkapidocs.url}"
1026	>	source="7"
1027	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1028	>	executable="${javadoc7}"
1029	>	additionalparam="-XDignore.symbol.file=true" >
1030		</javadoc>
1031
1032		</target>
1033
787	–	<target name="extra166ydist-jar"
788	–	depends="extra166yclean, extra166yjar">
1034
1035	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1035	>	<target name="jsr166edist"
1036	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1037	>	description="Puts all distributable products in single hierarchy"/>
1038	>
1039	>
1040	>
1041	>	<target name="jsr166eclean"
1042	>	description="Removes all jsr166e build products">
1043	>
1044	>	<delete dir="${build.jsr166e.dir}"/>
1045	>
1046	>	</target>
1047	>
1048	>
1049	>	<target name="jsr166edist-clean"
1050	>	description="Removes all build and distribution products">
1051	>
1052	>	</target>
1053	>
1054	>	<target name="jsr166edist-jar"
1055	>	depends="jsr166eclean, jsr166ejar">
1056	>
1057	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1058
1059		</target>
1060

Diff Legend

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