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.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC vs.
Revision 1.141 by jsr166, Tue Jun 18 19:03:50 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 39 | Line 42
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	+	<!-- Tck options; see JSR166TestCase.java -->
48	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49	+	<property name="jsr166.profileTests"     value="false"/>
50	+	<property name="jsr166.profileThreshold" value="100"/>
51	+	<property name="jsr166.runsPerTest"      value="1"/>
52	+	<!-- Allow running an individual tck test class -->
53	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
56		<!-- Build locations -->
57		<property name="build.dir"                   location="build"/>
#	Line 57 | Line 70
70		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72
73	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
74	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
75	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
76	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
73	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77
78	<	<!-- JDK binary locations -->
78	>	<!-- JDK locations -->
79		<property name="jdks.home"  location="${user.home}/jdk"/>
80
81		<macrodef name="defjdklocations">
#	Line 72 | Line 85
85		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
86		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
87		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
88		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
89	<	<property name="bootclasspath@{v}"
90	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
89	>	<local name="boot.jar.dir"/>
90	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91	>	<path id="bootclasspath@{v}">
92	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
93	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
94	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
95	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
96	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
97	>	</path>
98	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
99		</sequential>
100		</macrodef>
101
102	<	<defjdklocations v="6"/>
103	<	<defjdklocations v="7"/>
104	<	<defjdklocations v="8"/>
85	<
86	<	<macrodef name="run-tck-tests">
87	<	<attribute name="target"/>
88	<	<attribute name="workdir"/>
89	<	<attribute name="product.jar" default="${product.jar}"/>
90	<	<attribute name="jvmflags" default=""/>
102	>	<macrodef name="mirror-dir">
103	>	<attribute name="src"/>
104	>	<attribute name="dst"/>
105		<sequential>
106	<
107	<	<mkdir dir="@{workdir}/tck-classes"/>
108	<
109	<	<javac srcdir="${tck.src.dir}"
110	<	destdir="@{workdir}/tck-classes"
97	<	debug="${build.debug}"
98	<	debuglevel="${build.debuglevel}"
99	<	deprecation="${build.deprecation}"
100	<	source="6"
101	<	classpath="${junit.jar}"
102	<	bootclasspath="@{product.jar}:${bootclasspath6}"
103	<	includeAntRuntime="false"
104	<	includeJavaRuntime="false"
105	<	executable="${javac@{target}}"
106	<	fork="true">
107	<
108	<	<include name="**/*.java"/>
109	<	<compilerarg value="-XDignore.symbol.file=true"/>
110	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111	<	<compilerarg line="${build.args}"/>
112	<	</javac>
113	<
114	<	<java classname="JSR166TestCase"
115	<	failonerror="true"
116	<	jvm="${java@{target}}"
117	<	fork="true">
118	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
119	<	<jvmarg line="@{jvmflags}"/>
120	<	<classpath>
121	<	<pathelement location="${junit.jar}"/>
122	<	<pathelement location="@{workdir}/tck-classes"/>
123	<	</classpath>
124	<	</java>
125	<
106	>	<delete dir="@{dst}"/>
107	>	<mkdir dir="@{dst}"/>
108	>	<copy todir="@{dst}" preservelastmodified="true">
109	>	<fileset dir="@{src}"/>
110	>	</copy>
111		</sequential>
112		</macrodef>
113
114	+	<defjdklocations v="6"/>
115	+	<defjdklocations v="7"/>
116	+	<defjdklocations v="8"/>
117	+
118		<!-- Source locations -->
119		<property name="src.dir"              location="${basedir}/src/main"/>
120		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 141 | Line 130
130		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132
133	<	<!-- Distribution locations -->
134	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
135	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
136	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
137	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
138	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
139	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
133	>	<!-- Javadoc locations -->
134	>	<property name="docs.dir"          location="${build.dir}/docs"/>
135	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140	>
141	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147
148		<!-- Jar locations -->
149		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 158 | Line 154
154		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
155		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
156
161	–	<!-- Bootclasspath argument -->
162	–	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
163	–
157		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
158		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
159		<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
160		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
161
162		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163	<	<!-- The below does not yet exist as of 2012-11 -->
163	>	<!-- The below does not yet exist as of 2013-01 -->
164		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165
166		<!-- Default jdk api doc location (latest stable release seems best) -->
#	Line 184 | Line 177
177		<pathelement location="${junit.jar}"/>
178		</path>
179
180	+	<macrodef name="run-tck-tests">
181	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
182	+	<attribute name="target"/>
183	+	<attribute name="compile-target" default="@{target}"/>
184	+	<attribute name="workdir"/>
185	+	<attribute name="classes"/>
186	+	<attribute name="jvmflags" default=""/>
187	+	<element name="javac-elements" optional="true"/>
188	+	<sequential>
189	+
190	+	<mkdir dir="@{workdir}/tck-classes"/>
191	+
192	+	<javac srcdir="@{tck.src.dir}"
193	+	destdir="@{workdir}/tck-classes"
194	+	debug="${build.debug}"
195	+	debuglevel="${build.debuglevel}"
196	+	deprecation="${build.deprecation}"
197	+	source="@{compile-target}"
198	+	target="@{compile-target}"
199	+	classpath="${junit.jar}"
200	+	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201	+	includeAntRuntime="false"
202	+	includeJavaRuntime="false"
203	+	executable="${javac@{compile-target}}"
204	+	fork="true">
205	+
206	+	<include name="*.java"/>
207	+	<compilerarg value="-XDignore.symbol.file=true"/>
208	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209	+	<compilerarg line="${build.args}"/>
210	+	<javac-elements/>
211	+
212	+	</javac>
213	+
214	+	<java classname="${jsr166.tckTestClass}"
215	+	failonerror="true"
216	+	jvm="${java@{target}}"
217	+	fork="true">
218	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
219	+	<jvmarg line="@{jvmflags}"/>
220	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223	+	<classpath>
224	+	<pathelement location="${junit.jar}"/>
225	+	<pathelement location="@{workdir}/tck-classes"/>
226	+	</classpath>
227	+	</java>
228	+
229	+	</sequential>
230	+	</macrodef>
231	+
232	+	<macrodef name="run-jtreg-tests">
233	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234	+	<attribute name="source" default="7"/>
235	+	<attribute name="target"/>
236	+	<attribute name="workdir"/>
237	+	<attribute name="classes"/>
238	+	<attribute name="jtregflags" default=""/>
239	+	<sequential>
240	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
241	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
242	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
243	+	<mkdir dir="@{workdir}/JTreport"/>
244	+	<jtreg dir="@{jtreg.src.dir}"
245	+	jdk="${jdk@{target}.home}"
246	+	workDir="@{workdir}/JTwork"
247	+	reportDir="@{workdir}/JTreport">
248	+
249	+	<arg value="-Xbootclasspath/p:@{classes}"/>
250	+	<arg value="-agentvm"/>
251	+	<arg value="-v:nopass,fail"/>
252	+	<arg value="-vmoptions:-esa -ea"/>
253	+	<arg value="-automatic"/>
254	+	<arg value="-k:!ignore"/>
255	+	<arg line="@{jtregflags}"/>
256	+	</jtreg>
257	+	</sequential>
258	+	</macrodef>
259	+
260		<!-- ALoops classpath -->
261		<path id="loops.classpath">
262		<pathelement location="${build.loops.dir}"/>
263		</path>
264
265		<!-- Support @jls tag, used in jdk8+ javadoc -->
266	<	<!-- TODO: How do we get &trade to work? -->
194	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
195	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
196	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
266	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
267		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
268
269		<!-- Main targets -->
#	Line 220 | Line 290
290		fork="true">
291
292		<include name="**/*.java"/>
293	<	<compilerarg line="${build.args}"/>
293	>	<compilerarg value="-Xprefer:source"/>
294		<compilerarg value="-XDignore.symbol.file=true"/>
295		<compilerarg value="-Xlint:all"/>
226	–
227	–	<!--
228	–	<exclude name="java/lang/**"/>
296		<compilerarg line="${build.args}"/>
230	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
231	–	-->
297
298		</javac>
234	–
299		</target>
300
301
238	–
302		<target name="jar"
303		depends="compile"
304		description="Builds library jar from compiled sources">
#	Line 243 | Line 306
306		<jar destfile="${product.jar}">
307		<fileset dir="${build.classes.dir}"/>
308		</jar>
246	–
309		</target>
310
311
250	–
312		<target name="test"
313		depends="configure-tests, report-tests"
314		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315
316
256	–
317		<target name="docs"
318		description="Builds javadocs for src/main to dist dir">
319
320	<	<delete dir="${dist.javadocs.dir}"/>
321	<	<mkdir dir="${dist.javadocs.dir}"/>
320	>	<delete dir="${docs.dir}"/>
321	>	<mkdir dir="${docs.dir}"/>
322
323		<!-- the packagenames="none" hack below prevents scanning the -->
324		<!-- sourcepath for packages -->
325
326	<	<javadoc destdir="${dist.javadocs.dir}"
326	>	<javadoc destdir="${docs.dir}"
327		packagenames="none"
328		link="${jdkapi8docs.url}"
329		overview="${src.dir}/intro.html"
330	+	access="${build.javadoc.access}"
331		sourcepath="${src.dir}:${jdk8src.dir}"
332		classpath=""
333		executable="${javadoc8}">
273	–	<arg value="-XDignore.symbol.file=true"/>
274	–	<arg value="-tag"/>
275	–	<arg value="${javadoc.jls.option}"/>
334		<fileset dir="${src.dir}" defaultexcludes="yes">
335		<include name="**/*.java"/>
336		</fileset>
337	+	<arg value="-XDignore.symbol.file=true"/>
338	+	<arg value="-tag"/>
339	+	<arg value="${javadoc.jls.option}"/>
340		</javadoc>
280	–
341		</target>
342
343
284	–
344		<target name="dist"
345	<	depends="dist-clean, dist-jar, docs"
345	>	depends="dist-clean, dist-jar, dist-docs"
346		description="Puts all distributable products in single hierarchy"/>
347
348
#	Line 302 | Line 361
361		<exclude name="**/SyntaxTest.java"/>
362		<exclude name="**/SuperfluousAbstract.java"/>
363		</jar>
305	–
364		</target>
365
366
309	–
367		<target name="clean"
368		description="Removes all build products">
369
#	Line 315 | Line 372
372		</target>
373
374
318	–
375		<target name="dist-clean"
376		description="Removes all build and distribution products">
377
#	Line 324 | Line 380
380		</target>
381
382
327	–
383		<!-- Internal targets -->
384
385
386		<target name="dist-jar"
387		depends="clean, jar">
333	–
388		<copy file="${product.jar}" todir="${dist.dir}"/>
389	+	</target>
390
391	+	<target name="dist-docs"
392	+	depends="clean, docs">
393	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
394		</target>
395
396
#	Line 348 | Line 406
406		deprecation="${build.deprecation}"
407		source="6"
408		classpath="${junit.jar}"
409	<	bootclasspath="${product.jar}:${bootclasspath6}"
409	>	bootclasspath="@{product.jar}:${bootclasspath6}"
410		includeAntRuntime="false"
411		includeJavaRuntime="false"
412		executable="${javac8}"
413		fork="true">
414
415		<include name="**/*.java"/>
358	–	<compilerarg line="${build.args}"/>
416		<compilerarg value="-XDignore.symbol.file=true"/>
417		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418	+	<compilerarg line="${build.args}"/>
419
420		</javac>
421
#	Line 368 | Line 426
426		deprecation="${build.deprecation}"
427		source="6"
428		classpath=""
429	<	bootclasspath="${product.jar}:${bootclasspath6}"
429	>	bootclasspath="@{product.jar}:${bootclasspath6}"
430		includeAntRuntime="false"
431		includeJavaRuntime="false"
432		executable="${javac8}"
433		fork="true">
434
435		<include name="jsr166/test/**/*.java"/>
378	–
379	–	<compilerarg line="${build.args}"/>
436		<compilerarg value="-XDignore.symbol.file=true"/>
437		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438	+	<compilerarg line="${build.args}"/>
439
440		</javac>
441
#	Line 391 | Line 448
448		source="${build.sourcelevel}"
449		fork="true">
450
451	<	<compilerarg value="${bootclasspath.args}"/>
395	<	<compilerarg line="${build.args}"/>
451	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452		<compilerarg value="-XDignore.symbol.file=true"/>
453	+	<compilerarg line="${build.args}"/>
454
455		</javac>
456		-->
457
458		</target>
459
460	+	<target name="test-tck"
461	+	depends="jar"
462	+	description="Runs tck tests for main directly">
463	+
464	+	<run-tck-tests
465	+	target="8"
466	+	workdir="${build.dir}"
467	+	classes="${product.jar}"/>
468	+	</target>
469	+
470	+	<target name="test-jtreg"
471	+	depends="jar"
472	+	description="Runs jtreg tests for main using the jtreg ant task">
473	+	<run-jtreg-tests
474	+	target="8"
475	+	workdir="${build.dir}"
476	+	classes="${product.jar}"/>
477	+	</target>
478	+
479	+	<target name="test-ng"
480	+	depends="test-tck, test-jtreg"
481	+	description="Runs tck and jtreg tests for main">
482	+	</target>
483
484		<target name="run-tests"
485		depends="compile-tests">
#	Line 546 | Line 626
626
627		<!-- jsr166 4jdk7 -->
628
549	–
629		<target name="4jdk7compile"
630		depends="configure-compiler"
631		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 567 | Line 646
646		fork="true">
647
648		<include name="**/*.java"/>
649	<	<compilerarg line="${build.args}"/>
649	>	<compilerarg value="-Xprefer:source"/>
650		<compilerarg value="-XDignore.symbol.file=true"/>
651		<compilerarg value="-Xlint:all"/>
652	+	<compilerarg line="${build.args}"/>
653
654		</javac>
575	–
655		</target>
656
657	<	<target name="4jdk7-jar"
657	>
658	>	<target name="4jdk7jar"
659		depends="4jdk7compile"
660		description="Builds library jar from compiled sources">
661
#	Line 587 | Line 667
667
668
669		<target name="4jdk7-test-tck"
670	<	depends="4jdk7-jar"
670	>	depends="4jdk7jar"
671		description="Runs tck tests for jsr166-4jdk7 directly">
672
673		<run-tck-tests
674		target="7"
675		workdir="${build.4jdk7.dir}"
676	<	product.jar="${4jdk7product.jar}"/>
676	>	classes="${4jdk7product.jar}">
677	>	<javac-elements>
678	>	<!-- JDK8+ test classes -->
679	>	<exclude name="*8Test.java"/>
680	>	<exclude name="DoubleAccumulatorTest.java"/>
681	>	<exclude name="DoubleAdderTest.java"/>
682	>	<exclude name="LongAccumulatorTest.java"/>
683	>	<exclude name="LongAdderTest.java"/>
684	>	<exclude name="CompletableFutureTest.java"/>
685	>	<exclude name="StampedLockTest.java"/>
686	>	</javac-elements>
687	>	</run-tck-tests>
688		</target>
689
690
#	Line 619 | Line 710
710
711		<formatter type="brief"/>
712
713	<	<test name="JSR166TestCase" haltonfailure="no">
713	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
714		</test>
715
716		</junit>
717		</target>
718
719		<target name="4jdk7-test-jtreg"
720	<	depends="4jdk7compile"
720	>	depends="4jdk7jar"
721		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
722	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
723	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
724	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
725	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
726	<	<jtreg dir="${jtreg.src.dir}"
636	<	jdk="${jdk7.home}"
637	<	workDir="${build.4jdk7.dir}/JTwork"
638	<	reportDir="${build.4jdk7.dir}/JTreport">
639	<
640	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641	<	<arg value="-agentvm"/>
642	<	<arg value="-v:nopass,fail"/>
643	<	<arg value="-vmoptions:-esa -ea"/>
644	<	<arg value="-automatic"/>
645	<	<arg value="-k:!ignore"/>
646	<	</jtreg>
722	>	<run-jtreg-tests
723	>	target="7"
724	>	workdir="${build.4jdk7.dir}"
725	>	classes="${4jdk7product.jar}"
726	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
727		</target>
728
729
#	Line 656 | Line 736
736		<target name="4jdk7docs"
737		description="Builds javadocs for src/jdk7 to dist dir">
738
739	<	<delete dir="${dist.4jdk7.docs.dir}"/>
740	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
739	>	<delete dir="${4jdk7docs.dir}"/>
740	>	<mkdir dir="${4jdk7docs.dir}"/>
741
742	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
742	>	<javadoc destdir="${4jdk7docs.dir}"
743		packagenames="none"
744		link="${jdkapi7docs.url}"
745		overview="${4jdk7src.dir}/intro.html"
746	+	access="${build.javadoc.access}"
747		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
748		classpath=""
749		executable="${javadoc7}">
669	–	<arg value="-XDignore.symbol.file=true"/>
750		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
751		<include name="**/*.java"/>
752		</fileset>
753	+	<arg value="-XDignore.symbol.file=true"/>
754		</javadoc>
674	–
755		</target>
756
757
758		<target name="4jdk7dist"
759	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
759	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
760		description="Puts all distributable products in single hierarchy"/>
761
762
683	–
763		<target name="4jdk7clean"
764		description="Removes all 4jdk7 build products">
765
#	Line 689 | Line 768
768		</target>
769
770
692	–
771		<target name="4jdk7dist-clean"
772		description="Removes all build and distribution products">
773
774		</target>
775
776		<target name="4jdk7dist-jar"
777	<	depends="4jdk7clean, 4jdk7compile">
700	<
777	>	depends="4jdk7clean, 4jdk7jar">
778		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
779	+	</target>
780
781	+
782	+	<target name="4jdk7dist-docs"
783	+	depends="4jdk7clean, 4jdk7docs">
784	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
785		</target>
786
787
#	Line 717 | Line 799
799		debuglevel="${build.debuglevel}"
800		deprecation="${build.deprecation}"
801		classpath=""
720	–	source="5"
802		bootclasspath="${bootclasspath6}"
803	+	source="5"
804		includeAntRuntime="false"
805		includeJavaRuntime="false"
806		executable="${javac7}"
807		fork="true">
808
809		<include name="jsr166x/**/*.java"/>
728	–	<compilerarg line="${build.args}"/>
810		<compilerarg value="-XDignore.symbol.file=true"/>
811		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
812	+	<compilerarg line="${build.args}"/>
813
814		</javac>
733	–
815		</target>
816
817
737	–
818		<target name="jsr166xjar"
819		depends="jsr166xcompile"
820		description="Builds library jar from compiled sources">
#	Line 746 | Line 826
826		</target>
827
828
749	–
829		<target name="jsr166xdocs"
830		description="Builds javadocs to dist dir">
831
832	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
833	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
832	>	<delete dir="${jsr166xdocs.dir}"/>
833	>	<mkdir dir="${jsr166xdocs.dir}"/>
834
835	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
835	>	<javadoc destdir="${jsr166xdocs.dir}"
836		packagenames="jsr166x.*"
837		link="${jdkapidocs.url}"
838	<	source="5"
760	<	bootclasspath="${bootclasspath6}"
838	>	access="${build.javadoc.access}"
839		sourcepath="${topsrc.dir}:${jdk6src.dir}"
840	<	executable="${javadoc7}"
841	<	additionalparam="-XDignore.symbol.file=true"/>
840	>	bootclasspath="${bootclasspath6}"
841	>	source="5"
842	>	executable="${javadoc7}">
843	>	<arg value="-XDignore.symbol.file=true"/>
844
845	+	</javadoc>
846		</target>
847
848
849		<target name="jsr166xdist"
850	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
850	>	depends="jsr166xdist-jar, jsr166xdist-docs"
851		description="Puts all distributable products in single hierarchy"/>
852
853
773	–
854		<target name="jsr166xclean"
855		description="Removes all jsr166x build products">
856
#	Line 779 | Line 859
859		</target>
860
861
782	–
862		<target name="jsr166xdist-clean"
863		description="Removes all build and distribution products">
864
#	Line 788 | Line 867
867
868		<target name="jsr166xdist-jar"
869		depends="jsr166xclean, jsr166xjar">
791	–
870		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
871	+	</target>
872
873	+	<target name="jsr166xdist-docs"
874	+	depends="jsr166xclean, jsr166xdocs">
875	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
876		</target>
877
878		<!-- jsr166y -->
#	Line 816 | Line 898
898		fork="true">
899
900		<include name="jsr166y/**/*.java"/>
819	–	<compilerarg line="${build.args}"/>
901		<compilerarg value="-XDignore.symbol.file=true"/>
902		<compilerarg value="-Xlint:all"/>
903	+	<compilerarg line="${build.args}"/>
904	+
905		</javac>
906		</target>
907
#	Line 834 | Line 917
917		</target>
918
919
837	–
920		<target name="jsr166ydocs"
921		description="Builds javadocs to dist dir">
922
923	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
924	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
923	>	<delete dir="${jsr166ydocs.dir}"/>
924	>	<mkdir dir="${jsr166ydocs.dir}"/>
925
926	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
926	>	<javadoc destdir="${jsr166ydocs.dir}"
927		packagenames="jsr166y.*"
928		link="${jdkapidocs.url}"
929	<	source="6"
848	<	bootclasspath="${bootclasspath6}"
929	>	access="${build.javadoc.access}"
930		sourcepath="${topsrc.dir}:${jdk6src.dir}"
931	<	executable="${javadoc7}"
932	<	additionalparam="-XDignore.symbol.file=true"/>
931	>	bootclasspath="${bootclasspath6}"
932	>	source="6"
933	>	executable="${javadoc7}">
934	>	<arg value="-XDignore.symbol.file=true"/>
935
936	+	</javadoc>
937		</target>
938
939
940		<target name="jsr166ydist"
941	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
941	>	depends="jsr166ydist-jar, jsr166ydist-docs"
942		description="Puts all distributable products in single hierarchy"/>
943
944
861	–
945		<target name="jsr166yclean"
946		description="Removes all jsr166y build products">
947
#	Line 867 | Line 950
950		</target>
951
952
870	–
953		<target name="jsr166ydist-clean"
954		description="Removes all build and distribution products">
955
#	Line 875 | Line 957
957
958		<target name="jsr166ydist-jar"
959		depends="jsr166yclean, jsr166yjar">
878	–
960		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
961	+	</target>
962
963	+	<target name="jsr166ydist-docs"
964	+	depends="jsr166yclean, jsr166ydocs">
965	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
966		</target>
967
968
#	Line 895 | Line 980
980		debug="${build.debug}"
981		debuglevel="${build.debuglevel}"
982		deprecation="${build.deprecation}"
983	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
984		classpath=""
985		source="6"
900	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
986		includeAntRuntime="false"
987		includeJavaRuntime="false"
988		executable="${javac7}"
989		fork="true">
990
991		<include name="extra166y/**/*.java"/>
907	–	<compilerarg line="${build.args}"/>
992		<compilerarg value="-XDignore.symbol.file=true"/>
993		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
994	+	<compilerarg line="${build.args}"/>
995
996		</javac>
912	–
997		</target>
998
999
916	–
1000		<target name="extra166yjar"
1001		depends="extra166ycompile"
1002		description="Builds library jar from compiled sources">
#	Line 925 | Line 1008
1008		</target>
1009
1010
928	–
1011		<target name="extra166ydocs"
1012		description="Builds javadocs to build dir">
1013
1014	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
1015	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
1014	>	<delete dir="${extra166ydocs.dir}"/>
1015	>	<mkdir dir="${extra166ydocs.dir}"/>
1016
1017	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
1017	>	<javadoc destdir="${extra166ydocs.dir}"
1018		packagenames="extra166y.*"
1019		link="${jdkapidocs.url}"
1020	<	source="6"
939	<	bootclasspath="${bootclasspath6}"
1020	>	access="${build.javadoc.access}"
1021		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1022	<	executable="${javadoc7}"
1023	<	additionalparam="-XDignore.symbol.file=true"/>
1022	>	bootclasspath="${bootclasspath6}"
1023	>	source="6"
1024	>	executable="${javadoc7}">
1025	>	<arg value="-XDignore.symbol.file=true"/>
1026
1027	+	</javadoc>
1028		</target>
1029
1030
1031		<target name="extra166ydist"
1032	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
1032	>	depends="extra166ydist-jar, extra166ydist-docs"
1033		description="Puts all distributable products in single hierarchy"/>
1034
1035
952	–
1036		<target name="extra166yclean"
1037		description="Removes all extra166y build products">
1038
#	Line 958 | Line 1041
1041		</target>
1042
1043
961	–
1044		<target name="extra166ydist-clean"
1045		description="Removes all build and distribution products">
1046
#	Line 966 | Line 1048
1048
1049		<target name="extra166ydist-jar"
1050		depends="extra166yclean, extra166yjar">
969	–
1051		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1052	+	</target>
1053
1054	+	<target name="extra166ydist-docs"
1055	+	depends="extra166yclean, extra166ydocs">
1056	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1057		</target>
1058
1059		<!-- jsr166e -->
#	Line 992 | Line 1077
1077		fork="true">
1078
1079		<include name="jsr166e/**/*.java"/>
995	–	<compilerarg line="${build.args}"/>
1080		<compilerarg value="-XDignore.symbol.file=true"/>
1081		<compilerarg value="-Xlint:all"/>
1082	+	<compilerarg line="${build.args}"/>
1083
1084		</javac>
1000	–
1085		</target>
1086
1087
1004	–
1088		<target name="jsr166ejar"
1089		depends="jsr166ecompile"
1090		description="Builds library jar from compiled sources">
#	Line 1013 | Line 1096
1096		</target>
1097
1098
1016	–
1099		<target name="jsr166edocs"
1100		description="Builds javadocs to build dir">
1101
1102	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1103	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1102	>	<delete dir="${jsr166edocs.dir}"/>
1103	>	<mkdir dir="${jsr166edocs.dir}"/>
1104
1105	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1105	>	<javadoc destdir="${jsr166edocs.dir}"
1106		packagenames="jsr166e.*"
1107		link="${jdkapidocs.url}"
1108	<	source="7"
1108	>	access="${build.javadoc.access}"
1109		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1110	<	executable="${javadoc7}"
1111	<	additionalparam="-XDignore.symbol.file=true" >
1110	>	source="7"
1111	>	executable="${javadoc7}">
1112	>	<arg value="-XDignore.symbol.file=true"/>
1113	>
1114		</javadoc>
1115	+	</target>
1116
1117	+
1118	+	<target name="jsr166e-test-tck"
1119	+	depends="jsr166ejar"
1120	+	description="Runs tck tests for jsr166e">
1121	+
1122	+	<run-tck-tests
1123	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1124	+	target="7"
1125	+	workdir="${build.jsr166e.dir}"
1126	+	classes="${jsr166e.jar}"/>
1127		</target>
1128
1129
1130		<target name="jsr166edist"
1131	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1131	>	depends="jsr166edist-jar, jsr166edist-docs"
1132		description="Puts all distributable products in single hierarchy"/>
1133
1134
1040	–
1135		<target name="jsr166eclean"
1136		description="Removes all jsr166e build products">
1043	–
1137		<delete dir="${build.jsr166e.dir}"/>
1045	–
1138		</target>
1139
1140
#	Line 1053 | Line 1145
1145
1146		<target name="jsr166edist-jar"
1147		depends="jsr166eclean, jsr166ejar">
1056	–
1148		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1149	+	</target>
1150
1151	+	<target name="jsr166edist-docs"
1152	+	depends="jsr166eclean, jsr166edocs">
1153	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1154		</target>
1155
1156	+
1157	+	<!-- Find buglets that can be detected by static build tools -->
1158	+
1159	+	<target name="lint">
1160	+	<antcall target="dists">
1161	+	<param name="build.javadoc.access" value="private"/>
1162	+	</antcall>
1163	+	</target>
1164	+
1165	+
1166		</project>

Diff Legend

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