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.119 by jsr166, Mon Jan 21 02:31:40 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 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="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76	>	<local name="boot.jar.dir"/>
77	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
78	>	<path id="bootclasspath@{v}">
79	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
80	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
81	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
82	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
83	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
84	>	</path>
85	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
86	>	</sequential>
87	>	</macrodef>
88	>
89	>	<defjdklocations v="6"/>
90	>	<defjdklocations v="7"/>
91	>	<defjdklocations v="8"/>
92
93		<!-- Source locations -->
94		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 55 | Line 99
99		<property name="lib.dir"              location="${basedir}/lib"/>
100		<property name="dist.dir"             location="${basedir}/dist"/>
101		<property name="topsrc.dir"           location="${basedir}/src"/>
102	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
103	<	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
104	<	<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
105	<	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
102	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
103	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
104	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
105	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
106	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107	>
108		<!-- Distribution locations -->
109	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
110	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
111	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
112	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
109	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
110	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
111	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
112	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
113	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
114	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
115
116		<!-- Jar locations -->
117	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
118	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
119	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
120	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
121	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
122	<
123	<	<!-- Bootclasspath argument -->
124	<	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
117	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
118	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
119	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
120	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
121	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
122	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
123	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
124	>
125	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
126	>	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
127	>	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
128	>	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
129	>
130	>	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
131	>	<!-- The below does not yet exist as of 2012-11 -->
132	>	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
133	>
134	>	<!-- Default jdk api doc location (latest stable release seems best) -->
135	>	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
136	>
137	>	<!-- Define the "jtreg" task -->
138	>	<!-- See the docs in "jtreg -onlineHelp" -->
139	>	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
140	>	classpath="${lib.dir}/jtreg.jar" />
141
142		<!-- Test classpath -->
143		<path id="test.classpath">
#	Line 81 | Line 145
145		<pathelement location="${junit.jar}"/>
146		</path>
147
148	+	<macrodef name="run-tck-tests">
149	+	<attribute name="target"/>
150	+	<attribute name="workdir"/>
151	+	<attribute name="product.jar" default="${product.jar}"/>
152	+	<attribute name="jvmflags" default=""/>
153	+	<sequential>
154	+
155	+	<mkdir dir="@{workdir}/tck-classes"/>
156	+
157	+	<javac srcdir="${tck.src.dir}"
158	+	destdir="@{workdir}/tck-classes"
159	+	debug="${build.debug}"
160	+	debuglevel="${build.debuglevel}"
161	+	deprecation="${build.deprecation}"
162	+	source="6"
163	+	classpath="${junit.jar}"
164	+	bootclasspath="@{product.jar}:${bootclasspath6}"
165	+	includeAntRuntime="false"
166	+	includeJavaRuntime="false"
167	+	executable="${javac@{target}}"
168	+	fork="true">
169	+
170	+	<include name="JSR166TestCase.java"/>
171	+	<compilerarg value="-XDignore.symbol.file=true"/>
172	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
173	+	<compilerarg line="${build.args}"/>
174	+
175	+	</javac>
176	+
177	+	<java classname="JSR166TestCase"
178	+	failonerror="true"
179	+	jvm="${java@{target}}"
180	+	fork="true">
181	+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
182	+	<jvmarg line="@{jvmflags}"/>
183	+	<classpath>
184	+	<pathelement location="${junit.jar}"/>
185	+	<pathelement location="@{workdir}/tck-classes"/>
186	+	</classpath>
187	+	</java>
188	+
189	+	</sequential>
190	+	</macrodef>
191	+
192		<!-- ALoops classpath -->
193		<path id="loops.classpath">
194		<pathelement location="${build.loops.dir}"/>
195		</path>
196
197	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
198	+	<!-- TODO: How do we get &trade to work? -->
199	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
200	+	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
201	+	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
202	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
203
204		<!-- Main targets -->
205
206		<target name="dists"
207	<	depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
207	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
208		description="Builds all public jars and docs"/>
209
210		<target name="compile"
211	<	depends="init, configure-compiler"
212	<	description="Compiles main sources to build folder">
211	>	depends="configure-compiler"
212	>	description="Compiles src/main sources to build dir">
213
214		<mkdir dir="${build.classes.dir}"/>
215
216		<javac srcdir="${src.dir}"
217	<	destdir="${build.classes.dir}"
218	<	debug="${build.debug}"
219	<	debuglevel="${build.debuglevel}"
220	<	deprecation="${build.deprecation}"
221	<	source="${build.sourcelevel}"
222	<	fork="true">
217	>	destdir="${build.classes.dir}"
218	>	debug="${build.debug}"
219	>	debuglevel="${build.debuglevel}"
220	>	deprecation="${build.deprecation}"
221	>	classpath=""
222	>	includeAntRuntime="false"
223	>	includeJavaRuntime="false"
224	>	executable="${javac8}"
225	>	fork="true">
226
227		<include name="**/*.java"/>
228	<	<compilerarg value="-XDignore.symbol.file"/>
229	<
113	<	<!--
114	<	<exclude name="java/lang/**"/>
228	>	<compilerarg value="-XDignore.symbol.file=true"/>
229	>	<compilerarg value="-Xlint:all"/>
230		<compilerarg line="${build.args}"/>
116	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
117	–	-->
231
232		</javac>
120	–
233		</target>
234
235
124	–
236		<target name="jar"
237		depends="compile"
238		description="Builds library jar from compiled sources">
239
129	–	<mkdir dir="${build.lib.dir}"/>
130	–
240		<jar destfile="${product.jar}">
241		<fileset dir="${build.classes.dir}"/>
242		</jar>
134	–
243		</target>
244
245
138	–
246		<target name="test"
247	<	depends="init, configure-tests, report-tests"
247	>	depends="configure-tests, report-tests"
248		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
249
250
144	–
251		<target name="docs"
252	<	description="Builds javadocs with custom tags to build folder">
252	>	description="Builds javadocs for src/main to dist dir">
253
254	<	<delete dir="${build.javadocs.dir}"/>
255	<	<mkdir dir="${build.javadocs.dir}"/>
150	<
151	<	<javadoc destdir="${build.javadocs.dir}"
152	<	link="http://java.sun.com/javase/6/docs/api/"
153	<	overview="${src.dir}/intro.html"
154	<	sourcepath="${src.dir}:${jdksrc.dir}"
155	<	>
254	>	<delete dir="${dist.javadocs.dir}"/>
255	>	<mkdir dir="${dist.javadocs.dir}"/>
256
257	<	<packageset dir="${src.dir}"/>
257	>	<!-- the packagenames="none" hack below prevents scanning the -->
258	>	<!-- sourcepath for packages -->
259
260	+	<javadoc destdir="${dist.javadocs.dir}"
261	+	packagenames="none"
262	+	link="${jdkapi8docs.url}"
263	+	overview="${src.dir}/intro.html"
264	+	sourcepath="${src.dir}:${jdk8src.dir}"
265	+	classpath=""
266	+	executable="${javadoc8}">
267	+	<fileset dir="${src.dir}" defaultexcludes="yes">
268	+	<include name="**/*.java"/>
269	+	</fileset>
270	+	<arg value="-XDignore.symbol.file=true"/>
271	+	<arg value="-tag"/>
272	+	<arg value="${javadoc.jls.option}"/>
273		</javadoc>
160	–
274		</target>
275
276
164	–
277		<target name="dist"
278	<	depends="init, dist-clean, dist-jar, dist-docs"
278	>	depends="dist-clean, dist-jar, docs"
279		description="Puts all distributable products in single hierarchy"/>
280
281
#	Line 182 | Line 294
294		<exclude name="**/SyntaxTest.java"/>
295		<exclude name="**/SuperfluousAbstract.java"/>
296		</jar>
185	–
297		</target>
298
299
189	–
300		<target name="clean"
301		description="Removes all build products">
302
303		<delete dir="${build.dir}"/>
194	–	<delete dir="${build.classes.dir}"/>
195	–	<delete dir="${build.lib.dir}"/>
304
305		</target>
306
307
200	–
308		<target name="dist-clean"
309		description="Removes all build and distribution products">
310
#	Line 206 | Line 313
313		</target>
314
315
209	–
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	–
316		<!-- Internal targets -->
317
318
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	–
319		<target name="dist-jar"
320		depends="clean, jar">
321
#	Line 272 | Line 330
330		<mkdir dir="${build.testcases.dir}"/>
331
332		<javac srcdir="${tck.src.dir}"
333	<	destdir="${build.testcases.dir}"
334	<	debug="${build.debug}"
335	<	debuglevel="${build.debuglevel}"
336	<	deprecation="${build.deprecation}"
337	<	source="${build.sourcelevel}"
338	<	fork="true">
333	>	destdir="${build.testcases.dir}"
334	>	debug="${build.debug}"
335	>	debuglevel="${build.debuglevel}"
336	>	deprecation="${build.deprecation}"
337	>	source="6"
338	>	classpath="${junit.jar}"
339	>	bootclasspath="@{product.jar}:${bootclasspath6}"
340	>	includeAntRuntime="false"
341	>	includeJavaRuntime="false"
342	>	executable="${javac8}"
343	>	fork="true">
344
345	<	<compilerarg value="${bootclasspath.args}"/>
345	>	<include name="**/*.java"/>
346	>	<compilerarg value="-XDignore.symbol.file=true"/>
347	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
348		<compilerarg line="${build.args}"/>
349
285	–	<classpath refid="test.classpath"/>
286	–
350		</javac>
351
352		<javac srcdir="${test.src.dir}"
353	<	destdir="${build.testcases.dir}"
354	<	debug="${build.debug}"
355	<	debuglevel="${build.debuglevel}"
356	<	deprecation="${build.deprecation}"
357	<	source="${build.sourcelevel}"
358	<	fork="true">
359	<
360	<	<include name="jsr166/test/**"/>
361	<
362	<	<compilerarg value="${bootclasspath.args}"/>
353	>	destdir="${build.testcases.dir}"
354	>	debug="${build.debug}"
355	>	debuglevel="${build.debuglevel}"
356	>	deprecation="${build.deprecation}"
357	>	source="6"
358	>	classpath=""
359	>	bootclasspath="@{product.jar}:${bootclasspath6}"
360	>	includeAntRuntime="false"
361	>	includeJavaRuntime="false"
362	>	executable="${javac8}"
363	>	fork="true">
364	>
365	>	<include name="jsr166/test/**/*.java"/>
366	>	<compilerarg value="-XDignore.symbol.file=true"/>
367	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
368		<compilerarg line="${build.args}"/>
369
302	–	<classpath refid="test.classpath"/>
303	–
370		</javac>
371
372		<!--
#	Line 312 | Line 378
378		source="${build.sourcelevel}"
379		fork="true">
380
381	<	<compilerarg value="${bootclasspath.args}"/>
381	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
382	>	<compilerarg value="-XDignore.symbol.file=true"/>
383		<compilerarg line="${build.args}"/>
384
318	–	<classpath refid="test.classpath"/>
319	–
385		</javac>
386		-->
387
#	Line 336 | Line 401
401		errorProperty="junit.failed"
402		failureProperty="junit.failed"
403		dir="${build.reports.dir}"
404	+	jvm="${java8}"
405		fork="true">
406
407	<	<jvmarg value="${bootclasspath.args}"/>
407	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
408		<jvmarg value="-server"/>
409		<jvmarg value="-showversion"/>
410
#	Line 439 | Line 505
505		<!-- Various demos and test programs -->
506
507
508	<	<target name="loops" depends="init, configure-compiler"
508	>	<target name="loops" depends="configure-compiler"
509		description="Benchmark from Doug Lea's AQS paper">
510
511		<mkdir dir="${build.loops.dir}"/>
#	Line 454 | Line 520
520
521		<compilerarg line="${build.args}"/>
522		<classpath refid="loops.classpath"/>
523	+	<compilerarg value="-XDignore.symbol.file=true"/>
524
525		</javac>
526
#	Line 464 | Line 531
531		</target>
532
533
534	<	<!-- jsr166x -->
468	<
469	<
470	<	<target name="jsr166xcompile"
471	<	depends="init, configure-compiler"
472	<	description="Compiles jsr166x sources">
473	<
474	<	<mkdir dir="${build.jsr166x.dir}"/>
534	>	<!-- jsr166 4jdk7 -->
535
536	<	<javac srcdir="${jsr166xsrc.dir}"
537	<	destdir="${build.jsr166x.dir}"
538	<	debug="${build.debug}"
539	<	debuglevel="${build.debuglevel}"
540	<	deprecation="${build.deprecation}"
541	<	source="${build.sourcelevel}"
542	<	fork="true">
536	>	<target name="4jdk7compile"
537	>	depends="configure-compiler"
538	>	description="Compiles src/jdk7 sources, targeting jdk7">
539	>
540	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
541	>
542	>	<javac srcdir="${4jdk7src.dir}"
543	>	destdir="${build.4jdk7.classes.dir}"
544	>	debug="${build.debug}"
545	>	debuglevel="${build.debuglevel}"
546	>	deprecation="${build.deprecation}"
547	>	source="6"
548	>	classpath=""
549	>	bootclasspath="${bootclasspath6}"
550	>	includeAntRuntime="false"
551	>	includeJavaRuntime="false"
552	>	executable="${javac7}"
553	>	fork="true">
554
555		<include name="**/*.java"/>
556	+	<compilerarg value="-XDignore.symbol.file=true"/>
557	+	<compilerarg value="-Xlint:all"/>
558		<compilerarg line="${build.args}"/>
559
560		</javac>
488	–
561		</target>
562
563
564	<
565	<	<target name="jsr166xjar"
494	<	depends="jsr166xcompile"
564	>	<target name="4jdk7-jar"
565	>	depends="4jdk7compile"
566		description="Builds library jar from compiled sources">
567
568	<	<mkdir dir="${build.jsr166xlib.dir}"/>
569	<
499	<	<jar destfile="${jsr166xproduct.jar}">
500	<	<fileset dir="${build.jsr166x.dir}"/>
568	>	<jar destfile="${4jdk7product.jar}">
569	>	<fileset dir="${build.4jdk7.classes.dir}"/>
570		</jar>
571
572		</target>
573
574
575	+	<target name="4jdk7-test-tck"
576	+	depends="4jdk7-jar"
577	+	description="Runs tck tests for jsr166-4jdk7 directly">
578
579	<	<target name="jsr166xdocs"
580	<	description="Builds javadocs with custom tags to build folder">
579	>	<run-tck-tests
580	>	target="7"
581	>	workdir="${build.4jdk7.dir}"
582	>	product.jar="${4jdk7product.jar}"/>
583	>	</target>
584
510	–	<delete dir="${build.jsr166xjavadocs.dir}"/>
511	–	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
585
586	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
587	<	link="http://java.sun.com/javase/6/docs/api/"
588	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
516	<	>
517	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
518	<	<include name="jsr166x"/>
519	<	</packageset>
586	>	<target name="4jdk7-test-tck-junit"
587	>	depends="4jdk7compile"
588	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
589
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	<	</javadoc>
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	>	<test name="JSR166TestCase" haltonfailure="no">
609	>	</test>
610
611	+	</junit>
612	+	</target>
613	+
614	+	<target name="4jdk7-test-jtreg"
615	+	depends="4jdk7compile"
616	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
617	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
618	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
619	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
620	+	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
621	+	<jtreg dir="${jtreg.src.dir}"
622	+	jdk="${jdk7.home}"
623	+	workDir="${build.4jdk7.dir}/JTwork"
624	+	reportDir="${build.4jdk7.dir}/JTreport">
625	+
626	+	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
627	+	<arg value="-agentvm"/>
628	+	<arg value="-v:nopass,fail"/>
629	+	<arg value="-vmoptions:-esa -ea"/>
630	+	<arg value="-automatic"/>
631	+	<arg value="-k:!ignore"/>
632	+	</jtreg>
633		</target>
634
635
636	<	<target name="jsr166xdist"
637	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
636	>	<target name="4jdk7-test"
637	>	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
638	>	description="Runs tck and jtreg tests for jsr166-4jdk7">
639	>	</target>
640	>
641	>
642	>	<target name="4jdk7docs"
643	>	description="Builds javadocs for src/jdk7 to dist dir">
644	>
645	>	<delete dir="${dist.4jdk7.docs.dir}"/>
646	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
647	>
648	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
649	>	packagenames="none"
650	>	link="${jdkapi7docs.url}"
651	>	overview="${4jdk7src.dir}/intro.html"
652	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
653	>	classpath=""
654	>	executable="${javadoc7}">
655	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
656	>	<include name="**/*.java"/>
657	>	</fileset>
658	>	<arg value="-XDignore.symbol.file=true"/>
659	>	</javadoc>
660	>	</target>
661	>
662	>
663	>	<target name="4jdk7dist"
664	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
665		description="Puts all distributable products in single hierarchy"/>
666
667
668	+	<target name="4jdk7clean"
669	+	description="Removes all 4jdk7 build products">
670
671	<	<target name="jsr166xclean"
534	<	description="Removes all build products">
671	>	<delete dir="${build.4jdk7.dir}"/>
672
673	<	<delete dir="${build.jsr166x.dir}"/>
674	<	<delete dir="${build.jsr166xlib.dir}"/>
673	>	</target>
674	>
675	>
676	>	<target name="4jdk7dist-clean"
677	>	description="Removes all build and distribution products">
678
679		</target>
680
681	+	<target name="4jdk7dist-jar"
682	+	depends="4jdk7clean, 4jdk7-jar">
683
684	+	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
685
686	<	<target name="jsr166xdist-clean"
687	<	description="Removes all build and distribution products">
686	>	</target>
687	>
688	>
689	>	<!-- jsr166x -->
690	>
691	>	<target name="jsr166xcompile"
692	>	depends="configure-compiler"
693	>	description="Compiles jsr166x sources to build dir">
694
695	+	<mkdir dir="${build.jsr166x.classes.dir}"/>
696	+
697	+	<javac srcdir="${topsrc.dir}"
698	+	destdir="${build.jsr166x.classes.dir}"
699	+	debug="${build.debug}"
700	+	debuglevel="${build.debuglevel}"
701	+	deprecation="${build.deprecation}"
702	+	classpath=""
703	+	bootclasspath="${bootclasspath6}"
704	+	source="5"
705	+	includeAntRuntime="false"
706	+	includeJavaRuntime="false"
707	+	executable="${javac7}"
708	+	fork="true">
709	+
710	+	<include name="jsr166x/**/*.java"/>
711	+	<compilerarg value="-XDignore.symbol.file=true"/>
712	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
713	+	<compilerarg line="${build.args}"/>
714	+
715	+	</javac>
716		</target>
717
718
719	+	<target name="jsr166x-jar"
720	+	depends="jsr166xcompile"
721	+	description="Builds library jar from compiled sources">
722	+
723	+	<jar destfile="${jsr166x.jar}">
724	+	<fileset dir="${build.jsr166x.classes.dir}"/>
725	+	</jar>
726	+
727	+	</target>
728	+
729
730	<	<target name="jsr166xdist-docs"
731	<	description="Builds javadocs without custom tags to dist folder">
730	>	<target name="jsr166xdocs"
731	>	description="Builds javadocs to dist dir">
732
733		<delete dir="${dist.jsr166xjavadocs.dir}"/>
734		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
735
736		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
737	<	link="http://java.sun.com/javase/6/docs/api/"
738	<	source="${build.sourcelevel}">
739	<
740	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
741	<	<include name="jsr166x"/>
742	<	</packageset>
737	>	packagenames="jsr166x.*"
738	>	link="${jdkapidocs.url}"
739	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
740	>	bootclasspath="${bootclasspath6}"
741	>	source="5"
742	>	executable="${javadoc7}">
743	>	<arg value="-XDignore.symbol.file=true"/>
744
745		</javadoc>
746	+	</target>
747	+
748	+
749	+	<target name="jsr166xdist"
750	+	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
751	+	description="Puts all distributable products in single hierarchy"/>
752	+
753	+
754	+	<target name="jsr166xclean"
755	+	description="Removes all jsr166x build products">
756	+
757	+	<delete dir="${build.jsr166x.dir}"/>
758	+
759	+	</target>
760	+
761	+
762	+	<target name="jsr166xdist-clean"
763	+	description="Removes all build and distribution products">
764
765		</target>
766
767	+
768		<target name="jsr166xdist-jar"
769	<	depends="jsr166xclean, jsr166xjar">
769	>	depends="jsr166xclean, jsr166x-jar">
770
771	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
771	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
772
773		</target>
774
#	Line 576 | Line 776
776
777
778		<target name="jsr166ycompile"
779	<	depends="init, configure-compiler"
779	>	depends="configure-compiler"
780		description="Compiles jsr166y sources">
781
782	<	<mkdir dir="${build.jsr166y.dir}"/>
583	<
584	<	<javac srcdir="${jsr166ysrc.dir}"
585	<	destdir="${build.jsr166y.dir}"
586	<	debug="${build.debug}"
587	<	debuglevel="${build.debuglevel}"
588	<	deprecation="${build.deprecation}"
589	<	source="${build.sourcelevel}"
590	<	fork="true">
782	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
783
784	<	<include name="**/*.java"/>
784	>	<javac srcdir="${topsrc.dir}"
785	>	destdir="${build.jsr166y.classes.dir}"
786	>	debug="${build.debug}"
787	>	debuglevel="${build.debuglevel}"
788	>	deprecation="${build.deprecation}"
789	>	source="6"
790	>	classpath=""
791	>	bootclasspath="${bootclasspath6}"
792	>	includeAntRuntime="false"
793	>	includeJavaRuntime="false"
794	>	executable="${javac7}"
795	>	fork="true">
796	>
797	>	<include name="jsr166y/**/*.java"/>
798	>	<compilerarg value="-XDignore.symbol.file=true"/>
799	>	<compilerarg value="-Xlint:all"/>
800		<compilerarg line="${build.args}"/>
594	–	<compilerarg value="${bootclasspath.args}"/>
595	–
596	–	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
801
802		</javac>
599	–
803		</target>
804
805
806	<
604	<	<target name="jsr166yjar"
806	>	<target name="jsr166y-jar"
807		depends="jsr166ycompile"
808		description="Builds library jar from compiled sources">
809
810	<	<mkdir dir="${build.jsr166ylib.dir}"/>
811	<
610	<	<jar destfile="${jsr166yproduct.jar}" index="true">
611	<	<fileset dir="${build.jsr166y.dir}"/>
810	>	<jar destfile="${jsr166y.jar}" index="true">
811	>	<fileset dir="${build.jsr166y.classes.dir}"/>
812		</jar>
813
814		</target>
815
816
617	–
817		<target name="jsr166ydocs"
818	<	description="Builds javadocs with custom tags to build folder">
818	>	description="Builds javadocs to dist dir">
819
820	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
821	<	<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>
820	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
821	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
822
823	+	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
824	+	packagenames="jsr166y.*"
825	+	link="${jdkapidocs.url}"
826	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
827	+	bootclasspath="${bootclasspath6}"
828	+	source="6"
829	+	executable="${javadoc7}">
830	+	<arg value="-XDignore.symbol.file=true"/>
831
832		</javadoc>
634	–
833		</target>
834
835
836		<target name="jsr166ydist"
837	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
837	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
838		description="Puts all distributable products in single hierarchy"/>
839
840
643	–
841		<target name="jsr166yclean"
842	<	description="Removes all build products">
842	>	description="Removes all jsr166y build products">
843
844		<delete dir="${build.jsr166y.dir}"/>
648	–	<delete dir="${build.jsr166ylib.dir}"/>
845
846		</target>
847
848
653	–
849		<target name="jsr166ydist-clean"
850		description="Removes all build and distribution products">
851
852		</target>
853
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	–
854		<target name="jsr166ydist-jar"
855	<	depends="jsr166yclean, jsr166yjar">
855	>	depends="jsr166yclean, jsr166y-jar">
856
857	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
857	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
858
859		</target>
860
861	+
862		<!-- extra166y -->
863
864
865		<target name="extra166ycompile"
866	<	depends="init, configure-compiler, jsr166ycompile"
866	>	depends="configure-compiler, jsr166y-jar"
867		description="Compiles extra166y sources">
868
869	<	<mkdir dir="${build.extra166y.dir}"/>
692	<
693	<	<javac srcdir="${extra166ysrc.dir}"
694	<	destdir="${build.extra166y.dir}"
695	<	debug="${build.debug}"
696	<	classpath="${jsr166yproduct.jar}"
697	<	debuglevel="${build.debuglevel}"
698	<	deprecation="${build.deprecation}"
699	<	source="${build.sourcelevel}"
700	<	fork="true">
869	>	<mkdir dir="${build.extra166y.classes.dir}"/>
870
871	<	<include name="**/*.java"/>
871	>	<javac srcdir="${topsrc.dir}"
872	>	destdir="${build.extra166y.classes.dir}"
873	>	debug="${build.debug}"
874	>	debuglevel="${build.debuglevel}"
875	>	deprecation="${build.deprecation}"
876	>	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
877	>	classpath=""
878	>	source="6"
879	>	includeAntRuntime="false"
880	>	includeJavaRuntime="false"
881	>	executable="${javac7}"
882	>	fork="true">
883	>
884	>	<include name="extra166y/**/*.java"/>
885	>	<compilerarg value="-XDignore.symbol.file=true"/>
886	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
887		<compilerarg line="${build.args}"/>
704	–	<compilerarg value="${bootclasspath.args}"/>
705	–
706	–	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
888
889		</javac>
709	–
890		</target>
891
892
893	<
714	<	<target name="extra166yjar"
893	>	<target name="extra166y-jar"
894		depends="extra166ycompile"
895		description="Builds library jar from compiled sources">
896
897	<	<mkdir dir="${build.extra166ylib.dir}"/>
898	<
720	<	<jar destfile="${extra166yproduct.jar}" index="true">
721	<	<fileset dir="${build.extra166y.dir}"/>
897	>	<jar destfile="${extra166y.jar}" index="true">
898	>	<fileset dir="${build.extra166y.classes.dir}"/>
899		</jar>
900
901		</target>
902
903
727	–
904		<target name="extra166ydocs"
905	<	description="Builds javadocs with custom tags to build folder">
905	>	description="Builds javadocs to build dir">
906
907	<	<delete dir="${build.extra166yjavadocs.dir}"/>
908	<	<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>
907	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
908	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
909
910	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
911	+	packagenames="extra166y.*"
912	+	link="${jdkapidocs.url}"
913	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
914	+	bootclasspath="${bootclasspath6}"
915	+	source="6"
916	+	executable="${javadoc7}">
917	+	<arg value="-XDignore.symbol.file=true"/>
918
919		</javadoc>
744	–
920		</target>
921
922
923		<target name="extra166ydist"
924	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
924	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
925		description="Puts all distributable products in single hierarchy"/>
926
927
753	–
928		<target name="extra166yclean"
929	<	description="Removes all build products">
929	>	description="Removes all extra166y build products">
930
931		<delete dir="${build.extra166y.dir}"/>
758	–	<delete dir="${build.extra166ylib.dir}"/>
932
933		</target>
934
935
763	–
936		<target name="extra166ydist-clean"
937		description="Removes all build and distribution products">
938
939		</target>
940
941	<	<target name="extra166ydist-docs"
942	<	description="Builds javadocs without custom tags to dist folder">
941	>	<target name="extra166ydist-jar"
942	>	depends="extra166yclean, extra166y-jar">
943
944	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
945	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
944	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
945	>
946	>	</target>
947	>
948	>	<!-- jsr166e -->
949	>
950	>	<target name="jsr166ecompile"
951	>	depends="configure-compiler"
952	>	description="Compiles jsr166e sources">
953	>
954	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
955	>
956	>	<javac srcdir="${topsrc.dir}"
957	>	destdir="${build.jsr166e.classes.dir}"
958	>	debug="${build.debug}"
959	>	debuglevel="${build.debuglevel}"
960	>	deprecation="${build.deprecation}"
961	>	source="7"
962	>	classpath=""
963	>	includeAntRuntime="false"
964	>	includeJavaRuntime="false"
965	>	executable="${javac7}"
966	>	fork="true">
967	>
968	>	<include name="jsr166e/**/*.java"/>
969	>	<compilerarg value="-XDignore.symbol.file=true"/>
970	>	<compilerarg value="-Xlint:all"/>
971	>	<compilerarg line="${build.args}"/>
972	>
973	>	</javac>
974	>	</target>
975	>
976	>
977	>	<target name="jsr166e-jar"
978	>	depends="jsr166ecompile"
979	>	description="Builds library jar from compiled sources">
980	>
981	>	<jar destfile="${jsr166e.jar}" index="true">
982	>	<fileset dir="${build.jsr166e.classes.dir}"/>
983	>	</jar>
984	>
985	>	</target>
986	>
987	>
988	>	<target name="jsr166edocs"
989	>	description="Builds javadocs to build dir">
990	>
991	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
992	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
993	>
994	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
995	>	packagenames="jsr166e.*"
996	>	link="${jdkapidocs.url}"
997	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
998	>	source="7"
999	>	executable="${javadoc7}">
1000	>	<arg value="-XDignore.symbol.file=true"/>
1001
775	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
776	–	link="http://java.sun.com/javase/6/docs/api/"
777	–	source="${build.sourcelevel}"
778	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
779	–	>
780	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
781	–	<include name="extra166y/*.java"/>
782	–	</fileset>
1002		</javadoc>
1003	+	</target>
1004	+
1005	+
1006	+	<target name="jsr166edist"
1007	+	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1008	+	description="Puts all distributable products in single hierarchy"/>
1009	+
1010	+
1011	+	<target name="jsr166eclean"
1012	+	description="Removes all jsr166e build products">
1013	+
1014	+	<delete dir="${build.jsr166e.dir}"/>
1015
1016		</target>
1017
787	–	<target name="extra166ydist-jar"
788	–	depends="extra166yclean, extra166yjar">
1018
1019	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1019	>	<target name="jsr166edist-clean"
1020	>	description="Removes all build and distribution products">
1021	>
1022	>	</target>
1023	>
1024	>	<target name="jsr166edist-jar"
1025	>	depends="jsr166eclean, jsr166e-jar">
1026	>
1027	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1028
1029		</target>
1030

Diff Legend

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