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