25 |
|
------------------------------------------------------------------------------ |
26 |
|
</description> |
27 |
|
|
28 |
< |
<target name="usage" description="Advises user to run with -projecthelp"> |
29 |
< |
<echo>Run "ant -projecthelp" for full usage information.</echo> |
28 |
> |
<target name="usage" description="Display main targets by running 'ant -projecthelp'"> |
29 |
> |
<java classname="org.apache.tools.ant.Main"> |
30 |
> |
<arg value="-projecthelp" /> |
31 |
> |
</java> |
32 |
|
</target> |
33 |
|
|
34 |
|
|
59 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
60 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
61 |
|
|
62 |
< |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
63 |
< |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
64 |
< |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
65 |
< |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
62 |
> |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
63 |
> |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
64 |
> |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
65 |
> |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
66 |
|
|
67 |
|
<!-- JDK locations --> |
68 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
88 |
|
</sequential> |
89 |
|
</macrodef> |
90 |
|
|
91 |
+ |
<macrodef name="mirror-dir"> |
92 |
+ |
<attribute name="src"/> |
93 |
+ |
<attribute name="dst"/> |
94 |
+ |
<sequential> |
95 |
+ |
<delete dir="@{dst}"/> |
96 |
+ |
<mkdir dir="@{dst}"/> |
97 |
+ |
<copy todir="@{dst}" preservelastmodified="true"> |
98 |
+ |
<fileset dir="@{src}"/> |
99 |
+ |
</copy> |
100 |
+ |
</sequential> |
101 |
+ |
</macrodef> |
102 |
+ |
|
103 |
|
<defjdklocations v="6"/> |
104 |
|
<defjdklocations v="7"/> |
105 |
|
<defjdklocations v="8"/> |
119 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
120 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
121 |
|
|
122 |
< |
<!-- Distribution locations --> |
123 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
124 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
125 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
126 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
127 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
128 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
122 |
> |
<!-- Javadoc locations --> |
123 |
> |
<property name="docs.dir" location="${build.dir}/docs"/> |
124 |
> |
<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/> |
125 |
> |
<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/> |
126 |
> |
<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/> |
127 |
> |
<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/> |
128 |
> |
<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/> |
129 |
> |
|
130 |
> |
<property name="dist.docs.dir" location="${dist.dir}/docs"/> |
131 |
> |
<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
132 |
> |
<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/> |
133 |
> |
<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/> |
134 |
> |
<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/> |
135 |
> |
<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/> |
136 |
|
|
137 |
|
<!-- Jar locations --> |
138 |
|
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
149 |
|
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
150 |
|
|
151 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
152 |
< |
<!-- The below does not yet exist as of 2012-11 --> |
152 |
> |
<!-- The below does not yet exist as of 2013-01 --> |
153 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
154 |
|
|
155 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
167 |
|
</path> |
168 |
|
|
169 |
|
<macrodef name="run-tck-tests"> |
170 |
+ |
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
171 |
+ |
<attribute name="source" default="6"/> |
172 |
|
<attribute name="target"/> |
173 |
|
<attribute name="workdir"/> |
174 |
< |
<attribute name="product.jar" default="${product.jar}"/> |
174 |
> |
<attribute name="classes"/> |
175 |
|
<attribute name="jvmflags" default=""/> |
176 |
|
<sequential> |
177 |
|
|
178 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
179 |
|
|
180 |
< |
<javac srcdir="${tck.src.dir}" |
180 |
> |
<javac srcdir="@{tck.src.dir}" |
181 |
|
destdir="@{workdir}/tck-classes" |
182 |
|
debug="${build.debug}" |
183 |
|
debuglevel="${build.debuglevel}" |
184 |
|
deprecation="${build.deprecation}" |
185 |
< |
source="6" |
185 |
> |
source="@{source}" |
186 |
|
classpath="${junit.jar}" |
187 |
+ |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
188 |
|
includeAntRuntime="false" |
189 |
|
includeJavaRuntime="false" |
190 |
|
executable="${javac@{target}}" |
191 |
|
fork="true"> |
192 |
|
|
193 |
< |
<include name="**/*.java"/> |
170 |
< |
<bootclasspath path="@{product.jar}"/> |
171 |
< |
<bootclasspath path="${bootclasspath6}"/> |
193 |
> |
<include name="*.java"/> |
194 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
195 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
196 |
|
<compilerarg line="${build.args}"/> |
201 |
|
failonerror="true" |
202 |
|
jvm="${java@{target}}" |
203 |
|
fork="true"> |
204 |
< |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
204 |
> |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
205 |
|
<jvmarg line="@{jvmflags}"/> |
206 |
|
<classpath> |
207 |
|
<pathelement location="${junit.jar}"/> |
218 |
|
</path> |
219 |
|
|
220 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
221 |
< |
<!-- 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™ Language Specification" --> |
202 |
< |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
221 |
> |
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
222 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
223 |
|
|
224 |
|
<!-- Main targets --> |
271 |
|
<target name="docs" |
272 |
|
description="Builds javadocs for src/main to dist dir"> |
273 |
|
|
274 |
< |
<delete dir="${dist.javadocs.dir}"/> |
275 |
< |
<mkdir dir="${dist.javadocs.dir}"/> |
274 |
> |
<delete dir="${docs.dir}"/> |
275 |
> |
<mkdir dir="${docs.dir}"/> |
276 |
|
|
277 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
278 |
|
<!-- sourcepath for packages --> |
279 |
|
|
280 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
280 |
> |
<javadoc destdir="${docs.dir}" |
281 |
|
packagenames="none" |
282 |
|
link="${jdkapi8docs.url}" |
283 |
|
overview="${src.dir}/intro.html" |
284 |
+ |
sourcepath="${src.dir}:${jdk8src.dir}" |
285 |
|
classpath="" |
286 |
|
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}"/> |
287 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
288 |
|
<include name="**/*.java"/> |
289 |
|
</fileset> |
290 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
291 |
+ |
<arg value="-tag"/> |
292 |
+ |
<arg value="${javadoc.jls.option}"/> |
293 |
|
</javadoc> |
294 |
|
</target> |
295 |
|
|
296 |
|
|
297 |
|
<target name="dist" |
298 |
< |
depends="dist-clean, dist-jar, docs" |
298 |
> |
depends="dist-clean, dist-jar, dist-docs" |
299 |
|
description="Puts all distributable products in single hierarchy"/> |
300 |
|
|
301 |
|
|
338 |
|
|
339 |
|
<target name="dist-jar" |
340 |
|
depends="clean, jar"> |
323 |
– |
|
341 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
342 |
+ |
</target> |
343 |
|
|
344 |
+ |
<target name="dist-docs" |
345 |
+ |
depends="clean, docs"> |
346 |
+ |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
347 |
|
</target> |
348 |
|
|
349 |
|
|
359 |
|
deprecation="${build.deprecation}" |
360 |
|
source="6" |
361 |
|
classpath="${junit.jar}" |
362 |
+ |
bootclasspath="@{product.jar}:${bootclasspath6}" |
363 |
|
includeAntRuntime="false" |
364 |
|
includeJavaRuntime="false" |
365 |
|
executable="${javac8}" |
366 |
|
fork="true"> |
367 |
|
|
368 |
|
<include name="**/*.java"/> |
347 |
– |
<bootclasspath path="@{product.jar}"/> |
348 |
– |
<bootclasspath path="${bootclasspath6}"/> |
369 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
370 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
371 |
|
<compilerarg line="${build.args}"/> |
379 |
|
deprecation="${build.deprecation}" |
380 |
|
source="6" |
381 |
|
classpath="" |
382 |
+ |
bootclasspath="@{product.jar}:${bootclasspath6}" |
383 |
|
includeAntRuntime="false" |
384 |
|
includeJavaRuntime="false" |
385 |
|
executable="${javac8}" |
386 |
|
fork="true"> |
387 |
|
|
388 |
|
<include name="jsr166/test/**/*.java"/> |
368 |
– |
<bootclasspath path="${product.jar}"/> |
369 |
– |
<bootclasspath path="${bootclasspath6}"/> |
389 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
390 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
391 |
|
<compilerarg line="${build.args}"/> |
569 |
|
deprecation="${build.deprecation}" |
570 |
|
source="6" |
571 |
|
classpath="" |
572 |
+ |
bootclasspath="${bootclasspath6}" |
573 |
|
includeAntRuntime="false" |
574 |
|
includeJavaRuntime="false" |
575 |
|
executable="${javac7}" |
576 |
|
fork="true"> |
577 |
|
|
578 |
|
<include name="**/*.java"/> |
559 |
– |
<bootclasspath path="${bootclasspath6}"/> |
579 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
580 |
|
<compilerarg value="-Xlint:all"/> |
581 |
|
<compilerarg line="${build.args}"/> |
584 |
|
</target> |
585 |
|
|
586 |
|
|
587 |
< |
<target name="4jdk7-jar" |
587 |
> |
<target name="4jdk7jar" |
588 |
|
depends="4jdk7compile" |
589 |
|
description="Builds library jar from compiled sources"> |
590 |
|
|
596 |
|
|
597 |
|
|
598 |
|
<target name="4jdk7-test-tck" |
599 |
< |
depends="4jdk7-jar" |
599 |
> |
depends="4jdk7jar" |
600 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
601 |
|
|
602 |
|
<run-tck-tests |
603 |
|
target="7" |
604 |
|
workdir="${build.4jdk7.dir}" |
605 |
< |
product.jar="${4jdk7product.jar}"/> |
605 |
> |
classes="${4jdk7product.jar}"/> |
606 |
|
</target> |
607 |
|
|
608 |
|
|
665 |
|
<target name="4jdk7docs" |
666 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
667 |
|
|
668 |
< |
<delete dir="${dist.4jdk7.docs.dir}"/> |
669 |
< |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
668 |
> |
<delete dir="${4jdk7docs.dir}"/> |
669 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
670 |
|
|
671 |
< |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
671 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
672 |
|
packagenames="none" |
673 |
|
link="${jdkapi7docs.url}" |
674 |
|
overview="${4jdk7src.dir}/intro.html" |
675 |
+ |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
676 |
|
classpath="" |
677 |
|
executable="${javadoc7}"> |
658 |
– |
<sourcepath path="${4jdk7src.dir}"/> |
659 |
– |
<sourcepath path="${jdk7src.dir}"/> |
660 |
– |
<arg value="-XDignore.symbol.file=true"/> |
678 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
679 |
|
<include name="**/*.java"/> |
680 |
|
</fileset> |
681 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
682 |
|
</javadoc> |
683 |
|
</target> |
684 |
|
|
685 |
|
|
686 |
|
<target name="4jdk7dist" |
687 |
< |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
687 |
> |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
688 |
|
description="Puts all distributable products in single hierarchy"/> |
689 |
|
|
690 |
|
|
702 |
|
</target> |
703 |
|
|
704 |
|
<target name="4jdk7dist-jar" |
705 |
< |
depends="4jdk7clean, 4jdk7-jar"> |
688 |
< |
|
705 |
> |
depends="4jdk7clean, 4jdk7jar"> |
706 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
707 |
+ |
</target> |
708 |
+ |
|
709 |
|
|
710 |
+ |
<target name="4jdk7dist-docs" |
711 |
+ |
depends="4jdk7clean, 4jdk7docs"> |
712 |
+ |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
713 |
|
</target> |
714 |
|
|
715 |
|
|
727 |
|
debuglevel="${build.debuglevel}" |
728 |
|
deprecation="${build.deprecation}" |
729 |
|
classpath="" |
730 |
+ |
bootclasspath="${bootclasspath6}" |
731 |
|
source="5" |
732 |
|
includeAntRuntime="false" |
733 |
|
includeJavaRuntime="false" |
735 |
|
fork="true"> |
736 |
|
|
737 |
|
<include name="jsr166x/**/*.java"/> |
715 |
– |
<bootclasspath path="${bootclasspath6}"/> |
738 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
739 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
740 |
|
<compilerarg line="${build.args}"/> |
743 |
|
</target> |
744 |
|
|
745 |
|
|
746 |
< |
<target name="jsr166x-jar" |
746 |
> |
<target name="jsr166xjar" |
747 |
|
depends="jsr166xcompile" |
748 |
|
description="Builds library jar from compiled sources"> |
749 |
|
|
757 |
|
<target name="jsr166xdocs" |
758 |
|
description="Builds javadocs to dist dir"> |
759 |
|
|
760 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
761 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
760 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
761 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
762 |
|
|
763 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
763 |
> |
<javadoc destdir="${jsr166xdocs.dir}" |
764 |
|
packagenames="jsr166x.*" |
765 |
|
link="${jdkapidocs.url}" |
766 |
+ |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
767 |
+ |
bootclasspath="${bootclasspath6}" |
768 |
|
source="5" |
769 |
|
executable="${javadoc7}"> |
746 |
– |
<sourcepath path="${topsrc.dir}"/> |
747 |
– |
<sourcepath path="${jdk6src.dir}"/> |
748 |
– |
<bootclasspath path="${bootclasspath6}"/> |
770 |
|
<arg value="-XDignore.symbol.file=true"/> |
771 |
|
|
772 |
|
</javadoc> |
774 |
|
|
775 |
|
|
776 |
|
<target name="jsr166xdist" |
777 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
777 |
> |
depends="jsr166xdist-jar, jsr166xdist-docs" |
778 |
|
description="Puts all distributable products in single hierarchy"/> |
779 |
|
|
780 |
|
|
793 |
|
|
794 |
|
|
795 |
|
<target name="jsr166xdist-jar" |
796 |
< |
depends="jsr166xclean, jsr166x-jar"> |
776 |
< |
|
796 |
> |
depends="jsr166xclean, jsr166xjar"> |
797 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
798 |
+ |
</target> |
799 |
|
|
800 |
+ |
<target name="jsr166xdist-docs" |
801 |
+ |
depends="jsr166xclean, jsr166xdocs"> |
802 |
+ |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
803 |
|
</target> |
804 |
|
|
805 |
|
<!-- jsr166y --> |
818 |
|
deprecation="${build.deprecation}" |
819 |
|
source="6" |
820 |
|
classpath="" |
821 |
+ |
bootclasspath="${bootclasspath6}" |
822 |
|
includeAntRuntime="false" |
823 |
|
includeJavaRuntime="false" |
824 |
|
executable="${javac7}" |
825 |
|
fork="true"> |
826 |
|
|
827 |
|
<include name="jsr166y/**/*.java"/> |
803 |
– |
<bootclasspath path="${bootclasspath6}"/> |
828 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
829 |
|
<compilerarg value="-Xlint:all"/> |
830 |
|
<compilerarg line="${build.args}"/> |
833 |
|
</target> |
834 |
|
|
835 |
|
|
836 |
< |
<target name="jsr166y-jar" |
836 |
> |
<target name="jsr166yjar" |
837 |
|
depends="jsr166ycompile" |
838 |
|
description="Builds library jar from compiled sources"> |
839 |
|
|
847 |
|
<target name="jsr166ydocs" |
848 |
|
description="Builds javadocs to dist dir"> |
849 |
|
|
850 |
< |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
851 |
< |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
850 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
851 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
852 |
|
|
853 |
< |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
853 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
854 |
|
packagenames="jsr166y.*" |
855 |
|
link="${jdkapidocs.url}" |
856 |
+ |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
857 |
+ |
bootclasspath="${bootclasspath6}" |
858 |
|
source="6" |
859 |
|
executable="${javadoc7}"> |
834 |
– |
<sourcepath path="${topsrc.dir}"/> |
835 |
– |
<sourcepath path="${jdk6src.dir}"/> |
836 |
– |
<bootclasspath path="${bootclasspath6}"/> |
860 |
|
<arg value="-XDignore.symbol.file=true"/> |
861 |
|
|
862 |
|
</javadoc> |
864 |
|
|
865 |
|
|
866 |
|
<target name="jsr166ydist" |
867 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
867 |
> |
depends="jsr166ydist-jar, jsr166ydist-docs" |
868 |
|
description="Puts all distributable products in single hierarchy"/> |
869 |
|
|
870 |
|
|
882 |
|
</target> |
883 |
|
|
884 |
|
<target name="jsr166ydist-jar" |
885 |
< |
depends="jsr166yclean, jsr166y-jar"> |
863 |
< |
|
885 |
> |
depends="jsr166yclean, jsr166yjar"> |
886 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
887 |
+ |
</target> |
888 |
|
|
889 |
+ |
<target name="jsr166ydist-docs" |
890 |
+ |
depends="jsr166yclean, jsr166ydocs"> |
891 |
+ |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
892 |
|
</target> |
893 |
|
|
894 |
|
|
896 |
|
|
897 |
|
|
898 |
|
<target name="extra166ycompile" |
899 |
< |
depends="configure-compiler, jsr166y-jar" |
899 |
> |
depends="configure-compiler, jsr166yjar" |
900 |
|
description="Compiles extra166y sources"> |
901 |
|
|
902 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
906 |
|
debug="${build.debug}" |
907 |
|
debuglevel="${build.debuglevel}" |
908 |
|
deprecation="${build.deprecation}" |
909 |
+ |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
910 |
|
classpath="" |
911 |
|
source="6" |
912 |
|
includeAntRuntime="false" |
915 |
|
fork="true"> |
916 |
|
|
917 |
|
<include name="extra166y/**/*.java"/> |
891 |
– |
<bootclasspath path="${jsr166y.jar}"/> |
892 |
– |
<bootclasspath path="${bootclasspath6}"/> |
918 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
919 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
920 |
|
<compilerarg line="${build.args}"/> |
923 |
|
</target> |
924 |
|
|
925 |
|
|
926 |
< |
<target name="extra166y-jar" |
926 |
> |
<target name="extra166yjar" |
927 |
|
depends="extra166ycompile" |
928 |
|
description="Builds library jar from compiled sources"> |
929 |
|
|
937 |
|
<target name="extra166ydocs" |
938 |
|
description="Builds javadocs to build dir"> |
939 |
|
|
940 |
< |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
941 |
< |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
940 |
> |
<delete dir="${extra166ydocs.dir}"/> |
941 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
942 |
|
|
943 |
< |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
943 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
944 |
|
packagenames="extra166y.*" |
945 |
|
link="${jdkapidocs.url}" |
946 |
+ |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
947 |
+ |
bootclasspath="${bootclasspath6}" |
948 |
|
source="6" |
949 |
|
executable="${javadoc7}"> |
923 |
– |
<sourcepath path="${topsrc.dir}"/> |
924 |
– |
<sourcepath path="${jdk6src.dir}"/> |
925 |
– |
<bootclasspath path="${bootclasspath6}"/> |
950 |
|
<arg value="-XDignore.symbol.file=true"/> |
951 |
|
|
952 |
|
</javadoc> |
954 |
|
|
955 |
|
|
956 |
|
<target name="extra166ydist" |
957 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
957 |
> |
depends="extra166ydist-jar, extra166ydist-docs" |
958 |
|
description="Puts all distributable products in single hierarchy"/> |
959 |
|
|
960 |
|
|
972 |
|
</target> |
973 |
|
|
974 |
|
<target name="extra166ydist-jar" |
975 |
< |
depends="extra166yclean, extra166y-jar"> |
952 |
< |
|
975 |
> |
depends="extra166yclean, extra166yjar"> |
976 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
977 |
+ |
</target> |
978 |
|
|
979 |
+ |
<target name="extra166ydist-docs" |
980 |
+ |
depends="extra166yclean, extra166ydocs"> |
981 |
+ |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
982 |
|
</target> |
983 |
|
|
984 |
|
<!-- jsr166e --> |
1010 |
|
</target> |
1011 |
|
|
1012 |
|
|
1013 |
< |
<target name="jsr166e-jar" |
1013 |
> |
<target name="jsr166ejar" |
1014 |
|
depends="jsr166ecompile" |
1015 |
|
description="Builds library jar from compiled sources"> |
1016 |
|
|
1024 |
|
<target name="jsr166edocs" |
1025 |
|
description="Builds javadocs to build dir"> |
1026 |
|
|
1027 |
< |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1028 |
< |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1027 |
> |
<delete dir="${jsr166edocs.dir}"/> |
1028 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
1029 |
|
|
1030 |
< |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1030 |
> |
<javadoc destdir="${jsr166edocs.dir}" |
1031 |
|
packagenames="jsr166e.*" |
1032 |
|
link="${jdkapidocs.url}" |
1033 |
+ |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1034 |
|
source="7" |
1035 |
|
executable="${javadoc7}"> |
1008 |
– |
<sourcepath path="${topsrc.dir}"/> |
1009 |
– |
<sourcepath path="${jdk7src.dir}"/> |
1036 |
|
<arg value="-XDignore.symbol.file=true"/> |
1037 |
|
|
1038 |
|
</javadoc> |
1039 |
|
</target> |
1040 |
|
|
1041 |
|
|
1042 |
+ |
<target name="jsr166e-test-tck" |
1043 |
+ |
depends="jsr166ejar" |
1044 |
+ |
description="Runs tck tests for jsr166e"> |
1045 |
+ |
|
1046 |
+ |
<run-tck-tests |
1047 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1048 |
+ |
source="7" |
1049 |
+ |
target="8" |
1050 |
+ |
workdir="${build.jsr166e.dir}" |
1051 |
+ |
classes="${jsr166e.jar}"/> |
1052 |
+ |
</target> |
1053 |
+ |
|
1054 |
+ |
|
1055 |
|
<target name="jsr166edist" |
1056 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
1056 |
> |
depends="jsr166edist-jar, jsr166edist-docs" |
1057 |
|
description="Puts all distributable products in single hierarchy"/> |
1058 |
|
|
1059 |
|
|
1060 |
|
<target name="jsr166eclean" |
1061 |
|
description="Removes all jsr166e build products"> |
1023 |
– |
|
1062 |
|
<delete dir="${build.jsr166e.dir}"/> |
1025 |
– |
|
1063 |
|
</target> |
1064 |
|
|
1065 |
|
|
1069 |
|
</target> |
1070 |
|
|
1071 |
|
<target name="jsr166edist-jar" |
1072 |
< |
depends="jsr166eclean, jsr166e-jar"> |
1036 |
< |
|
1072 |
> |
depends="jsr166eclean, jsr166ejar"> |
1073 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1074 |
+ |
</target> |
1075 |
|
|
1076 |
+ |
<target name="jsr166edist-docs" |
1077 |
+ |
depends="jsr166eclean, jsr166edocs"> |
1078 |
+ |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1079 |
|
</target> |
1080 |
|
|
1081 |
|
</project> |