| 58 |
|
|
| 59 |
|
<!-- JDK binary locations --> |
| 60 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
| 61 |
< |
<property name="jdk6.home" location="${jdks.home}/jdk1.6.0"/> |
| 62 |
< |
<property name="jdk7.home" location="${jdks.home}/jdk1.7.0"/> |
| 63 |
< |
<property name="jdk8.home" location="${jdks.home}/jdk1.8.0"/> |
| 64 |
< |
<property name="javac6" location="${jdk6.home}/bin/javac"/> |
| 65 |
< |
<property name="javac7" location="${jdk7.home}/bin/javac"/> |
| 66 |
< |
<property name="javac8" location="${jdk8.home}/bin/javac"/> |
| 67 |
< |
<property name="javadoc6" location="${jdk6.home}/bin/javadoc"/> |
| 68 |
< |
<property name="javadoc7" location="${jdk7.home}/bin/javadoc"/> |
| 69 |
< |
<property name="javadoc8" location="${jdk8.home}/bin/javadoc"/> |
| 70 |
< |
<property name="bootdir6" location="${jdk6.home}/jre/lib"/> |
| 71 |
< |
<property name="bootdir7" location="${jdk7.home}/jre/lib"/> |
| 72 |
< |
<property name="bootdir8" location="${jdk8.home}/jre/lib"/> |
| 73 |
< |
<property name="bootclasspath6" value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/> |
| 74 |
< |
<property name="bootclasspath7" value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/> |
| 75 |
< |
<property name="bootclasspath8" value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/> |
| 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"/> |
| 937 |
|
|
| 938 |
|
<!-- jsr166e --> |
| 939 |
|
|
| 939 |
– |
|
| 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}"/> |
| 958 |
< |
|
| 959 |
< |
<!-- <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 |
|
|
