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.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC vs.
Revision 1.146 by jsr166, Thu Jul 18 18:27:55 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 locations -->
79		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 86 | Line 99
99		</sequential>
100		</macrodef>
101
102	+	<macrodef name="mirror-dir">
103	+	<attribute name="src"/>
104	+	<attribute name="dst"/>
105	+	<sequential>
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"/>
#	Line 105 | 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 128 | Line 160
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 146 | Line 178
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="product.jar" default="${product.jar}"/>
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}"
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="6"
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@{target}}"
203	>	executable="${javac@{compile-target}}"
204		fork="true">
205
206	<	<include name="**/*.java"/>
170	<	<bootclasspath path="@{product.jar}"/>
171	<	<bootclasspath path="${bootclasspath6}"/>
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="JSR166TestCase"
214	>	<java classname="${jsr166.tckTestClass}"
215		failonerror="true"
216		jvm="${java@{target}}"
217		fork="true">
218	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
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"/>
#	Line 190 | Line 229
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? -->
200	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
201	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
202	<	<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 226 | Line 290
290		fork="true">
291
292		<include name="**/*.java"/>
293	+	<compilerarg value="-Xprefer:source"/>
294		<compilerarg value="-XDignore.symbol.file=true"/>
295		<compilerarg value="-Xlint:all"/>
296	+	<compilerarg value="-Xdoclint:all/protected"/>
297	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
298		<compilerarg line="${build.args}"/>
299
300		</javac>
#	Line 244 | Line 311
311		</target>
312
313
247	–	<target name="test"
248	–	depends="configure-tests, report-tests"
249	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
250	–
251	–
314		<target name="docs"
315		description="Builds javadocs for src/main to dist dir">
316
317	<	<delete dir="${dist.javadocs.dir}"/>
318	<	<mkdir dir="${dist.javadocs.dir}"/>
317	>	<delete dir="${docs.dir}"/>
318	>	<mkdir dir="${docs.dir}"/>
319
320		<!-- the packagenames="none" hack below prevents scanning the -->
321		<!-- sourcepath for packages -->
322
323	<	<javadoc destdir="${dist.javadocs.dir}"
323	>	<javadoc destdir="${docs.dir}"
324		packagenames="none"
325		link="${jdkapi8docs.url}"
326		overview="${src.dir}/intro.html"
327	+	access="${build.javadoc.access}"
328	+	sourcepath="${src.dir}:${jdk8src.dir}"
329		classpath=""
330		executable="${javadoc8}">
267	–	<sourcepath path="${src.dir}"/>
268	–	<sourcepath path="${jdk8src.dir}"/>
269	–	<arg value="-XDignore.symbol.file=true"/>
270	–	<arg value="-tag"/>
271	–	<arg value="${javadoc.jls.option}"/>
331		<fileset dir="${src.dir}" defaultexcludes="yes">
332		<include name="**/*.java"/>
333		</fileset>
334	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
335	+	<arg value="-XDignore.symbol.file=true"/>
336	+	<arg value="-tag"/>
337	+	<arg value="${javadoc.jls.option}"/>
338	+	<arg value="-tag"/>
339	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
340	+	<arg value="-tag"/>
341	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
342	+	<arg value="-tag"/>
343	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
344		</javadoc>
345		</target>
346
347
348		<target name="dist"
349	<	depends="dist-clean, dist-jar, docs"
349	>	depends="dist-clean, dist-jar, dist-docs"
350		description="Puts all distributable products in single hierarchy"/>
351
352
#	Line 315 | Line 384
384		</target>
385
386
318	–	<!-- Internal targets -->
319	–
320	–
387		<target name="dist-jar"
388		depends="clean, jar">
323	–
389		<copy file="${product.jar}" todir="${dist.dir}"/>
325	–
390		</target>
391
392	<
393	<	<target name="compile-tests"
394	<	depends="jar">
331	<
332	<	<mkdir dir="${build.testcases.dir}"/>
333	<
334	<	<javac srcdir="${tck.src.dir}"
335	<	destdir="${build.testcases.dir}"
336	<	debug="${build.debug}"
337	<	debuglevel="${build.debuglevel}"
338	<	deprecation="${build.deprecation}"
339	<	source="6"
340	<	classpath="${junit.jar}"
341	<	includeAntRuntime="false"
342	<	includeJavaRuntime="false"
343	<	executable="${javac8}"
344	<	fork="true">
345	<
346	<	<include name="**/*.java"/>
347	<	<bootclasspath path="@{product.jar}"/>
348	<	<bootclasspath path="${bootclasspath6}"/>
349	<	<compilerarg value="-XDignore.symbol.file=true"/>
350	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
351	<	<compilerarg line="${build.args}"/>
352	<
353	<	</javac>
354	<
355	<	<javac srcdir="${test.src.dir}"
356	<	destdir="${build.testcases.dir}"
357	<	debug="${build.debug}"
358	<	debuglevel="${build.debuglevel}"
359	<	deprecation="${build.deprecation}"
360	<	source="6"
361	<	classpath=""
362	<	includeAntRuntime="false"
363	<	includeJavaRuntime="false"
364	<	executable="${javac8}"
365	<	fork="true">
366	<
367	<	<include name="jsr166/test/**/*.java"/>
368	<	<bootclasspath path="${product.jar}"/>
369	<	<bootclasspath path="${bootclasspath6}"/>
370	<	<compilerarg value="-XDignore.symbol.file=true"/>
371	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
372	<	<compilerarg line="${build.args}"/>
373	<
374	<	</javac>
375	<
376	<	<!--
377	<	<javac srcdir="${jtreg.src.dir}"
378	<	destdir="${build.testcases.dir}"
379	<	debug="${build.debug}"
380	<	debuglevel="${build.debuglevel}"
381	<	deprecation="${build.deprecation}"
382	<	source="${build.sourcelevel}"
383	<	fork="true">
384	<
385	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
386	<	<compilerarg value="-XDignore.symbol.file=true"/>
387	<	<compilerarg line="${build.args}"/>
388	<
389	<	</javac>
390	<	-->
391	<
392	>	<target name="dist-docs"
393	>	depends="clean, docs">
394	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
395		</target>
396
397
398	<	<target name="run-tests"
399	<	depends="compile-tests">
400	<
398	<	<!-- May be overridden by user.properties -->
399	<	<property name="testcase" value="*"/>
400	<
401	<	<mkdir dir="${build.reports.dir}"/>
402	<
403	<	<junit printsummary="true"
404	<	showoutput="true"
405	<	errorProperty="junit.failed"
406	<	failureProperty="junit.failed"
407	<	dir="${build.reports.dir}"
408	<	jvm="${java8}"
409	<	fork="true">
410	<
411	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
412	<	<jvmarg value="-server"/>
413	<	<jvmarg value="-showversion"/>
414	<
415	<	<classpath refid="test.classpath"/>
416	<
417	<	<formatter type="xml"/>
418	<
419	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
420	<	<fileset dir="${tck.src.dir}">
421	<	<include name="**/${testcase}Test.java"/>
422	<	</fileset>
423	<	</batchtest>
424	<
425	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
426	<	<fileset dir="${test.src.dir}">
427	<	<include name="jsr166/test/**/${testcase}Test.java"/>
428	<	</fileset>
429	<	</batchtest>
430	<
431	<	<!--
432	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
433	<	<fileset dir="${jtreg.src.dir}">
434	<	<include name="**/${testcase}Test.java"/>
435	<	</fileset>
436	<	</batchtest>
437	<	-->
438	<
439	<	</junit>
398	>	<target name="test-tck"
399	>	depends="jar"
400	>	description="Runs tck tests for main directly">
401
402	+	<run-tck-tests
403	+	target="8"
404	+	workdir="${build.dir}"
405	+	classes="${product.jar}"/>
406		</target>
407
408	+	<target name="test-jtreg"
409	+	depends="jar"
410	+	description="Runs jtreg tests for main using the jtreg ant task">
411	+	<run-jtreg-tests
412	+	target="8"
413	+	workdir="${build.dir}"
414	+	classes="${product.jar}"/>
415	+	</target>
416
417	<	<target name="report-tests"
418	<	depends="run-tests">
419	<
447	<	<!-- Sets junit.report.format to frames if redirection is present,
448	<	otherwise sets it to noframes. -->
449	<	<available property="junit.report.format"
450	<	value="frames"
451	<	classname="org.apache.xalan.lib.Redirect"
452	<	/>
453	<	<property name="junit.report.format" value="noframes"/>
454	<
455	<	<junitreport todir="${build.reports.dir}">
456	<	<fileset dir="${build.reports.dir}">
457	<	<include name="TEST-*.xml"/>
458	<	</fileset>
459	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
460	<	/>
461	<	</junitreport>
462	<
463	<	<fail message="Test Cases Failed" if="junit.failed"/>
464	<
417	>	<target name="test"
418	>	depends="test-tck, test-jtreg"
419	>	description="Runs tck and jtreg tests for main">
420		</target>
421
422
423	+
424		<target name="configure-compiler">
425
426		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 482 | Line 438
438		</target>
439
440
485	–	<target name="configure-tests"
486	–	depends="configure-compiler">
487	–
488	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
489	–	<available property="junit.available"
490	–	classname="junit.framework.Protectable"/>
491	–
492	–	<!-- Xalan -->
493	–	<available property="xalan.available"
494	–	classname="org.apache.xalan.Version"/>
495	–
496	–
497	–	<!-- Ant 1.6beta and later don't need or want this check -->
498	–	<!--
499	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
500	–	unless="junit.available"/>
501	–
502	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
503	–	unless="xalan.available"/>
504	–	-->
505	–
506	–	</target>
507	–
441
442		<!-- Various demos and test programs -->
443
#	Line 550 | Line 483
483		deprecation="${build.deprecation}"
484		source="6"
485		classpath=""
486	+	bootclasspath="${bootclasspath6}"
487		includeAntRuntime="false"
488		includeJavaRuntime="false"
489		executable="${javac7}"
490		fork="true">
491
492		<include name="**/*.java"/>
493	<	<bootclasspath path="${bootclasspath6}"/>
493	>	<compilerarg value="-Xprefer:source"/>
494		<compilerarg value="-XDignore.symbol.file=true"/>
495		<compilerarg value="-Xlint:all"/>
496		<compilerarg line="${build.args}"/>
#	Line 565 | Line 499
499		</target>
500
501
502	<	<target name="4jdk7-jar"
502	>	<target name="4jdk7jar"
503		depends="4jdk7compile"
504		description="Builds library jar from compiled sources">
505
#	Line 577 | Line 511
511
512
513		<target name="4jdk7-test-tck"
514	<	depends="4jdk7-jar"
514	>	depends="4jdk7jar"
515		description="Runs tck tests for jsr166-4jdk7 directly">
516
517		<run-tck-tests
518		target="7"
519		workdir="${build.4jdk7.dir}"
520	<	product.jar="${4jdk7product.jar}"/>
520	>	classes="${4jdk7product.jar}">
521	>	<javac-elements>
522	>	<!-- JDK8+ test classes -->
523	>	<exclude name="*8Test.java"/>
524	>	<exclude name="DoubleAccumulatorTest.java"/>
525	>	<exclude name="DoubleAdderTest.java"/>
526	>	<exclude name="LongAccumulatorTest.java"/>
527	>	<exclude name="LongAdderTest.java"/>
528	>	<exclude name="CompletableFutureTest.java"/>
529	>	<exclude name="SplittableRandomTest.java"/>
530	>	<exclude name="StampedLockTest.java"/>
531	>	</javac-elements>
532	>	</run-tck-tests>
533		</target>
534
535
#	Line 609 | Line 555
555
556		<formatter type="brief"/>
557
558	<	<test name="JSR166TestCase" haltonfailure="no">
558	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
559		</test>
560
561		</junit>
562		</target>
563
564		<target name="4jdk7-test-jtreg"
565	<	depends="4jdk7compile"
565	>	depends="4jdk7jar"
566		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
567	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
568	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
569	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
570	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
571	<	<jtreg dir="${jtreg.src.dir}"
626	<	jdk="${jdk7.home}"
627	<	workDir="${build.4jdk7.dir}/JTwork"
628	<	reportDir="${build.4jdk7.dir}/JTreport">
629	<
630	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631	<	<arg value="-agentvm"/>
632	<	<arg value="-v:nopass,fail"/>
633	<	<arg value="-vmoptions:-esa -ea"/>
634	<	<arg value="-automatic"/>
635	<	<arg value="-k:!ignore"/>
636	<	</jtreg>
567	>	<run-jtreg-tests
568	>	target="7"
569	>	workdir="${build.4jdk7.dir}"
570	>	classes="${4jdk7product.jar}"
571	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
572		</target>
573
574
#	Line 646 | Line 581
581		<target name="4jdk7docs"
582		description="Builds javadocs for src/jdk7 to dist dir">
583
584	<	<delete dir="${dist.4jdk7.docs.dir}"/>
585	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
584	>	<delete dir="${4jdk7docs.dir}"/>
585	>	<mkdir dir="${4jdk7docs.dir}"/>
586
587	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
587	>	<javadoc destdir="${4jdk7docs.dir}"
588		packagenames="none"
589		link="${jdkapi7docs.url}"
590		overview="${4jdk7src.dir}/intro.html"
591	+	access="${build.javadoc.access}"
592	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
593		classpath=""
594		executable="${javadoc7}">
658	–	<sourcepath path="${4jdk7src.dir}"/>
659	–	<sourcepath path="${jdk7src.dir}"/>
660	–	<arg value="-XDignore.symbol.file=true"/>
595		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
596		<include name="**/*.java"/>
597		</fileset>
598	+	<arg value="-XDignore.symbol.file=true"/>
599		</javadoc>
600		</target>
601
602
603		<target name="4jdk7dist"
604	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
604	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
605		description="Puts all distributable products in single hierarchy"/>
606
607
#	Line 684 | Line 619
619		</target>
620
621		<target name="4jdk7dist-jar"
622	<	depends="4jdk7clean, 4jdk7-jar">
688	<
622	>	depends="4jdk7clean, 4jdk7jar">
623		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
624	+	</target>
625	+
626
627	+	<target name="4jdk7dist-docs"
628	+	depends="4jdk7clean, 4jdk7docs">
629	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
630		</target>
631
632
#	Line 705 | Line 644
644		debuglevel="${build.debuglevel}"
645		deprecation="${build.deprecation}"
646		classpath=""
647	+	bootclasspath="${bootclasspath6}"
648		source="5"
649		includeAntRuntime="false"
650		includeJavaRuntime="false"
#	Line 712 | Line 652
652		fork="true">
653
654		<include name="jsr166x/**/*.java"/>
715	–	<bootclasspath path="${bootclasspath6}"/>
655		<compilerarg value="-XDignore.symbol.file=true"/>
656		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
657		<compilerarg line="${build.args}"/>
#	Line 721 | Line 660
660		</target>
661
662
663	<	<target name="jsr166x-jar"
663	>	<target name="jsr166xjar"
664		depends="jsr166xcompile"
665		description="Builds library jar from compiled sources">
666
#	Line 735 | Line 674
674		<target name="jsr166xdocs"
675		description="Builds javadocs to dist dir">
676
677	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
678	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
677	>	<delete dir="${jsr166xdocs.dir}"/>
678	>	<mkdir dir="${jsr166xdocs.dir}"/>
679
680	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
680	>	<javadoc destdir="${jsr166xdocs.dir}"
681		packagenames="jsr166x.*"
682		link="${jdkapidocs.url}"
683	+	access="${build.javadoc.access}"
684	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
685	+	bootclasspath="${bootclasspath6}"
686		source="5"
687		executable="${javadoc7}">
746	–	<sourcepath path="${topsrc.dir}"/>
747	–	<sourcepath path="${jdk6src.dir}"/>
748	–	<bootclasspath path="${bootclasspath6}"/>
688		<arg value="-XDignore.symbol.file=true"/>
689
690		</javadoc>
#	Line 753 | Line 692
692
693
694		<target name="jsr166xdist"
695	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
695	>	depends="jsr166xdist-jar, jsr166xdist-docs"
696		description="Puts all distributable products in single hierarchy"/>
697
698
#	Line 772 | Line 711
711
712
713		<target name="jsr166xdist-jar"
714	<	depends="jsr166xclean, jsr166x-jar">
776	<
714	>	depends="jsr166xclean, jsr166xjar">
715		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
716	+	</target>
717
718	+	<target name="jsr166xdist-docs"
719	+	depends="jsr166xclean, jsr166xdocs">
720	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
721		</target>
722
723		<!-- jsr166y -->
#	Line 794 | Line 736
736		deprecation="${build.deprecation}"
737		source="6"
738		classpath=""
739	+	bootclasspath="${bootclasspath6}"
740		includeAntRuntime="false"
741		includeJavaRuntime="false"
742		executable="${javac7}"
743		fork="true">
744
745		<include name="jsr166y/**/*.java"/>
803	–	<bootclasspath path="${bootclasspath6}"/>
746		<compilerarg value="-XDignore.symbol.file=true"/>
747		<compilerarg value="-Xlint:all"/>
748		<compilerarg line="${build.args}"/>
#	Line 809 | Line 751
751		</target>
752
753
754	<	<target name="jsr166y-jar"
754	>	<target name="jsr166yjar"
755		depends="jsr166ycompile"
756		description="Builds library jar from compiled sources">
757
#	Line 823 | Line 765
765		<target name="jsr166ydocs"
766		description="Builds javadocs to dist dir">
767
768	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
769	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
768	>	<delete dir="${jsr166ydocs.dir}"/>
769	>	<mkdir dir="${jsr166ydocs.dir}"/>
770
771	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
771	>	<javadoc destdir="${jsr166ydocs.dir}"
772		packagenames="jsr166y.*"
773		link="${jdkapidocs.url}"
774	+	access="${build.javadoc.access}"
775	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
776	+	bootclasspath="${bootclasspath6}"
777		source="6"
778		executable="${javadoc7}">
834	–	<sourcepath path="${topsrc.dir}"/>
835	–	<sourcepath path="${jdk6src.dir}"/>
836	–	<bootclasspath path="${bootclasspath6}"/>
779		<arg value="-XDignore.symbol.file=true"/>
780
781		</javadoc>
#	Line 841 | Line 783
783
784
785		<target name="jsr166ydist"
786	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
786	>	depends="jsr166ydist-jar, jsr166ydist-docs"
787		description="Puts all distributable products in single hierarchy"/>
788
789
#	Line 859 | Line 801
801		</target>
802
803		<target name="jsr166ydist-jar"
804	<	depends="jsr166yclean, jsr166y-jar">
863	<
804	>	depends="jsr166yclean, jsr166yjar">
805		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
806	+	</target>
807
808	+	<target name="jsr166ydist-docs"
809	+	depends="jsr166yclean, jsr166ydocs">
810	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
811		</target>
812
813
#	Line 870 | Line 815
815
816
817		<target name="extra166ycompile"
818	<	depends="configure-compiler, jsr166y-jar"
818	>	depends="configure-compiler, jsr166yjar"
819		description="Compiles extra166y sources">
820
821		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 880 | Line 825
825		debug="${build.debug}"
826		debuglevel="${build.debuglevel}"
827		deprecation="${build.deprecation}"
828	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
829		classpath=""
830		source="6"
831		includeAntRuntime="false"
#	Line 888 | Line 834
834		fork="true">
835
836		<include name="extra166y/**/*.java"/>
891	–	<bootclasspath path="${jsr166y.jar}"/>
892	–	<bootclasspath path="${bootclasspath6}"/>
837		<compilerarg value="-XDignore.symbol.file=true"/>
838		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
839		<compilerarg line="${build.args}"/>
#	Line 898 | Line 842
842		</target>
843
844
845	<	<target name="extra166y-jar"
845	>	<target name="extra166yjar"
846		depends="extra166ycompile"
847		description="Builds library jar from compiled sources">
848
#	Line 912 | Line 856
856		<target name="extra166ydocs"
857		description="Builds javadocs to build dir">
858
859	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
860	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
859	>	<delete dir="${extra166ydocs.dir}"/>
860	>	<mkdir dir="${extra166ydocs.dir}"/>
861
862	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
862	>	<javadoc destdir="${extra166ydocs.dir}"
863		packagenames="extra166y.*"
864		link="${jdkapidocs.url}"
865	+	access="${build.javadoc.access}"
866	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
867	+	bootclasspath="${bootclasspath6}"
868		source="6"
869		executable="${javadoc7}">
923	–	<sourcepath path="${topsrc.dir}"/>
924	–	<sourcepath path="${jdk6src.dir}"/>
925	–	<bootclasspath path="${bootclasspath6}"/>
870		<arg value="-XDignore.symbol.file=true"/>
871
872		</javadoc>
#	Line 930 | Line 874
874
875
876		<target name="extra166ydist"
877	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
877	>	depends="extra166ydist-jar, extra166ydist-docs"
878		description="Puts all distributable products in single hierarchy"/>
879
880
#	Line 948 | Line 892
892		</target>
893
894		<target name="extra166ydist-jar"
895	<	depends="extra166yclean, extra166y-jar">
952	<
895	>	depends="extra166yclean, extra166yjar">
896		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
897	+	</target>
898
899	+	<target name="extra166ydist-docs"
900	+	depends="extra166yclean, extra166ydocs">
901	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
902		</target>
903
904		<!-- jsr166e -->
905
906	+	<property name="build.jsr166e.java.version" value="6"/>
907	+	<property name="build.jsr166e.javac" value="${javac6}"/>
908	+
909		<target name="jsr166ecompile"
910		depends="configure-compiler"
911		description="Compiles jsr166e sources">
#	Line 967 | Line 917
917		debug="${build.debug}"
918		debuglevel="${build.debuglevel}"
919		deprecation="${build.deprecation}"
920	<	source="7"
920	>	source="${build.jsr166e.java.version}"
921		classpath=""
922		includeAntRuntime="false"
923		includeJavaRuntime="false"
924	<	executable="${javac7}"
924	>	executable="${build.jsr166e.javac}"
925		fork="true">
926
927		<include name="jsr166e/**/*.java"/>
#	Line 983 | Line 933
933		</target>
934
935
936	<	<target name="jsr166e-jar"
936	>	<target name="jsr166ejar"
937		depends="jsr166ecompile"
938		description="Builds library jar from compiled sources">
939
#	Line 997 | Line 947
947		<target name="jsr166edocs"
948		description="Builds javadocs to build dir">
949
950	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
951	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
950	>	<delete dir="${jsr166edocs.dir}"/>
951	>	<mkdir dir="${jsr166edocs.dir}"/>
952
953	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
953	>	<javadoc destdir="${jsr166edocs.dir}"
954		packagenames="jsr166e.*"
955		link="${jdkapidocs.url}"
956	<	source="7"
956	>	access="${build.javadoc.access}"
957	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
958	>	source="${build.jsr166e.java.version}"
959		executable="${javadoc7}">
1008	–	<sourcepath path="${topsrc.dir}"/>
1009	–	<sourcepath path="${jdk7src.dir}"/>
960		<arg value="-XDignore.symbol.file=true"/>
961
962		</javadoc>
963		</target>
964
965
966	+	<target name="jsr166e-test-tck-one-java-version"
967	+	depends="jsr166ejar"
968	+	description="Runs tck tests for jsr166e">
969	+
970	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
971	+
972	+	<run-tck-tests
973	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
974	+	target="${build.jsr166e.java.version}"
975	+	workdir="${build.jsr166e.dir}"
976	+	classes="${jsr166e.jar}"/>
977	+	</target>
978	+
979	+	<target name="jsr166e-test-tck"
980	+	description="Runs tck tests for jsr166e for multiple java versions">
981	+
982	+	<!--     <antcall target="clean"/> -->
983	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
984	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
985	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
986	+	<!--     </antcall> -->
987	+
988	+	<antcall target="clean"/>
989	+	<antcall target="jsr166e-test-tck-one-java-version">
990	+	<param name="build.jsr166e.java.version" value="7"/>
991	+	<param name="build.jsr166e.javac" value="${javac7}"/>
992	+	</antcall>
993	+
994	+	<antcall target="clean"/>
995	+	<antcall target="jsr166e-test-tck-one-java-version">
996	+	<param name="build.jsr166e.java.version" value="6"/>
997	+	<param name="build.jsr166e.javac" value="${javac6}"/>
998	+	</antcall>
999	+	</target>
1000	+
1001	+
1002		<target name="jsr166edist"
1003	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1003	>	depends="jsr166edist-jar, jsr166edist-docs"
1004		description="Puts all distributable products in single hierarchy"/>
1005
1006
1007		<target name="jsr166eclean"
1008		description="Removes all jsr166e build products">
1023	–
1009		<delete dir="${build.jsr166e.dir}"/>
1025	–
1010		</target>
1011
1012
#	Line 1032 | Line 1016
1016		</target>
1017
1018		<target name="jsr166edist-jar"
1019	<	depends="jsr166eclean, jsr166e-jar">
1036	<
1019	>	depends="jsr166eclean, jsr166ejar">
1020		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1021	+	</target>
1022	+
1023	+	<target name="jsr166edist-docs"
1024	+	depends="jsr166eclean, jsr166edocs">
1025	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1026	+	</target>
1027	+
1028
1029	+	<!-- Find buglets that can be detected by static build tools -->
1030	+
1031	+	<target name="lint">
1032	+	<antcall target="dists">
1033	+	<param name="build.javadoc.access" value="private"/>
1034	+	</antcall>
1035		</target>
1036
1037	+
1038		</project>

Diff Legend

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