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"/> |
67 |
– |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
59 |
|
|
60 |
|
<!-- JDK binary locations --> |
61 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
110 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
111 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
112 |
|
<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"/> |
113 |
|
|
114 |
|
<!-- Distribution locations --> |
115 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
116 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
117 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
118 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
119 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
120 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
115 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
116 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
117 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
118 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
119 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
120 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
121 |
|
|
122 |
|
<!-- Jar locations --> |
123 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
124 |
< |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
125 |
< |
<property name="jsr166x.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
126 |
< |
<property name="jsr166y.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
127 |
< |
<property name="jsr166e.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
128 |
< |
<property name="extra166y.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
123 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
124 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
125 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
126 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
127 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
128 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
129 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
130 |
|
|
131 |
|
<!-- Bootclasspath argument --> |
205 |
|
depends="compile" |
206 |
|
description="Builds library jar from compiled sources"> |
207 |
|
|
218 |
– |
<mkdir dir="${build.lib.dir}"/> |
219 |
– |
|
208 |
|
<jar destfile="${product.jar}"> |
209 |
|
<fileset dir="${build.classes.dir}"/> |
210 |
|
</jar> |
276 |
|
description="Removes all build products"> |
277 |
|
|
278 |
|
<delete dir="${build.dir}"/> |
291 |
– |
<delete dir="${build.classes.dir}"/> |
292 |
– |
<delete dir="${build.lib.dir}"/> |
279 |
|
|
280 |
|
</target> |
281 |
|
|
307 |
|
<mkdir dir="${build.testcases.dir}"/> |
308 |
|
|
309 |
|
<javac srcdir="${tck.src.dir}" |
310 |
< |
destdir="${build.testcases.dir}" |
311 |
< |
debug="${build.debug}" |
312 |
< |
debuglevel="${build.debuglevel}" |
313 |
< |
deprecation="${build.deprecation}" |
314 |
< |
source="${build.sourcelevel}" |
315 |
< |
fork="true"> |
310 |
> |
destdir="${build.testcases.dir}" |
311 |
> |
debug="${build.debug}" |
312 |
> |
debuglevel="${build.debuglevel}" |
313 |
> |
deprecation="${build.deprecation}" |
314 |
> |
source="6" |
315 |
> |
classpath="${junit.jar}" |
316 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
317 |
> |
includeAntRuntime="false" |
318 |
> |
includeJavaRuntime="false" |
319 |
> |
executable="${javac8}" |
320 |
> |
fork="true"> |
321 |
|
|
322 |
< |
<compilerarg value="${bootclasspath.args}"/> |
322 |
> |
<include name="**/*.java"/> |
323 |
|
<compilerarg line="${build.args}"/> |
324 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
325 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
326 |
|
|
327 |
|
<classpath refid="test.classpath"/> |
328 |
|
|
329 |
|
</javac> |
330 |
|
|
331 |
|
<javac srcdir="${test.src.dir}" |
332 |
< |
destdir="${build.testcases.dir}" |
333 |
< |
debug="${build.debug}" |
334 |
< |
debuglevel="${build.debuglevel}" |
335 |
< |
deprecation="${build.deprecation}" |
336 |
< |
source="${build.sourcelevel}" |
337 |
< |
fork="true"> |
332 |
> |
destdir="${build.testcases.dir}" |
333 |
> |
debug="${build.debug}" |
334 |
> |
debuglevel="${build.debuglevel}" |
335 |
> |
deprecation="${build.deprecation}" |
336 |
> |
source="6" |
337 |
> |
classpath="${junit.jar}" |
338 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
339 |
> |
includeAntRuntime="false" |
340 |
> |
includeJavaRuntime="false" |
341 |
> |
executable="${javac8}" |
342 |
> |
fork="true"> |
343 |
|
|
344 |
< |
<include name="jsr166/test/**"/> |
344 |
> |
<include name="jsr166/test/**/*.java"/> |
345 |
|
|
349 |
– |
<compilerarg value="${bootclasspath.args}"/> |
346 |
|
<compilerarg line="${build.args}"/> |
347 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
348 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
349 |
|
|
350 |
|
<classpath refid="test.classpath"/> |
351 |
|
|
385 |
|
errorProperty="junit.failed" |
386 |
|
failureProperty="junit.failed" |
387 |
|
dir="${build.reports.dir}" |
388 |
+ |
jvm="${java8}" |
389 |
|
fork="true"> |
390 |
|
|
391 |
< |
<jvmarg value="${bootclasspath.args}"/> |
391 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
392 |
|
<jvmarg value="-server"/> |
393 |
|
<jvmarg value="-showversion"/> |
394 |
|
|
544 |
|
|
545 |
|
</javac> |
546 |
|
|
549 |
– |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
550 |
– |
|
547 |
|
<jar destfile="${4jdk7product.jar}" index="true"> |
548 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
549 |
|
</jar> |
641 |
|
|
642 |
|
|
643 |
|
<target name="4jdk7clean" |
644 |
< |
description="Removes all build products"> |
644 |
> |
description="Removes all 4jdk7 build products"> |
645 |
|
|
646 |
|
<delete dir="${build.4jdk7.dir}"/> |
647 |
|
|
661 |
|
|
662 |
|
</target> |
663 |
|
|
668 |
– |
<!-- jsr166x --> |
664 |
|
|
665 |
+ |
<!-- jsr166x --> |
666 |
|
|
667 |
|
<target name="jsr166xcompile" |
668 |
|
depends="configure-compiler" |
698 |
|
depends="jsr166xcompile" |
699 |
|
description="Builds library jar from compiled sources"> |
700 |
|
|
705 |
– |
<mkdir dir="${build.jsr166xlib.dir}"/> |
706 |
– |
|
701 |
|
<jar destfile="${jsr166x.jar}"> |
702 |
|
<fileset dir="${build.jsr166x.dir}"/> |
703 |
|
</jar> |
731 |
|
|
732 |
|
|
733 |
|
<target name="jsr166xclean" |
734 |
< |
description="Removes all build products"> |
734 |
> |
description="Removes all jsr166x build products"> |
735 |
|
|
736 |
|
<delete dir="${build.jsr166x.dir}"/> |
743 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
737 |
|
|
738 |
|
</target> |
739 |
|
|
786 |
|
depends="jsr166ycompile" |
787 |
|
description="Builds library jar from compiled sources"> |
788 |
|
|
796 |
– |
<mkdir dir="${build.jsr166ylib.dir}"/> |
797 |
– |
|
789 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
790 |
|
<fileset dir="${build.jsr166y.dir}"/> |
791 |
|
</jar> |
819 |
|
|
820 |
|
|
821 |
|
<target name="jsr166yclean" |
822 |
< |
description="Removes all build products"> |
822 |
> |
description="Removes all jsr166y build products"> |
823 |
|
|
824 |
|
<delete dir="${build.jsr166y.dir}"/> |
834 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
825 |
|
|
826 |
|
</target> |
827 |
|
|
877 |
|
depends="extra166ycompile" |
878 |
|
description="Builds library jar from compiled sources"> |
879 |
|
|
890 |
– |
<mkdir dir="${build.extra166ylib.dir}"/> |
891 |
– |
|
880 |
|
<jar destfile="${extra166y.jar}" index="true"> |
881 |
|
<fileset dir="${build.extra166y.dir}"/> |
882 |
|
</jar> |
910 |
|
|
911 |
|
|
912 |
|
<target name="extra166yclean" |
913 |
< |
description="Removes all build products"> |
913 |
> |
description="Removes all extra166y build products"> |
914 |
|
|
915 |
|
<delete dir="${build.extra166y.dir}"/> |
928 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
916 |
|
|
917 |
|
</target> |
918 |
|
|
965 |
|
depends="jsr166ecompile" |
966 |
|
description="Builds library jar from compiled sources"> |
967 |
|
|
981 |
– |
<mkdir dir="${build.jsr166elib.dir}"/> |
982 |
– |
|
968 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
969 |
|
<fileset dir="${build.jsr166e.dir}"/> |
970 |
|
</jar> |
998 |
|
|
999 |
|
|
1000 |
|
<target name="jsr166eclean" |
1001 |
< |
description="Removes all build products"> |
1001 |
> |
description="Removes all jsr166e build products"> |
1002 |
|
|
1003 |
|
<delete dir="${build.jsr166e.dir}"/> |
1019 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1004 |
|
|
1005 |
|
</target> |
1006 |
|
|