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 |
|
|
84 |
|
<defjdklocations v="8"/> |
85 |
|
|
86 |
|
<macrodef name="run-tck-tests"> |
87 |
< |
<attribute name="jvm"/> |
88 |
< |
<attribute name="tck.classes"/> |
87 |
> |
<attribute name="target"/> |
88 |
> |
<attribute name="workdir"/> |
89 |
|
<attribute name="product.jar" default="${product.jar}"/> |
90 |
|
<attribute name="jvmflags" default=""/> |
91 |
|
<sequential> |
92 |
< |
<java classname="JSR166TestCase" |
93 |
< |
jvm="@{jvm}" fork="true"> |
92 |
> |
|
93 |
> |
<mkdir dir="@{workdir}/tck-classes"/> |
94 |
> |
|
95 |
> |
<javac srcdir="${tck.src.dir}" |
96 |
> |
destdir="@{workdir}/tck-classes" |
97 |
> |
debug="${build.debug}" |
98 |
> |
debuglevel="${build.debuglevel}" |
99 |
> |
deprecation="${build.deprecation}" |
100 |
> |
source="6" |
101 |
> |
classpath="${junit.jar}" |
102 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
103 |
> |
includeAntRuntime="false" |
104 |
> |
includeJavaRuntime="false" |
105 |
> |
executable="${javac@{target}}" |
106 |
> |
fork="true"> |
107 |
> |
|
108 |
> |
<include name="**/*.java"/> |
109 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
110 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
111 |
> |
<compilerarg line="${build.args}"/> |
112 |
> |
</javac> |
113 |
> |
|
114 |
> |
<java classname="JSR166TestCase" jvm="${java@{target}}" fork="true"> |
115 |
|
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
116 |
|
<jvmarg line="@{jvmflags}"/> |
117 |
|
<classpath> |
118 |
|
<pathelement location="${junit.jar}"/> |
119 |
< |
<pathelement location="@{tck.classes}"/> |
119 |
> |
<pathelement location="@{workdir}/tck-classes"/> |
120 |
|
</classpath> |
121 |
|
</java> |
122 |
+ |
|
123 |
|
</sequential> |
124 |
|
</macrodef> |
125 |
|
|
137 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
138 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
139 |
|
<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"/> |
140 |
|
|
141 |
|
<!-- Distribution locations --> |
142 |
|
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
170 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
171 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
172 |
|
|
173 |
+ |
<!-- Define the "jtreg" task --> |
174 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
175 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
176 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
177 |
+ |
|
178 |
|
<!-- Test classpath --> |
179 |
|
<path id="test.classpath"> |
180 |
|
<pathelement location="${build.testcases.dir}"/> |
339 |
|
<mkdir dir="${build.testcases.dir}"/> |
340 |
|
|
341 |
|
<javac srcdir="${tck.src.dir}" |
342 |
< |
destdir="${build.testcases.dir}" |
343 |
< |
debug="${build.debug}" |
344 |
< |
debuglevel="${build.debuglevel}" |
345 |
< |
deprecation="${build.deprecation}" |
346 |
< |
source="${build.sourcelevel}" |
347 |
< |
fork="true"> |
342 |
> |
destdir="${build.testcases.dir}" |
343 |
> |
debug="${build.debug}" |
344 |
> |
debuglevel="${build.debuglevel}" |
345 |
> |
deprecation="${build.deprecation}" |
346 |
> |
source="6" |
347 |
> |
classpath="${junit.jar}" |
348 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
349 |
> |
includeAntRuntime="false" |
350 |
> |
includeJavaRuntime="false" |
351 |
> |
executable="${javac8}" |
352 |
> |
fork="true"> |
353 |
|
|
354 |
< |
<compilerarg value="${bootclasspath.args}"/> |
354 |
> |
<include name="**/*.java"/> |
355 |
|
<compilerarg line="${build.args}"/> |
356 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
357 |
< |
|
322 |
< |
<classpath refid="test.classpath"/> |
357 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
358 |
|
|
359 |
|
</javac> |
360 |
|
|
361 |
|
<javac srcdir="${test.src.dir}" |
362 |
< |
destdir="${build.testcases.dir}" |
363 |
< |
debug="${build.debug}" |
364 |
< |
debuglevel="${build.debuglevel}" |
365 |
< |
deprecation="${build.deprecation}" |
366 |
< |
source="${build.sourcelevel}" |
367 |
< |
fork="true"> |
362 |
> |
destdir="${build.testcases.dir}" |
363 |
> |
debug="${build.debug}" |
364 |
> |
debuglevel="${build.debuglevel}" |
365 |
> |
deprecation="${build.deprecation}" |
366 |
> |
source="6" |
367 |
> |
classpath="" |
368 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
369 |
> |
includeAntRuntime="false" |
370 |
> |
includeJavaRuntime="false" |
371 |
> |
executable="${javac8}" |
372 |
> |
fork="true"> |
373 |
|
|
374 |
< |
<include name="jsr166/test/**"/> |
374 |
> |
<include name="jsr166/test/**/*.java"/> |
375 |
|
|
336 |
– |
<compilerarg value="${bootclasspath.args}"/> |
376 |
|
<compilerarg line="${build.args}"/> |
377 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
378 |
< |
|
340 |
< |
<classpath refid="test.classpath"/> |
378 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
379 |
|
|
380 |
|
</javac> |
381 |
|
|
392 |
|
<compilerarg line="${build.args}"/> |
393 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
394 |
|
|
357 |
– |
<classpath refid="test.classpath"/> |
358 |
– |
|
395 |
|
</javac> |
396 |
|
--> |
397 |
|
|
411 |
|
errorProperty="junit.failed" |
412 |
|
failureProperty="junit.failed" |
413 |
|
dir="${build.reports.dir}" |
414 |
+ |
jvm="${java8}" |
415 |
|
fork="true"> |
416 |
|
|
417 |
< |
<jvmarg value="${bootclasspath.args}"/> |
417 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
418 |
|
<jvmarg value="-server"/> |
419 |
|
<jvmarg value="-showversion"/> |
420 |
|
|
570 |
|
|
571 |
|
</javac> |
572 |
|
|
573 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
537 |
< |
<fileset dir="${build.4jdk7.classes.dir}"/> |
538 |
< |
</jar> |
539 |
< |
|
540 |
< |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
541 |
< |
|
542 |
< |
<javac srcdir="${tck.src.dir}" |
543 |
< |
destdir="${build.4jdk7.tck.classes.dir}" |
544 |
< |
debug="${build.debug}" |
545 |
< |
debuglevel="${build.debuglevel}" |
546 |
< |
deprecation="${build.deprecation}" |
547 |
< |
source="6" |
548 |
< |
classpath="${junit.jar}" |
549 |
< |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
550 |
< |
includeAntRuntime="false" |
551 |
< |
includeJavaRuntime="false" |
552 |
< |
executable="${javac7}" |
553 |
< |
fork="true"> |
573 |
> |
</target> |
574 |
|
|
575 |
< |
<include name="**/*.java"/> |
576 |
< |
<compilerarg line="${build.args}"/> |
577 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
558 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
575 |
> |
<target name="4jdk7-jar" |
576 |
> |
depends="4jdk7compile" |
577 |
> |
description="Builds library jar from compiled sources"> |
578 |
|
|
579 |
< |
</javac> |
579 |
> |
<jar destfile="${4jdk7product.jar}"> |
580 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
581 |
> |
</jar> |
582 |
|
|
583 |
|
</target> |
584 |
|
|
585 |
|
|
586 |
|
<target name="4jdk7-test-tck" |
587 |
< |
depends="4jdk7compile" |
587 |
> |
depends="4jdk7-jar" |
588 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
589 |
+ |
|
590 |
|
<run-tck-tests |
591 |
< |
jvm="${java7}" |
592 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
591 |
> |
target="7" |
592 |
> |
workdir="${build.4jdk7.dir}" |
593 |
|
product.jar="${4jdk7product.jar}"/> |
594 |
|
</target> |
595 |
|
|
622 |
|
</junit> |
623 |
|
</target> |
624 |
|
|
625 |
+ |
<target name="4jdk7-test-jtreg" |
626 |
+ |
depends="4jdk7compile" |
627 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
628 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
629 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
630 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
631 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
632 |
+ |
<jtreg dir="${jtreg.src.dir}" |
633 |
+ |
jdk="${jdk7.home}" |
634 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
635 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
636 |
+ |
|
637 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
638 |
+ |
<arg value="-agentvm"/> |
639 |
+ |
<arg value="-v:nopass,fail"/> |
640 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
641 |
+ |
<arg value="-automatic"/> |
642 |
+ |
<arg value="-k:!ignore"/> |
643 |
+ |
</jtreg> |
644 |
+ |
</target> |
645 |
+ |
|
646 |
+ |
|
647 |
+ |
<target name="4jdk7-test" |
648 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
649 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
650 |
+ |
</target> |
651 |
+ |
|
652 |
|
|
653 |
|
<target name="4jdk7docs" |
654 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
706 |
|
depends="configure-compiler" |
707 |
|
description="Compiles jsr166x sources to build dir"> |
708 |
|
|
709 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
709 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
710 |
|
|
711 |
|
<javac srcdir="${topsrc.dir}" |
712 |
< |
destdir="${build.jsr166x.dir}" |
712 |
> |
destdir="${build.jsr166x.classes.dir}" |
713 |
|
debug="${build.debug}" |
714 |
|
debuglevel="${build.debuglevel}" |
715 |
|
deprecation="${build.deprecation}" |
737 |
|
description="Builds library jar from compiled sources"> |
738 |
|
|
739 |
|
<jar destfile="${jsr166x.jar}"> |
740 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
740 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
741 |
|
</jar> |
742 |
|
|
743 |
|
</target> |
757 |
|
bootclasspath="${bootclasspath6}" |
758 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
759 |
|
executable="${javadoc7}" |
760 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
760 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
761 |
|
|
762 |
|
</target> |
763 |
|
|
797 |
|
depends="configure-compiler" |
798 |
|
description="Compiles jsr166y sources"> |
799 |
|
|
800 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
800 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
801 |
|
|
802 |
|
<javac srcdir="${topsrc.dir}" |
803 |
< |
destdir="${build.jsr166y.dir}" |
803 |
> |
destdir="${build.jsr166y.classes.dir}" |
804 |
|
debug="${build.debug}" |
805 |
|
debuglevel="${build.debuglevel}" |
806 |
|
deprecation="${build.deprecation}" |
825 |
|
description="Builds library jar from compiled sources"> |
826 |
|
|
827 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
828 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
828 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
829 |
|
</jar> |
830 |
|
|
831 |
|
</target> |
845 |
|
bootclasspath="${bootclasspath6}" |
846 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
847 |
|
executable="${javadoc7}" |
848 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
848 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
849 |
|
|
850 |
|
</target> |
851 |
|
|
885 |
|
depends="configure-compiler, jsr166yjar" |
886 |
|
description="Compiles extra166y sources"> |
887 |
|
|
888 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
888 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
889 |
|
|
890 |
|
<javac srcdir="${topsrc.dir}" |
891 |
< |
destdir="${build.extra166y.dir}" |
891 |
> |
destdir="${build.extra166y.classes.dir}" |
892 |
|
debug="${build.debug}" |
893 |
|
debuglevel="${build.debuglevel}" |
894 |
|
deprecation="${build.deprecation}" |
916 |
|
description="Builds library jar from compiled sources"> |
917 |
|
|
918 |
|
<jar destfile="${extra166y.jar}" index="true"> |
919 |
< |
<fileset dir="${build.extra166y.dir}"/> |
919 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
920 |
|
</jar> |
921 |
|
|
922 |
|
</target> |
936 |
|
bootclasspath="${bootclasspath6}" |
937 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
938 |
|
executable="${javadoc7}" |
939 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
939 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
940 |
|
|
941 |
|
</target> |
942 |
|
|
974 |
|
depends="configure-compiler" |
975 |
|
description="Compiles jsr166e sources"> |
976 |
|
|
977 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
977 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
978 |
|
|
979 |
|
<javac srcdir="${topsrc.dir}" |
980 |
< |
destdir="${build.jsr166e.dir}" |
980 |
> |
destdir="${build.jsr166e.classes.dir}" |
981 |
|
debug="${build.debug}" |
982 |
|
debuglevel="${build.debuglevel}" |
983 |
|
deprecation="${build.deprecation}" |
1004 |
|
description="Builds library jar from compiled sources"> |
1005 |
|
|
1006 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1007 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
1007 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
1008 |
|
</jar> |
1009 |
|
|
1010 |
|
</target> |