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.110 by jsr166, Sun Jan 20 01:09:12 2013 UTC vs.
Revision 1.133 by jsr166, Sun Feb 3 02:16:08 2013 UTC

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

Diff Legend

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