45 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
46 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
47 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
48 |
– |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
49 |
– |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
48 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
49 |
|
|
50 |
< |
<property name="build.4jdk7.dir" location="${build.dir}/4jdk7"/> |
51 |
< |
<property name="build.4jdk7.lib.dir" location="${build.4jdk7.dir}"/> |
52 |
< |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
53 |
< |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/> |
56 |
< |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
50 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
51 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
52 |
> |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/> |
53 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
54 |
|
|
55 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
59 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
60 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
61 |
– |
|
56 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
63 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
64 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
65 |
– |
|
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
67 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
68 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
69 |
– |
|
58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
71 |
– |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
72 |
– |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
59 |
|
|
60 |
|
<!-- JDK binary locations --> |
61 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
113 |
|
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
114 |
|
|
115 |
|
<!-- Distribution locations --> |
116 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
117 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
118 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
119 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
120 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
121 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
116 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
117 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
118 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
119 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
120 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
121 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
122 |
|
|
123 |
|
<!-- Jar locations --> |
124 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
125 |
< |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
126 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
127 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
128 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
129 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
130 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
124 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
125 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
126 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
127 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
128 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
129 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
130 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
131 |
|
|
132 |
|
<!-- Bootclasspath argument --> |
133 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
140 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
141 |
|
<!-- The below does not yet exist as of 2012-11 --> |
142 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
143 |
+ |
|
144 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
145 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
146 |
|
|
147 |
|
<!-- Test classpath --> |
165 |
|
<!-- Main targets --> |
166 |
|
|
167 |
|
<target name="dists" |
168 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
168 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
169 |
|
description="Builds all public jars and docs"/> |
170 |
|
|
171 |
|
<target name="compile" |
172 |
|
depends="configure-compiler" |
173 |
< |
description="Compiles src/main sources to build folder"> |
173 |
> |
description="Compiles src/main sources to build dir"> |
174 |
|
|
175 |
|
<mkdir dir="${build.classes.dir}"/> |
176 |
|
|
206 |
|
depends="compile" |
207 |
|
description="Builds library jar from compiled sources"> |
208 |
|
|
221 |
– |
<mkdir dir="${build.lib.dir}"/> |
222 |
– |
|
209 |
|
<jar destfile="${product.jar}"> |
210 |
|
<fileset dir="${build.classes.dir}"/> |
211 |
|
</jar> |
215 |
|
|
216 |
|
|
217 |
|
<target name="test" |
218 |
< |
depends="init, configure-tests, report-tests" |
218 |
> |
depends="configure-tests, report-tests" |
219 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
220 |
|
|
221 |
|
|
222 |
|
|
223 |
|
<target name="docs" |
224 |
< |
description="Builds javadocs for src/main"> |
224 |
> |
description="Builds javadocs for src/main to dist dir"> |
225 |
|
|
226 |
|
<delete dir="${dist.javadocs.dir}"/> |
227 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
249 |
|
|
250 |
|
|
251 |
|
<target name="dist" |
252 |
< |
depends="init, dist-clean, dist-jar, docs" |
252 |
> |
depends="dist-clean, dist-jar, docs" |
253 |
|
description="Puts all distributable products in single hierarchy"/> |
254 |
|
|
255 |
|
|
277 |
|
description="Removes all build products"> |
278 |
|
|
279 |
|
<delete dir="${build.dir}"/> |
294 |
– |
<delete dir="${build.classes.dir}"/> |
295 |
– |
<delete dir="${build.lib.dir}"/> |
280 |
|
|
281 |
|
</target> |
282 |
|
|
294 |
|
<!-- Internal targets --> |
295 |
|
|
296 |
|
|
313 |
– |
<target name="init"> |
314 |
– |
|
315 |
– |
<!-- Version is kept in a separate file --> |
316 |
– |
<loadfile property="version" srcFile="version.properties"/> |
317 |
– |
<echo>Building JSR-166 version ${version}</echo> |
318 |
– |
<echo>java.home is ${java.home}</echo> |
319 |
– |
|
320 |
– |
</target> |
321 |
– |
|
322 |
– |
|
297 |
|
<target name="dist-jar" |
298 |
|
depends="clean, jar"> |
299 |
|
|
478 |
|
<!-- Various demos and test programs --> |
479 |
|
|
480 |
|
|
481 |
< |
<target name="loops" depends="init, configure-compiler" |
481 |
> |
<target name="loops" depends="configure-compiler" |
482 |
|
description="Benchmark from Doug Lea's AQS paper"> |
483 |
|
|
484 |
|
<mkdir dir="${build.loops.dir}"/> |
518 |
|
debug="${build.debug}" |
519 |
|
debuglevel="${build.debuglevel}" |
520 |
|
deprecation="${build.deprecation}" |
521 |
< |
source="1.6" |
521 |
> |
source="6" |
522 |
|
classpath="" |
523 |
|
bootclasspath="${bootclasspath6}" |
524 |
|
includeAntRuntime="false" |
533 |
|
|
534 |
|
</javac> |
535 |
|
|
562 |
– |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
563 |
– |
|
536 |
|
<jar destfile="${4jdk7product.jar}" index="true"> |
537 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
538 |
|
</jar> |
544 |
|
debug="${build.debug}" |
545 |
|
debuglevel="${build.debuglevel}" |
546 |
|
deprecation="${build.deprecation}" |
547 |
< |
source="1.6" |
547 |
> |
source="6" |
548 |
|
classpath="${junit.jar}" |
549 |
|
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
550 |
|
includeAntRuntime="false" |
602 |
|
|
603 |
|
|
604 |
|
<target name="4jdk7docs" |
605 |
< |
description="Builds javadocs with custom tags to build folder"> |
605 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
606 |
|
|
607 |
< |
<delete dir="${build.4jdk7.docs.dir}"/> |
608 |
< |
<mkdir dir="${build.4jdk7.docs.dir}"/> |
607 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
608 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
609 |
|
|
610 |
< |
<javadoc destdir="${build.4jdk7.docs.dir}" |
610 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
611 |
|
packagenames="none" |
612 |
|
link="${jdkapi7docs.url}" |
613 |
|
overview="${4jdk7src.dir}/intro.html" |
624 |
|
|
625 |
|
|
626 |
|
<target name="4jdk7dist" |
627 |
< |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs" |
627 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
628 |
|
description="Puts all distributable products in single hierarchy"/> |
629 |
|
|
630 |
|
|
631 |
|
|
632 |
|
<target name="4jdk7clean" |
633 |
< |
description="Removes all build products"> |
633 |
> |
description="Removes all 4jdk7 build products"> |
634 |
|
|
635 |
|
<delete dir="${build.4jdk7.dir}"/> |
636 |
|
|
643 |
|
|
644 |
|
</target> |
645 |
|
|
674 |
– |
<target name="4jdk7dist-docs" |
675 |
– |
description="Builds javadocs without custom tags to dist folder"> |
676 |
– |
|
677 |
– |
<delete dir="${dist.4jdk7.docs.dir}"/> |
678 |
– |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
679 |
– |
|
680 |
– |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
681 |
– |
packagenames="none" |
682 |
– |
link="${jdkapi7docs.url}" |
683 |
– |
overview="${4jdk7src.dir}/intro.html" |
684 |
– |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
685 |
– |
classpath="" |
686 |
– |
executable="${javadoc7}"> |
687 |
– |
<arg value="-XDignore.symbol.file=true"/> |
688 |
– |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
689 |
– |
<include name="**/*.java"/> |
690 |
– |
</fileset> |
691 |
– |
</javadoc> |
692 |
– |
|
693 |
– |
</target> |
694 |
– |
|
646 |
|
<target name="4jdk7dist-jar" |
647 |
|
depends="4jdk7clean, 4jdk7compile"> |
648 |
|
|
650 |
|
|
651 |
|
</target> |
652 |
|
|
702 |
– |
<!-- jsr166x --> |
653 |
|
|
654 |
+ |
<!-- jsr166x --> |
655 |
|
|
656 |
|
<target name="jsr166xcompile" |
657 |
< |
depends="init, configure-compiler" |
658 |
< |
description="Compiles jsr166x sources"> |
657 |
> |
depends="configure-compiler" |
658 |
> |
description="Compiles jsr166x sources to build dir"> |
659 |
|
|
660 |
|
<mkdir dir="${build.jsr166x.dir}"/> |
661 |
|
|
662 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
663 |
< |
destdir="${build.jsr166x.dir}" |
664 |
< |
debug="${build.debug}" |
665 |
< |
debuglevel="${build.debuglevel}" |
666 |
< |
deprecation="${build.deprecation}" |
667 |
< |
source="${build.sourcelevel}" |
668 |
< |
fork="true"> |
662 |
> |
<javac srcdir="${topsrc.dir}" |
663 |
> |
destdir="${build.jsr166x.dir}" |
664 |
> |
debug="${build.debug}" |
665 |
> |
debuglevel="${build.debuglevel}" |
666 |
> |
deprecation="${build.deprecation}" |
667 |
> |
classpath="" |
668 |
> |
source="5" |
669 |
> |
bootclasspath="${bootclasspath6}" |
670 |
> |
includeAntRuntime="false" |
671 |
> |
includeJavaRuntime="false" |
672 |
> |
executable="${javac7}" |
673 |
> |
fork="true"> |
674 |
|
|
675 |
< |
<include name="**/*.java"/> |
675 |
> |
<include name="jsr166x/**/*.java"/> |
676 |
|
<compilerarg line="${build.args}"/> |
677 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
678 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
679 |
|
|
680 |
|
</javac> |
681 |
|
|
687 |
|
depends="jsr166xcompile" |
688 |
|
description="Builds library jar from compiled sources"> |
689 |
|
|
690 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
734 |
< |
|
735 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
690 |
> |
<jar destfile="${jsr166x.jar}"> |
691 |
|
<fileset dir="${build.jsr166x.dir}"/> |
692 |
|
</jar> |
693 |
|
|
696 |
|
|
697 |
|
|
698 |
|
<target name="jsr166xdocs" |
699 |
< |
description="Builds javadocs with custom tags to build folder"> |
699 |
> |
description="Builds javadocs to dist dir"> |
700 |
|
|
701 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
702 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
701 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
702 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
703 |
|
|
704 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
705 |
< |
packagenames="jsr166x" |
704 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
705 |
> |
packagenames="jsr166x.*" |
706 |
|
link="${jdkapidocs.url}" |
707 |
< |
source="${build.sourcelevel}" |
708 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
707 |
> |
source="5" |
708 |
> |
bootclasspath="${bootclasspath6}" |
709 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
710 |
> |
executable="${javadoc7}" |
711 |
|
additionalparam="-XDignore.symbol.file=true" /> |
712 |
|
|
713 |
|
</target> |
714 |
|
|
715 |
|
|
716 |
|
<target name="jsr166xdist" |
717 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
717 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
718 |
|
description="Puts all distributable products in single hierarchy"/> |
719 |
|
|
720 |
|
|
721 |
|
|
722 |
|
<target name="jsr166xclean" |
723 |
< |
description="Removes all build products"> |
723 |
> |
description="Removes all jsr166x build products"> |
724 |
|
|
725 |
|
<delete dir="${build.jsr166x.dir}"/> |
769 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
726 |
|
|
727 |
|
</target> |
728 |
|
|
734 |
|
</target> |
735 |
|
|
736 |
|
|
781 |
– |
|
782 |
– |
<target name="jsr166xdist-docs" |
783 |
– |
description="Builds javadocs without custom tags to dist folder"> |
784 |
– |
|
785 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
786 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
787 |
– |
|
788 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
789 |
– |
packagenames="jsr166x" |
790 |
– |
link="${jdkapidocs.url}" |
791 |
– |
source="${build.sourcelevel}" |
792 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
793 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
794 |
– |
|
795 |
– |
</target> |
796 |
– |
|
737 |
|
<target name="jsr166xdist-jar" |
738 |
|
depends="jsr166xclean, jsr166xjar"> |
739 |
|
|
740 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
740 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
741 |
|
|
742 |
|
</target> |
743 |
|
|
745 |
|
|
746 |
|
|
747 |
|
<target name="jsr166ycompile" |
748 |
< |
depends="init, configure-compiler" |
748 |
> |
depends="configure-compiler" |
749 |
|
description="Compiles jsr166y sources"> |
750 |
|
|
751 |
|
<mkdir dir="${build.jsr166y.dir}"/> |
752 |
|
|
753 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
754 |
< |
destdir="${build.jsr166y.dir}" |
755 |
< |
debug="${build.debug}" |
756 |
< |
debuglevel="${build.debuglevel}" |
757 |
< |
deprecation="${build.deprecation}" |
758 |
< |
source="${build.sourcelevel}" |
759 |
< |
fork="true"> |
753 |
> |
<javac srcdir="${topsrc.dir}" |
754 |
> |
destdir="${build.jsr166y.dir}" |
755 |
> |
debug="${build.debug}" |
756 |
> |
debuglevel="${build.debuglevel}" |
757 |
> |
deprecation="${build.deprecation}" |
758 |
> |
source="6" |
759 |
> |
classpath="" |
760 |
> |
bootclasspath="${bootclasspath6}" |
761 |
> |
includeAntRuntime="false" |
762 |
> |
includeJavaRuntime="false" |
763 |
> |
executable="${javac7}" |
764 |
> |
fork="true"> |
765 |
|
|
766 |
< |
<include name="**/*.java"/> |
766 |
> |
<include name="jsr166y/**/*.java"/> |
767 |
|
<compilerarg line="${build.args}"/> |
768 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
769 |
< |
<compilerarg value="${bootclasspath.args}"/> |
825 |
< |
|
826 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
827 |
< |
|
769 |
> |
<compilerarg value="-Xlint:all"/> |
770 |
|
</javac> |
829 |
– |
|
771 |
|
</target> |
772 |
|
|
773 |
|
|
833 |
– |
|
774 |
|
<target name="jsr166yjar" |
775 |
|
depends="jsr166ycompile" |
776 |
|
description="Builds library jar from compiled sources"> |
777 |
|
|
778 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
839 |
< |
|
840 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
778 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
779 |
|
<fileset dir="${build.jsr166y.dir}"/> |
780 |
|
</jar> |
781 |
|
|
784 |
|
|
785 |
|
|
786 |
|
<target name="jsr166ydocs" |
787 |
< |
description="Builds javadocs with custom tags to build folder"> |
787 |
> |
description="Builds javadocs to dist dir"> |
788 |
|
|
789 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
790 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
789 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
790 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
791 |
|
|
792 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
793 |
< |
packagenames="jsr166y" |
792 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
793 |
> |
packagenames="jsr166y.*" |
794 |
|
link="${jdkapidocs.url}" |
795 |
< |
source="${build.sourcelevel}" |
796 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
795 |
> |
source="6" |
796 |
> |
bootclasspath="${bootclasspath6}" |
797 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
798 |
> |
executable="${javadoc7}" |
799 |
|
additionalparam="-XDignore.symbol.file=true" /> |
800 |
|
|
801 |
|
</target> |
802 |
|
|
803 |
|
|
804 |
|
<target name="jsr166ydist" |
805 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
805 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
806 |
|
description="Puts all distributable products in single hierarchy"/> |
807 |
|
|
808 |
|
|
809 |
|
|
810 |
|
<target name="jsr166yclean" |
811 |
< |
description="Removes all build products"> |
811 |
> |
description="Removes all jsr166y build products"> |
812 |
|
|
813 |
|
<delete dir="${build.jsr166y.dir}"/> |
874 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
814 |
|
|
815 |
|
</target> |
816 |
|
|
821 |
|
|
822 |
|
</target> |
823 |
|
|
885 |
– |
<target name="jsr166ydist-docs" |
886 |
– |
description="Builds javadocs without custom tags to dist folder"> |
887 |
– |
|
888 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
889 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
890 |
– |
|
891 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
892 |
– |
packagenames="jsr166y" |
893 |
– |
link="${jdkapidocs.url}" |
894 |
– |
source="${build.sourcelevel}" |
895 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
896 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
897 |
– |
|
898 |
– |
</target> |
899 |
– |
|
824 |
|
<target name="jsr166ydist-jar" |
825 |
|
depends="jsr166yclean, jsr166yjar"> |
826 |
|
|
827 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
827 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
828 |
|
|
829 |
|
</target> |
830 |
|
|
833 |
|
|
834 |
|
|
835 |
|
<target name="extra166ycompile" |
836 |
< |
depends="init, configure-compiler, jsr166ycompile" |
836 |
> |
depends="configure-compiler, jsr166yjar" |
837 |
|
description="Compiles extra166y sources"> |
838 |
|
|
839 |
|
<mkdir dir="${build.extra166y.dir}"/> |
840 |
|
|
841 |
< |
<javac srcdir="${extra166ysrc.dir}" |
842 |
< |
destdir="${build.extra166y.dir}" |
843 |
< |
debug="${build.debug}" |
844 |
< |
classpath="${jsr166yproduct.jar}" |
845 |
< |
debuglevel="${build.debuglevel}" |
846 |
< |
deprecation="${build.deprecation}" |
847 |
< |
source="${build.sourcelevel}" |
848 |
< |
fork="true"> |
841 |
> |
<javac srcdir="${topsrc.dir}" |
842 |
> |
destdir="${build.extra166y.dir}" |
843 |
> |
debug="${build.debug}" |
844 |
> |
debuglevel="${build.debuglevel}" |
845 |
> |
deprecation="${build.deprecation}" |
846 |
> |
classpath="" |
847 |
> |
source="6" |
848 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
849 |
> |
includeAntRuntime="false" |
850 |
> |
includeJavaRuntime="false" |
851 |
> |
executable="${javac7}" |
852 |
> |
fork="true"> |
853 |
|
|
854 |
< |
<include name="**/*.java"/> |
854 |
> |
<include name="extra166y/**/*.java"/> |
855 |
|
<compilerarg line="${build.args}"/> |
856 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
857 |
< |
<compilerarg value="${bootclasspath.args}"/> |
930 |
< |
|
931 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
857 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
858 |
|
|
859 |
|
</javac> |
860 |
|
|
866 |
|
depends="extra166ycompile" |
867 |
|
description="Builds library jar from compiled sources"> |
868 |
|
|
869 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
944 |
< |
|
945 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
869 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
870 |
|
<fileset dir="${build.extra166y.dir}"/> |
871 |
|
</jar> |
872 |
|
|
875 |
|
|
876 |
|
|
877 |
|
<target name="extra166ydocs" |
878 |
< |
description="Builds javadocs with custom tags to build folder"> |
878 |
> |
description="Builds javadocs to build dir"> |
879 |
|
|
880 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
881 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
880 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
881 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
882 |
|
|
883 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
884 |
< |
packagenames="extra166y" |
883 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
884 |
> |
packagenames="extra166y.*" |
885 |
|
link="${jdkapidocs.url}" |
886 |
< |
source="${build.sourcelevel}" |
887 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
886 |
> |
source="6" |
887 |
> |
bootclasspath="${bootclasspath6}" |
888 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
889 |
> |
executable="${javadoc7}" |
890 |
|
additionalparam="-XDignore.symbol.file=true" /> |
891 |
|
|
892 |
|
</target> |
893 |
|
|
894 |
|
|
895 |
|
<target name="extra166ydist" |
896 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
896 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
897 |
|
description="Puts all distributable products in single hierarchy"/> |
898 |
|
|
899 |
|
|
900 |
|
|
901 |
|
<target name="extra166yclean" |
902 |
< |
description="Removes all build products"> |
902 |
> |
description="Removes all extra166y build products"> |
903 |
|
|
904 |
|
<delete dir="${build.extra166y.dir}"/> |
979 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
905 |
|
|
906 |
|
</target> |
907 |
|
|
912 |
|
|
913 |
|
</target> |
914 |
|
|
990 |
– |
<target name="extra166ydist-docs" |
991 |
– |
description="Builds javadocs without custom tags to dist folder"> |
992 |
– |
|
993 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
994 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
995 |
– |
|
996 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
997 |
– |
packagenames="extra166y" |
998 |
– |
link="${jdkapidocs.url}" |
999 |
– |
source="${build.sourcelevel}" |
1000 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1001 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1002 |
– |
|
1003 |
– |
</target> |
1004 |
– |
|
915 |
|
<target name="extra166ydist-jar" |
916 |
|
depends="extra166yclean, extra166yjar"> |
917 |
|
|
918 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
918 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
919 |
|
|
920 |
|
</target> |
921 |
|
|
932 |
|
debug="${build.debug}" |
933 |
|
debuglevel="${build.debuglevel}" |
934 |
|
deprecation="${build.deprecation}" |
935 |
< |
source="1.7" |
935 |
> |
source="7" |
936 |
|
classpath="" |
937 |
|
includeAntRuntime="false" |
938 |
|
includeJavaRuntime="false" |
954 |
|
depends="jsr166ecompile" |
955 |
|
description="Builds library jar from compiled sources"> |
956 |
|
|
957 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
1048 |
< |
|
1049 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
957 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
958 |
|
<fileset dir="${build.jsr166e.dir}"/> |
959 |
|
</jar> |
960 |
|
|
963 |
|
|
964 |
|
|
965 |
|
<target name="jsr166edocs" |
966 |
< |
description="Builds javadocs with custom tags to build folder"> |
966 |
> |
description="Builds javadocs to build dir"> |
967 |
|
|
968 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
969 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
968 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
969 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
970 |
|
|
971 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
972 |
< |
packagenames="jsr166e,jsr166e.extra" |
973 |
< |
link="${jdkapi7docs.url}" |
974 |
< |
source="1.7" |
971 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
972 |
> |
packagenames="jsr166e.*" |
973 |
> |
link="${jdkapidocs.url}" |
974 |
> |
source="7" |
975 |
|
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
976 |
|
executable="${javadoc7}" |
977 |
|
additionalparam="-XDignore.symbol.file=true" > |
1070 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1071 |
– |
<include name="jsr166e/**/*.java"/> |
1072 |
– |
</fileset> |
978 |
|
</javadoc> |
979 |
|
|
980 |
|
</target> |
981 |
|
|
982 |
|
|
983 |
|
<target name="jsr166edist" |
984 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
984 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
985 |
|
description="Puts all distributable products in single hierarchy"/> |
986 |
|
|
987 |
|
|
988 |
|
|
989 |
|
<target name="jsr166eclean" |
990 |
< |
description="Removes all build products"> |
990 |
> |
description="Removes all jsr166e build products"> |
991 |
|
|
992 |
|
<delete dir="${build.jsr166e.dir}"/> |
1088 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
993 |
|
|
994 |
|
</target> |
995 |
|
|
996 |
|
|
1093 |
– |
|
997 |
|
<target name="jsr166edist-clean" |
998 |
|
description="Removes all build and distribution products"> |
999 |
|
|
1000 |
|
</target> |
1001 |
|
|
1099 |
– |
<target name="jsr166edist-docs" |
1100 |
– |
description="Builds javadocs without custom tags to dist folder"> |
1101 |
– |
|
1102 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1103 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1104 |
– |
|
1105 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1106 |
– |
packagenames="jsr166e,jsr166e.extra" |
1107 |
– |
link="${jdkapidocs.url}" |
1108 |
– |
source="1.7" |
1109 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1110 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1111 |
– |
|
1112 |
– |
</target> |
1113 |
– |
|
1002 |
|
<target name="jsr166edist-jar" |
1003 |
|
depends="jsr166eclean, jsr166ejar"> |
1004 |
|
|
1005 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1005 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1006 |
|
|
1007 |
|
</target> |
1008 |
|
|