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.134 by jsr166, Sun Feb 3 02:25:01 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 243 | Line 249
249             fork="true">
250  
251        <include name="**/*.java"/>
252 +      <compilerarg value="-Xprefer:source"/>
253        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all"/>
255        <compilerarg line="${build.args}"/>
# Line 269 | Line 276
276    <target name="docs"
277            description="Builds javadocs for src/main to dist dir">
278  
279 <    <delete dir="${javadocs.dir}"/>
280 <    <mkdir dir="${javadocs.dir}"/>
279 >    <delete dir="${docs.dir}"/>
280 >    <mkdir dir="${docs.dir}"/>
281  
282      <!-- the packagenames="none" hack below prevents scanning the -->
283      <!-- sourcepath for packages -->
284  
285 <    <javadoc destdir="${javadocs.dir}"
285 >    <javadoc destdir="${docs.dir}"
286               packagenames="none"
287               link="${jdkapi8docs.url}"
288               overview="${src.dir}/intro.html"
289 +             access="${build.javadoc.access}"
290               sourcepath="${src.dir}:${jdk8src.dir}"
291               classpath=""
292               executable="${javadoc8}">
# Line 341 | Line 349
349  
350    <target name="dist-docs"
351            depends="clean, docs">
352 <    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
352 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
353    </target>
354  
355  
# Line 408 | Line 416
416  
417    </target>
418  
419 +  <target name="test-tck"
420 +          depends="jar"
421 +          description="Runs tck tests for main directly">
422 +
423 +    <run-tck-tests
424 +      target="8"
425 +      workdir="${build.dir}"
426 +      classes="${product.jar}"/>
427 +  </target>
428  
429    <target name="run-tests"
430            depends="compile-tests">
# Line 574 | Line 591
591             fork="true">
592  
593        <include name="**/*.java"/>
594 +      <compilerarg value="-Xprefer:source"/>
595        <compilerarg value="-XDignore.symbol.file=true"/>
596        <compilerarg value="-Xlint:all"/>
597        <compilerarg line="${build.args}"/>
# Line 582 | Line 600
600    </target>
601  
602  
603 <  <target name="4jdk7-jar"
603 >  <target name="4jdk7jar"
604            depends="4jdk7compile"
605            description="Builds library jar from compiled sources">
606  
# Line 594 | Line 612
612  
613  
614    <target name="4jdk7-test-tck"
615 <          depends="4jdk7-jar"
615 >          depends="4jdk7jar"
616            description="Runs tck tests for jsr166-4jdk7 directly">
617  
618      <run-tck-tests
619        target="7"
620        workdir="${build.4jdk7.dir}"
621 <      classes="${4jdk7product.jar}"/>
621 >      classes="${4jdk7product.jar}">
622 >      <javac-elements>
623 >        <!-- JDK8+ test classes -->
624 >        <exclude name="StampedLockTest.java"/>
625 >      </javac-elements>
626 >    </run-tck-tests>
627    </target>
628  
629  
# Line 663 | Line 686
686    <target name="4jdk7docs"
687            description="Builds javadocs for src/jdk7 to dist dir">
688  
689 <    <delete dir="${4jdk7javadocs.dir}"/>
690 <    <mkdir dir="${4jdk7javadocs.dir}"/>
689 >    <delete dir="${4jdk7docs.dir}"/>
690 >    <mkdir dir="${4jdk7docs.dir}"/>
691  
692 <    <javadoc destdir="${4jdk7javadocs.dir}"
692 >    <javadoc destdir="${4jdk7docs.dir}"
693               packagenames="none"
694               link="${jdkapi7docs.url}"
695               overview="${4jdk7src.dir}/intro.html"
696 +             access="${build.javadoc.access}"
697               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
698               classpath=""
699               executable="${javadoc7}">
# Line 700 | Line 724
724    </target>
725  
726    <target name="4jdk7dist-jar"
727 <          depends="4jdk7clean, 4jdk7-jar">
727 >          depends="4jdk7clean, 4jdk7jar">
728      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
729    </target>
730  
731  
732    <target name="4jdk7dist-docs"
733            depends="4jdk7clean, 4jdk7docs">
734 <    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
734 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
735    </target>
736  
737  
# Line 741 | Line 765
765    </target>
766  
767  
768 <  <target name="jsr166x-jar"
768 >  <target name="jsr166xjar"
769            depends="jsr166xcompile"
770            description="Builds library jar from compiled sources">
771  
# Line 755 | Line 779
779    <target name="jsr166xdocs"
780            description="Builds javadocs to dist dir">
781  
782 <    <delete dir="${jsr166xjavadocs.dir}"/>
783 <    <mkdir dir="${jsr166xjavadocs.dir}"/>
782 >    <delete dir="${jsr166xdocs.dir}"/>
783 >    <mkdir dir="${jsr166xdocs.dir}"/>
784  
785 <    <javadoc destdir="${jsr166xjavadocs.dir}"
785 >    <javadoc destdir="${jsr166xdocs.dir}"
786               packagenames="jsr166x.*"
787               link="${jdkapidocs.url}"
788 +             access="${build.javadoc.access}"
789               sourcepath="${topsrc.dir}:${jdk6src.dir}"
790               bootclasspath="${bootclasspath6}"
791               source="5"
# Line 791 | Line 816
816  
817  
818    <target name="jsr166xdist-jar"
819 <          depends="jsr166xclean, jsr166x-jar">
819 >          depends="jsr166xclean, jsr166xjar">
820      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
821    </target>
822  
823    <target name="jsr166xdist-docs"
824            depends="jsr166xclean, jsr166xdocs">
825 <    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
825 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
826    </target>
827  
828    <!-- jsr166y -->
# Line 831 | Line 856
856    </target>
857  
858  
859 <  <target name="jsr166y-jar"
859 >  <target name="jsr166yjar"
860            depends="jsr166ycompile"
861            description="Builds library jar from compiled sources">
862  
# Line 845 | Line 870
870    <target name="jsr166ydocs"
871            description="Builds javadocs to dist dir">
872  
873 <    <delete dir="${jsr166yjavadocs.dir}"/>
874 <    <mkdir dir="${jsr166yjavadocs.dir}"/>
873 >    <delete dir="${jsr166ydocs.dir}"/>
874 >    <mkdir dir="${jsr166ydocs.dir}"/>
875  
876 <    <javadoc destdir="${jsr166yjavadocs.dir}"
876 >    <javadoc destdir="${jsr166ydocs.dir}"
877               packagenames="jsr166y.*"
878               link="${jdkapidocs.url}"
879 +             access="${build.javadoc.access}"
880               sourcepath="${topsrc.dir}:${jdk6src.dir}"
881               bootclasspath="${bootclasspath6}"
882               source="6"
# Line 880 | Line 906
906    </target>
907  
908    <target name="jsr166ydist-jar"
909 <          depends="jsr166yclean, jsr166y-jar">
909 >          depends="jsr166yclean, jsr166yjar">
910      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
911    </target>
912  
913    <target name="jsr166ydist-docs"
914            depends="jsr166yclean, jsr166ydocs">
915 <    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
915 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
916    </target>
917  
918  
# Line 894 | Line 920
920  
921  
922    <target name="extra166ycompile"
923 <          depends="configure-compiler, jsr166y-jar"
923 >          depends="configure-compiler, jsr166yjar"
924            description="Compiles extra166y sources">
925  
926      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 921 | Line 947
947    </target>
948  
949  
950 <  <target name="extra166y-jar"
950 >  <target name="extra166yjar"
951            depends="extra166ycompile"
952            description="Builds library jar from compiled sources">
953  
# Line 935 | Line 961
961    <target name="extra166ydocs"
962            description="Builds javadocs to build dir">
963  
964 <    <delete dir="${extra166yjavadocs.dir}"/>
965 <    <mkdir dir="${extra166yjavadocs.dir}"/>
964 >    <delete dir="${extra166ydocs.dir}"/>
965 >    <mkdir dir="${extra166ydocs.dir}"/>
966  
967 <    <javadoc destdir="${extra166yjavadocs.dir}"
967 >    <javadoc destdir="${extra166ydocs.dir}"
968               packagenames="extra166y.*"
969               link="${jdkapidocs.url}"
970 +             access="${build.javadoc.access}"
971               sourcepath="${topsrc.dir}:${jdk6src.dir}"
972               bootclasspath="${bootclasspath6}"
973               source="6"
# Line 970 | Line 997
997    </target>
998  
999    <target name="extra166ydist-jar"
1000 <          depends="extra166yclean, extra166y-jar">
1000 >          depends="extra166yclean, extra166yjar">
1001      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1002    </target>
1003  
1004    <target name="extra166ydist-docs"
1005            depends="extra166yclean, extra166ydocs">
1006 <    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
1006 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1007    </target>
1008  
1009    <!-- jsr166e -->
# Line 1008 | Line 1035
1035    </target>
1036  
1037  
1038 <  <target name="jsr166e-jar"
1038 >  <target name="jsr166ejar"
1039            depends="jsr166ecompile"
1040            description="Builds library jar from compiled sources">
1041  
# Line 1022 | Line 1049
1049    <target name="jsr166edocs"
1050            description="Builds javadocs to build dir">
1051  
1052 <    <delete dir="${jsr166ejavadocs.dir}"/>
1053 <    <mkdir dir="${jsr166ejavadocs.dir}"/>
1052 >    <delete dir="${jsr166edocs.dir}"/>
1053 >    <mkdir dir="${jsr166edocs.dir}"/>
1054  
1055 <    <javadoc destdir="${jsr166ejavadocs.dir}"
1055 >    <javadoc destdir="${jsr166edocs.dir}"
1056               packagenames="jsr166e.*"
1057               link="${jdkapidocs.url}"
1058 +             access="${build.javadoc.access}"
1059               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1060               source="7"
1061               executable="${javadoc7}">
# Line 1038 | Line 1066
1066  
1067  
1068    <target name="jsr166e-test-tck"
1069 <          depends="jsr166e-jar"
1069 >          depends="jsr166ejar"
1070            description="Runs tck tests for jsr166e">
1071  
1072      <run-tck-tests
# Line 1067 | Line 1095
1095    </target>
1096  
1097    <target name="jsr166edist-jar"
1098 <          depends="jsr166eclean, jsr166e-jar">
1098 >          depends="jsr166eclean, jsr166ejar">
1099      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1100    </target>
1101  
1102    <target name="jsr166edist-docs"
1103            depends="jsr166eclean, jsr166edocs">
1104 <    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1104 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1105    </target>
1106  
1107 +
1108 + <!-- Find buglets that can be detected by static build tools -->
1109 +
1110 +  <target name="lint">
1111 +    <antcall target="dists">
1112 +      <param name="build.javadoc.access" value="private"/>
1113 +    </antcall>
1114 +  </target>
1115 +
1116 +
1117   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines