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.126 by jsr166, Wed Jan 23 06:46:27 2013 UTC vs.
Revision 1.142 by jsr166, Tue Jun 18 20:54:57 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 118 | Line 131
131		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132
133		<!-- Javadoc locations -->
134	<	<property name="javadocs.dir"          location="${build.dir}/javadocs"/>
135	<	<property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
136	<	<property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
137	<	<property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
138	<	<property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
139	<	<property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
140	<
141	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
142	<	<property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
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 166 | Line 179
179
180		<macrodef name="run-tck-tests">
181		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
169	–	<attribute name="source" default="6"/>
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"/>
#	Line 180 | Line 194
194		debug="${build.debug}"
195		debuglevel="${build.debuglevel}"
196		deprecation="${build.deprecation}"
197	<	source="@{source}"
197	>	source="@{compile-target}"
198	>	target="@{compile-target}"
199		classpath="${junit.jar}"
200	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
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"/>
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:@{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 210 | 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}"/>
#	Line 243 | 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 line="${build.args}"/>
#	Line 261 | Line 309
309		</target>
310
311
264	–	<target name="test"
265	–	depends="configure-tests, report-tests"
266	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
267	–
268	–
312		<target name="docs"
313		description="Builds javadocs for src/main to dist dir">
314
315	<	<delete dir="${javadocs.dir}"/>
316	<	<mkdir dir="${javadocs.dir}"/>
315	>	<delete dir="${docs.dir}"/>
316	>	<mkdir dir="${docs.dir}"/>
317
318		<!-- the packagenames="none" hack below prevents scanning the -->
319		<!-- sourcepath for packages -->
320
321	<	<javadoc destdir="${javadocs.dir}"
321	>	<javadoc destdir="${docs.dir}"
322		packagenames="none"
323		link="${jdkapi8docs.url}"
324		overview="${src.dir}/intro.html"
325	+	access="${build.javadoc.access}"
326		sourcepath="${src.dir}:${jdk8src.dir}"
327		classpath=""
328		executable="${javadoc8}">
#	Line 331 | Line 375
375		</target>
376
377
334	–	<!-- Internal targets -->
335	–
336	–
378		<target name="dist-jar"
379		depends="clean, jar">
380		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 341 | Line 382
382
383		<target name="dist-docs"
384		depends="clean, docs">
385	<	<mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
385	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
386		</target>
387
388
389	<	<target name="compile-tests"
390	<	depends="jar">
391	<
351	<	<mkdir dir="${build.testcases.dir}"/>
352	<
353	<	<javac srcdir="${tck.src.dir}"
354	<	destdir="${build.testcases.dir}"
355	<	debug="${build.debug}"
356	<	debuglevel="${build.debuglevel}"
357	<	deprecation="${build.deprecation}"
358	<	source="6"
359	<	classpath="${junit.jar}"
360	<	bootclasspath="@{product.jar}:${bootclasspath6}"
361	<	includeAntRuntime="false"
362	<	includeJavaRuntime="false"
363	<	executable="${javac8}"
364	<	fork="true">
365	<
366	<	<include name="**/*.java"/>
367	<	<compilerarg value="-XDignore.symbol.file=true"/>
368	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
369	<	<compilerarg line="${build.args}"/>
370	<
371	<	</javac>
372	<
373	<	<javac srcdir="${test.src.dir}"
374	<	destdir="${build.testcases.dir}"
375	<	debug="${build.debug}"
376	<	debuglevel="${build.debuglevel}"
377	<	deprecation="${build.deprecation}"
378	<	source="6"
379	<	classpath=""
380	<	bootclasspath="@{product.jar}:${bootclasspath6}"
381	<	includeAntRuntime="false"
382	<	includeJavaRuntime="false"
383	<	executable="${javac8}"
384	<	fork="true">
385	<
386	<	<include name="jsr166/test/**/*.java"/>
387	<	<compilerarg value="-XDignore.symbol.file=true"/>
388	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
389	<	<compilerarg line="${build.args}"/>
390	<
391	<	</javac>
392	<
393	<	<!--
394	<	<javac srcdir="${jtreg.src.dir}"
395	<	destdir="${build.testcases.dir}"
396	<	debug="${build.debug}"
397	<	debuglevel="${build.debuglevel}"
398	<	deprecation="${build.deprecation}"
399	<	source="${build.sourcelevel}"
400	<	fork="true">
401	<
402	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
403	<	<compilerarg value="-XDignore.symbol.file=true"/>
404	<	<compilerarg line="${build.args}"/>
405	<
406	<	</javac>
407	<	-->
389	>	<target name="test-tck"
390	>	depends="jar"
391	>	description="Runs tck tests for main directly">
392
393	+	<run-tck-tests
394	+	target="8"
395	+	workdir="${build.dir}"
396	+	classes="${product.jar}"/>
397		</target>
398
399	<
400	<	<target name="run-tests"
401	<	depends="compile-tests">
402	<
403	<	<!-- May be overridden by user.properties -->
404	<	<property name="testcase" value="*"/>
405	<
418	<	<mkdir dir="${build.reports.dir}"/>
419	<
420	<	<junit printsummary="true"
421	<	showoutput="true"
422	<	errorProperty="junit.failed"
423	<	failureProperty="junit.failed"
424	<	dir="${build.reports.dir}"
425	<	jvm="${java8}"
426	<	fork="true">
427	<
428	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
429	<	<jvmarg value="-server"/>
430	<	<jvmarg value="-showversion"/>
431	<
432	<	<classpath refid="test.classpath"/>
433	<
434	<	<formatter type="xml"/>
435	<
436	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
437	<	<fileset dir="${tck.src.dir}">
438	<	<include name="**/${testcase}Test.java"/>
439	<	</fileset>
440	<	</batchtest>
441	<
442	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
443	<	<fileset dir="${test.src.dir}">
444	<	<include name="jsr166/test/**/${testcase}Test.java"/>
445	<	</fileset>
446	<	</batchtest>
447	<
448	<	<!--
449	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
450	<	<fileset dir="${jtreg.src.dir}">
451	<	<include name="**/${testcase}Test.java"/>
452	<	</fileset>
453	<	</batchtest>
454	<	-->
455	<
456	<	</junit>
457	<
399	>	<target name="test-jtreg"
400	>	depends="jar"
401	>	description="Runs jtreg tests for main using the jtreg ant task">
402	>	<run-jtreg-tests
403	>	target="8"
404	>	workdir="${build.dir}"
405	>	classes="${product.jar}"/>
406		</target>
407
408	<
409	<	<target name="report-tests"
410	<	depends="run-tests">
463	<
464	<	<!-- Sets junit.report.format to frames if redirection is present,
465	<	otherwise sets it to noframes. -->
466	<	<available property="junit.report.format"
467	<	value="frames"
468	<	classname="org.apache.xalan.lib.Redirect"
469	<	/>
470	<	<property name="junit.report.format" value="noframes"/>
471	<
472	<	<junitreport todir="${build.reports.dir}">
473	<	<fileset dir="${build.reports.dir}">
474	<	<include name="TEST-*.xml"/>
475	<	</fileset>
476	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
477	<	/>
478	<	</junitreport>
479	<
480	<	<fail message="Test Cases Failed" if="junit.failed"/>
481	<
408	>	<target name="test"
409	>	depends="test-tck, test-jtreg"
410	>	description="Runs tck and jtreg tests for main">
411		</target>
412
413
414	+
415		<target name="configure-compiler">
416
417		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 499 | Line 429
429		</target>
430
431
502	–	<target name="configure-tests"
503	–	depends="configure-compiler">
504	–
505	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
506	–	<available property="junit.available"
507	–	classname="junit.framework.Protectable"/>
508	–
509	–	<!-- Xalan -->
510	–	<available property="xalan.available"
511	–	classname="org.apache.xalan.Version"/>
512	–
513	–
514	–	<!-- Ant 1.6beta and later don't need or want this check -->
515	–	<!--
516	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
517	–	unless="junit.available"/>
518	–
519	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
520	–	unless="xalan.available"/>
521	–	-->
522	–
523	–	</target>
524	–
432
433		<!-- Various demos and test programs -->
434
#	Line 574 | Line 481
481		fork="true">
482
483		<include name="**/*.java"/>
484	+	<compilerarg value="-Xprefer:source"/>
485		<compilerarg value="-XDignore.symbol.file=true"/>
486		<compilerarg value="-Xlint:all"/>
487		<compilerarg line="${build.args}"/>
#	Line 582 | Line 490
490		</target>
491
492
493	<	<target name="4jdk7-jar"
493	>	<target name="4jdk7jar"
494		depends="4jdk7compile"
495		description="Builds library jar from compiled sources">
496
#	Line 594 | Line 502
502
503
504		<target name="4jdk7-test-tck"
505	<	depends="4jdk7-jar"
505	>	depends="4jdk7jar"
506		description="Runs tck tests for jsr166-4jdk7 directly">
507
508		<run-tck-tests
509		target="7"
510		workdir="${build.4jdk7.dir}"
511	<	classes="${4jdk7product.jar}"/>
511	>	classes="${4jdk7product.jar}">
512	>	<javac-elements>
513	>	<!-- JDK8+ test classes -->
514	>	<exclude name="*8Test.java"/>
515	>	<exclude name="DoubleAccumulatorTest.java"/>
516	>	<exclude name="DoubleAdderTest.java"/>
517	>	<exclude name="LongAccumulatorTest.java"/>
518	>	<exclude name="LongAdderTest.java"/>
519	>	<exclude name="CompletableFutureTest.java"/>
520	>	<exclude name="StampedLockTest.java"/>
521	>	</javac-elements>
522	>	</run-tck-tests>
523		</target>
524
525
#	Line 626 | Line 545
545
546		<formatter type="brief"/>
547
548	<	<test name="JSR166TestCase" haltonfailure="no">
548	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
549		</test>
550
551		</junit>
552		</target>
553
554		<target name="4jdk7-test-jtreg"
555	<	depends="4jdk7compile"
555	>	depends="4jdk7jar"
556		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
557	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
558	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
559	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
560	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
561	<	<jtreg dir="${jtreg.src.dir}"
643	<	jdk="${jdk7.home}"
644	<	workDir="${build.4jdk7.dir}/JTwork"
645	<	reportDir="${build.4jdk7.dir}/JTreport">
646	<
647	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648	<	<arg value="-agentvm"/>
649	<	<arg value="-v:nopass,fail"/>
650	<	<arg value="-vmoptions:-esa -ea"/>
651	<	<arg value="-automatic"/>
652	<	<arg value="-k:!ignore"/>
653	<	</jtreg>
557	>	<run-jtreg-tests
558	>	target="7"
559	>	workdir="${build.4jdk7.dir}"
560	>	classes="${4jdk7product.jar}"
561	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
562		</target>
563
564
#	Line 663 | Line 571
571		<target name="4jdk7docs"
572		description="Builds javadocs for src/jdk7 to dist dir">
573
574	<	<delete dir="${4jdk7javadocs.dir}"/>
575	<	<mkdir dir="${4jdk7javadocs.dir}"/>
574	>	<delete dir="${4jdk7docs.dir}"/>
575	>	<mkdir dir="${4jdk7docs.dir}"/>
576
577	<	<javadoc destdir="${4jdk7javadocs.dir}"
577	>	<javadoc destdir="${4jdk7docs.dir}"
578		packagenames="none"
579		link="${jdkapi7docs.url}"
580		overview="${4jdk7src.dir}/intro.html"
581	+	access="${build.javadoc.access}"
582		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
583		classpath=""
584		executable="${javadoc7}">
#	Line 700 | Line 609
609		</target>
610
611		<target name="4jdk7dist-jar"
612	<	depends="4jdk7clean, 4jdk7-jar">
612	>	depends="4jdk7clean, 4jdk7jar">
613		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
614		</target>
615
616
617		<target name="4jdk7dist-docs"
618		depends="4jdk7clean, 4jdk7docs">
619	<	<mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
619	>	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
620		</target>
621
622
#	Line 741 | Line 650
650		</target>
651
652
653	<	<target name="jsr166x-jar"
653	>	<target name="jsr166xjar"
654		depends="jsr166xcompile"
655		description="Builds library jar from compiled sources">
656
#	Line 755 | Line 664
664		<target name="jsr166xdocs"
665		description="Builds javadocs to dist dir">
666
667	<	<delete dir="${jsr166xjavadocs.dir}"/>
668	<	<mkdir dir="${jsr166xjavadocs.dir}"/>
667	>	<delete dir="${jsr166xdocs.dir}"/>
668	>	<mkdir dir="${jsr166xdocs.dir}"/>
669
670	<	<javadoc destdir="${jsr166xjavadocs.dir}"
670	>	<javadoc destdir="${jsr166xdocs.dir}"
671		packagenames="jsr166x.*"
672		link="${jdkapidocs.url}"
673	+	access="${build.javadoc.access}"
674		sourcepath="${topsrc.dir}:${jdk6src.dir}"
675		bootclasspath="${bootclasspath6}"
676		source="5"
#	Line 791 | Line 701
701
702
703		<target name="jsr166xdist-jar"
704	<	depends="jsr166xclean, jsr166x-jar">
704	>	depends="jsr166xclean, jsr166xjar">
705		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
706		</target>
707
708		<target name="jsr166xdist-docs"
709		depends="jsr166xclean, jsr166xdocs">
710	<	<mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
710	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
711		</target>
712
713		<!-- jsr166y -->
#	Line 831 | Line 741
741		</target>
742
743
744	<	<target name="jsr166y-jar"
744	>	<target name="jsr166yjar"
745		depends="jsr166ycompile"
746		description="Builds library jar from compiled sources">
747
#	Line 845 | Line 755
755		<target name="jsr166ydocs"
756		description="Builds javadocs to dist dir">
757
758	<	<delete dir="${jsr166yjavadocs.dir}"/>
759	<	<mkdir dir="${jsr166yjavadocs.dir}"/>
758	>	<delete dir="${jsr166ydocs.dir}"/>
759	>	<mkdir dir="${jsr166ydocs.dir}"/>
760
761	<	<javadoc destdir="${jsr166yjavadocs.dir}"
761	>	<javadoc destdir="${jsr166ydocs.dir}"
762		packagenames="jsr166y.*"
763		link="${jdkapidocs.url}"
764	+	access="${build.javadoc.access}"
765		sourcepath="${topsrc.dir}:${jdk6src.dir}"
766		bootclasspath="${bootclasspath6}"
767		source="6"
#	Line 880 | Line 791
791		</target>
792
793		<target name="jsr166ydist-jar"
794	<	depends="jsr166yclean, jsr166y-jar">
794	>	depends="jsr166yclean, jsr166yjar">
795		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
796		</target>
797
798		<target name="jsr166ydist-docs"
799		depends="jsr166yclean, jsr166ydocs">
800	<	<mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
800	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
801		</target>
802
803
#	Line 894 | Line 805
805
806
807		<target name="extra166ycompile"
808	<	depends="configure-compiler, jsr166y-jar"
808	>	depends="configure-compiler, jsr166yjar"
809		description="Compiles extra166y sources">
810
811		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 921 | Line 832
832		</target>
833
834
835	<	<target name="extra166y-jar"
835	>	<target name="extra166yjar"
836		depends="extra166ycompile"
837		description="Builds library jar from compiled sources">
838
#	Line 935 | Line 846
846		<target name="extra166ydocs"
847		description="Builds javadocs to build dir">
848
849	<	<delete dir="${extra166yjavadocs.dir}"/>
850	<	<mkdir dir="${extra166yjavadocs.dir}"/>
849	>	<delete dir="${extra166ydocs.dir}"/>
850	>	<mkdir dir="${extra166ydocs.dir}"/>
851
852	<	<javadoc destdir="${extra166yjavadocs.dir}"
852	>	<javadoc destdir="${extra166ydocs.dir}"
853		packagenames="extra166y.*"
854		link="${jdkapidocs.url}"
855	+	access="${build.javadoc.access}"
856		sourcepath="${topsrc.dir}:${jdk6src.dir}"
857		bootclasspath="${bootclasspath6}"
858		source="6"
#	Line 970 | Line 882
882		</target>
883
884		<target name="extra166ydist-jar"
885	<	depends="extra166yclean, extra166y-jar">
885	>	depends="extra166yclean, extra166yjar">
886		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
887		</target>
888
889		<target name="extra166ydist-docs"
890		depends="extra166yclean, extra166ydocs">
891	<	<mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
891	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
892		</target>
893
894		<!-- jsr166e -->
#	Line 1008 | Line 920
920		</target>
921
922
923	<	<target name="jsr166e-jar"
923	>	<target name="jsr166ejar"
924		depends="jsr166ecompile"
925		description="Builds library jar from compiled sources">
926
#	Line 1022 | Line 934
934		<target name="jsr166edocs"
935		description="Builds javadocs to build dir">
936
937	<	<delete dir="${jsr166ejavadocs.dir}"/>
938	<	<mkdir dir="${jsr166ejavadocs.dir}"/>
937	>	<delete dir="${jsr166edocs.dir}"/>
938	>	<mkdir dir="${jsr166edocs.dir}"/>
939
940	<	<javadoc destdir="${jsr166ejavadocs.dir}"
940	>	<javadoc destdir="${jsr166edocs.dir}"
941		packagenames="jsr166e.*"
942		link="${jdkapidocs.url}"
943	+	access="${build.javadoc.access}"
944		sourcepath="${topsrc.dir}:${jdk7src.dir}"
945		source="7"
946		executable="${javadoc7}">
#	Line 1038 | Line 951
951
952
953		<target name="jsr166e-test-tck"
954	<	depends="jsr166e-jar"
954	>	depends="jsr166ejar"
955		description="Runs tck tests for jsr166e">
956
957		<run-tck-tests
958		tck.src.dir="${test.src.dir}/tck-jsr166e"
959	<	source="7"
1047	<	target="8"
959	>	target="7"
960		workdir="${build.jsr166e.dir}"
961		classes="${jsr166e.jar}"/>
962		</target>
#	Line 1067 | Line 979
979		</target>
980
981		<target name="jsr166edist-jar"
982	<	depends="jsr166eclean, jsr166e-jar">
982	>	depends="jsr166eclean, jsr166ejar">
983		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
984		</target>
985
986		<target name="jsr166edist-docs"
987		depends="jsr166eclean, jsr166edocs">
988	<	<mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
988	>	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
989	>	</target>
990	>
991	>
992	>	<!-- Find buglets that can be detected by static build tools -->
993	>
994	>	<target name="lint">
995	>	<antcall target="dists">
996	>	<param name="build.javadoc.access" value="private"/>
997	>	</antcall>
998		</target>
999
1000	+
1001		</project>

Diff Legend

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