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.126 by jsr166, Wed Jan 23 06:46:27 2013 UTC vs.
Revision 1.136 by jsr166, Tue Feb 5 03:39:35 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 118 | Line 122
122    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
123  
124    <!-- Javadoc locations -->
125 <  <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
126 <  <property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
127 <  <property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
128 <  <property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
129 <  <property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
130 <  <property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
131 <
132 <  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
133 <  <property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
137 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
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 171 | 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 192 | 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 210 | 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 243 | 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 269 | Line 304
304    <target name="docs"
305            description="Builds javadocs for src/main to dist dir">
306  
307 <    <delete dir="${javadocs.dir}"/>
308 <    <mkdir dir="${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="${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 341 | Line 377
377  
378    <target name="dist-docs"
379            depends="clean, docs">
380 <    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
380 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
381    </target>
382  
383  
# Line 408 | 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 574 | 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 582 | 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 594 | 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="StampedLockTest.java"/>
667 >        <exclude name="ForkJoinPool8Test.java"/>
668 >      </javac-elements>
669 >    </run-tck-tests>
670    </target>
671  
672  
# Line 633 | Line 699
699    </target>
700  
701    <target name="4jdk7-test-jtreg"
702 <          depends="4jdk7compile"
702 >          depends="4jdk7jar"
703            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
704 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
705 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
706 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
707 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
642 <    <jtreg dir="${jtreg.src.dir}"
643 <           jdk="${jdk7.home}"
644 <           workDir="${build.4jdk7.dir}/JTwork"
645 <           reportDir="${build.4jdk7.dir}/JTreport">
646 <
647 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648 <      <arg value="-agentvm"/>
649 <      <arg value="-v:nopass,fail"/>
650 <      <arg value="-vmoptions:-esa -ea"/>
651 <      <arg value="-automatic"/>
652 <      <arg value="-k:!ignore"/>
653 <    </jtreg>
704 >    <run-jtreg-tests
705 >       target="7"
706 >       workdir="${build.4jdk7.dir}"
707 >       classes="${4jdk7product.jar}"/>
708    </target>
709  
710  
# Line 663 | Line 717
717    <target name="4jdk7docs"
718            description="Builds javadocs for src/jdk7 to dist dir">
719  
720 <    <delete dir="${4jdk7javadocs.dir}"/>
721 <    <mkdir dir="${4jdk7javadocs.dir}"/>
720 >    <delete dir="${4jdk7docs.dir}"/>
721 >    <mkdir dir="${4jdk7docs.dir}"/>
722  
723 <    <javadoc destdir="${4jdk7javadocs.dir}"
723 >    <javadoc destdir="${4jdk7docs.dir}"
724               packagenames="none"
725               link="${jdkapi7docs.url}"
726               overview="${4jdk7src.dir}/intro.html"
727 +             access="${build.javadoc.access}"
728               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
729               classpath=""
730               executable="${javadoc7}">
# Line 700 | Line 755
755    </target>
756  
757    <target name="4jdk7dist-jar"
758 <          depends="4jdk7clean, 4jdk7-jar">
758 >          depends="4jdk7clean, 4jdk7jar">
759      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
760    </target>
761  
762  
763    <target name="4jdk7dist-docs"
764            depends="4jdk7clean, 4jdk7docs">
765 <    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
765 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
766    </target>
767  
768  
# Line 741 | Line 796
796    </target>
797  
798  
799 <  <target name="jsr166x-jar"
799 >  <target name="jsr166xjar"
800            depends="jsr166xcompile"
801            description="Builds library jar from compiled sources">
802  
# Line 755 | Line 810
810    <target name="jsr166xdocs"
811            description="Builds javadocs to dist dir">
812  
813 <    <delete dir="${jsr166xjavadocs.dir}"/>
814 <    <mkdir dir="${jsr166xjavadocs.dir}"/>
813 >    <delete dir="${jsr166xdocs.dir}"/>
814 >    <mkdir dir="${jsr166xdocs.dir}"/>
815  
816 <    <javadoc destdir="${jsr166xjavadocs.dir}"
816 >    <javadoc destdir="${jsr166xdocs.dir}"
817               packagenames="jsr166x.*"
818               link="${jdkapidocs.url}"
819 +             access="${build.javadoc.access}"
820               sourcepath="${topsrc.dir}:${jdk6src.dir}"
821               bootclasspath="${bootclasspath6}"
822               source="5"
# Line 791 | Line 847
847  
848  
849    <target name="jsr166xdist-jar"
850 <          depends="jsr166xclean, jsr166x-jar">
850 >          depends="jsr166xclean, jsr166xjar">
851      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
852    </target>
853  
854    <target name="jsr166xdist-docs"
855            depends="jsr166xclean, jsr166xdocs">
856 <    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
856 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
857    </target>
858  
859    <!-- jsr166y -->
# Line 831 | Line 887
887    </target>
888  
889  
890 <  <target name="jsr166y-jar"
890 >  <target name="jsr166yjar"
891            depends="jsr166ycompile"
892            description="Builds library jar from compiled sources">
893  
# Line 845 | Line 901
901    <target name="jsr166ydocs"
902            description="Builds javadocs to dist dir">
903  
904 <    <delete dir="${jsr166yjavadocs.dir}"/>
905 <    <mkdir dir="${jsr166yjavadocs.dir}"/>
904 >    <delete dir="${jsr166ydocs.dir}"/>
905 >    <mkdir dir="${jsr166ydocs.dir}"/>
906  
907 <    <javadoc destdir="${jsr166yjavadocs.dir}"
907 >    <javadoc destdir="${jsr166ydocs.dir}"
908               packagenames="jsr166y.*"
909               link="${jdkapidocs.url}"
910 +             access="${build.javadoc.access}"
911               sourcepath="${topsrc.dir}:${jdk6src.dir}"
912               bootclasspath="${bootclasspath6}"
913               source="6"
# Line 880 | Line 937
937    </target>
938  
939    <target name="jsr166ydist-jar"
940 <          depends="jsr166yclean, jsr166y-jar">
940 >          depends="jsr166yclean, jsr166yjar">
941      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
942    </target>
943  
944    <target name="jsr166ydist-docs"
945            depends="jsr166yclean, jsr166ydocs">
946 <    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
946 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
947    </target>
948  
949  
# Line 894 | Line 951
951  
952  
953    <target name="extra166ycompile"
954 <          depends="configure-compiler, jsr166y-jar"
954 >          depends="configure-compiler, jsr166yjar"
955            description="Compiles extra166y sources">
956  
957      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 921 | Line 978
978    </target>
979  
980  
981 <  <target name="extra166y-jar"
981 >  <target name="extra166yjar"
982            depends="extra166ycompile"
983            description="Builds library jar from compiled sources">
984  
# Line 935 | Line 992
992    <target name="extra166ydocs"
993            description="Builds javadocs to build dir">
994  
995 <    <delete dir="${extra166yjavadocs.dir}"/>
996 <    <mkdir dir="${extra166yjavadocs.dir}"/>
995 >    <delete dir="${extra166ydocs.dir}"/>
996 >    <mkdir dir="${extra166ydocs.dir}"/>
997  
998 <    <javadoc destdir="${extra166yjavadocs.dir}"
998 >    <javadoc destdir="${extra166ydocs.dir}"
999               packagenames="extra166y.*"
1000               link="${jdkapidocs.url}"
1001 +             access="${build.javadoc.access}"
1002               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1003               bootclasspath="${bootclasspath6}"
1004               source="6"
# Line 970 | Line 1028
1028    </target>
1029  
1030    <target name="extra166ydist-jar"
1031 <          depends="extra166yclean, extra166y-jar">
1031 >          depends="extra166yclean, extra166yjar">
1032      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1033    </target>
1034  
1035    <target name="extra166ydist-docs"
1036            depends="extra166yclean, extra166ydocs">
1037 <    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
1037 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1038    </target>
1039  
1040    <!-- jsr166e -->
# Line 1008 | Line 1066
1066    </target>
1067  
1068  
1069 <  <target name="jsr166e-jar"
1069 >  <target name="jsr166ejar"
1070            depends="jsr166ecompile"
1071            description="Builds library jar from compiled sources">
1072  
# Line 1022 | Line 1080
1080    <target name="jsr166edocs"
1081            description="Builds javadocs to build dir">
1082  
1083 <    <delete dir="${jsr166ejavadocs.dir}"/>
1084 <    <mkdir dir="${jsr166ejavadocs.dir}"/>
1083 >    <delete dir="${jsr166edocs.dir}"/>
1084 >    <mkdir dir="${jsr166edocs.dir}"/>
1085  
1086 <    <javadoc destdir="${jsr166ejavadocs.dir}"
1086 >    <javadoc destdir="${jsr166edocs.dir}"
1087               packagenames="jsr166e.*"
1088               link="${jdkapidocs.url}"
1089 +             access="${build.javadoc.access}"
1090               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1091               source="7"
1092               executable="${javadoc7}">
# Line 1038 | Line 1097
1097  
1098  
1099    <target name="jsr166e-test-tck"
1100 <          depends="jsr166e-jar"
1100 >          depends="jsr166ejar"
1101            description="Runs tck tests for jsr166e">
1102  
1103      <run-tck-tests
# Line 1067 | Line 1126
1126    </target>
1127  
1128    <target name="jsr166edist-jar"
1129 <          depends="jsr166eclean, jsr166e-jar">
1129 >          depends="jsr166eclean, jsr166ejar">
1130      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1131    </target>
1132  
1133    <target name="jsr166edist-docs"
1134            depends="jsr166eclean, jsr166edocs">
1135 <    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1135 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1136 >  </target>
1137 >
1138 >
1139 > <!-- Find buglets that can be detected by static build tools -->
1140 >
1141 >  <target name="lint">
1142 >    <antcall target="dists">
1143 >      <param name="build.javadoc.access" value="private"/>
1144 >    </antcall>
1145    </target>
1146  
1147 +
1148   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines