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.104 by jsr166, Sat Jan 19 21:40:04 2013 UTC vs.
Revision 1.132 by jsr166, Fri Feb 1 21:58:27 2013 UTC

#	Line 22 | Line 22
22		$HOME/jdk/src/jdk8
23		where each of the above is a complete JDK source tree
24		(e.g. mercurial forest) or a symlink to same.
25	+	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Advises user to run with -projecthelp">
30	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
29	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<java classname="org.apache.tools.ant.Main">
31	>	<arg value="-projecthelp" />
32	>	</java>
33		</target>
34
35
#	Line 35 | Line 38
38
39
40		<!-- Compilation options -->
41	<	<property name="build.sourcelevel"    value="1.6"/>
41	>	<property name="build.sourcelevel"    value="6"/>
42		<property name="build.debug"          value="true"/>
43		<property name="build.debuglevel"     value="source,lines,vars"/>
44		<property name="build.deprecation"    value="false"/>
45	+	<property name="build.javadoc.access" value="protected"/>
46
47		<!-- Build locations -->
48		<property name="build.dir"                   location="build"/>
49		<property name="build.classes.dir"           location="${build.dir}/classes"/>
50		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
51		<property name="build.loops.dir"             location="${build.dir}/loops"/>
48	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
49	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
52		<property name="build.reports.dir"           location="${build.dir}/reports"/>
53
54	<	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
55	<	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
56	<	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
57	<	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56	<	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
54	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
55	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
56	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
57	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
58
59		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61	–
60		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65	–
61		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69	–
62		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72	–	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
63
64	<	<!-- JDK binary locations -->
64	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68	>
69	>	<!-- JDK locations -->
70		<property name="jdks.home"  location="${user.home}/jdk"/>
71
72		<macrodef name="defjdklocations">
#	Line 81 | Line 76
76		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
77		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
78		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
79		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
80	<	<property name="bootclasspath@{v}"
81	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
80	>	<local name="boot.jar.dir"/>
81	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
82	>	<path id="bootclasspath@{v}">
83	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
84	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
85	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
86	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
87	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
88	>	</path>
89	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
90		</sequential>
91		</macrodef>
92
93	<	<defjdklocations v="6"/>
94	<	<defjdklocations v="7"/>
95	<	<defjdklocations v="8"/>
94	<
95	<	<macrodef name="run-tck-tests">
96	<	<attribute name="jvm"/>
97	<	<attribute name="tck.classes"/>
98	<	<attribute name="product.jar" default="${product.jar}"/>
99	<	<attribute name="jvmflags" default=""/>
93	>	<macrodef name="mirror-dir">
94	>	<attribute name="src"/>
95	>	<attribute name="dst"/>
96		<sequential>
97	<	<java classname="JSR166TestCase"
98	<	jvm="@{jvm}" fork="true">
99	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
100	<	<jvmarg line="@{jvmflags}"/>
101	<	<classpath>
106	<	<pathelement location="${junit.jar}"/>
107	<	<pathelement location="@{tck.classes}"/>
108	<	</classpath>
109	<	</java>
97	>	<delete dir="@{dst}"/>
98	>	<mkdir dir="@{dst}"/>
99	>	<copy todir="@{dst}" preservelastmodified="true">
100	>	<fileset dir="@{src}"/>
101	>	</copy>
102		</sequential>
103		</macrodef>
104
105	+	<defjdklocations v="6"/>
106	+	<defjdklocations v="7"/>
107	+	<defjdklocations v="8"/>
108	+
109		<!-- Source locations -->
110		<property name="src.dir"              location="${basedir}/src/main"/>
111		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 124 | Line 120
120		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
121		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
123
124	<	<!-- Distribution locations -->
125	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
126	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
127	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
128	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
129	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
130	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
124	>	<!-- Javadoc locations -->
125	>	<property name="docs.dir"          location="${build.dir}/docs"/>
126	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131	>
132	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138
139		<!-- Jar locations -->
140	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
141	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
142	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
143	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
144	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
145	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
146	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
145	<
146	<	<!-- Bootclasspath argument -->
147	<	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
140	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
141	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
142	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
143	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
144	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
145	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
146	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
147
148		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
149		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
#	Line 152 | Line 151
151		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
152
153		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154	<	<!-- The below does not yet exist as of 2012-11 -->
154	>	<!-- The below does not yet exist as of 2013-01 -->
155		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
156	+
157	+	<!-- Default jdk api doc location (latest stable release seems best) -->
158		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
159
160	+	<!-- Define the "jtreg" task -->
161	+	<!-- See the docs in "jtreg -onlineHelp" -->
162	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
163	+	classpath="${lib.dir}/jtreg.jar" />
164	+
165		<!-- Test classpath -->
166		<path id="test.classpath">
167		<pathelement location="${build.testcases.dir}"/>
168		<pathelement location="${junit.jar}"/>
169		</path>
170
171	+	<macrodef name="run-tck-tests">
172	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	+	<attribute name="source" default="6"/>
174	+	<attribute name="target"/>
175	+	<attribute name="workdir"/>
176	+	<attribute name="classes"/>
177	+	<attribute name="jvmflags" default=""/>
178	+	<element name="javac-elements" optional="true"/>
179	+	<sequential>
180	+
181	+	<mkdir dir="@{workdir}/tck-classes"/>
182	+
183	+	<javac srcdir="@{tck.src.dir}"
184	+	destdir="@{workdir}/tck-classes"
185	+	debug="${build.debug}"
186	+	debuglevel="${build.debuglevel}"
187	+	deprecation="${build.deprecation}"
188	+	source="@{source}"
189	+	classpath="${junit.jar}"
190	+	bootclasspath="@{classes}:${bootclasspath@{source}}"
191	+	includeAntRuntime="false"
192	+	includeJavaRuntime="false"
193	+	executable="${javac@{target}}"
194	+	fork="true">
195	+
196	+	<include name="*.java"/>
197	+	<compilerarg value="-XDignore.symbol.file=true"/>
198	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199	+	<compilerarg line="${build.args}"/>
200	+	<javac-elements/>
201	+
202	+	</javac>
203	+
204	+	<java classname="JSR166TestCase"
205	+	failonerror="true"
206	+	jvm="${java@{target}}"
207	+	fork="true">
208	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
209	+	<jvmarg line="@{jvmflags}"/>
210	+	<classpath>
211	+	<pathelement location="${junit.jar}"/>
212	+	<pathelement location="@{workdir}/tck-classes"/>
213	+	</classpath>
214	+	</java>
215	+
216	+	</sequential>
217	+	</macrodef>
218	+
219		<!-- ALoops classpath -->
220		<path id="loops.classpath">
221		<pathelement location="${build.loops.dir}"/>
222		</path>
223
224		<!-- Support @jls tag, used in jdk8+ javadoc -->
225	<	<!-- TODO: How do we get &trade to work? -->
172	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
173	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
225	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
226		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
227
228		<!-- Main targets -->
229
230		<target name="dists"
231	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
231	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
232		description="Builds all public jars and docs"/>
233
234		<target name="compile"
#	Line 198 | Line 249
249		fork="true">
250
251		<include name="**/*.java"/>
201	–	<compilerarg line="${build.args}"/>
252		<compilerarg value="-XDignore.symbol.file=true"/>
253		<compilerarg value="-Xlint:all"/>
204	–
205	–	<!--
206	–	<exclude name="java/lang/**"/>
254		<compilerarg line="${build.args}"/>
208	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
209	–	-->
255
256		</javac>
212	–
257		</target>
258
259
216	–
260		<target name="jar"
261		depends="compile"
262		description="Builds library jar from compiled sources">
263
221	–	<mkdir dir="${build.lib.dir}"/>
222	–
264		<jar destfile="${product.jar}">
265		<fileset dir="${build.classes.dir}"/>
266		</jar>
226	–
267		</target>
268
269
230	–
270		<target name="test"
271		depends="configure-tests, report-tests"
272		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
273
274
236	–
275		<target name="docs"
276		description="Builds javadocs for src/main to dist dir">
277
278	<	<delete dir="${dist.javadocs.dir}"/>
279	<	<mkdir dir="${dist.javadocs.dir}"/>
278	>	<delete dir="${docs.dir}"/>
279	>	<mkdir dir="${docs.dir}"/>
280
281		<!-- the packagenames="none" hack below prevents scanning the -->
282		<!-- sourcepath for packages -->
283
284	<	<javadoc destdir="${dist.javadocs.dir}"
284	>	<javadoc destdir="${docs.dir}"
285		packagenames="none"
286		link="${jdkapi8docs.url}"
287		overview="${src.dir}/intro.html"
288	+	access="${build.javadoc.access}"
289		sourcepath="${src.dir}:${jdk8src.dir}"
290		classpath=""
291		executable="${javadoc8}">
253	–	<arg value="-XDignore.symbol.file=true"/>
254	–	<arg value="-tag"/>
255	–	<arg value="${javadoc.jls.option}"/>
292		<fileset dir="${src.dir}" defaultexcludes="yes">
293		<include name="**/*.java"/>
294		</fileset>
295	+	<arg value="-XDignore.symbol.file=true"/>
296	+	<arg value="-tag"/>
297	+	<arg value="${javadoc.jls.option}"/>
298		</javadoc>
260	–
299		</target>
300
301
264	–
302		<target name="dist"
303	<	depends="dist-clean, dist-jar, docs"
303	>	depends="dist-clean, dist-jar, dist-docs"
304		description="Puts all distributable products in single hierarchy"/>
305
306
#	Line 282 | Line 319
319		<exclude name="**/SyntaxTest.java"/>
320		<exclude name="**/SuperfluousAbstract.java"/>
321		</jar>
285	–
322		</target>
323
324
289	–
325		<target name="clean"
326		description="Removes all build products">
327
328		<delete dir="${build.dir}"/>
294	–	<delete dir="${build.classes.dir}"/>
295	–	<delete dir="${build.lib.dir}"/>
329
330		</target>
331
332
300	–
333		<target name="dist-clean"
334		description="Removes all build and distribution products">
335
#	Line 306 | Line 338
338		</target>
339
340
309	–
341		<!-- Internal targets -->
342
343
344		<target name="dist-jar"
345		depends="clean, jar">
315	–
346		<copy file="${product.jar}" todir="${dist.dir}"/>
347	+	</target>
348
349	+	<target name="dist-docs"
350	+	depends="clean, docs">
351	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
352		</target>
353
354
#	Line 324 | Line 358
358		<mkdir dir="${build.testcases.dir}"/>
359
360		<javac srcdir="${tck.src.dir}"
361	<	destdir="${build.testcases.dir}"
362	<	debug="${build.debug}"
363	<	debuglevel="${build.debuglevel}"
364	<	deprecation="${build.deprecation}"
365	<	source="${build.sourcelevel}"
366	<	fork="true">
361	>	destdir="${build.testcases.dir}"
362	>	debug="${build.debug}"
363	>	debuglevel="${build.debuglevel}"
364	>	deprecation="${build.deprecation}"
365	>	source="6"
366	>	classpath="${junit.jar}"
367	>	bootclasspath="@{product.jar}:${bootclasspath6}"
368	>	includeAntRuntime="false"
369	>	includeJavaRuntime="false"
370	>	executable="${javac8}"
371	>	fork="true">
372
373	<	<compilerarg value="${bootclasspath.args}"/>
335	<	<compilerarg line="${build.args}"/>
373	>	<include name="**/*.java"/>
374		<compilerarg value="-XDignore.symbol.file=true"/>
375	<
376	<	<classpath refid="test.classpath"/>
375	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
376	>	<compilerarg line="${build.args}"/>
377
378		</javac>
379
380		<javac srcdir="${test.src.dir}"
381	<	destdir="${build.testcases.dir}"
382	<	debug="${build.debug}"
383	<	debuglevel="${build.debuglevel}"
384	<	deprecation="${build.deprecation}"
385	<	source="${build.sourcelevel}"
386	<	fork="true">
387	<
388	<	<include name="jsr166/test/**"/>
381	>	destdir="${build.testcases.dir}"
382	>	debug="${build.debug}"
383	>	debuglevel="${build.debuglevel}"
384	>	deprecation="${build.deprecation}"
385	>	source="6"
386	>	classpath=""
387	>	bootclasspath="@{product.jar}:${bootclasspath6}"
388	>	includeAntRuntime="false"
389	>	includeJavaRuntime="false"
390	>	executable="${javac8}"
391	>	fork="true">
392
393	<	<compilerarg value="${bootclasspath.args}"/>
353	<	<compilerarg line="${build.args}"/>
393	>	<include name="jsr166/test/**/*.java"/>
394		<compilerarg value="-XDignore.symbol.file=true"/>
395	<
396	<	<classpath refid="test.classpath"/>
395	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
396	>	<compilerarg line="${build.args}"/>
397
398		</javac>
399
#	Line 366 | Line 406
406		source="${build.sourcelevel}"
407		fork="true">
408
409	<	<compilerarg value="${bootclasspath.args}"/>
370	<	<compilerarg line="${build.args}"/>
409	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
410		<compilerarg value="-XDignore.symbol.file=true"/>
411	<
373	<	<classpath refid="test.classpath"/>
411	>	<compilerarg line="${build.args}"/>
412
413		</javac>
414		-->
415
416		</target>
417
418	+	<target name="test-tck"
419	+	depends="jar"
420	+	description="Runs tck tests for main directly">
421	+
422	+	<run-tck-tests
423	+	target="8"
424	+	workdir="${build.dir}"
425	+	classes="${product.jar}"/>
426	+	</target>
427
428		<target name="run-tests"
429		depends="compile-tests">
#	Line 391 | Line 438
438		errorProperty="junit.failed"
439		failureProperty="junit.failed"
440		dir="${build.reports.dir}"
441	+	jvm="${java8}"
442		fork="true">
443
444	<	<jvmarg value="${bootclasspath.args}"/>
444	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
445		<jvmarg value="-server"/>
446		<jvmarg value="-showversion"/>
447
#	Line 522 | Line 570
570
571		<!-- jsr166 4jdk7 -->
572
525	–
573		<target name="4jdk7compile"
574		depends="configure-compiler"
575		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 534 | Line 581
581		debug="${build.debug}"
582		debuglevel="${build.debuglevel}"
583		deprecation="${build.deprecation}"
584	<	source="1.6"
584	>	source="6"
585		classpath=""
586		bootclasspath="${bootclasspath6}"
587		includeAntRuntime="false"
#	Line 543 | Line 590
590		fork="true">
591
592		<include name="**/*.java"/>
546	–	<compilerarg line="${build.args}"/>
593		<compilerarg value="-XDignore.symbol.file=true"/>
594		<compilerarg value="-Xlint:all"/>
595	+	<compilerarg line="${build.args}"/>
596
597		</javac>
598	+	</target>
599	+
600
601	<	<mkdir dir="${build.4jdk7.lib.dir}"/>
601	>	<target name="4jdk7jar"
602	>	depends="4jdk7compile"
603	>	description="Builds library jar from compiled sources">
604
605	<	<jar destfile="${4jdk7product.jar}" index="true">
605	>	<jar destfile="${4jdk7product.jar}">
606		<fileset dir="${build.4jdk7.classes.dir}"/>
607		</jar>
608
558	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
559	–
560	–	<javac srcdir="${tck.src.dir}"
561	–	destdir="${build.4jdk7.tck.classes.dir}"
562	–	debug="${build.debug}"
563	–	debuglevel="${build.debuglevel}"
564	–	deprecation="${build.deprecation}"
565	–	source="1.6"
566	–	classpath="${junit.jar}"
567	–	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
568	–	includeAntRuntime="false"
569	–	includeJavaRuntime="false"
570	–	executable="${javac7}"
571	–	fork="true">
572	–
573	–	<include name="**/*.java"/>
574	–	<compilerarg line="${build.args}"/>
575	–	<compilerarg value="-XDignore.symbol.file=true"/>
576	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577	–
578	–	</javac>
579	–
609		</target>
610
611
612		<target name="4jdk7-test-tck"
613	<	depends="4jdk7compile"
613	>	depends="4jdk7jar"
614		description="Runs tck tests for jsr166-4jdk7 directly">
615	+
616		<run-tck-tests
617	<	jvm="${java7}"
618	<	tck.classes="${build.4jdk7.tck.classes.dir}"
619	<	product.jar="${4jdk7product.jar}"/>
617	>	target="7"
618	>	workdir="${build.4jdk7.dir}"
619	>	classes="${4jdk7product.jar}">
620	>	<javac-elements>
621	>	<exclude name="StampedLockTest.java"/>
622	>	</javac-elements>
623	>	</run-tck-tests>
624		</target>
625
626
#	Line 618 | Line 652
652		</junit>
653		</target>
654
655	+	<target name="4jdk7-test-jtreg"
656	+	depends="4jdk7compile"
657	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
658	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
659	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
660	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
661	+	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
662	+	<jtreg dir="${jtreg.src.dir}"
663	+	jdk="${jdk7.home}"
664	+	workDir="${build.4jdk7.dir}/JTwork"
665	+	reportDir="${build.4jdk7.dir}/JTreport">
666	+
667	+	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
668	+	<arg value="-agentvm"/>
669	+	<arg value="-v:nopass,fail"/>
670	+	<arg value="-vmoptions:-esa -ea"/>
671	+	<arg value="-automatic"/>
672	+	<arg value="-k:!ignore"/>
673	+	</jtreg>
674	+	</target>
675	+
676	+
677	+	<target name="4jdk7-test"
678	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
679	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
680	+	</target>
681	+
682
683		<target name="4jdk7docs"
684		description="Builds javadocs for src/jdk7 to dist dir">
685
686	<	<delete dir="${dist.4jdk7.docs.dir}"/>
687	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
686	>	<delete dir="${4jdk7docs.dir}"/>
687	>	<mkdir dir="${4jdk7docs.dir}"/>
688
689	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
689	>	<javadoc destdir="${4jdk7docs.dir}"
690		packagenames="none"
691		link="${jdkapi7docs.url}"
692		overview="${4jdk7src.dir}/intro.html"
693	+	access="${build.javadoc.access}"
694		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
695		classpath=""
696		executable="${javadoc7}">
635	–	<arg value="-XDignore.symbol.file=true"/>
697		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
698		<include name="**/*.java"/>
699		</fileset>
700	+	<arg value="-XDignore.symbol.file=true"/>
701		</javadoc>
640	–
702		</target>
703
704
705		<target name="4jdk7dist"
706	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
706	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
707		description="Puts all distributable products in single hierarchy"/>
708
709
649	–
710		<target name="4jdk7clean"
711	<	description="Removes all build products">
711	>	description="Removes all 4jdk7 build products">
712
713		<delete dir="${build.4jdk7.dir}"/>
714
715		</target>
716
717
658	–
718		<target name="4jdk7dist-clean"
719		description="Removes all build and distribution products">
720
721		</target>
722
723		<target name="4jdk7dist-jar"
724	<	depends="4jdk7clean, 4jdk7compile">
666	<
724	>	depends="4jdk7clean, 4jdk7jar">
725		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
726	+	</target>
727
728	+
729	+	<target name="4jdk7dist-docs"
730	+	depends="4jdk7clean, 4jdk7docs">
731	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
732		</target>
733
671	–	<!-- jsr166x -->
734
735	+	<!-- jsr166x -->
736
737		<target name="jsr166xcompile"
738		depends="configure-compiler"
739	<	description="Compiles jsr166x sources">
739	>	description="Compiles jsr166x sources to build dir">
740
741	<	<mkdir dir="${build.jsr166x.dir}"/>
741	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
742
743	<	<javac srcdir="${jsr166xsrc.dir}"
744	<	destdir="${build.jsr166x.dir}"
745	<	debug="${build.debug}"
746	<	debuglevel="${build.debuglevel}"
747	<	deprecation="${build.deprecation}"
748	<	source="${build.sourcelevel}"
749	<	fork="true">
743	>	<javac srcdir="${topsrc.dir}"
744	>	destdir="${build.jsr166x.classes.dir}"
745	>	debug="${build.debug}"
746	>	debuglevel="${build.debuglevel}"
747	>	deprecation="${build.deprecation}"
748	>	classpath=""
749	>	bootclasspath="${bootclasspath6}"
750	>	source="5"
751	>	includeAntRuntime="false"
752	>	includeJavaRuntime="false"
753	>	executable="${javac7}"
754	>	fork="true">
755
756	<	<include name="**/*.java"/>
689	<	<compilerarg line="${build.args}"/>
756	>	<include name="jsr166x/**/*.java"/>
757		<compilerarg value="-XDignore.symbol.file=true"/>
758	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
759	+	<compilerarg line="${build.args}"/>
760
761		</javac>
693	–
762		</target>
763
764
697	–
765		<target name="jsr166xjar"
766		depends="jsr166xcompile"
767		description="Builds library jar from compiled sources">
768
769	<	<mkdir dir="${build.jsr166xlib.dir}"/>
770	<
704	<	<jar destfile="${jsr166xproduct.jar}">
705	<	<fileset dir="${build.jsr166x.dir}"/>
769	>	<jar destfile="${jsr166x.jar}">
770	>	<fileset dir="${build.jsr166x.classes.dir}"/>
771		</jar>
772
773		</target>
774
775
711	–
776		<target name="jsr166xdocs"
777		description="Builds javadocs to dist dir">
778
779	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
780	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
779	>	<delete dir="${jsr166xdocs.dir}"/>
780	>	<mkdir dir="${jsr166xdocs.dir}"/>
781
782	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
783	<	packagenames="jsr166x"
782	>	<javadoc destdir="${jsr166xdocs.dir}"
783	>	packagenames="jsr166x.*"
784		link="${jdkapidocs.url}"
785	<	source="${build.sourcelevel}"
786	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
787	<	additionalparam="-XDignore.symbol.file=true" />
785	>	access="${build.javadoc.access}"
786	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
787	>	bootclasspath="${bootclasspath6}"
788	>	source="5"
789	>	executable="${javadoc7}">
790	>	<arg value="-XDignore.symbol.file=true"/>
791
792	+	</javadoc>
793		</target>
794
795
796		<target name="jsr166xdist"
797	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
797	>	depends="jsr166xdist-jar, jsr166xdist-docs"
798		description="Puts all distributable products in single hierarchy"/>
799
800
733	–
801		<target name="jsr166xclean"
802	<	description="Removes all build products">
802	>	description="Removes all jsr166x build products">
803
804		<delete dir="${build.jsr166x.dir}"/>
738	–	<delete dir="${build.jsr166xlib.dir}"/>
805
806		</target>
807
808
743	–
809		<target name="jsr166xdist-clean"
810		description="Removes all build and distribution products">
811
812		</target>
813
814
750	–
751	–	<target name="jsr166xdist-docs"
752	–	description="Builds javadocs to dist dir">
753	–
754	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
755	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
756	–
757	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
758	–	packagenames="jsr166x"
759	–	link="${jdkapidocs.url}"
760	–	source="${build.sourcelevel}"
761	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
762	–	additionalparam="-XDignore.symbol.file=true" />
763	–
764	–	</target>
765	–
815		<target name="jsr166xdist-jar"
816		depends="jsr166xclean, jsr166xjar">
817	+	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
818	+	</target>
819
820	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
821	<
820	>	<target name="jsr166xdist-docs"
821	>	depends="jsr166xclean, jsr166xdocs">
822	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
823		</target>
824
825		<!-- jsr166y -->
#	Line 777 | Line 829
829		depends="configure-compiler"
830		description="Compiles jsr166y sources">
831
832	<	<mkdir dir="${build.jsr166y.dir}"/>
832	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
833
834		<javac srcdir="${topsrc.dir}"
835	<	destdir="${build.jsr166y.dir}"
835	>	destdir="${build.jsr166y.classes.dir}"
836		debug="${build.debug}"
837		debuglevel="${build.debuglevel}"
838		deprecation="${build.deprecation}"
839	<	source="1.6"
839	>	source="6"
840		classpath=""
841		bootclasspath="${bootclasspath6}"
842		includeAntRuntime="false"
#	Line 793 | Line 845
845		fork="true">
846
847		<include name="jsr166y/**/*.java"/>
796	–	<compilerarg line="${build.args}"/>
848		<compilerarg value="-XDignore.symbol.file=true"/>
849		<compilerarg value="-Xlint:all"/>
850	+	<compilerarg line="${build.args}"/>
851	+
852		</javac>
853		</target>
854
#	Line 804 | Line 857
857		depends="jsr166ycompile"
858		description="Builds library jar from compiled sources">
859
860	<	<mkdir dir="${build.jsr166ylib.dir}"/>
861	<
809	<	<jar destfile="${jsr166yproduct.jar}" index="true">
810	<	<fileset dir="${build.jsr166y.dir}"/>
860	>	<jar destfile="${jsr166y.jar}" index="true">
861	>	<fileset dir="${build.jsr166y.classes.dir}"/>
862		</jar>
863
864		</target>
865
866
816	–
867		<target name="jsr166ydocs"
868		description="Builds javadocs to dist dir">
869
870	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
871	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
870	>	<delete dir="${jsr166ydocs.dir}"/>
871	>	<mkdir dir="${jsr166ydocs.dir}"/>
872
873	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
874	<	packagenames="jsr166y"
873	>	<javadoc destdir="${jsr166ydocs.dir}"
874	>	packagenames="jsr166y.*"
875		link="${jdkapidocs.url}"
876	<	source="${build.sourcelevel}"
877	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
878	<	additionalparam="-XDignore.symbol.file=true" />
876	>	access="${build.javadoc.access}"
877	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
878	>	bootclasspath="${bootclasspath6}"
879	>	source="6"
880	>	executable="${javadoc7}">
881	>	<arg value="-XDignore.symbol.file=true"/>
882
883	+	</javadoc>
884		</target>
885
886
887		<target name="jsr166ydist"
888	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
888	>	depends="jsr166ydist-jar, jsr166ydist-docs"
889		description="Puts all distributable products in single hierarchy"/>
890
891
838	–
892		<target name="jsr166yclean"
893	<	description="Removes all build products">
893	>	description="Removes all jsr166y build products">
894
895		<delete dir="${build.jsr166y.dir}"/>
843	–	<delete dir="${build.jsr166ylib.dir}"/>
896
897		</target>
898
899
848	–
900		<target name="jsr166ydist-clean"
901		description="Removes all build and distribution products">
902
903		</target>
904
854	–	<target name="jsr166ydist-docs"
855	–	description="Builds javadocs to dist dir">
856	–
857	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
858	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
859	–
860	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
861	–	packagenames="jsr166y"
862	–	link="${jdkapidocs.url}"
863	–	source="${build.sourcelevel}"
864	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
865	–	additionalparam="-XDignore.symbol.file=true" />
866	–
867	–	</target>
868	–
905		<target name="jsr166ydist-jar"
906		depends="jsr166yclean, jsr166yjar">
907	+	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
908	+	</target>
909
910	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
911	<
910	>	<target name="jsr166ydist-docs"
911	>	depends="jsr166yclean, jsr166ydocs">
912	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
913		</target>
914
915
#	Line 881 | Line 920
920		depends="configure-compiler, jsr166yjar"
921		description="Compiles extra166y sources">
922
923	<	<mkdir dir="${build.extra166y.dir}"/>
923	>	<mkdir dir="${build.extra166y.classes.dir}"/>
924
925		<javac srcdir="${topsrc.dir}"
926	<	destdir="${build.extra166y.dir}"
926	>	destdir="${build.extra166y.classes.dir}"
927		debug="${build.debug}"
889	–	classpath=""
928		debuglevel="${build.debuglevel}"
929		deprecation="${build.deprecation}"
930	<	source="1.6"
931	<	bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
930	>	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
931	>	classpath=""
932	>	source="6"
933		includeAntRuntime="false"
934		includeJavaRuntime="false"
935		executable="${javac7}"
936		fork="true">
937
938		<include name="extra166y/**/*.java"/>
900	–	<compilerarg line="${build.args}"/>
939		<compilerarg value="-XDignore.symbol.file=true"/>
940		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
941	+	<compilerarg line="${build.args}"/>
942
943		</javac>
905	–
944		</target>
945
946
909	–
947		<target name="extra166yjar"
948		depends="extra166ycompile"
949		description="Builds library jar from compiled sources">
950
951	<	<mkdir dir="${build.extra166ylib.dir}"/>
952	<
916	<	<jar destfile="${extra166yproduct.jar}" index="true">
917	<	<fileset dir="${build.extra166y.dir}"/>
951	>	<jar destfile="${extra166y.jar}" index="true">
952	>	<fileset dir="${build.extra166y.classes.dir}"/>
953		</jar>
954
955		</target>
956
957
923	–
958		<target name="extra166ydocs"
959	<	description="Builds javadocs with custom tags to build dir">
959	>	description="Builds javadocs to build dir">
960
961	<	<delete dir="${build.extra166yjavadocs.dir}"/>
962	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
961	>	<delete dir="${extra166ydocs.dir}"/>
962	>	<mkdir dir="${extra166ydocs.dir}"/>
963
964	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
965	<	packagenames="extra166y"
964	>	<javadoc destdir="${extra166ydocs.dir}"
965	>	packagenames="extra166y.*"
966		link="${jdkapidocs.url}"
967	<	source="${build.sourcelevel}"
968	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
969	<	additionalparam="-XDignore.symbol.file=true" />
967	>	access="${build.javadoc.access}"
968	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
969	>	bootclasspath="${bootclasspath6}"
970	>	source="6"
971	>	executable="${javadoc7}">
972	>	<arg value="-XDignore.symbol.file=true"/>
973
974	+	</javadoc>
975		</target>
976
977
978		<target name="extra166ydist"
979	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
979	>	depends="extra166ydist-jar, extra166ydist-docs"
980		description="Puts all distributable products in single hierarchy"/>
981
982
945	–
983		<target name="extra166yclean"
984	<	description="Removes all build products">
984	>	description="Removes all extra166y build products">
985
986		<delete dir="${build.extra166y.dir}"/>
950	–	<delete dir="${build.extra166ylib.dir}"/>
987
988		</target>
989
990
955	–
991		<target name="extra166ydist-clean"
992		description="Removes all build and distribution products">
993
994		</target>
995
961	–	<target name="extra166ydist-docs"
962	–	description="Builds javadocs to dist dir">
963	–
964	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
965	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
966	–
967	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
968	–	packagenames="extra166y"
969	–	link="${jdkapidocs.url}"
970	–	source="${build.sourcelevel}"
971	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
972	–	additionalparam="-XDignore.symbol.file=true" />
973	–
974	–	</target>
975	–
996		<target name="extra166ydist-jar"
997		depends="extra166yclean, extra166yjar">
998	+	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
999	+	</target>
1000
1001	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1002	<
1001	>	<target name="extra166ydist-docs"
1002	>	depends="extra166yclean, extra166ydocs">
1003	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1004		</target>
1005
1006		<!-- jsr166e -->
#	Line 986 | Line 1009
1009		depends="configure-compiler"
1010		description="Compiles jsr166e sources">
1011
1012	<	<mkdir dir="${build.jsr166e.dir}"/>
1012	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
1013
1014		<javac srcdir="${topsrc.dir}"
1015	<	destdir="${build.jsr166e.dir}"
1015	>	destdir="${build.jsr166e.classes.dir}"
1016		debug="${build.debug}"
1017		debuglevel="${build.debuglevel}"
1018		deprecation="${build.deprecation}"
1019	<	source="1.7"
1019	>	source="7"
1020		classpath=""
1021		includeAntRuntime="false"
1022		includeJavaRuntime="false"
#	Line 1001 | Line 1024
1024		fork="true">
1025
1026		<include name="jsr166e/**/*.java"/>
1004	–	<compilerarg line="${build.args}"/>
1027		<compilerarg value="-XDignore.symbol.file=true"/>
1028		<compilerarg value="-Xlint:all"/>
1029	+	<compilerarg line="${build.args}"/>
1030
1031		</javac>
1009	–
1032		</target>
1033
1034
1013	–
1035		<target name="jsr166ejar"
1036		depends="jsr166ecompile"
1037		description="Builds library jar from compiled sources">
1038
1039	<	<mkdir dir="${build.jsr166elib.dir}"/>
1040	<
1020	<	<jar destfile="${jsr166eproduct.jar}" index="true">
1021	<	<fileset dir="${build.jsr166e.dir}"/>
1039	>	<jar destfile="${jsr166e.jar}" index="true">
1040	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1041		</jar>
1042
1043		</target>
1044
1045
1027	–
1046		<target name="jsr166edocs"
1047	<	description="Builds javadocs with custom tags to build dir">
1047	>	description="Builds javadocs to build dir">
1048
1049	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
1050	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1049	>	<delete dir="${jsr166edocs.dir}"/>
1050	>	<mkdir dir="${jsr166edocs.dir}"/>
1051
1052	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1053	<	packagenames="jsr166e,jsr166e.extra"
1054	<	link="${jdkapi7docs.url}"
1055	<	source="1.7"
1052	>	<javadoc destdir="${jsr166edocs.dir}"
1053	>	packagenames="jsr166e.*"
1054	>	link="${jdkapidocs.url}"
1055	>	access="${build.javadoc.access}"
1056		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1057	<	executable="${javadoc7}"
1058	<	additionalparam="-XDignore.symbol.file=true" >
1059	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1060	<	<include name="jsr166e/**/*.java"/>
1043	<	</fileset>
1057	>	source="7"
1058	>	executable="${javadoc7}">
1059	>	<arg value="-XDignore.symbol.file=true"/>
1060	>
1061		</javadoc>
1062	+	</target>
1063	+
1064	+
1065	+	<target name="jsr166e-test-tck"
1066	+	depends="jsr166ejar"
1067	+	description="Runs tck tests for jsr166e">
1068
1069	+	<run-tck-tests
1070	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1071	+	source="7"
1072	+	target="8"
1073	+	workdir="${build.jsr166e.dir}"
1074	+	classes="${jsr166e.jar}"/>
1075		</target>
1076
1077
1078		<target name="jsr166edist"
1079	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1079	>	depends="jsr166edist-jar, jsr166edist-docs"
1080		description="Puts all distributable products in single hierarchy"/>
1081
1082
1054	–
1083		<target name="jsr166eclean"
1084	<	description="Removes all build products">
1057	<
1084	>	description="Removes all jsr166e build products">
1085		<delete dir="${build.jsr166e.dir}"/>
1059	–	<delete dir="${build.jsr166elib.dir}"/>
1060	–
1086		</target>
1087
1088
1064	–
1089		<target name="jsr166edist-clean"
1090		description="Removes all build and distribution products">
1091
1092		</target>
1093
1094	<	<target name="jsr166edist-docs"
1095	<	description="Builds javadocs to dist dir">
1096	<
1097	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1074	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1075	<
1076	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1077	<	packagenames="jsr166e,jsr166e.extra"
1078	<	link="${jdkapidocs.url}"
1079	<	source="1.7"
1080	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1081	<	additionalparam="-XDignore.symbol.file=true" />
1094	>	<target name="jsr166edist-jar"
1095	>	depends="jsr166eclean, jsr166ejar">
1096	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1097	>	</target>
1098
1099	+	<target name="jsr166edist-docs"
1100	+	depends="jsr166eclean, jsr166edocs">
1101	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1102		</target>
1103
1085	–	<target name="jsr166edist-jar"
1086	–	depends="jsr166eclean, jsr166ejar">
1104
1105	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1105	>	<!-- Find buglets that can be detected by static build tools -->
1106
1107	+	<target name="lint">
1108	+	<antcall target="dists">
1109	+	<param name="build.javadoc.access" value="private"/>
1110	+	</antcall>
1111		</target>
1112
1113	+
1114		</project>

Diff Legend

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