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 |
+ |
|
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" |
115 |
< |
jvm="@{jvm}" fork="true"> |
115 |
> |
failonerror="true" |
116 |
> |
jvm="${java@{target}}" |
117 |
> |
fork="true"> |
118 |
|
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
119 |
|
<jvmarg line="@{jvmflags}"/> |
120 |
|
<classpath> |
121 |
|
<pathelement location="${junit.jar}"/> |
122 |
< |
<pathelement location="@{tck.classes}"/> |
122 |
> |
<pathelement location="@{workdir}/tck-classes"/> |
123 |
|
</classpath> |
124 |
|
</java> |
125 |
+ |
|
126 |
|
</sequential> |
127 |
|
</macrodef> |
128 |
|
|
173 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
174 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
175 |
|
|
176 |
+ |
<!-- Define the "jtreg" task --> |
177 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
178 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
179 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
180 |
+ |
|
181 |
|
<!-- Test classpath --> |
182 |
|
<path id="test.classpath"> |
183 |
|
<pathelement location="${build.testcases.dir}"/> |
573 |
|
|
574 |
|
</javac> |
575 |
|
|
576 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
542 |
< |
<fileset dir="${build.4jdk7.classes.dir}"/> |
543 |
< |
</jar> |
544 |
< |
|
545 |
< |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
546 |
< |
|
547 |
< |
<javac srcdir="${tck.src.dir}" |
548 |
< |
destdir="${build.4jdk7.tck.classes.dir}" |
549 |
< |
debug="${build.debug}" |
550 |
< |
debuglevel="${build.debuglevel}" |
551 |
< |
deprecation="${build.deprecation}" |
552 |
< |
source="6" |
553 |
< |
classpath="${junit.jar}" |
554 |
< |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
555 |
< |
includeAntRuntime="false" |
556 |
< |
includeJavaRuntime="false" |
557 |
< |
executable="${javac7}" |
558 |
< |
fork="true"> |
576 |
> |
</target> |
577 |
|
|
578 |
< |
<include name="**/*.java"/> |
579 |
< |
<compilerarg line="${build.args}"/> |
580 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
563 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
578 |
> |
<target name="4jdk7-jar" |
579 |
> |
depends="4jdk7compile" |
580 |
> |
description="Builds library jar from compiled sources"> |
581 |
|
|
582 |
< |
</javac> |
582 |
> |
<jar destfile="${4jdk7product.jar}"> |
583 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
584 |
> |
</jar> |
585 |
|
|
586 |
|
</target> |
587 |
|
|
588 |
|
|
589 |
|
<target name="4jdk7-test-tck" |
590 |
< |
depends="4jdk7compile" |
590 |
> |
depends="4jdk7-jar" |
591 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
592 |
+ |
|
593 |
|
<run-tck-tests |
594 |
< |
jvm="${java7}" |
595 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
594 |
> |
target="7" |
595 |
> |
workdir="${build.4jdk7.dir}" |
596 |
|
product.jar="${4jdk7product.jar}"/> |
597 |
|
</target> |
598 |
|
|
625 |
|
</junit> |
626 |
|
</target> |
627 |
|
|
628 |
+ |
<target name="4jdk7-test-jtreg" |
629 |
+ |
depends="4jdk7compile" |
630 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
631 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
632 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
633 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
634 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
635 |
+ |
<jtreg dir="${jtreg.src.dir}" |
636 |
+ |
jdk="${jdk7.home}" |
637 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
638 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
639 |
+ |
|
640 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
641 |
+ |
<arg value="-agentvm"/> |
642 |
+ |
<arg value="-v:nopass,fail"/> |
643 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
644 |
+ |
<arg value="-automatic"/> |
645 |
+ |
<arg value="-k:!ignore"/> |
646 |
+ |
</jtreg> |
647 |
+ |
</target> |
648 |
+ |
|
649 |
+ |
|
650 |
+ |
<target name="4jdk7-test" |
651 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
652 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
653 |
+ |
</target> |
654 |
+ |
|
655 |
|
|
656 |
|
<target name="4jdk7docs" |
657 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
709 |
|
depends="configure-compiler" |
710 |
|
description="Compiles jsr166x sources to build dir"> |
711 |
|
|
712 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
712 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
713 |
|
|
714 |
|
<javac srcdir="${topsrc.dir}" |
715 |
< |
destdir="${build.jsr166x.dir}" |
715 |
> |
destdir="${build.jsr166x.classes.dir}" |
716 |
|
debug="${build.debug}" |
717 |
|
debuglevel="${build.debuglevel}" |
718 |
|
deprecation="${build.deprecation}" |
740 |
|
description="Builds library jar from compiled sources"> |
741 |
|
|
742 |
|
<jar destfile="${jsr166x.jar}"> |
743 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
743 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
744 |
|
</jar> |
745 |
|
|
746 |
|
</target> |
760 |
|
bootclasspath="${bootclasspath6}" |
761 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
762 |
|
executable="${javadoc7}" |
763 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
763 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
764 |
|
|
765 |
|
</target> |
766 |
|
|
800 |
|
depends="configure-compiler" |
801 |
|
description="Compiles jsr166y sources"> |
802 |
|
|
803 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
803 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
804 |
|
|
805 |
|
<javac srcdir="${topsrc.dir}" |
806 |
< |
destdir="${build.jsr166y.dir}" |
806 |
> |
destdir="${build.jsr166y.classes.dir}" |
807 |
|
debug="${build.debug}" |
808 |
|
debuglevel="${build.debuglevel}" |
809 |
|
deprecation="${build.deprecation}" |
828 |
|
description="Builds library jar from compiled sources"> |
829 |
|
|
830 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
831 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
831 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
832 |
|
</jar> |
833 |
|
|
834 |
|
</target> |
848 |
|
bootclasspath="${bootclasspath6}" |
849 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
850 |
|
executable="${javadoc7}" |
851 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
851 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
852 |
|
|
853 |
|
</target> |
854 |
|
|
888 |
|
depends="configure-compiler, jsr166yjar" |
889 |
|
description="Compiles extra166y sources"> |
890 |
|
|
891 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
891 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
892 |
|
|
893 |
|
<javac srcdir="${topsrc.dir}" |
894 |
< |
destdir="${build.extra166y.dir}" |
894 |
> |
destdir="${build.extra166y.classes.dir}" |
895 |
|
debug="${build.debug}" |
896 |
|
debuglevel="${build.debuglevel}" |
897 |
|
deprecation="${build.deprecation}" |
919 |
|
description="Builds library jar from compiled sources"> |
920 |
|
|
921 |
|
<jar destfile="${extra166y.jar}" index="true"> |
922 |
< |
<fileset dir="${build.extra166y.dir}"/> |
922 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
923 |
|
</jar> |
924 |
|
|
925 |
|
</target> |
939 |
|
bootclasspath="${bootclasspath6}" |
940 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
941 |
|
executable="${javadoc7}" |
942 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
942 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
943 |
|
|
944 |
|
</target> |
945 |
|
|
977 |
|
depends="configure-compiler" |
978 |
|
description="Compiles jsr166e sources"> |
979 |
|
|
980 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
980 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
981 |
|
|
982 |
|
<javac srcdir="${topsrc.dir}" |
983 |
< |
destdir="${build.jsr166e.dir}" |
983 |
> |
destdir="${build.jsr166e.classes.dir}" |
984 |
|
debug="${build.debug}" |
985 |
|
debuglevel="${build.debuglevel}" |
986 |
|
deprecation="${build.deprecation}" |
1007 |
|
description="Builds library jar from compiled sources"> |
1008 |
|
|
1009 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1010 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
1010 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
1011 |
|
</jar> |
1012 |
|
|
1013 |
|
</target> |