[cvs] / jsr166 / build.xml Repository:
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.124, Tue Jan 22 21:22:57 2013 UTC revision 1.132, Fri Feb 1 21:58:27 2013 UTC
# Line 22  Line 22 
22    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.    (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>    </description>
28    
29    <target name="usage" description="Advises user to run with -projecthelp">    <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30      <echo>Run "ant -projecthelp" for full usage information.</echo>      <java classname="org.apache.tools.ant.Main">
31          <arg value="-projecthelp" />
32        </java>
33    </target>    </target>
34    
35    
# Line 39  Line 42 
42    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45      <property name="build.javadoc.access" value="protected"/>
46    
47    <!-- Build locations -->    <!-- Build locations -->
48    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 86  Line 90 
90      </sequential>      </sequential>
91    </macrodef>    </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"/>    <defjdklocations v="6"/>
106    <defjdklocations v="7"/>    <defjdklocations v="7"/>
107    <defjdklocations v="8"/>    <defjdklocations v="8"/>
# Line 105  Line 121 
121    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
123    
124    <!-- Distribution locations -->    <!-- Javadoc locations -->
125    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
126    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <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 -->    <!-- Jar locations -->
140    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 152  Line 175 
175      <attribute name="workdir"/>      <attribute name="workdir"/>
176      <attribute name="classes"/>      <attribute name="classes"/>
177      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
178        <element name="javac-elements" optional="true"/>
179      <sequential>      <sequential>
180    
181      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 173  Line 197 
197        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
200          <javac-elements/>
201    
202      </javac>      </javac>
203    
# Line 250  Line 275 
275    <target name="docs"    <target name="docs"
276            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
277    
278      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
279      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
280    
281      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
282      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
283    
284      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
285               packagenames="none"               packagenames="none"
286               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
287               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
288                 access="${build.javadoc.access}"
289               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
290               classpath=""               classpath=""
291               executable="${javadoc8}">               executable="${javadoc8}">
# Line 274  Line 300 
300    
301    
302    <target name="dist"    <target name="dist"
303            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
304            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
305    
306    
# Line 317  Line 343 
343    
344    <target name="dist-jar"    <target name="dist-jar"
345            depends="clean, jar">            depends="clean, jar">
   
346      <copy file="${product.jar}" todir="${dist.dir}"/>      <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>    </target>
353    
354    
# Line 386  Line 415 
415    
416    </target>    </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"    <target name="run-tests"
429            depends="compile-tests">            depends="compile-tests">
# Line 560  Line 598 
598    </target>    </target>
599    
600    
601    <target name="4jdk7-jar"    <target name="4jdk7jar"
602            depends="4jdk7compile"            depends="4jdk7compile"
603            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
604    
# Line 572  Line 610 
610    
611    
612    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
613            depends="4jdk7-jar"            depends="4jdk7jar"
614            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
615    
616      <run-tck-tests      <run-tck-tests
617        target="7"        target="7"
618        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
619        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
620          <javac-elements>
621            <exclude name="StampedLockTest.java"/>
622          </javac-elements>
623        </run-tck-tests>
624    </target>    </target>
625    
626    
# Line 641  Line 683 
683    <target name="4jdk7docs"    <target name="4jdk7docs"
684            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
685    
686      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
687      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
688    
689      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
690               packagenames="none"               packagenames="none"
691               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
692               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
693                 access="${build.javadoc.access}"
694               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
695               classpath=""               classpath=""
696               executable="${javadoc7}">               executable="${javadoc7}">
# Line 660  Line 703 
703    
704    
705    <target name="4jdk7dist"    <target name="4jdk7dist"
706            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
707            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
708    
709    
# Line 678  Line 721 
721    </target>    </target>
722    
723    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
724            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
725      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <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>    </target>
733    
734    
# Line 715  Line 762 
762    </target>    </target>
763    
764    
765    <target name="jsr166x-jar"    <target name="jsr166xjar"
766            depends="jsr166xcompile"            depends="jsr166xcompile"
767            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
768    
# Line 729  Line 776 
776    <target name="jsr166xdocs"    <target name="jsr166xdocs"
777            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
778    
779      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
780      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
781    
782      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
783               packagenames="jsr166x.*"               packagenames="jsr166x.*"
784               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
785                 access="${build.javadoc.access}"
786               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
787               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
788               source="5"               source="5"
# Line 746  Line 794 
794    
795    
796    <target name="jsr166xdist"    <target name="jsr166xdist"
797            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
798            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
799    
800    
# Line 765  Line 813 
813    
814    
815    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
816            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
817      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <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>    </target>
824    
825    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 853 
853    </target>    </target>
854    
855    
856    <target name="jsr166y-jar"    <target name="jsr166yjar"
857            depends="jsr166ycompile"            depends="jsr166ycompile"
858            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
859    
# Line 816  Line 867 
867    <target name="jsr166ydocs"    <target name="jsr166ydocs"
868            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
869    
870      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
871      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
872    
873      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
874               packagenames="jsr166y.*"               packagenames="jsr166y.*"
875               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
876                 access="${build.javadoc.access}"
877               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
878               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
879               source="6"               source="6"
# Line 833  Line 885 
885    
886    
887    <target name="jsr166ydist"    <target name="jsr166ydist"
888            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
889            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
890    
891    
# Line 851  Line 903 
903    </target>    </target>
904    
905    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
906            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
907      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <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>    </target>
914    
915    
# Line 862  Line 917 
917    
918    
919    <target name="extra166ycompile"    <target name="extra166ycompile"
920            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
921            description="Compiles extra166y sources">            description="Compiles extra166y sources">
922    
923      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 944 
944    </target>    </target>
945    
946    
947    <target name="extra166y-jar"    <target name="extra166yjar"
948            depends="extra166ycompile"            depends="extra166ycompile"
949            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
950    
# Line 903  Line 958 
958    <target name="extra166ydocs"    <target name="extra166ydocs"
959            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
960    
961      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
962      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
963    
964      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
965               packagenames="extra166y.*"               packagenames="extra166y.*"
966               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
967                 access="${build.javadoc.access}"
968               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
969               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
970               source="6"               source="6"
# Line 920  Line 976 
976    
977    
978    <target name="extra166ydist"    <target name="extra166ydist"
979            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
980            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
981    
982    
# Line 938  Line 994 
994    </target>    </target>
995    
996    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
997            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
998      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <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>    </target>
1005    
1006    <!-- jsr166e -->    <!-- jsr166e -->
# Line 973  Line 1032 
1032    </target>    </target>
1033    
1034    
1035    <target name="jsr166e-jar"    <target name="jsr166ejar"
1036            depends="jsr166ecompile"            depends="jsr166ecompile"
1037            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1038    
# Line 987  Line 1046 
1046    <target name="jsr166edocs"    <target name="jsr166edocs"
1047            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1048    
1049      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1050      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1051    
1052      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1053               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1054               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1055                 access="${build.javadoc.access}"
1056               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1057               source="7"               source="7"
1058               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1003  Line 1063 
1063    
1064    
1065    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck"
1066            depends="jsr166e-jar"            depends="jsr166ejar"
1067            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
1068    
1069      <run-tck-tests      <run-tck-tests
# Line 1016  Line 1076 
1076    
1077    
1078    <target name="jsr166edist"    <target name="jsr166edist"
1079            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1080            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1081    
1082    
1083    <target name="jsr166eclean"    <target name="jsr166eclean"
1084            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1085      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1086    </target>    </target>
1087    
1088    
# Line 1034  Line 1092 
1092    </target>    </target>
1093    
1094    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1095            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1096      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <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>    </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>  </project>

Legend:
Removed from v.1.124  
changed lines
  Added in v.1.132

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8