21 |
|
|
22 |
|
|
23 |
|
<!-- Compilation options --> |
24 |
< |
<property name="build.sourcelevel" value="1.5"/> |
24 |
> |
<property name="build.sourcelevel" value="1.6"/> |
25 |
|
<property name="build.debug" value="true"/> |
26 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
27 |
|
<property name="build.deprecation" value="false"/> |
28 |
|
|
29 |
|
<!-- Build locations --> |
30 |
< |
<property name="build.dir" location="build"/> |
31 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
< |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
34 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
36 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
37 |
< |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
30 |
> |
<property name="build.dir" location="build"/> |
31 |
> |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
> |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
> |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
34 |
> |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
> |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
36 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
37 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
38 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
39 |
|
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
40 |
|
|
41 |
< |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
41 |
> |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
42 |
|
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
43 |
|
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
44 |
|
|
45 |
+ |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
46 |
+ |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
47 |
+ |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
48 |
+ |
|
49 |
|
<!-- Source locations --> |
50 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
51 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
57 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
58 |
|
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
59 |
|
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
60 |
< |
|
60 |
> |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
61 |
> |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
62 |
|
<!-- Distribution locations --> |
63 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
63 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
64 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
65 |
|
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
66 |
+ |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
67 |
|
|
68 |
|
<!-- Jar locations --> |
69 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
70 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
71 |
|
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
72 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
73 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
74 |
|
|
75 |
|
<!-- Bootclasspath argument --> |
89 |
|
|
90 |
|
<!-- Main targets --> |
91 |
|
|
92 |
+ |
<target name="dists" |
93 |
+ |
depends="dist, jsr166xdist, jsr166ydist, extra166ydist" |
94 |
+ |
description="Builds all public jars and docs"/> |
95 |
|
|
96 |
|
<target name="compile" |
97 |
|
depends="init, configure-compiler" |
151 |
|
<javadoc destdir="${build.javadocs.dir}" |
152 |
|
link="http://java.sun.com/javase/6/docs/api/" |
153 |
|
overview="${src.dir}/intro.html" |
154 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
155 |
< |
> |
154 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
155 |
> |
> |
156 |
|
|
157 |
|
<packageset dir="${src.dir}"/> |
158 |
|
|
167 |
|
description="Puts all distributable products in single hierarchy"/> |
168 |
|
|
169 |
|
|
160 |
– |
|
170 |
|
<target name="release" |
171 |
|
depends="dist" |
172 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
217 |
|
link="http://java.sun.com/javase/6/docs/api/" |
218 |
|
overview="${src.dir}/intro.html" |
219 |
|
|
220 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
220 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
221 |
|
> |
222 |
|
<!-- |
223 |
|
<packageset dir="${src.dir}" defaultexcludes="yes"> |
512 |
|
|
513 |
|
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
514 |
|
link="http://java.sun.com/javase/6/docs/api/" |
515 |
< |
|
507 |
< |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
508 |
< |
|
515 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
516 |
|
> |
517 |
|
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
518 |
|
<include name="jsr166x"/> |
607 |
|
|
608 |
|
<mkdir dir="${build.jsr166ylib.dir}"/> |
609 |
|
|
610 |
< |
<jar destfile="${jsr166yproduct.jar}"> |
610 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
611 |
|
<fileset dir="${build.jsr166y.dir}"/> |
612 |
|
</jar> |
613 |
|
|
623 |
|
|
624 |
|
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
625 |
|
link="http://java.sun.com/javase/6/docs/api/" |
626 |
< |
sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
620 |
< |
|
626 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
627 |
|
> |
628 |
|
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
629 |
|
<include name="jsr166y"/> |
664 |
|
|
665 |
|
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
666 |
|
link="http://java.sun.com/javase/6/docs/api/" |
667 |
< |
source="${build.sourcelevel}"> |
667 |
> |
source="${build.sourcelevel}" |
668 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
669 |
> |
> |
670 |
|
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
671 |
|
<include name="jsr166y/*.java"/> |
664 |
– |
<include name="jsr166y/forkjoin/*.java"/> |
672 |
|
</fileset> |
673 |
|
</javadoc> |
674 |
|
|
681 |
|
|
682 |
|
</target> |
683 |
|
|
684 |
+ |
<!-- extra166y --> |
685 |
+ |
|
686 |
+ |
|
687 |
+ |
<target name="extra166ycompile" |
688 |
+ |
depends="init, configure-compiler, jsr166ycompile" |
689 |
+ |
description="Compiles extra166y sources"> |
690 |
+ |
|
691 |
+ |
<mkdir dir="${build.extra166y.dir}"/> |
692 |
+ |
|
693 |
+ |
<javac srcdir="${extra166ysrc.dir}" |
694 |
+ |
destdir="${build.extra166y.dir}" |
695 |
+ |
debug="${build.debug}" |
696 |
+ |
classpath="${jsr166yproduct.jar}" |
697 |
+ |
debuglevel="${build.debuglevel}" |
698 |
+ |
deprecation="${build.deprecation}" |
699 |
+ |
source="${build.sourcelevel}" |
700 |
+ |
fork="true"> |
701 |
+ |
|
702 |
+ |
<include name="**/*.java"/> |
703 |
+ |
<compilerarg line="${build.args}"/> |
704 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
705 |
+ |
|
706 |
+ |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
707 |
+ |
|
708 |
+ |
</javac> |
709 |
+ |
|
710 |
+ |
</target> |
711 |
+ |
|
712 |
+ |
|
713 |
+ |
|
714 |
+ |
<target name="extra166yjar" |
715 |
+ |
depends="extra166ycompile" |
716 |
+ |
description="Builds library jar from compiled sources"> |
717 |
+ |
|
718 |
+ |
<mkdir dir="${build.extra166ylib.dir}"/> |
719 |
+ |
|
720 |
+ |
<jar destfile="${extra166yproduct.jar}" index="true"> |
721 |
+ |
<fileset dir="${build.extra166y.dir}"/> |
722 |
+ |
</jar> |
723 |
+ |
|
724 |
+ |
</target> |
725 |
+ |
|
726 |
+ |
|
727 |
+ |
|
728 |
+ |
<target name="extra166ydocs" |
729 |
+ |
description="Builds javadocs with custom tags to build folder"> |
730 |
+ |
|
731 |
+ |
<delete dir="${build.extra166yjavadocs.dir}"/> |
732 |
+ |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
733 |
+ |
|
734 |
+ |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
735 |
+ |
link="http://java.sun.com/javase/6/docs/api/" |
736 |
+ |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
737 |
+ |
> |
738 |
+ |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
739 |
+ |
<include name="extra166y"/> |
740 |
+ |
</packageset> |
741 |
+ |
|
742 |
+ |
|
743 |
+ |
</javadoc> |
744 |
+ |
|
745 |
+ |
</target> |
746 |
+ |
|
747 |
+ |
|
748 |
+ |
<target name="extra166ydist" |
749 |
+ |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
750 |
+ |
description="Puts all distributable products in single hierarchy"/> |
751 |
+ |
|
752 |
+ |
|
753 |
+ |
|
754 |
+ |
<target name="extra166yclean" |
755 |
+ |
description="Removes all build products"> |
756 |
+ |
|
757 |
+ |
<delete dir="${build.extra166y.dir}"/> |
758 |
+ |
<delete dir="${build.extra166ylib.dir}"/> |
759 |
+ |
|
760 |
+ |
</target> |
761 |
+ |
|
762 |
+ |
|
763 |
+ |
|
764 |
+ |
<target name="extra166ydist-clean" |
765 |
+ |
description="Removes all build and distribution products"> |
766 |
+ |
|
767 |
+ |
</target> |
768 |
+ |
|
769 |
+ |
<target name="extra166ydist-docs" |
770 |
+ |
description="Builds javadocs without custom tags to dist folder"> |
771 |
+ |
|
772 |
+ |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
773 |
+ |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
774 |
+ |
|
775 |
+ |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
776 |
+ |
link="http://java.sun.com/javase/6/docs/api/" |
777 |
+ |
source="${build.sourcelevel}" |
778 |
+ |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
779 |
+ |
> |
780 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
781 |
+ |
<include name="extra166y/*.java"/> |
782 |
+ |
</fileset> |
783 |
+ |
</javadoc> |
784 |
+ |
|
785 |
+ |
</target> |
786 |
+ |
|
787 |
+ |
<target name="extra166ydist-jar" |
788 |
+ |
depends="extra166yclean, extra166yjar"> |
789 |
+ |
|
790 |
+ |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
791 |
+ |
|
792 |
+ |
</target> |
793 |
+ |
|
794 |
|
</project> |