35 |
|
|
36 |
|
|
37 |
|
<!-- Compilation options --> |
38 |
< |
<property name="build.sourcelevel" value="1.6"/> |
38 |
> |
<property name="build.sourcelevel" value="6"/> |
39 |
|
<property name="build.debug" value="true"/> |
40 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
41 |
|
<property name="build.deprecation" value="false"/> |
49 |
|
|
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"/> |
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"/> |
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
59 |
|
|
60 |
+ |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
61 |
+ |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
62 |
+ |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
63 |
+ |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
64 |
+ |
|
65 |
|
<!-- JDK binary locations --> |
66 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
67 |
|
|
115 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
116 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
117 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
113 |
– |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
118 |
|
|
119 |
|
<!-- Distribution locations --> |
120 |
|
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
312 |
|
<mkdir dir="${build.testcases.dir}"/> |
313 |
|
|
314 |
|
<javac srcdir="${tck.src.dir}" |
315 |
< |
destdir="${build.testcases.dir}" |
316 |
< |
debug="${build.debug}" |
317 |
< |
debuglevel="${build.debuglevel}" |
318 |
< |
deprecation="${build.deprecation}" |
319 |
< |
source="${build.sourcelevel}" |
320 |
< |
fork="true"> |
315 |
> |
destdir="${build.testcases.dir}" |
316 |
> |
debug="${build.debug}" |
317 |
> |
debuglevel="${build.debuglevel}" |
318 |
> |
deprecation="${build.deprecation}" |
319 |
> |
source="6" |
320 |
> |
classpath="${junit.jar}" |
321 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
322 |
> |
includeAntRuntime="false" |
323 |
> |
includeJavaRuntime="false" |
324 |
> |
executable="${javac8}" |
325 |
> |
fork="true"> |
326 |
|
|
327 |
< |
<compilerarg value="${bootclasspath.args}"/> |
327 |
> |
<include name="**/*.java"/> |
328 |
|
<compilerarg line="${build.args}"/> |
329 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
330 |
< |
|
322 |
< |
<classpath refid="test.classpath"/> |
330 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
331 |
|
|
332 |
|
</javac> |
333 |
|
|
334 |
|
<javac srcdir="${test.src.dir}" |
335 |
< |
destdir="${build.testcases.dir}" |
336 |
< |
debug="${build.debug}" |
337 |
< |
debuglevel="${build.debuglevel}" |
338 |
< |
deprecation="${build.deprecation}" |
339 |
< |
source="${build.sourcelevel}" |
340 |
< |
fork="true"> |
335 |
> |
destdir="${build.testcases.dir}" |
336 |
> |
debug="${build.debug}" |
337 |
> |
debuglevel="${build.debuglevel}" |
338 |
> |
deprecation="${build.deprecation}" |
339 |
> |
source="6" |
340 |
> |
classpath="" |
341 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
342 |
> |
includeAntRuntime="false" |
343 |
> |
includeJavaRuntime="false" |
344 |
> |
executable="${javac8}" |
345 |
> |
fork="true"> |
346 |
|
|
347 |
< |
<include name="jsr166/test/**"/> |
347 |
> |
<include name="jsr166/test/**/*.java"/> |
348 |
|
|
336 |
– |
<compilerarg value="${bootclasspath.args}"/> |
349 |
|
<compilerarg line="${build.args}"/> |
350 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
351 |
< |
|
340 |
< |
<classpath refid="test.classpath"/> |
351 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
352 |
|
|
353 |
|
</javac> |
354 |
|
|
365 |
|
<compilerarg line="${build.args}"/> |
366 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
367 |
|
|
357 |
– |
<classpath refid="test.classpath"/> |
358 |
– |
|
368 |
|
</javac> |
369 |
|
--> |
370 |
|
|
384 |
|
errorProperty="junit.failed" |
385 |
|
failureProperty="junit.failed" |
386 |
|
dir="${build.reports.dir}" |
387 |
+ |
jvm="${java8}" |
388 |
|
fork="true"> |
389 |
|
|
390 |
< |
<jvmarg value="${bootclasspath.args}"/> |
390 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
391 |
|
<jvmarg value="-server"/> |
392 |
|
<jvmarg value="-showversion"/> |
393 |
|
|
667 |
|
depends="configure-compiler" |
668 |
|
description="Compiles jsr166x sources to build dir"> |
669 |
|
|
670 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
670 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
671 |
|
|
672 |
|
<javac srcdir="${topsrc.dir}" |
673 |
< |
destdir="${build.jsr166x.dir}" |
673 |
> |
destdir="${build.jsr166x.classes.dir}" |
674 |
|
debug="${build.debug}" |
675 |
|
debuglevel="${build.debuglevel}" |
676 |
|
deprecation="${build.deprecation}" |
698 |
|
description="Builds library jar from compiled sources"> |
699 |
|
|
700 |
|
<jar destfile="${jsr166x.jar}"> |
701 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
701 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
702 |
|
</jar> |
703 |
|
|
704 |
|
</target> |
758 |
|
depends="configure-compiler" |
759 |
|
description="Compiles jsr166y sources"> |
760 |
|
|
761 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
761 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
762 |
|
|
763 |
|
<javac srcdir="${topsrc.dir}" |
764 |
< |
destdir="${build.jsr166y.dir}" |
764 |
> |
destdir="${build.jsr166y.classes.dir}" |
765 |
|
debug="${build.debug}" |
766 |
|
debuglevel="${build.debuglevel}" |
767 |
|
deprecation="${build.deprecation}" |
786 |
|
description="Builds library jar from compiled sources"> |
787 |
|
|
788 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
789 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
789 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
790 |
|
</jar> |
791 |
|
|
792 |
|
</target> |
846 |
|
depends="configure-compiler, jsr166yjar" |
847 |
|
description="Compiles extra166y sources"> |
848 |
|
|
849 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
849 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
850 |
|
|
851 |
|
<javac srcdir="${topsrc.dir}" |
852 |
< |
destdir="${build.extra166y.dir}" |
852 |
> |
destdir="${build.extra166y.classes.dir}" |
853 |
|
debug="${build.debug}" |
854 |
|
debuglevel="${build.debuglevel}" |
855 |
|
deprecation="${build.deprecation}" |
877 |
|
description="Builds library jar from compiled sources"> |
878 |
|
|
879 |
|
<jar destfile="${extra166y.jar}" index="true"> |
880 |
< |
<fileset dir="${build.extra166y.dir}"/> |
880 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
881 |
|
</jar> |
882 |
|
|
883 |
|
</target> |
935 |
|
depends="configure-compiler" |
936 |
|
description="Compiles jsr166e sources"> |
937 |
|
|
938 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
938 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
939 |
|
|
940 |
|
<javac srcdir="${topsrc.dir}" |
941 |
< |
destdir="${build.jsr166e.dir}" |
941 |
> |
destdir="${build.jsr166e.classes.dir}" |
942 |
|
debug="${build.debug}" |
943 |
|
debuglevel="${build.debuglevel}" |
944 |
|
deprecation="${build.deprecation}" |
965 |
|
description="Builds library jar from compiled sources"> |
966 |
|
|
967 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
968 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
968 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
969 |
|
</jar> |
970 |
|
|
971 |
|
</target> |