69 |
|
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/> |
70 |
|
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
71 |
|
|
72 |
+ |
<property name="build.4jdk8.dir" location="${build.dir}/jsr166-4jdk8"/> |
73 |
+ |
<property name="build.4jdk8.classes.dir" location="${build.4jdk8.dir}/classes"/> |
74 |
+ |
<property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/> |
75 |
+ |
<property name="build.4jdk8.docs.dir" location="${build.4jdk8.dir}/docs"/> |
76 |
+ |
|
77 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
78 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
79 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
140 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
141 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
142 |
|
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
143 |
< |
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg"/> |
143 |
> |
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
144 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
145 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
146 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
147 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
148 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
149 |
|
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
150 |
+ |
<property name="4jdk8src.dir" location="${topsrc.dir}/jdk8"/> |
151 |
|
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
152 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
153 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
156 |
|
<!-- Javadoc locations --> |
157 |
|
<property name="docs.dir" location="${build.dir}/docs"/> |
158 |
|
<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/> |
159 |
+ |
<property name="4jdk8docs.dir" location="${build.4jdk8.dir}/docs"/> |
160 |
|
<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/> |
161 |
|
<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/> |
162 |
|
<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/> |
164 |
|
|
165 |
|
<property name="dist.docs.dir" location="${dist.dir}/docs"/> |
166 |
|
<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
167 |
+ |
<property name="dist.4jdk8docs.dir" location="${dist.dir}/jsr166-4jdk8docs"/> |
168 |
|
<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/> |
169 |
|
<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/> |
170 |
|
<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/> |
173 |
|
<!-- Jar locations --> |
174 |
|
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
175 |
|
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
176 |
+ |
<property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/> |
177 |
|
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
178 |
|
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
179 |
|
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
185 |
|
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
186 |
|
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
187 |
|
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
188 |
< |
<!-- The expected canonical location does not yet exist as of 2015-11 --> |
188 |
> |
<!-- The expected canonical location does not yet exist as of 2016-03 --> |
189 |
|
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
190 |
|
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
191 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
219 |
|
<attribute name="compile-target" default="@{target}"/> |
220 |
|
<attribute name="workdir"/> |
221 |
|
<attribute name="classes"/> |
222 |
< |
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
222 |
> |
<!-- |
223 |
> |
<attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/> |
224 |
> |
--> |
225 |
> |
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
226 |
|
<element name="javac-elements" optional="true"/> |
227 |
|
|
228 |
|
<sequential> |
363 |
|
<property name="build.main.javac" value="${javac9}"/> |
364 |
|
|
365 |
|
<target name="dists" |
366 |
< |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
366 |
> |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
367 |
|
description="Builds all public jars and docs"/> |
368 |
|
|
369 |
|
<target name="compile" |
408 |
|
</javac> |
409 |
|
|
410 |
|
<!-- We need jdk9's Contended annotation, but at compile time only --> |
411 |
< |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
411 |
> |
<!-- |
412 |
> |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
413 |
> |
--> |
414 |
|
</target> |
415 |
|
|
416 |
|
|
668 |
|
</target> |
669 |
|
|
670 |
|
|
671 |
+ |
<!-- jsr166 4jdk8 --> |
672 |
+ |
|
673 |
+ |
<target name="4jdk8compile" |
674 |
+ |
depends="configure-compiler" |
675 |
+ |
description="Compiles src/jdk8 sources, targeting jdk8"> |
676 |
+ |
|
677 |
+ |
<mkdir dir="${build.4jdk8.classes.dir}"/> |
678 |
+ |
|
679 |
+ |
<javac srcdir="${4jdk8src.dir}" |
680 |
+ |
destdir="${build.4jdk8.classes.dir}" |
681 |
+ |
debug="${build.debug}" |
682 |
+ |
debuglevel="${build.debuglevel}" |
683 |
+ |
deprecation="${build.deprecation}" |
684 |
+ |
source="8" |
685 |
+ |
target="8" |
686 |
+ |
classpath="" |
687 |
+ |
bootclasspath="${bootclasspath8}" |
688 |
+ |
includeAntRuntime="false" |
689 |
+ |
includeJavaRuntime="false" |
690 |
+ |
executable="${javac8}" |
691 |
+ |
fork="true"> |
692 |
+ |
|
693 |
+ |
<include name="**/*.java"/> |
694 |
+ |
<compilerarg value="-Xprefer:source"/> |
695 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
696 |
+ |
<compilerarg value="-Xlint:all"/> |
697 |
+ |
<compilerarg value="-Werror"/> |
698 |
+ |
<compilerarg line="${build.args}"/> |
699 |
+ |
|
700 |
+ |
</javac> |
701 |
+ |
</target> |
702 |
+ |
|
703 |
+ |
<target name="4jdk8doclint" |
704 |
+ |
depends="configure-compiler" |
705 |
+ |
description="Finds doclint warnings"> |
706 |
+ |
|
707 |
+ |
<mkdir dir="${build.4jdk8.classes.dir}"/> |
708 |
+ |
|
709 |
+ |
<javac srcdir="${4jdk8src.dir}" |
710 |
+ |
destdir="${build.4jdk8.classes.dir}" |
711 |
+ |
debug="${build.debug}" |
712 |
+ |
debuglevel="${build.debuglevel}" |
713 |
+ |
deprecation="${build.deprecation}" |
714 |
+ |
source="8" |
715 |
+ |
target="8" |
716 |
+ |
classpath="" |
717 |
+ |
bootclasspath="${bootclasspath8}" |
718 |
+ |
includeAntRuntime="false" |
719 |
+ |
includeJavaRuntime="false" |
720 |
+ |
executable="${javac8}" |
721 |
+ |
fork="true"> |
722 |
+ |
|
723 |
+ |
<include name="**/*.java"/> |
724 |
+ |
<compilerarg value="-Xprefer:source"/> |
725 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
726 |
+ |
<compilerarg value="-Xlint:all"/> |
727 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
728 |
+ |
<compilerarg line="${build.args}"/> |
729 |
+ |
|
730 |
+ |
</javac> |
731 |
+ |
</target> |
732 |
+ |
|
733 |
+ |
|
734 |
+ |
<target name="4jdk8jar" |
735 |
+ |
depends="4jdk8compile" |
736 |
+ |
description="Builds library jar from compiled sources"> |
737 |
+ |
|
738 |
+ |
<jar destfile="${4jdk8product.jar}"> |
739 |
+ |
<fileset dir="${build.4jdk8.classes.dir}"/> |
740 |
+ |
<manifest> |
741 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
742 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
743 |
+ |
</manifest> |
744 |
+ |
</jar> |
745 |
+ |
|
746 |
+ |
</target> |
747 |
+ |
|
748 |
+ |
|
749 |
+ |
<target name="4jdk8-tck" |
750 |
+ |
depends="4jdk8jar" |
751 |
+ |
description="Runs tck tests for jsr166-4jdk8 directly"> |
752 |
+ |
|
753 |
+ |
<run-tck-tests |
754 |
+ |
target="8" |
755 |
+ |
workdir="${build.4jdk8.dir}" |
756 |
+ |
classes="${4jdk8product.jar}"> |
757 |
+ |
<javac-elements> |
758 |
+ |
<!-- JDK9+ test classes --> |
759 |
+ |
<exclude name="*9Test.java"/> |
760 |
+ |
<exclude name="*10Test.java"/> |
761 |
+ |
</javac-elements> |
762 |
+ |
</run-tck-tests> |
763 |
+ |
</target> |
764 |
+ |
|
765 |
+ |
|
766 |
+ |
<target name="4jdk8-jtreg" |
767 |
+ |
depends="4jdk8jar" |
768 |
+ |
description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task"> |
769 |
+ |
<run-jtreg-tests |
770 |
+ |
target="8" |
771 |
+ |
workdir="${build.4jdk8.dir}" |
772 |
+ |
classes="${4jdk8product.jar}"/> |
773 |
+ |
</target> |
774 |
+ |
|
775 |
+ |
|
776 |
+ |
<target name="4jdk8-test" |
777 |
+ |
depends="4jdk8-tck, 4jdk8-jtreg" |
778 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
779 |
+ |
</target> |
780 |
+ |
|
781 |
+ |
|
782 |
+ |
<target name="4jdk8docs" |
783 |
+ |
description="Builds javadocs for src/jdk8 to dist dir"> |
784 |
+ |
|
785 |
+ |
<delete dir="${4jdk8docs.dir}"/> |
786 |
+ |
<mkdir dir="${4jdk8docs.dir}"/> |
787 |
+ |
|
788 |
+ |
<javadoc destdir="${4jdk8docs.dir}" |
789 |
+ |
packagenames="none" |
790 |
+ |
link="${java8.api.url}" |
791 |
+ |
overview="${4jdk8src.dir}/intro.html" |
792 |
+ |
access="${build.javadoc.access}" |
793 |
+ |
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
794 |
+ |
classpath="" |
795 |
+ |
executable="${javadoc8}"> |
796 |
+ |
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
797 |
+ |
<include name="**/*.java"/> |
798 |
+ |
</fileset> |
799 |
+ |
<arg line="-Xdocrootparent ${java8.docroot.url}"/> |
800 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
801 |
+ |
<arg value="-tag"/> |
802 |
+ |
<arg value="${javadoc.jls.option}"/> |
803 |
+ |
<arg value="-tag"/> |
804 |
+ |
<arg value="apiNote:a:<em>API Note:</em>"/> |
805 |
+ |
<arg value="-tag"/> |
806 |
+ |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
807 |
+ |
<arg value="-tag"/> |
808 |
+ |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
809 |
+ |
</javadoc> |
810 |
+ |
</target> |
811 |
+ |
|
812 |
+ |
|
813 |
+ |
<target name="4jdk8dist" |
814 |
+ |
depends="4jdk8dist-jar, 4jdk8dist-docs" |
815 |
+ |
description="Puts all distributable products in single hierarchy"/> |
816 |
+ |
|
817 |
+ |
|
818 |
+ |
<target name="4jdk8clean" |
819 |
+ |
description="Removes all 4jdk8 build products"> |
820 |
+ |
|
821 |
+ |
<delete dir="${build.4jdk8.dir}"/> |
822 |
+ |
|
823 |
+ |
</target> |
824 |
+ |
|
825 |
+ |
|
826 |
+ |
<target name="4jdk8dist-jar" |
827 |
+ |
depends="4jdk8clean, 4jdk8jar"> |
828 |
+ |
<copy file="${4jdk8product.jar}" todir="${dist.dir}"/> |
829 |
+ |
</target> |
830 |
+ |
|
831 |
+ |
|
832 |
+ |
<target name="4jdk8dist-docs" |
833 |
+ |
depends="4jdk8clean, 4jdk8docs"> |
834 |
+ |
<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/> |
835 |
+ |
</target> |
836 |
+ |
|
837 |
+ |
|
838 |
+ |
|
839 |
|
<!-- jsr166 4jdk7 --> |
840 |
|
|
841 |
|
<target name="4jdk7compile" |