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"/> |
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"/> |
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"/> |
55 |
< |
<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"/> |
58 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
59 |
– |
|
56 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
61 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
62 |
– |
|
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
64 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
65 |
– |
|
58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
59 |
< |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
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"/> |
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"/> |
122 |
– |
<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}/docs"/> |
121 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
122 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
123 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
124 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
125 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
120 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
121 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
122 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
123 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
124 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
125 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
126 |
|
|
127 |
|
<!-- Jar locations --> |
128 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
129 |
< |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
130 |
< |
<property name="jsr166x.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
131 |
< |
<property name="jsr166y.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
132 |
< |
<property name="jsr166e.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
133 |
< |
<property name="extra166y.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
128 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
129 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
130 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
131 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
132 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
133 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
134 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
135 |
|
|
136 |
|
<!-- Bootclasspath argument --> |
210 |
|
depends="compile" |
211 |
|
description="Builds library jar from compiled sources"> |
212 |
|
|
218 |
– |
<mkdir dir="${build.lib.dir}"/> |
219 |
– |
|
213 |
|
<jar destfile="${product.jar}"> |
214 |
|
<fileset dir="${build.classes.dir}"/> |
215 |
|
</jar> |
281 |
|
description="Removes all build products"> |
282 |
|
|
283 |
|
<delete dir="${build.dir}"/> |
291 |
– |
<delete dir="${build.classes.dir}"/> |
292 |
– |
<delete dir="${build.lib.dir}"/> |
284 |
|
|
285 |
|
</target> |
286 |
|
|
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 |
< |
|
335 |
< |
<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 |
|
|
349 |
– |
<compilerarg value="${bootclasspath.args}"/> |
349 |
|
<compilerarg line="${build.args}"/> |
350 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
351 |
< |
|
353 |
< |
<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 |
|
|
370 |
– |
<classpath refid="test.classpath"/> |
371 |
– |
|
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 |
|
|
543 |
|
|
544 |
|
</javac> |
545 |
|
|
549 |
– |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
550 |
– |
|
546 |
|
<jar destfile="${4jdk7product.jar}" index="true"> |
547 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
548 |
|
</jar> |
640 |
|
|
641 |
|
|
642 |
|
<target name="4jdk7clean" |
643 |
< |
description="Removes all build products"> |
643 |
> |
description="Removes all 4jdk7 build products"> |
644 |
|
|
645 |
|
<delete dir="${build.4jdk7.dir}"/> |
646 |
|
|
660 |
|
|
661 |
|
</target> |
662 |
|
|
668 |
– |
<!-- jsr166x --> |
663 |
|
|
664 |
+ |
<!-- jsr166x --> |
665 |
|
|
666 |
|
<target name="jsr166xcompile" |
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}" |
697 |
|
depends="jsr166xcompile" |
698 |
|
description="Builds library jar from compiled sources"> |
699 |
|
|
705 |
– |
<mkdir dir="${build.jsr166xlib.dir}"/> |
706 |
– |
|
700 |
|
<jar destfile="${jsr166x.jar}"> |
701 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
701 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
702 |
|
</jar> |
703 |
|
|
704 |
|
</target> |
730 |
|
|
731 |
|
|
732 |
|
<target name="jsr166xclean" |
733 |
< |
description="Removes all build products"> |
733 |
> |
description="Removes all jsr166x build products"> |
734 |
|
|
735 |
|
<delete dir="${build.jsr166x.dir}"/> |
743 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
736 |
|
|
737 |
|
</target> |
738 |
|
|
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}" |
785 |
|
depends="jsr166ycompile" |
786 |
|
description="Builds library jar from compiled sources"> |
787 |
|
|
796 |
– |
<mkdir dir="${build.jsr166ylib.dir}"/> |
797 |
– |
|
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> |
818 |
|
|
819 |
|
|
820 |
|
<target name="jsr166yclean" |
821 |
< |
description="Removes all build products"> |
821 |
> |
description="Removes all jsr166y build products"> |
822 |
|
|
823 |
|
<delete dir="${build.jsr166y.dir}"/> |
834 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
824 |
|
|
825 |
|
</target> |
826 |
|
|
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}" |
876 |
|
depends="extra166ycompile" |
877 |
|
description="Builds library jar from compiled sources"> |
878 |
|
|
890 |
– |
<mkdir dir="${build.extra166ylib.dir}"/> |
891 |
– |
|
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> |
909 |
|
|
910 |
|
|
911 |
|
<target name="extra166yclean" |
912 |
< |
description="Removes all build products"> |
912 |
> |
description="Removes all extra166y build products"> |
913 |
|
|
914 |
|
<delete dir="${build.extra166y.dir}"/> |
928 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
915 |
|
|
916 |
|
</target> |
917 |
|
|
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}" |
964 |
|
depends="jsr166ecompile" |
965 |
|
description="Builds library jar from compiled sources"> |
966 |
|
|
981 |
– |
<mkdir dir="${build.jsr166elib.dir}"/> |
982 |
– |
|
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> |
997 |
|
|
998 |
|
|
999 |
|
<target name="jsr166eclean" |
1000 |
< |
description="Removes all build products"> |
1000 |
> |
description="Removes all jsr166e build products"> |
1001 |
|
|
1002 |
|
<delete dir="${build.jsr166e.dir}"/> |
1019 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1003 |
|
|
1004 |
|
</target> |
1005 |
|
|