ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC vs.
Revision 1.137 by jsr166, Wed Feb 6 19:55:06 2013 UTC

# Line 22 | Line 22
22    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.
25 + As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26   ------------------------------------------------------------------------------
27    </description>
28  
29 <  <target name="usage" description="Advises user to run with -projecthelp">
30 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
29 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30 >    <java classname="org.apache.tools.ant.Main">
31 >      <arg value="-projecthelp" />
32 >    </java>
33    </target>
34  
35  
# Line 39 | Line 42
42    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>
45 +  <property name="build.javadoc.access" value="protected"/>
46  
47    <!-- Build locations -->
48    <property name="build.dir"                   location="build"/>
# Line 57 | Line 61
61    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
63  
64 <  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
65 <  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
66 <  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
67 <  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68  
69    <!-- JDK locations -->
70    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 86 | Line 90
90      </sequential>
91    </macrodef>
92  
93 +  <macrodef name="mirror-dir">
94 +    <attribute name="src"/>
95 +    <attribute name="dst"/>
96 +    <sequential>
97 +    <delete dir="@{dst}"/>
98 +    <mkdir dir="@{dst}"/>
99 +    <copy todir="@{dst}" preservelastmodified="true">
100 +      <fileset dir="@{src}"/>
101 +    </copy>
102 +    </sequential>
103 +  </macrodef>
104 +
105    <defjdklocations v="6"/>
106    <defjdklocations v="7"/>
107    <defjdklocations v="8"/>
# Line 105 | Line 121
121    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
123  
124 <  <!-- Distribution locations -->
125 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>
126 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
127 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
128 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
129 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
130 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
124 >  <!-- Javadoc locations -->
125 >  <property name="docs.dir"          location="${build.dir}/docs"/>
126 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131 >
132 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138  
139    <!-- Jar locations -->
140    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 152 | Line 175
175      <attribute name="workdir"/>
176      <attribute name="classes"/>
177      <attribute name="jvmflags" default=""/>
178 +    <element name="javac-elements" optional="true"/>
179      <sequential>
180  
181      <mkdir dir="@{workdir}/tck-classes"/>
# Line 173 | Line 197
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199        <compilerarg line="${build.args}"/>
200 +      <javac-elements/>
201  
202      </javac>
203  
# Line 191 | Line 216
216      </sequential>
217    </macrodef>
218  
219 +  <macrodef name="run-jtreg-tests">
220 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221 +    <attribute name="source" default="7"/>
222 +    <attribute name="target"/>
223 +    <attribute name="workdir"/>
224 +    <attribute name="classes"/>
225 +    <attribute name="jtregflags" default=""/>
226 +    <sequential>
227 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
228 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
229 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
230 +    <mkdir dir="@{workdir}/JTreport"/>
231 +    <jtreg dir="@{jtreg.src.dir}"
232 +           jdk="${jdk@{target}.home}"
233 +           workDir="@{workdir}/JTwork"
234 +           reportDir="@{workdir}/JTreport">
235 +
236 +      <arg value="-Xbootclasspath/p:@{classes}"/>
237 +      <arg value="-agentvm"/>
238 +      <arg value="-v:nopass,fail"/>
239 +      <arg value="-vmoptions:-esa -ea"/>
240 +      <arg value="-automatic"/>
241 +      <arg value="-k:!ignore"/>
242 +      <arg line="@{jtregflags}"/>
243 +    </jtreg>
244 +    </sequential>
245 +  </macrodef>
246 +
247    <!-- ALoops classpath -->
248    <path id="loops.classpath">
249      <pathelement location="${build.loops.dir}"/>
# Line 224 | Line 277
277             fork="true">
278  
279        <include name="**/*.java"/>
280 +      <compilerarg value="-Xprefer:source"/>
281        <compilerarg value="-XDignore.symbol.file=true"/>
282        <compilerarg value="-Xlint:all"/>
283        <compilerarg line="${build.args}"/>
# Line 250 | Line 304
304    <target name="docs"
305            description="Builds javadocs for src/main to dist dir">
306  
307 <    <delete dir="${dist.javadocs.dir}"/>
308 <    <mkdir dir="${dist.javadocs.dir}"/>
307 >    <delete dir="${docs.dir}"/>
308 >    <mkdir dir="${docs.dir}"/>
309  
310      <!-- the packagenames="none" hack below prevents scanning the -->
311      <!-- sourcepath for packages -->
312  
313 <    <javadoc destdir="${dist.javadocs.dir}"
313 >    <javadoc destdir="${docs.dir}"
314               packagenames="none"
315               link="${jdkapi8docs.url}"
316               overview="${src.dir}/intro.html"
317 +             access="${build.javadoc.access}"
318               sourcepath="${src.dir}:${jdk8src.dir}"
319               classpath=""
320               executable="${javadoc8}">
# Line 274 | Line 329
329  
330  
331    <target name="dist"
332 <          depends="dist-clean, dist-jar, docs"
332 >          depends="dist-clean, dist-jar, dist-docs"
333            description="Puts all distributable products in single hierarchy"/>
334  
335  
# Line 317 | Line 372
372  
373    <target name="dist-jar"
374            depends="clean, jar">
320
375      <copy file="${product.jar}" todir="${dist.dir}"/>
376 +  </target>
377  
378 +  <target name="dist-docs"
379 +          depends="clean, docs">
380 +    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
381    </target>
382  
383  
# Line 386 | Line 444
444  
445    </target>
446  
447 +  <target name="test-tck"
448 +          depends="jar"
449 +          description="Runs tck tests for main directly">
450 +
451 +    <run-tck-tests
452 +      target="8"
453 +      workdir="${build.dir}"
454 +      classes="${product.jar}"/>
455 +  </target>
456 +
457 +  <target name="test-jtreg"
458 +          depends="jar"
459 +          description="Runs jtreg tests for main using the jtreg ant task">
460 +    <run-jtreg-tests
461 +       target="8"
462 +       workdir="${build.dir}"
463 +       classes="${product.jar}"/>
464 +  </target>
465 +
466 +  <target name="test-ng"
467 +          depends="test-tck, test-jtreg"
468 +          description="Runs tck and jtreg tests for main">
469 +  </target>
470  
471    <target name="run-tests"
472            depends="compile-tests">
# Line 552 | Line 633
633             fork="true">
634  
635        <include name="**/*.java"/>
636 +      <compilerarg value="-Xprefer:source"/>
637        <compilerarg value="-XDignore.symbol.file=true"/>
638        <compilerarg value="-Xlint:all"/>
639        <compilerarg line="${build.args}"/>
# Line 560 | Line 642
642    </target>
643  
644  
645 <  <target name="4jdk7-jar"
645 >  <target name="4jdk7jar"
646            depends="4jdk7compile"
647            description="Builds library jar from compiled sources">
648  
# Line 572 | Line 654
654  
655  
656    <target name="4jdk7-test-tck"
657 <          depends="4jdk7-jar"
657 >          depends="4jdk7jar"
658            description="Runs tck tests for jsr166-4jdk7 directly">
659  
660      <run-tck-tests
661        target="7"
662        workdir="${build.4jdk7.dir}"
663 <      classes="${4jdk7product.jar}"/>
663 >      classes="${4jdk7product.jar}">
664 >      <javac-elements>
665 >        <!-- JDK8+ test classes -->
666 >        <exclude name="*8Test.java"/>
667 >        <exclude name="CompletableFutureTest.java"/>
668 >        <exclude name="StampedLockTest.java"/>
669 >      </javac-elements>
670 >    </run-tck-tests>
671    </target>
672  
673  
# Line 611 | Line 700
700    </target>
701  
702    <target name="4jdk7-test-jtreg"
703 <          depends="4jdk7compile"
703 >          depends="4jdk7jar"
704            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
705 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
706 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
707 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
708 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
620 <    <jtreg dir="${jtreg.src.dir}"
621 <           jdk="${jdk7.home}"
622 <           workDir="${build.4jdk7.dir}/JTwork"
623 <           reportDir="${build.4jdk7.dir}/JTreport">
624 <
625 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
626 <      <arg value="-agentvm"/>
627 <      <arg value="-v:nopass,fail"/>
628 <      <arg value="-vmoptions:-esa -ea"/>
629 <      <arg value="-automatic"/>
630 <      <arg value="-k:!ignore"/>
631 <    </jtreg>
705 >    <run-jtreg-tests
706 >       target="7"
707 >       workdir="${build.4jdk7.dir}"
708 >       classes="${4jdk7product.jar}"/>
709    </target>
710  
711  
# Line 641 | Line 718
718    <target name="4jdk7docs"
719            description="Builds javadocs for src/jdk7 to dist dir">
720  
721 <    <delete dir="${dist.4jdk7.docs.dir}"/>
722 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
721 >    <delete dir="${4jdk7docs.dir}"/>
722 >    <mkdir dir="${4jdk7docs.dir}"/>
723  
724 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
724 >    <javadoc destdir="${4jdk7docs.dir}"
725               packagenames="none"
726               link="${jdkapi7docs.url}"
727               overview="${4jdk7src.dir}/intro.html"
728 +             access="${build.javadoc.access}"
729               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
730               classpath=""
731               executable="${javadoc7}">
# Line 660 | Line 738
738  
739  
740    <target name="4jdk7dist"
741 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
741 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
742            description="Puts all distributable products in single hierarchy"/>
743  
744  
# Line 678 | Line 756
756    </target>
757  
758    <target name="4jdk7dist-jar"
759 <          depends="4jdk7clean, 4jdk7-jar">
682 <
759 >          depends="4jdk7clean, 4jdk7jar">
760      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
761 +  </target>
762  
763 +
764 +  <target name="4jdk7dist-docs"
765 +          depends="4jdk7clean, 4jdk7docs">
766 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
767    </target>
768  
769  
# Line 715 | Line 797
797    </target>
798  
799  
800 <  <target name="jsr166x-jar"
800 >  <target name="jsr166xjar"
801            depends="jsr166xcompile"
802            description="Builds library jar from compiled sources">
803  
# Line 729 | Line 811
811    <target name="jsr166xdocs"
812            description="Builds javadocs to dist dir">
813  
814 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
815 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
814 >    <delete dir="${jsr166xdocs.dir}"/>
815 >    <mkdir dir="${jsr166xdocs.dir}"/>
816  
817 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
817 >    <javadoc destdir="${jsr166xdocs.dir}"
818               packagenames="jsr166x.*"
819               link="${jdkapidocs.url}"
820 +             access="${build.javadoc.access}"
821               sourcepath="${topsrc.dir}:${jdk6src.dir}"
822               bootclasspath="${bootclasspath6}"
823               source="5"
# Line 746 | Line 829
829  
830  
831    <target name="jsr166xdist"
832 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
832 >          depends="jsr166xdist-jar, jsr166xdist-docs"
833            description="Puts all distributable products in single hierarchy"/>
834  
835  
# Line 765 | Line 848
848  
849  
850    <target name="jsr166xdist-jar"
851 <          depends="jsr166xclean, jsr166x-jar">
769 <
851 >          depends="jsr166xclean, jsr166xjar">
852      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
853 +  </target>
854  
855 +  <target name="jsr166xdist-docs"
856 +          depends="jsr166xclean, jsr166xdocs">
857 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
858    </target>
859  
860    <!-- jsr166y -->
# Line 802 | Line 888
888    </target>
889  
890  
891 <  <target name="jsr166y-jar"
891 >  <target name="jsr166yjar"
892            depends="jsr166ycompile"
893            description="Builds library jar from compiled sources">
894  
# Line 816 | Line 902
902    <target name="jsr166ydocs"
903            description="Builds javadocs to dist dir">
904  
905 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
906 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
905 >    <delete dir="${jsr166ydocs.dir}"/>
906 >    <mkdir dir="${jsr166ydocs.dir}"/>
907  
908 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
908 >    <javadoc destdir="${jsr166ydocs.dir}"
909               packagenames="jsr166y.*"
910               link="${jdkapidocs.url}"
911 +             access="${build.javadoc.access}"
912               sourcepath="${topsrc.dir}:${jdk6src.dir}"
913               bootclasspath="${bootclasspath6}"
914               source="6"
# Line 833 | Line 920
920  
921  
922    <target name="jsr166ydist"
923 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
923 >          depends="jsr166ydist-jar, jsr166ydist-docs"
924            description="Puts all distributable products in single hierarchy"/>
925  
926  
# Line 851 | Line 938
938    </target>
939  
940    <target name="jsr166ydist-jar"
941 <          depends="jsr166yclean, jsr166y-jar">
855 <
941 >          depends="jsr166yclean, jsr166yjar">
942      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
943 +  </target>
944  
945 +  <target name="jsr166ydist-docs"
946 +          depends="jsr166yclean, jsr166ydocs">
947 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
948    </target>
949  
950  
# Line 862 | Line 952
952  
953  
954    <target name="extra166ycompile"
955 <          depends="configure-compiler, jsr166y-jar"
955 >          depends="configure-compiler, jsr166yjar"
956            description="Compiles extra166y sources">
957  
958      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889 | Line 979
979    </target>
980  
981  
982 <  <target name="extra166y-jar"
982 >  <target name="extra166yjar"
983            depends="extra166ycompile"
984            description="Builds library jar from compiled sources">
985  
# Line 903 | Line 993
993    <target name="extra166ydocs"
994            description="Builds javadocs to build dir">
995  
996 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
997 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
996 >    <delete dir="${extra166ydocs.dir}"/>
997 >    <mkdir dir="${extra166ydocs.dir}"/>
998  
999 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
999 >    <javadoc destdir="${extra166ydocs.dir}"
1000               packagenames="extra166y.*"
1001               link="${jdkapidocs.url}"
1002 +             access="${build.javadoc.access}"
1003               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1004               bootclasspath="${bootclasspath6}"
1005               source="6"
# Line 920 | Line 1011
1011  
1012  
1013    <target name="extra166ydist"
1014 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
1014 >          depends="extra166ydist-jar, extra166ydist-docs"
1015            description="Puts all distributable products in single hierarchy"/>
1016  
1017  
# Line 938 | Line 1029
1029    </target>
1030  
1031    <target name="extra166ydist-jar"
1032 <          depends="extra166yclean, extra166y-jar">
942 <
1032 >          depends="extra166yclean, extra166yjar">
1033      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1034 +  </target>
1035  
1036 +  <target name="extra166ydist-docs"
1037 +          depends="extra166yclean, extra166ydocs">
1038 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1039    </target>
1040  
1041    <!-- jsr166e -->
# Line 973 | Line 1067
1067    </target>
1068  
1069  
1070 <  <target name="jsr166e-jar"
1070 >  <target name="jsr166ejar"
1071            depends="jsr166ecompile"
1072            description="Builds library jar from compiled sources">
1073  
# Line 987 | Line 1081
1081    <target name="jsr166edocs"
1082            description="Builds javadocs to build dir">
1083  
1084 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1085 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1084 >    <delete dir="${jsr166edocs.dir}"/>
1085 >    <mkdir dir="${jsr166edocs.dir}"/>
1086  
1087 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1087 >    <javadoc destdir="${jsr166edocs.dir}"
1088               packagenames="jsr166e.*"
1089               link="${jdkapidocs.url}"
1090 +             access="${build.javadoc.access}"
1091               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1092               source="7"
1093               executable="${javadoc7}">
# Line 1003 | Line 1098
1098  
1099  
1100    <target name="jsr166e-test-tck"
1101 <          depends="jsr166e-jar"
1101 >          depends="jsr166ejar"
1102            description="Runs tck tests for jsr166e">
1103  
1104      <run-tck-tests
# Line 1016 | Line 1111
1111  
1112  
1113    <target name="jsr166edist"
1114 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1114 >          depends="jsr166edist-jar, jsr166edist-docs"
1115            description="Puts all distributable products in single hierarchy"/>
1116  
1117  
1118    <target name="jsr166eclean"
1119            description="Removes all jsr166e build products">
1025
1120      <delete dir="${build.jsr166e.dir}"/>
1027
1121    </target>
1122  
1123  
# Line 1034 | Line 1127
1127    </target>
1128  
1129    <target name="jsr166edist-jar"
1130 <          depends="jsr166eclean, jsr166e-jar">
1038 <
1130 >          depends="jsr166eclean, jsr166ejar">
1131      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1132 +  </target>
1133 +
1134 +  <target name="jsr166edist-docs"
1135 +          depends="jsr166eclean, jsr166edocs">
1136 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1137 +  </target>
1138  
1139 +
1140 + <!-- Find buglets that can be detected by static build tools -->
1141 +
1142 +  <target name="lint">
1143 +    <antcall target="dists">
1144 +      <param name="build.javadoc.access" value="private"/>
1145 +    </antcall>
1146    </target>
1147  
1148 +
1149   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines