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

Diff of /jsr166/build.xml

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

revision 1.123 by jsr166, Tue Jan 22 20:22:00 2013 UTC revision 1.138 by jsr166, Fri Mar 22 18:04:56 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 57  Line 61 
61    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
63    
64    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65    <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>    <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68    
69    <!-- JDK locations -->    <!-- JDK locations -->
70    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# 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}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
126    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <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 147  Line 170 
170    
171    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
172      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
173      <attribute name="target"/>      <attribute name="target"/>
174        <attribute name="compile-target" default="@{target}"/>
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 161  Line 185 
185             debug="${build.debug}"             debug="${build.debug}"
186             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
187             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
188             source="@{source}"             source="@{compile-target}"
189               target="@{compile-target}"
190             classpath="${junit.jar}"             classpath="${junit.jar}"
191             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
192             includeAntRuntime="false"             includeAntRuntime="false"
193             includeJavaRuntime="false"             includeJavaRuntime="false"
194             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
195             fork="true">             fork="true">
196    
197        <include name="*.java"/>        <include name="*.java"/>
198        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
199        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
200        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
201          <javac-elements/>
202    
203      </javac>      </javac>
204    
# Line 191  Line 217 
217      </sequential>      </sequential>
218    </macrodef>    </macrodef>
219    
220      <macrodef name="run-jtreg-tests">
221        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
222        <attribute name="source" default="7"/>
223        <attribute name="target"/>
224        <attribute name="workdir"/>
225        <attribute name="classes"/>
226        <attribute name="jtregflags" default=""/>
227        <sequential>
228        <delete dir="@{workdir}/JTwork"   quiet="true"/>
229        <delete dir="@{workdir}/JTreport" quiet="true"/>
230        <mkdir dir="@{workdir}/JTwork/scratch"/>
231        <mkdir dir="@{workdir}/JTreport"/>
232        <jtreg dir="@{jtreg.src.dir}"
233               jdk="${jdk@{target}.home}"
234               workDir="@{workdir}/JTwork"
235               reportDir="@{workdir}/JTreport">
236    
237          <arg value="-Xbootclasspath/p:@{classes}"/>
238          <arg value="-agentvm"/>
239          <arg value="-v:nopass,fail"/>
240          <arg value="-vmoptions:-esa -ea"/>
241          <arg value="-automatic"/>
242          <arg value="-k:!ignore"/>
243          <arg line="@{jtregflags}"/>
244        </jtreg>
245        </sequential>
246      </macrodef>
247    
248    <!-- ALoops classpath -->    <!-- ALoops classpath -->
249    <path id="loops.classpath">    <path id="loops.classpath">
250      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 224  Line 278 
278             fork="true">             fork="true">
279    
280        <include name="**/*.java"/>        <include name="**/*.java"/>
281          <compilerarg value="-Xprefer:source"/>
282        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
283        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
284        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 250  Line 305 
305    <target name="docs"    <target name="docs"
306            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
307    
308      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
309      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
310    
311      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
312      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
313    
314      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
315               packagenames="none"               packagenames="none"
316               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
317               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
318                 access="${build.javadoc.access}"
319               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
320               classpath=""               classpath=""
321               executable="${javadoc8}">               executable="${javadoc8}">
# Line 274  Line 330 
330    
331    
332    <target name="dist"    <target name="dist"
333            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
334            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
335    
336    
# Line 317  Line 373 
373    
374    <target name="dist-jar"    <target name="dist-jar"
375            depends="clean, jar">            depends="clean, jar">
   
376      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
377      </target>
378    
379      <target name="dist-docs"
380              depends="clean, docs">
381        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
382    </target>    </target>
383    
384    
# Line 386  Line 445 
445    
446    </target>    </target>
447    
448      <target name="test-tck"
449              depends="jar"
450              description="Runs tck tests for main directly">
451    
452        <run-tck-tests
453          target="8"
454          workdir="${build.dir}"
455          classes="${product.jar}"/>
456      </target>
457    
458      <target name="test-jtreg"
459              depends="jar"
460              description="Runs jtreg tests for main using the jtreg ant task">
461        <run-jtreg-tests
462           target="8"
463           workdir="${build.dir}"
464           classes="${product.jar}"/>
465      </target>
466    
467      <target name="test-ng"
468              depends="test-tck, test-jtreg"
469              description="Runs tck and jtreg tests for main">
470      </target>
471    
472    <target name="run-tests"    <target name="run-tests"
473            depends="compile-tests">            depends="compile-tests">
# Line 552  Line 634 
634             fork="true">             fork="true">
635    
636        <include name="**/*.java"/>        <include name="**/*.java"/>
637          <compilerarg value="-Xprefer:source"/>
638        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
639        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
640        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 560  Line 643 
643    </target>    </target>
644    
645    
646    <target name="4jdk7-jar"    <target name="4jdk7jar"
647            depends="4jdk7compile"            depends="4jdk7compile"
648            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
649    
# Line 572  Line 655 
655    
656    
657    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
658            depends="4jdk7-jar"            depends="4jdk7jar"
659            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
660    
661      <run-tck-tests      <run-tck-tests
662        target="7"        target="7"
663        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
664        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
665          <javac-elements>
666            <!-- JDK8+ test classes -->
667            <exclude name="*8Test.java"/>
668            <exclude name="DoubleAccumulatorTest.java"/>
669            <exclude name="DoubleAdderTest.java"/>
670            <exclude name="LongAccumulatorTest.java"/>
671            <exclude name="LongAdderTest.java"/>
672            <exclude name="CompletableFutureTest.java"/>
673            <exclude name="StampedLockTest.java"/>
674          </javac-elements>
675        </run-tck-tests>
676    </target>    </target>
677    
678    
# Line 611  Line 705 
705    </target>    </target>
706    
707    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
708            depends="4jdk7compile"            depends="4jdk7jar"
709            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
710      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
711      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
712      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
713      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
714    </target>    </target>
715    
716    
# Line 641  Line 723 
723    <target name="4jdk7docs"    <target name="4jdk7docs"
724            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
725    
726      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
727      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
728    
729      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
730               packagenames="none"               packagenames="none"
731               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
732               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
733                 access="${build.javadoc.access}"
734               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
735               classpath=""               classpath=""
736               executable="${javadoc7}">               executable="${javadoc7}">
# Line 660  Line 743 
743    
744    
745    <target name="4jdk7dist"    <target name="4jdk7dist"
746            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
747            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
748    
749    
# Line 678  Line 761 
761    </target>    </target>
762    
763    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
764            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
765      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
766      </target>
767    
768    
769      <target name="4jdk7dist-docs"
770              depends="4jdk7clean, 4jdk7docs">
771        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
772    </target>    </target>
773    
774    
# Line 715  Line 802 
802    </target>    </target>
803    
804    
805    <target name="jsr166x-jar"    <target name="jsr166xjar"
806            depends="jsr166xcompile"            depends="jsr166xcompile"
807            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
808    
# Line 729  Line 816 
816    <target name="jsr166xdocs"    <target name="jsr166xdocs"
817            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
818    
819      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
820      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
821    
822      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
823               packagenames="jsr166x.*"               packagenames="jsr166x.*"
824               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
825                 access="${build.javadoc.access}"
826               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
827               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
828               source="5"               source="5"
# Line 746  Line 834 
834    
835    
836    <target name="jsr166xdist"    <target name="jsr166xdist"
837            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
838            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
839    
840    
# Line 765  Line 853 
853    
854    
855    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
856            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
857      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
858      </target>
859    
860      <target name="jsr166xdist-docs"
861              depends="jsr166xclean, jsr166xdocs">
862        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
863    </target>    </target>
864    
865    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 893 
893    </target>    </target>
894    
895    
896    <target name="jsr166y-jar"    <target name="jsr166yjar"
897            depends="jsr166ycompile"            depends="jsr166ycompile"
898            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
899    
# Line 816  Line 907 
907    <target name="jsr166ydocs"    <target name="jsr166ydocs"
908            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
909    
910      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
911      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
912    
913      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
914               packagenames="jsr166y.*"               packagenames="jsr166y.*"
915               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
916                 access="${build.javadoc.access}"
917               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
918               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
919               source="6"               source="6"
# Line 833  Line 925 
925    
926    
927    <target name="jsr166ydist"    <target name="jsr166ydist"
928            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
929            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
930    
931    
# Line 851  Line 943 
943    </target>    </target>
944    
945    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
946            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
947      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
948      </target>
949    
950      <target name="jsr166ydist-docs"
951              depends="jsr166yclean, jsr166ydocs">
952        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
953    </target>    </target>
954    
955    
# Line 862  Line 957 
957    
958    
959    <target name="extra166ycompile"    <target name="extra166ycompile"
960            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
961            description="Compiles extra166y sources">            description="Compiles extra166y sources">
962    
963      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 984 
984    </target>    </target>
985    
986    
987    <target name="extra166y-jar"    <target name="extra166yjar"
988            depends="extra166ycompile"            depends="extra166ycompile"
989            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
990    
# Line 903  Line 998 
998    <target name="extra166ydocs"    <target name="extra166ydocs"
999            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1000    
1001      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1002      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1003    
1004      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1005               packagenames="extra166y.*"               packagenames="extra166y.*"
1006               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1007                 access="${build.javadoc.access}"
1008               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1009               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1010               source="6"               source="6"
# Line 920  Line 1016 
1016    
1017    
1018    <target name="extra166ydist"    <target name="extra166ydist"
1019            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1020            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1021    
1022    
# Line 938  Line 1034 
1034    </target>    </target>
1035    
1036    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1037            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
1038      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1039      </target>
1040    
1041      <target name="extra166ydist-docs"
1042              depends="extra166yclean, extra166ydocs">
1043        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1044    </target>    </target>
1045    
1046    <!-- jsr166e -->    <!-- jsr166e -->
# Line 973  Line 1072 
1072    </target>    </target>
1073    
1074    
1075    <target name="jsr166e-jar"    <target name="jsr166ejar"
1076            depends="jsr166ecompile"            depends="jsr166ecompile"
1077            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1078    
# Line 987  Line 1086 
1086    <target name="jsr166edocs"    <target name="jsr166edocs"
1087            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1088    
1089      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1090      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1091    
1092      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1093               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1094               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1095                 access="${build.javadoc.access}"
1096               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1097               source="7"               source="7"
1098               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1003  Line 1103 
1103    
1104    
1105    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck"
1106            depends="jsr166e-jar"            depends="jsr166ejar"
1107            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
1108    
1109      <run-tck-tests      <run-tck-tests
1110        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1111        source="7"        target="7"
       target="8"  
1112        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1113        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1114    </target>    </target>
1115    
1116    
1117    <target name="jsr166edist"    <target name="jsr166edist"
1118            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1119            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1120    
1121    
1122    <target name="jsr166eclean"    <target name="jsr166eclean"
1123            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1124      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1125    </target>    </target>
1126    
1127    
# Line 1034  Line 1131 
1131    </target>    </target>
1132    
1133    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1134            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1135      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1136      </target>
1137    
1138      <target name="jsr166edist-docs"
1139              depends="jsr166eclean, jsr166edocs">
1140        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1141      </target>
1142    
1143    
1144    <!-- Find buglets that can be detected by static build tools -->
1145    
1146      <target name="lint">
1147        <antcall target="dists">
1148          <param name="build.javadoc.access" value="private"/>
1149        </antcall>
1150    </target>    </target>
1151    
1152    
1153  </project>  </project>

Legend:
Removed from v.1.123  
changed lines
  Added in v.1.138

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27