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.133 by jsr166, Sun Feb 3 02:16:08 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 224 | 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 250 | Line 276
276    <target name="docs"
277            description="Builds javadocs for src/main to dist dir">
278  
279 <    <delete dir="${dist.javadocs.dir}"/>
280 <    <mkdir dir="${dist.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="${dist.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 274 | Line 301
301  
302  
303    <target name="dist"
304 <          depends="dist-clean, dist-jar, docs"
304 >          depends="dist-clean, dist-jar, dist-docs"
305            description="Puts all distributable products in single hierarchy"/>
306  
307  
# Line 317 | Line 344
344  
345    <target name="dist-jar"
346            depends="clean, jar">
320
347      <copy file="${product.jar}" todir="${dist.dir}"/>
348 +  </target>
349  
350 +  <target name="dist-docs"
351 +          depends="clean, docs">
352 +    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
353    </target>
354  
355  
# Line 386 | 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 552 | 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 560 | 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 572 | 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 >        <exclude name="StampedLockTest.java"/>
624 >      </javac-elements>
625 >    </run-tck-tests>
626    </target>
627  
628  
# Line 641 | Line 685
685    <target name="4jdk7docs"
686            description="Builds javadocs for src/jdk7 to dist dir">
687  
688 <    <delete dir="${dist.4jdk7.docs.dir}"/>
689 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
688 >    <delete dir="${4jdk7docs.dir}"/>
689 >    <mkdir dir="${4jdk7docs.dir}"/>
690  
691 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
691 >    <javadoc destdir="${4jdk7docs.dir}"
692               packagenames="none"
693               link="${jdkapi7docs.url}"
694               overview="${4jdk7src.dir}/intro.html"
695 +             access="${build.javadoc.access}"
696               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
697               classpath=""
698               executable="${javadoc7}">
# Line 660 | Line 705
705  
706  
707    <target name="4jdk7dist"
708 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
708 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
709            description="Puts all distributable products in single hierarchy"/>
710  
711  
# Line 678 | Line 723
723    </target>
724  
725    <target name="4jdk7dist-jar"
726 <          depends="4jdk7clean, 4jdk7-jar">
682 <
726 >          depends="4jdk7clean, 4jdk7jar">
727      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
728 +  </target>
729 +
730  
731 +  <target name="4jdk7dist-docs"
732 +          depends="4jdk7clean, 4jdk7docs">
733 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
734    </target>
735  
736  
# Line 715 | Line 764
764    </target>
765  
766  
767 <  <target name="jsr166x-jar"
767 >  <target name="jsr166xjar"
768            depends="jsr166xcompile"
769            description="Builds library jar from compiled sources">
770  
# Line 729 | Line 778
778    <target name="jsr166xdocs"
779            description="Builds javadocs to dist dir">
780  
781 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
782 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
781 >    <delete dir="${jsr166xdocs.dir}"/>
782 >    <mkdir dir="${jsr166xdocs.dir}"/>
783  
784 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
784 >    <javadoc destdir="${jsr166xdocs.dir}"
785               packagenames="jsr166x.*"
786               link="${jdkapidocs.url}"
787 +             access="${build.javadoc.access}"
788               sourcepath="${topsrc.dir}:${jdk6src.dir}"
789               bootclasspath="${bootclasspath6}"
790               source="5"
# Line 746 | Line 796
796  
797  
798    <target name="jsr166xdist"
799 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
799 >          depends="jsr166xdist-jar, jsr166xdist-docs"
800            description="Puts all distributable products in single hierarchy"/>
801  
802  
# Line 765 | Line 815
815  
816  
817    <target name="jsr166xdist-jar"
818 <          depends="jsr166xclean, jsr166x-jar">
769 <
818 >          depends="jsr166xclean, jsr166xjar">
819      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
820 +  </target>
821  
822 +  <target name="jsr166xdist-docs"
823 +          depends="jsr166xclean, jsr166xdocs">
824 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
825    </target>
826  
827    <!-- jsr166y -->
# Line 802 | Line 855
855    </target>
856  
857  
858 <  <target name="jsr166y-jar"
858 >  <target name="jsr166yjar"
859            depends="jsr166ycompile"
860            description="Builds library jar from compiled sources">
861  
# Line 816 | Line 869
869    <target name="jsr166ydocs"
870            description="Builds javadocs to dist dir">
871  
872 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
873 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
872 >    <delete dir="${jsr166ydocs.dir}"/>
873 >    <mkdir dir="${jsr166ydocs.dir}"/>
874  
875 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
875 >    <javadoc destdir="${jsr166ydocs.dir}"
876               packagenames="jsr166y.*"
877               link="${jdkapidocs.url}"
878 +             access="${build.javadoc.access}"
879               sourcepath="${topsrc.dir}:${jdk6src.dir}"
880               bootclasspath="${bootclasspath6}"
881               source="6"
# Line 833 | Line 887
887  
888  
889    <target name="jsr166ydist"
890 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
890 >          depends="jsr166ydist-jar, jsr166ydist-docs"
891            description="Puts all distributable products in single hierarchy"/>
892  
893  
# Line 851 | Line 905
905    </target>
906  
907    <target name="jsr166ydist-jar"
908 <          depends="jsr166yclean, jsr166y-jar">
855 <
908 >          depends="jsr166yclean, jsr166yjar">
909      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
910 +  </target>
911  
912 +  <target name="jsr166ydist-docs"
913 +          depends="jsr166yclean, jsr166ydocs">
914 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
915    </target>
916  
917  
# Line 862 | Line 919
919  
920  
921    <target name="extra166ycompile"
922 <          depends="configure-compiler, jsr166y-jar"
922 >          depends="configure-compiler, jsr166yjar"
923            description="Compiles extra166y sources">
924  
925      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889 | Line 946
946    </target>
947  
948  
949 <  <target name="extra166y-jar"
949 >  <target name="extra166yjar"
950            depends="extra166ycompile"
951            description="Builds library jar from compiled sources">
952  
# Line 903 | Line 960
960    <target name="extra166ydocs"
961            description="Builds javadocs to build dir">
962  
963 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
964 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
963 >    <delete dir="${extra166ydocs.dir}"/>
964 >    <mkdir dir="${extra166ydocs.dir}"/>
965  
966 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
966 >    <javadoc destdir="${extra166ydocs.dir}"
967               packagenames="extra166y.*"
968               link="${jdkapidocs.url}"
969 +             access="${build.javadoc.access}"
970               sourcepath="${topsrc.dir}:${jdk6src.dir}"
971               bootclasspath="${bootclasspath6}"
972               source="6"
# Line 920 | Line 978
978  
979  
980    <target name="extra166ydist"
981 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
981 >          depends="extra166ydist-jar, extra166ydist-docs"
982            description="Puts all distributable products in single hierarchy"/>
983  
984  
# Line 938 | Line 996
996    </target>
997  
998    <target name="extra166ydist-jar"
999 <          depends="extra166yclean, extra166y-jar">
942 <
999 >          depends="extra166yclean, extra166yjar">
1000      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1001 +  </target>
1002  
1003 +  <target name="extra166ydist-docs"
1004 +          depends="extra166yclean, extra166ydocs">
1005 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1006    </target>
1007  
1008    <!-- jsr166e -->
# Line 973 | Line 1034
1034    </target>
1035  
1036  
1037 <  <target name="jsr166e-jar"
1037 >  <target name="jsr166ejar"
1038            depends="jsr166ecompile"
1039            description="Builds library jar from compiled sources">
1040  
# Line 987 | Line 1048
1048    <target name="jsr166edocs"
1049            description="Builds javadocs to build dir">
1050  
1051 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1052 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1051 >    <delete dir="${jsr166edocs.dir}"/>
1052 >    <mkdir dir="${jsr166edocs.dir}"/>
1053  
1054 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1054 >    <javadoc destdir="${jsr166edocs.dir}"
1055               packagenames="jsr166e.*"
1056               link="${jdkapidocs.url}"
1057 +             access="${build.javadoc.access}"
1058               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1059               source="7"
1060               executable="${javadoc7}">
# Line 1003 | Line 1065
1065  
1066  
1067    <target name="jsr166e-test-tck"
1068 <          depends="jsr166e-jar"
1068 >          depends="jsr166ejar"
1069            description="Runs tck tests for jsr166e">
1070  
1071      <run-tck-tests
# Line 1016 | Line 1078
1078  
1079  
1080    <target name="jsr166edist"
1081 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1081 >          depends="jsr166edist-jar, jsr166edist-docs"
1082            description="Puts all distributable products in single hierarchy"/>
1083  
1084  
1085    <target name="jsr166eclean"
1086            description="Removes all jsr166e build products">
1025
1087      <delete dir="${build.jsr166e.dir}"/>
1027
1088    </target>
1089  
1090  
# Line 1034 | Line 1094
1094    </target>
1095  
1096    <target name="jsr166edist-jar"
1097 <          depends="jsr166eclean, jsr166e-jar">
1038 <
1097 >          depends="jsr166eclean, jsr166ejar">
1098      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1099 +  </target>
1100  
1101 +  <target name="jsr166edist-docs"
1102 +          depends="jsr166eclean, jsr166edocs">
1103 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1104    </target>
1105  
1106 +
1107 + <!-- Find buglets that can be detected by static build tools -->
1108 +
1109 +  <target name="lint">
1110 +    <antcall target="dists">
1111 +      <param name="build.javadoc.access" value="private"/>
1112 +    </antcall>
1113 +  </target>
1114 +
1115 +
1116   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines