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.105 by jsr166, Sat Jan 19 21:54:53 2013 UTC vs.
Revision 1.112 by jsr166, Sun Jan 20 03:44:54 2013 UTC

# Line 45 | Line 45
45    <property name="build.classes.dir"           location="${build.dir}/classes"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <property name="build.loops.dir"             location="${build.dir}/loops"/>
48  <property name="build.lib.dir"               location="${build.dir}/lib"/>
49  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
48    <property name="build.reports.dir"           location="${build.dir}/reports"/>
49  
50 <  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
51 <  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
52 <  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
53 <  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56 <  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
50 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
53 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54  
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61
56    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
59  
60    <!-- JDK binary locations -->
61    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 124 | Line 110
110    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
113  
114    <!-- Distribution locations -->
115 <  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
116 <  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
117 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
118 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
119 <  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
120 <  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
115 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121  
122    <!-- Jar locations -->
123 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124 <  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
125 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
126 <  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
127 <  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
128 <  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
129 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
123 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130  
131    <!-- Bootclasspath argument -->
132    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 154 | Line 139
139    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140    <!-- The below does not yet exist as of 2012-11 -->
141    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142 +
143 +  <!-- Default jdk api doc location (latest stable release seems best) -->
144    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145  
146    <!-- Test classpath -->
# Line 177 | Line 164
164    <!-- Main targets -->
165  
166    <target name="dists"
167 <          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
167 >          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168            description="Builds all public jars and docs"/>
169  
170    <target name="compile"
# Line 218 | Line 205
205            depends="compile"
206            description="Builds library jar from compiled sources">
207  
221    <mkdir dir="${build.lib.dir}"/>
222
208      <jar destfile="${product.jar}">
209        <fileset dir="${build.classes.dir}"/>
210      </jar>
# Line 291 | Line 276
276            description="Removes all build products">
277  
278      <delete dir="${build.dir}"/>
294    <delete dir="${build.classes.dir}"/>
295    <delete dir="${build.lib.dir}"/>
279  
280    </target>
281  
# Line 324 | Line 307
307      <mkdir dir="${build.testcases.dir}"/>
308  
309      <javac srcdir="${tck.src.dir}"
310 <          destdir="${build.testcases.dir}"
311 <            debug="${build.debug}"
312 <       debuglevel="${build.debuglevel}"
313 <      deprecation="${build.deprecation}"
314 <           source="${build.sourcelevel}"
315 <             fork="true">
310 >           destdir="${build.testcases.dir}"
311 >           debug="${build.debug}"
312 >           debuglevel="${build.debuglevel}"
313 >           deprecation="${build.deprecation}"
314 >           source="6"
315 >           classpath="${junit.jar}"
316 >           bootclasspath="${product.jar}:${bootclasspath6}"
317 >           includeAntRuntime="false"
318 >           includeJavaRuntime="false"
319 >           executable="${javac8}"
320 >           fork="true">
321  
322 <      <compilerarg value="${bootclasspath.args}"/>
322 >      <include name="**/*.java"/>
323        <compilerarg line="${build.args}"/>
324        <compilerarg value="-XDignore.symbol.file=true"/>
325 <
338 <      <classpath refid="test.classpath"/>
325 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326  
327      </javac>
328  
329      <javac srcdir="${test.src.dir}"
330 <          destdir="${build.testcases.dir}"
331 <            debug="${build.debug}"
332 <       debuglevel="${build.debuglevel}"
333 <      deprecation="${build.deprecation}"
334 <           source="${build.sourcelevel}"
335 <             fork="true">
330 >           destdir="${build.testcases.dir}"
331 >           debug="${build.debug}"
332 >           debuglevel="${build.debuglevel}"
333 >           deprecation="${build.deprecation}"
334 >           source="6"
335 >           classpath=""
336 >           bootclasspath="${product.jar}:${bootclasspath6}"
337 >           includeAntRuntime="false"
338 >           includeJavaRuntime="false"
339 >           executable="${javac8}"
340 >           fork="true">
341  
342 <      <include name="jsr166/test/**"/>
342 >      <include name="jsr166/test/**/*.java"/>
343  
352      <compilerarg value="${bootclasspath.args}"/>
344        <compilerarg line="${build.args}"/>
345        <compilerarg value="-XDignore.symbol.file=true"/>
346 <
356 <      <classpath refid="test.classpath"/>
346 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347  
348      </javac>
349  
# Line 370 | Line 360
360        <compilerarg line="${build.args}"/>
361        <compilerarg value="-XDignore.symbol.file=true"/>
362  
373      <classpath refid="test.classpath"/>
374
363      </javac>
364   -->
365  
# Line 391 | Line 379
379            errorProperty="junit.failed"
380          failureProperty="junit.failed"
381                      dir="${build.reports.dir}"
382 +                    jvm="${java8}"
383                     fork="true">
384  
385 <      <jvmarg value="${bootclasspath.args}"/>
385 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
386        <jvmarg value="-server"/>
387        <jvmarg value="-showversion"/>
388  
# Line 534 | Line 523
523             debug="${build.debug}"
524             debuglevel="${build.debuglevel}"
525             deprecation="${build.deprecation}"
526 <           source="1.6"
526 >           source="6"
527             classpath=""
528             bootclasspath="${bootclasspath6}"
529             includeAntRuntime="false"
# Line 549 | Line 538
538  
539      </javac>
540  
552    <mkdir dir="${build.4jdk7.lib.dir}"/>
553
541      <jar destfile="${4jdk7product.jar}" index="true">
542        <fileset dir="${build.4jdk7.classes.dir}"/>
543      </jar>
# Line 562 | Line 549
549             debug="${build.debug}"
550             debuglevel="${build.debuglevel}"
551             deprecation="${build.deprecation}"
552 <           source="1.6"
552 >           source="6"
553             classpath="${junit.jar}"
554             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
555             includeAntRuntime="false"
# Line 648 | Line 635
635  
636  
637    <target name="4jdk7clean"
638 <          description="Removes all build products">
638 >          description="Removes all 4jdk7 build products">
639  
640      <delete dir="${build.4jdk7.dir}"/>
641  
# Line 668 | Line 655
655  
656    </target>
657  
671  <!-- jsr166x -->
658  
659 +  <!-- jsr166x -->
660  
661    <target name="jsr166xcompile"
662            depends="configure-compiler"
# Line 683 | Line 670
670             debuglevel="${build.debuglevel}"
671             deprecation="${build.deprecation}"
672             classpath=""
673 <           source="1.5"
673 >           source="5"
674             bootclasspath="${bootclasspath6}"
675             includeAntRuntime="false"
676             includeJavaRuntime="false"
# Line 705 | Line 692
692            depends="jsr166xcompile"
693            description="Builds library jar from compiled sources">
694  
695 <    <mkdir dir="${build.jsr166xlib.dir}"/>
709 <
710 <    <jar destfile="${jsr166xproduct.jar}">
695 >    <jar destfile="${jsr166x.jar}">
696        <fileset dir="${build.jsr166x.dir}"/>
697      </jar>
698  
# Line 718 | Line 703
703    <target name="jsr166xdocs"
704            description="Builds javadocs to dist dir">
705  
706 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
707 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
706 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
707 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
708  
709 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
710 <             packagenames="jsr166x"
709 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
710 >             packagenames="jsr166x.*"
711               link="${jdkapidocs.url}"
712 <             source="${build.sourcelevel}"
713 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
712 >             source="5"
713 >             bootclasspath="${bootclasspath6}"
714 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
715 >             executable="${javadoc7}"
716               additionalparam="-XDignore.symbol.file=true" />
717  
718    </target>
719  
720  
721    <target name="jsr166xdist"
722 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
722 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
723            description="Puts all distributable products in single hierarchy"/>
724  
725  
726  
727    <target name="jsr166xclean"
728 <          description="Removes all build products">
728 >          description="Removes all jsr166x build products">
729  
730      <delete dir="${build.jsr166x.dir}"/>
744    <delete dir="${build.jsr166xlib.dir}"/>
731  
732    </target>
733  
# Line 753 | Line 739
739    </target>
740  
741  
756
757  <target name="jsr166xdist-docs"
758          description="Builds javadocs to dist dir">
759
760    <delete dir="${dist.jsr166xjavadocs.dir}"/>
761    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
762
763    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
764             packagenames="jsr166x"
765             link="${jdkapidocs.url}"
766             source="${build.sourcelevel}"
767             sourcepath="${topsrc.dir}:${jdksrc.dir}"
768             additionalparam="-XDignore.symbol.file=true" />
769
770  </target>
771
742    <target name="jsr166xdist-jar"
743            depends="jsr166xclean, jsr166xjar">
744  
745 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
745 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
746  
747    </target>
748  
# Line 790 | Line 760
760             debug="${build.debug}"
761             debuglevel="${build.debuglevel}"
762             deprecation="${build.deprecation}"
763 <           source="1.6"
763 >           source="6"
764             classpath=""
765             bootclasspath="${bootclasspath6}"
766             includeAntRuntime="false"
# Line 810 | Line 780
780            depends="jsr166ycompile"
781            description="Builds library jar from compiled sources">
782  
783 <    <mkdir dir="${build.jsr166ylib.dir}"/>
814 <
815 <    <jar destfile="${jsr166yproduct.jar}" index="true">
783 >    <jar destfile="${jsr166y.jar}" index="true">
784        <fileset dir="${build.jsr166y.dir}"/>
785      </jar>
786  
# Line 823 | Line 791
791    <target name="jsr166ydocs"
792            description="Builds javadocs to dist dir">
793  
794 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
795 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
794 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
795 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
796  
797 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
798 <             packagenames="jsr166y"
797 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
798 >             packagenames="jsr166y.*"
799               link="${jdkapidocs.url}"
800 <             source="${build.sourcelevel}"
801 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
800 >             source="6"
801 >             bootclasspath="${bootclasspath6}"
802 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
803 >             executable="${javadoc7}"
804               additionalparam="-XDignore.symbol.file=true" />
805  
806    </target>
807  
808  
809    <target name="jsr166ydist"
810 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
810 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
811            description="Puts all distributable products in single hierarchy"/>
812  
813  
814  
815    <target name="jsr166yclean"
816 <          description="Removes all build products">
816 >          description="Removes all jsr166y build products">
817  
818      <delete dir="${build.jsr166y.dir}"/>
849    <delete dir="${build.jsr166ylib.dir}"/>
819  
820    </target>
821  
# Line 857 | Line 826
826  
827    </target>
828  
860  <target name="jsr166ydist-docs"
861          description="Builds javadocs to dist dir">
862
863    <delete dir="${dist.jsr166yjavadocs.dir}"/>
864    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
865
866    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
867             packagenames="jsr166y"
868             link="${jdkapidocs.url}"
869             source="${build.sourcelevel}"
870             sourcepath="${topsrc.dir}:${jdksrc.dir}"
871             additionalparam="-XDignore.symbol.file=true" />
872
873  </target>
874
829    <target name="jsr166ydist-jar"
830            depends="jsr166yclean, jsr166yjar">
831  
832 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
832 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
833  
834    </target>
835  
# Line 895 | Line 849
849             debuglevel="${build.debuglevel}"
850             deprecation="${build.deprecation}"
851             classpath=""
852 <           source="1.6"
853 <           bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
852 >           source="6"
853 >           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
854             includeAntRuntime="false"
855             includeJavaRuntime="false"
856             executable="${javac7}"
# Line 917 | Line 871
871            depends="extra166ycompile"
872            description="Builds library jar from compiled sources">
873  
874 <    <mkdir dir="${build.extra166ylib.dir}"/>
921 <
922 <    <jar destfile="${extra166yproduct.jar}" index="true">
874 >    <jar destfile="${extra166y.jar}" index="true">
875        <fileset dir="${build.extra166y.dir}"/>
876      </jar>
877  
# Line 928 | Line 880
880  
881  
882    <target name="extra166ydocs"
883 <          description="Builds javadocs with custom tags to build dir">
883 >          description="Builds javadocs to build dir">
884  
885 <    <delete dir="${build.extra166yjavadocs.dir}"/>
886 <    <mkdir dir="${build.extra166yjavadocs.dir}"/>
885 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
886 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
887  
888 <    <javadoc destdir="${build.extra166yjavadocs.dir}"
889 <             packagenames="extra166y"
888 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
889 >             packagenames="extra166y.*"
890               link="${jdkapidocs.url}"
891 <             source="${build.sourcelevel}"
892 <             sourcepath="${topsrc.dir}:${jdksrc.dir}"
891 >             source="6"
892 >             bootclasspath="${bootclasspath6}"
893 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
894 >             executable="${javadoc7}"
895               additionalparam="-XDignore.symbol.file=true" />
896  
897    </target>
898  
899  
900    <target name="extra166ydist"
901 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
901 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
902            description="Puts all distributable products in single hierarchy"/>
903  
904  
905  
906    <target name="extra166yclean"
907 <          description="Removes all build products">
907 >          description="Removes all extra166y build products">
908  
909      <delete dir="${build.extra166y.dir}"/>
956    <delete dir="${build.extra166ylib.dir}"/>
910  
911    </target>
912  
# Line 964 | Line 917
917  
918    </target>
919  
967  <target name="extra166ydist-docs"
968          description="Builds javadocs to dist dir">
969
970    <delete dir="${dist.extra166yjavadocs.dir}"/>
971    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
972
973    <javadoc destdir="${dist.extra166yjavadocs.dir}"
974             packagenames="extra166y"
975             link="${jdkapidocs.url}"
976             source="${build.sourcelevel}"
977             sourcepath="${topsrc.dir}:${jdksrc.dir}"
978             additionalparam="-XDignore.symbol.file=true" />
979
980  </target>
981
920    <target name="extra166ydist-jar"
921            depends="extra166yclean, extra166yjar">
922  
923 <    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
923 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
924  
925    </target>
926  
# Line 999 | Line 937
937             debug="${build.debug}"
938             debuglevel="${build.debuglevel}"
939             deprecation="${build.deprecation}"
940 <           source="1.7"
940 >           source="7"
941             classpath=""
942             includeAntRuntime="false"
943             includeJavaRuntime="false"
# Line 1021 | Line 959
959            depends="jsr166ecompile"
960            description="Builds library jar from compiled sources">
961  
962 <    <mkdir dir="${build.jsr166elib.dir}"/>
1025 <
1026 <    <jar destfile="${jsr166eproduct.jar}" index="true">
962 >    <jar destfile="${jsr166e.jar}" index="true">
963        <fileset dir="${build.jsr166e.dir}"/>
964      </jar>
965  
# Line 1032 | Line 968
968  
969  
970    <target name="jsr166edocs"
971 <          description="Builds javadocs with custom tags to build dir">
971 >          description="Builds javadocs to build dir">
972  
973 <    <delete dir="${build.jsr166ejavadocs.dir}"/>
974 <    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
973 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
974 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
975  
976 <    <javadoc destdir="${build.jsr166ejavadocs.dir}"
977 <             packagenames="jsr166e,jsr166e.extra"
978 <             link="${jdkapi7docs.url}"
979 <             source="1.7"
976 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
977 >             packagenames="jsr166e.*"
978 >             link="${jdkapidocs.url}"
979 >             source="7"
980               sourcepath="${topsrc.dir}:${jdk7src.dir}"
981               executable="${javadoc7}"
982               additionalparam="-XDignore.symbol.file=true" >
1047      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1048        <include name="jsr166e/**/*.java"/>
1049      </fileset>
983      </javadoc>
984  
985    </target>
986  
987  
988    <target name="jsr166edist"
989 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
989 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
990            description="Puts all distributable products in single hierarchy"/>
991  
992  
993  
994    <target name="jsr166eclean"
995 <          description="Removes all build products">
995 >          description="Removes all jsr166e build products">
996  
997      <delete dir="${build.jsr166e.dir}"/>
1065    <delete dir="${build.jsr166elib.dir}"/>
998  
999    </target>
1000  
1001  
1070
1002    <target name="jsr166edist-clean"
1003            description="Removes all build and distribution products">
1004  
1005    </target>
1006  
1076  <target name="jsr166edist-docs"
1077          description="Builds javadocs to dist dir">
1078
1079    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1080    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1081
1082    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1083             packagenames="jsr166e,jsr166e.extra"
1084             link="${jdkapidocs.url}"
1085             source="1.7"
1086             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1087             additionalparam="-XDignore.symbol.file=true" />
1088
1089  </target>
1090
1007    <target name="jsr166edist-jar"
1008            depends="jsr166eclean, jsr166ejar">
1009  
1010 <    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1010 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1011  
1012    </target>
1013  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines