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 |
+ |
|
38 |
+ |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
39 |
+ |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
40 |
+ |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
41 |
+ |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
42 |
+ |
|
43 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
44 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
45 |
|
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
56 |
|
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
57 |
|
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
58 |
|
|
59 |
+ |
<!-- JDK binary locations --> |
60 |
+ |
<property name="jdks.home" location="${user.home}/jdk"/> |
61 |
+ |
|
62 |
+ |
<macrodef name="defjdklocations"> |
63 |
+ |
<attribute name="v"/> |
64 |
+ |
<sequential> |
65 |
+ |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
66 |
+ |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
67 |
+ |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
68 |
+ |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
69 |
+ |
<property name="bootclasspath@{v}" |
70 |
+ |
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
71 |
+ |
</sequential> |
72 |
+ |
</macrodef> |
73 |
+ |
|
74 |
+ |
<defjdklocations v="6"/> |
75 |
+ |
<defjdklocations v="7"/> |
76 |
+ |
<defjdklocations v="8"/> |
77 |
+ |
|
78 |
|
<!-- Source locations --> |
79 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
80 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
84 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
85 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
86 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
87 |
< |
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
88 |
< |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
89 |
< |
<property name="jsr166esrc.dir" location="${basedir}/src/jsr166e"/> |
90 |
< |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
87 |
> |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
88 |
> |
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
89 |
> |
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
90 |
> |
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
91 |
> |
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
92 |
|
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
93 |
|
|
94 |
|
<!-- Distribution locations --> |
95 |
|
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
96 |
+ |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
97 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
98 |
|
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
99 |
|
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
101 |
|
|
102 |
|
<!-- Jar locations --> |
103 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
104 |
+ |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
105 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
106 |
|
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
107 |
|
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
204 |
|
sourcepath="${src.dir}:${jdksrc.dir}" |
205 |
|
additionalparam="-XDignore.symbol.file=true" > |
206 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
207 |
< |
<include name="**/*.java"/> |
207 |
> |
<include name="**/*.java"/> |
208 |
|
</fileset> |
209 |
|
</javadoc> |
210 |
|
|
273 |
|
sourcepath="${src.dir}:${jdksrc.dir}" |
274 |
|
additionalparam="-XDignore.symbol.file=true" > |
275 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
276 |
< |
<include name="**/*.java"/> |
276 |
> |
<include name="**/*.java"/> |
277 |
|
</fileset> |
278 |
|
</javadoc> |
279 |
|
|
504 |
|
</target> |
505 |
|
|
506 |
|
|
507 |
+ |
<!-- jdk7 --> |
508 |
+ |
|
509 |
+ |
|
510 |
+ |
<target name="jdk7compile" |
511 |
+ |
depends="configure-compiler" |
512 |
+ |
description="Compiles src/jdk7 sources"> |
513 |
+ |
|
514 |
+ |
<mkdir dir="${build.jdk7.classes.dir}"/> |
515 |
+ |
|
516 |
+ |
<javac srcdir="${jdk7src.dir}" |
517 |
+ |
destdir="${build.jdk7.classes.dir}" |
518 |
+ |
debug="${build.debug}" |
519 |
+ |
debuglevel="${build.debuglevel}" |
520 |
+ |
deprecation="${build.deprecation}" |
521 |
+ |
source="1.6" |
522 |
+ |
classpath="" |
523 |
+ |
bootclasspath="${bootclasspath6}" |
524 |
+ |
includeAntRuntime="false" |
525 |
+ |
includeJavaRuntime="false" |
526 |
+ |
executable="${javac6}" |
527 |
+ |
fork="true"> |
528 |
+ |
|
529 |
+ |
<include name="**/*.java"/> |
530 |
+ |
<compilerarg line="${build.args}"/> |
531 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
532 |
+ |
<compilerarg value="-Xlint:all"/> |
533 |
+ |
|
534 |
+ |
</javac> |
535 |
+ |
|
536 |
+ |
</target> |
537 |
+ |
|
538 |
+ |
|
539 |
+ |
|
540 |
+ |
<target name="jdk7jar" |
541 |
+ |
depends="jdk7compile" |
542 |
+ |
description="Builds library jar from compiled sources"> |
543 |
+ |
|
544 |
+ |
<mkdir dir="${build.jdk7.lib.dir}"/> |
545 |
+ |
|
546 |
+ |
<jar destfile="${jdk7product.jar}" index="true"> |
547 |
+ |
<fileset dir="${build.jdk7.classes.dir}"/> |
548 |
+ |
</jar> |
549 |
+ |
|
550 |
+ |
</target> |
551 |
+ |
|
552 |
+ |
|
553 |
+ |
|
554 |
+ |
<target name="jdk7docs" |
555 |
+ |
description="Builds javadocs with custom tags to build folder"> |
556 |
+ |
|
557 |
+ |
<delete dir="${build.jdk7.docs.dir}"/> |
558 |
+ |
<mkdir dir="${build.jdk7.docs.dir}"/> |
559 |
+ |
|
560 |
+ |
<javadoc destdir="${build.jdk7.docs.dir}" |
561 |
+ |
packagenames="none" |
562 |
+ |
link="${jdkapi7docs.url}" |
563 |
+ |
overview="${jdk7src.dir}/intro.html" |
564 |
+ |
sourcepath="${jdk7src.dir}" |
565 |
+ |
bootclasspath="${bootclasspath6}" |
566 |
+ |
classpath="" |
567 |
+ |
source="1.6" |
568 |
+ |
executable="${javadoc7}" |
569 |
+ |
additionalparam="-XDignore.symbol.file=true" > |
570 |
+ |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
571 |
+ |
<include name="**/*.java"/> |
572 |
+ |
</fileset> |
573 |
+ |
</javadoc> |
574 |
+ |
|
575 |
+ |
</target> |
576 |
+ |
|
577 |
+ |
|
578 |
+ |
<target name="jdk7dist" |
579 |
+ |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
580 |
+ |
description="Puts all distributable products in single hierarchy"/> |
581 |
+ |
|
582 |
+ |
|
583 |
+ |
|
584 |
+ |
<target name="jdk7clean" |
585 |
+ |
description="Removes all build products"> |
586 |
+ |
|
587 |
+ |
<delete dir="${build.jdk7.dir}"/> |
588 |
+ |
|
589 |
+ |
</target> |
590 |
+ |
|
591 |
+ |
|
592 |
+ |
|
593 |
+ |
<target name="jdk7dist-clean" |
594 |
+ |
description="Removes all build and distribution products"> |
595 |
+ |
|
596 |
+ |
</target> |
597 |
+ |
|
598 |
+ |
<target name="jdk7dist-docs" |
599 |
+ |
description="Builds javadocs without custom tags to dist folder"> |
600 |
+ |
|
601 |
+ |
<delete dir="${dist.jdk7.docs.dir}"/> |
602 |
+ |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
603 |
+ |
|
604 |
+ |
<javadoc destdir="${dist.jdk7.docs.dir}" |
605 |
+ |
packagenames="none" |
606 |
+ |
link="${jdkapi7docs.url}" |
607 |
+ |
overview="${jdk7src.dir}/intro.html" |
608 |
+ |
sourcepath="${jdk7src.dir}" |
609 |
+ |
classpath="" |
610 |
+ |
executable="${javadoc7}" |
611 |
+ |
bootclasspath="${bootclasspath6}" |
612 |
+ |
source="1.6"> |
613 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
614 |
+ |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
615 |
+ |
<include name="**/*.java"/> |
616 |
+ |
</fileset> |
617 |
+ |
</javadoc> |
618 |
+ |
|
619 |
+ |
</target> |
620 |
+ |
|
621 |
+ |
<target name="jdk7dist-jar" |
622 |
+ |
depends="jdk7clean, jdk7jar"> |
623 |
+ |
|
624 |
+ |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
625 |
+ |
|
626 |
+ |
</target> |
627 |
+ |
|
628 |
|
<!-- jsr166x --> |
629 |
|
|
630 |
|
|
937 |
|
|
938 |
|
<!-- jsr166e --> |
939 |
|
|
791 |
– |
|
940 |
|
<target name="jsr166ecompile" |
941 |
< |
depends="init, configure-compiler" |
941 |
> |
depends="configure-compiler" |
942 |
|
description="Compiles jsr166e sources"> |
943 |
|
|
944 |
|
<mkdir dir="${build.jsr166e.dir}"/> |
945 |
|
|
946 |
< |
<javac srcdir="${jsr166esrc.dir}" |
947 |
< |
destdir="${build.jsr166e.dir}" |
948 |
< |
debug="${build.debug}" |
949 |
< |
debuglevel="${build.debuglevel}" |
950 |
< |
deprecation="${build.deprecation}" |
946 |
> |
<javac srcdir="${topsrc.dir}" |
947 |
> |
destdir="${build.jsr166e.dir}" |
948 |
> |
debug="${build.debug}" |
949 |
> |
debuglevel="${build.debuglevel}" |
950 |
> |
deprecation="${build.deprecation}" |
951 |
|
source="1.7" |
952 |
< |
fork="true"> |
952 |
> |
classpath="" |
953 |
> |
includeAntRuntime="false" |
954 |
> |
includeJavaRuntime="false" |
955 |
> |
executable="${javac7}" |
956 |
> |
fork="true"> |
957 |
|
|
958 |
< |
<include name="**/*.java"/> |
958 |
> |
<include name="jsr166e/**/*.java"/> |
959 |
|
<compilerarg line="${build.args}"/> |
960 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
961 |
< |
<compilerarg value="${bootclasspath.args}"/> |
810 |
< |
|
811 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
961 |
> |
<compilerarg value="-Xlint:all"/> |
962 |
|
|
963 |
|
</javac> |
964 |
|
|
988 |
|
|
989 |
|
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
990 |
|
packagenames="jsr166e,jsr166e.extra" |
991 |
< |
link="${jdkapidocs.url}" |
991 |
> |
link="${jdkapi7docs.url}" |
992 |
|
source="1.7" |
993 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
994 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
993 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" |
994 |
> |
executable="${javadoc7}" |
995 |
> |
additionalparam="-XDignore.symbol.file=true" > |
996 |
> |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
997 |
> |
<include name="jsr166e/**/*.java"/> |
998 |
> |
</fileset> |
999 |
> |
</javadoc> |
1000 |
|
|
1001 |
|
</target> |
1002 |
|
|