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.121 by jsr166, Mon Jan 21 22:03:09 2013 UTC vs.
Revision 1.132 by jsr166, Fri Feb 1 21:58:27 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}/jsr166.docs"/>
126 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
127 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
128 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
129 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
130 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
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 128 | Line 151
151    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
152  
153    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154 <  <!-- The below does not yet exist as of 2012-11 -->
154 >  <!-- The below does not yet exist as of 2013-01 -->
155    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
156  
157    <!-- Default jdk api doc location (latest stable release seems best) -->
# Line 146 | Line 169
169    </path>
170  
171    <macrodef name="run-tck-tests">
172 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173 +    <attribute name="source" default="6"/>
174      <attribute name="target"/>
175      <attribute name="workdir"/>
176 <    <attribute name="product.jar" default="${product.jar}"/>
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"/>
182  
183 <    <javac srcdir="${tck.src.dir}"
183 >    <javac srcdir="@{tck.src.dir}"
184             destdir="@{workdir}/tck-classes"
185             debug="${build.debug}"
186             debuglevel="${build.debuglevel}"
187             deprecation="${build.deprecation}"
188 <           source="6"
188 >           source="@{source}"
189             classpath="${junit.jar}"
190 <           bootclasspath="@{product.jar}:${bootclasspath6}"
190 >           bootclasspath="@{classes}:${bootclasspath@{source}}"
191             includeAntRuntime="false"
192             includeJavaRuntime="false"
193             executable="${javac@{target}}"
# Line 171 | 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 178 | Line 205
205            failonerror="true"
206            jvm="${java@{target}}"
207            fork="true">
208 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
208 >        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
209          <jvmarg line="@{jvmflags}"/>
210          <classpath>
211            <pathelement location="${junit.jar}"/>
# Line 248 | Line 275
275    <target name="docs"
276            description="Builds javadocs for src/main to dist dir">
277  
278 <    <delete dir="${dist.javadocs.dir}"/>
279 <    <mkdir dir="${dist.javadocs.dir}"/>
278 >    <delete dir="${docs.dir}"/>
279 >    <mkdir dir="${docs.dir}"/>
280  
281      <!-- the packagenames="none" hack below prevents scanning the -->
282      <!-- sourcepath for packages -->
283  
284 <    <javadoc destdir="${dist.javadocs.dir}"
284 >    <javadoc destdir="${docs.dir}"
285               packagenames="none"
286               link="${jdkapi8docs.url}"
287               overview="${src.dir}/intro.html"
288 +             access="${build.javadoc.access}"
289               sourcepath="${src.dir}:${jdk8src.dir}"
290               classpath=""
291               executable="${javadoc8}">
# Line 272 | Line 300
300  
301  
302    <target name="dist"
303 <          depends="dist-clean, dist-jar, docs"
303 >          depends="dist-clean, dist-jar, dist-docs"
304            description="Puts all distributable products in single hierarchy"/>
305  
306  
# Line 315 | Line 343
343  
344    <target name="dist-jar"
345            depends="clean, jar">
318
346      <copy file="${product.jar}" todir="${dist.dir}"/>
347 +  </target>
348  
349 +  <target name="dist-docs"
350 +          depends="clean, docs">
351 +    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
352    </target>
353  
354  
# Line 384 | Line 415
415  
416    </target>
417  
418 +  <target name="test-tck"
419 +          depends="jar"
420 +          description="Runs tck tests for main directly">
421 +
422 +    <run-tck-tests
423 +      target="8"
424 +      workdir="${build.dir}"
425 +      classes="${product.jar}"/>
426 +  </target>
427  
428    <target name="run-tests"
429            depends="compile-tests">
# Line 558 | Line 598
598    </target>
599  
600  
601 <  <target name="4jdk7-jar"
601 >  <target name="4jdk7jar"
602            depends="4jdk7compile"
603            description="Builds library jar from compiled sources">
604  
# Line 570 | Line 610
610  
611  
612    <target name="4jdk7-test-tck"
613 <          depends="4jdk7-jar"
613 >          depends="4jdk7jar"
614            description="Runs tck tests for jsr166-4jdk7 directly">
615  
616      <run-tck-tests
617        target="7"
618        workdir="${build.4jdk7.dir}"
619 <      product.jar="${4jdk7product.jar}"/>
619 >      classes="${4jdk7product.jar}">
620 >      <javac-elements>
621 >        <exclude name="StampedLockTest.java"/>
622 >      </javac-elements>
623 >    </run-tck-tests>
624    </target>
625  
626  
# Line 639 | Line 683
683    <target name="4jdk7docs"
684            description="Builds javadocs for src/jdk7 to dist dir">
685  
686 <    <delete dir="${dist.4jdk7.docs.dir}"/>
687 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
686 >    <delete dir="${4jdk7docs.dir}"/>
687 >    <mkdir dir="${4jdk7docs.dir}"/>
688  
689 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
689 >    <javadoc destdir="${4jdk7docs.dir}"
690               packagenames="none"
691               link="${jdkapi7docs.url}"
692               overview="${4jdk7src.dir}/intro.html"
693 +             access="${build.javadoc.access}"
694               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
695               classpath=""
696               executable="${javadoc7}">
# Line 658 | Line 703
703  
704  
705    <target name="4jdk7dist"
706 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
706 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
707            description="Puts all distributable products in single hierarchy"/>
708  
709  
# Line 676 | Line 721
721    </target>
722  
723    <target name="4jdk7dist-jar"
724 <          depends="4jdk7clean, 4jdk7-jar">
680 <
724 >          depends="4jdk7clean, 4jdk7jar">
725      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
726 +  </target>
727 +
728  
729 +  <target name="4jdk7dist-docs"
730 +          depends="4jdk7clean, 4jdk7docs">
731 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
732    </target>
733  
734  
# Line 713 | Line 762
762    </target>
763  
764  
765 <  <target name="jsr166x-jar"
765 >  <target name="jsr166xjar"
766            depends="jsr166xcompile"
767            description="Builds library jar from compiled sources">
768  
# Line 727 | Line 776
776    <target name="jsr166xdocs"
777            description="Builds javadocs to dist dir">
778  
779 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
780 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
779 >    <delete dir="${jsr166xdocs.dir}"/>
780 >    <mkdir dir="${jsr166xdocs.dir}"/>
781  
782 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
782 >    <javadoc destdir="${jsr166xdocs.dir}"
783               packagenames="jsr166x.*"
784               link="${jdkapidocs.url}"
785 +             access="${build.javadoc.access}"
786               sourcepath="${topsrc.dir}:${jdk6src.dir}"
787               bootclasspath="${bootclasspath6}"
788               source="5"
# Line 744 | Line 794
794  
795  
796    <target name="jsr166xdist"
797 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
797 >          depends="jsr166xdist-jar, jsr166xdist-docs"
798            description="Puts all distributable products in single hierarchy"/>
799  
800  
# Line 763 | Line 813
813  
814  
815    <target name="jsr166xdist-jar"
816 <          depends="jsr166xclean, jsr166x-jar">
767 <
816 >          depends="jsr166xclean, jsr166xjar">
817      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
818 +  </target>
819  
820 +  <target name="jsr166xdist-docs"
821 +          depends="jsr166xclean, jsr166xdocs">
822 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
823    </target>
824  
825    <!-- jsr166y -->
# Line 800 | Line 853
853    </target>
854  
855  
856 <  <target name="jsr166y-jar"
856 >  <target name="jsr166yjar"
857            depends="jsr166ycompile"
858            description="Builds library jar from compiled sources">
859  
# Line 814 | Line 867
867    <target name="jsr166ydocs"
868            description="Builds javadocs to dist dir">
869  
870 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
871 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
870 >    <delete dir="${jsr166ydocs.dir}"/>
871 >    <mkdir dir="${jsr166ydocs.dir}"/>
872  
873 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
873 >    <javadoc destdir="${jsr166ydocs.dir}"
874               packagenames="jsr166y.*"
875               link="${jdkapidocs.url}"
876 +             access="${build.javadoc.access}"
877               sourcepath="${topsrc.dir}:${jdk6src.dir}"
878               bootclasspath="${bootclasspath6}"
879               source="6"
# Line 831 | Line 885
885  
886  
887    <target name="jsr166ydist"
888 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
888 >          depends="jsr166ydist-jar, jsr166ydist-docs"
889            description="Puts all distributable products in single hierarchy"/>
890  
891  
# Line 849 | Line 903
903    </target>
904  
905    <target name="jsr166ydist-jar"
906 <          depends="jsr166yclean, jsr166y-jar">
853 <
906 >          depends="jsr166yclean, jsr166yjar">
907      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
908 +  </target>
909  
910 +  <target name="jsr166ydist-docs"
911 +          depends="jsr166yclean, jsr166ydocs">
912 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
913    </target>
914  
915  
# Line 860 | Line 917
917  
918  
919    <target name="extra166ycompile"
920 <          depends="configure-compiler, jsr166y-jar"
920 >          depends="configure-compiler, jsr166yjar"
921            description="Compiles extra166y sources">
922  
923      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 887 | Line 944
944    </target>
945  
946  
947 <  <target name="extra166y-jar"
947 >  <target name="extra166yjar"
948            depends="extra166ycompile"
949            description="Builds library jar from compiled sources">
950  
# Line 901 | Line 958
958    <target name="extra166ydocs"
959            description="Builds javadocs to build dir">
960  
961 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
962 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
961 >    <delete dir="${extra166ydocs.dir}"/>
962 >    <mkdir dir="${extra166ydocs.dir}"/>
963  
964 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
964 >    <javadoc destdir="${extra166ydocs.dir}"
965               packagenames="extra166y.*"
966               link="${jdkapidocs.url}"
967 +             access="${build.javadoc.access}"
968               sourcepath="${topsrc.dir}:${jdk6src.dir}"
969               bootclasspath="${bootclasspath6}"
970               source="6"
# Line 918 | Line 976
976  
977  
978    <target name="extra166ydist"
979 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
979 >          depends="extra166ydist-jar, extra166ydist-docs"
980            description="Puts all distributable products in single hierarchy"/>
981  
982  
# Line 936 | Line 994
994    </target>
995  
996    <target name="extra166ydist-jar"
997 <          depends="extra166yclean, extra166y-jar">
940 <
997 >          depends="extra166yclean, extra166yjar">
998      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
999 +  </target>
1000  
1001 +  <target name="extra166ydist-docs"
1002 +          depends="extra166yclean, extra166ydocs">
1003 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1004    </target>
1005  
1006    <!-- jsr166e -->
# Line 971 | Line 1032
1032    </target>
1033  
1034  
1035 <  <target name="jsr166e-jar"
1035 >  <target name="jsr166ejar"
1036            depends="jsr166ecompile"
1037            description="Builds library jar from compiled sources">
1038  
# Line 985 | Line 1046
1046    <target name="jsr166edocs"
1047            description="Builds javadocs to build dir">
1048  
1049 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1050 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1049 >    <delete dir="${jsr166edocs.dir}"/>
1050 >    <mkdir dir="${jsr166edocs.dir}"/>
1051  
1052 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1052 >    <javadoc destdir="${jsr166edocs.dir}"
1053               packagenames="jsr166e.*"
1054               link="${jdkapidocs.url}"
1055 +             access="${build.javadoc.access}"
1056               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1057               source="7"
1058               executable="${javadoc7}">
# Line 1000 | Line 1062
1062    </target>
1063  
1064  
1065 +  <target name="jsr166e-test-tck"
1066 +          depends="jsr166ejar"
1067 +          description="Runs tck tests for jsr166e">
1068 +
1069 +    <run-tck-tests
1070 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1071 +      source="7"
1072 +      target="8"
1073 +      workdir="${build.jsr166e.dir}"
1074 +      classes="${jsr166e.jar}"/>
1075 +  </target>
1076 +
1077 +
1078    <target name="jsr166edist"
1079 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1079 >          depends="jsr166edist-jar, jsr166edist-docs"
1080            description="Puts all distributable products in single hierarchy"/>
1081  
1082  
1083    <target name="jsr166eclean"
1084            description="Removes all jsr166e build products">
1010
1085      <delete dir="${build.jsr166e.dir}"/>
1012
1086    </target>
1087  
1088  
# Line 1019 | Line 1092
1092    </target>
1093  
1094    <target name="jsr166edist-jar"
1095 <          depends="jsr166eclean, jsr166e-jar">
1023 <
1095 >          depends="jsr166eclean, jsr166ejar">
1096      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1097 +  </target>
1098  
1099 +  <target name="jsr166edist-docs"
1100 +          depends="jsr166eclean, jsr166edocs">
1101 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1102    </target>
1103  
1104 +
1105 + <!-- Find buglets that can be detected by static build tools -->
1106 +
1107 +  <target name="lint">
1108 +    <antcall target="dists">
1109 +      <param name="build.javadoc.access" value="private"/>
1110 +    </antcall>
1111 +  </target>
1112 +
1113 +
1114   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines