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

Diff of /jsr166/build.xml

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

revision 1.119 by jsr166, Mon Jan 21 02:31:40 2013 UTC revision 1.137 by jsr166, Wed Feb 6 19:55:06 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 128  Line 151 
151    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <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/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
155    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <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) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
# Line 146  Line 169 
169    </path>    </path>
170    
171    <macrodef name="run-tck-tests">    <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"/>      <attribute name="target"/>
175      <attribute name="workdir"/>      <attribute name="workdir"/>
176      <attribute name="product.jar" default="${product.jar}"/>      <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"/>
182    
183      <javac srcdir="${tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
184             destdir="@{workdir}/tck-classes"             destdir="@{workdir}/tck-classes"
185             debug="${build.debug}"             debug="${build.debug}"
186             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
187             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
188             source="6"             source="@{source}"
189             classpath="${junit.jar}"             classpath="${junit.jar}"
190             bootclasspath="@{product.jar}:${bootclasspath6}"             bootclasspath="@{classes}:${bootclasspath@{source}}"
191             includeAntRuntime="false"             includeAntRuntime="false"
192             includeJavaRuntime="false"             includeJavaRuntime="false"
193             executable="${javac@{target}}"             executable="${javac@{target}}"
194             fork="true">             fork="true">
195    
196        <include name="JSR166TestCase.java"/>        <include name="*.java"/>
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 178  Line 205 
205            failonerror="true"            failonerror="true"
206            jvm="${java@{target}}"            jvm="${java@{target}}"
207            fork="true">            fork="true">
208          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
209          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
210          <classpath>          <classpath>
211            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
# Line 189  Line 216 
216      </sequential>      </sequential>
217    </macrodef>    </macrodef>
218    
219      <macrodef name="run-jtreg-tests">
220        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221        <attribute name="source" default="7"/>
222        <attribute name="target"/>
223        <attribute name="workdir"/>
224        <attribute name="classes"/>
225        <attribute name="jtregflags" default=""/>
226        <sequential>
227        <delete dir="@{workdir}/JTwork"   quiet="true"/>
228        <delete dir="@{workdir}/JTreport" quiet="true"/>
229        <mkdir dir="@{workdir}/JTwork/scratch"/>
230        <mkdir dir="@{workdir}/JTreport"/>
231        <jtreg dir="@{jtreg.src.dir}"
232               jdk="${jdk@{target}.home}"
233               workDir="@{workdir}/JTwork"
234               reportDir="@{workdir}/JTreport">
235    
236          <arg value="-Xbootclasspath/p:@{classes}"/>
237          <arg value="-agentvm"/>
238          <arg value="-v:nopass,fail"/>
239          <arg value="-vmoptions:-esa -ea"/>
240          <arg value="-automatic"/>
241          <arg value="-k:!ignore"/>
242          <arg line="@{jtregflags}"/>
243        </jtreg>
244        </sequential>
245      </macrodef>
246    
247    <!-- ALoops classpath -->    <!-- ALoops classpath -->
248    <path id="loops.classpath">    <path id="loops.classpath">
249      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
250    </path>    </path>
251    
252    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
253    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
254    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
255    
256    <!-- Main targets -->    <!-- Main targets -->
# Line 225  Line 277 
277             fork="true">             fork="true">
278    
279        <include name="**/*.java"/>        <include name="**/*.java"/>
280          <compilerarg value="-Xprefer:source"/>
281        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
282        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
283        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 251  Line 304 
304    <target name="docs"    <target name="docs"
305            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
306    
307      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
308      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
309    
310      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
311      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
312    
313      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
314               packagenames="none"               packagenames="none"
315               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
316               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
317                 access="${build.javadoc.access}"
318               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
319               classpath=""               classpath=""
320               executable="${javadoc8}">               executable="${javadoc8}">
# Line 275  Line 329 
329    
330    
331    <target name="dist"    <target name="dist"
332            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
333            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
334    
335    
# Line 318  Line 372 
372    
373    <target name="dist-jar"    <target name="dist-jar"
374            depends="clean, jar">            depends="clean, jar">
   
375      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
376      </target>
377    
378      <target name="dist-docs"
379              depends="clean, docs">
380        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
381    </target>    </target>
382    
383    
# Line 387  Line 444 
444    
445    </target>    </target>
446    
447      <target name="test-tck"
448              depends="jar"
449              description="Runs tck tests for main directly">
450    
451        <run-tck-tests
452          target="8"
453          workdir="${build.dir}"
454          classes="${product.jar}"/>
455      </target>
456    
457      <target name="test-jtreg"
458              depends="jar"
459              description="Runs jtreg tests for main using the jtreg ant task">
460        <run-jtreg-tests
461           target="8"
462           workdir="${build.dir}"
463           classes="${product.jar}"/>
464      </target>
465    
466      <target name="test-ng"
467              depends="test-tck, test-jtreg"
468              description="Runs tck and jtreg tests for main">
469      </target>
470    
471    <target name="run-tests"    <target name="run-tests"
472            depends="compile-tests">            depends="compile-tests">
# Line 553  Line 633 
633             fork="true">             fork="true">
634    
635        <include name="**/*.java"/>        <include name="**/*.java"/>
636          <compilerarg value="-Xprefer:source"/>
637        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
638        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
639        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 561  Line 642 
642    </target>    </target>
643    
644    
645    <target name="4jdk7-jar"    <target name="4jdk7jar"
646            depends="4jdk7compile"            depends="4jdk7compile"
647            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
648    
# Line 573  Line 654 
654    
655    
656    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
657            depends="4jdk7-jar"            depends="4jdk7jar"
658            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
659    
660      <run-tck-tests      <run-tck-tests
661        target="7"        target="7"
662        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
663        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
664          <javac-elements>
665            <!-- JDK8+ test classes -->
666            <exclude name="*8Test.java"/>
667            <exclude name="CompletableFutureTest.java"/>
668            <exclude name="StampedLockTest.java"/>
669          </javac-elements>
670        </run-tck-tests>
671    </target>    </target>
672    
673    
# Line 612  Line 700 
700    </target>    </target>
701    
702    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
703            depends="4jdk7compile"            depends="4jdk7jar"
704            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
705      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
706      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
707      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
708      <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>  
709    </target>    </target>
710    
711    
# Line 642  Line 718 
718    <target name="4jdk7docs"    <target name="4jdk7docs"
719            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
720    
721      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
722      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
723    
724      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
725               packagenames="none"               packagenames="none"
726               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
727               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
728                 access="${build.javadoc.access}"
729               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
730               classpath=""               classpath=""
731               executable="${javadoc7}">               executable="${javadoc7}">
# Line 661  Line 738 
738    
739    
740    <target name="4jdk7dist"    <target name="4jdk7dist"
741            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
742            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
743    
744    
# Line 679  Line 756 
756    </target>    </target>
757    
758    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
759            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
760      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
761      </target>
762    
763    
764      <target name="4jdk7dist-docs"
765              depends="4jdk7clean, 4jdk7docs">
766        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
767    </target>    </target>
768    
769    
# Line 716  Line 797 
797    </target>    </target>
798    
799    
800    <target name="jsr166x-jar"    <target name="jsr166xjar"
801            depends="jsr166xcompile"            depends="jsr166xcompile"
802            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
803    
# Line 730  Line 811 
811    <target name="jsr166xdocs"    <target name="jsr166xdocs"
812            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
813    
814      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
815      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
816    
817      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
818               packagenames="jsr166x.*"               packagenames="jsr166x.*"
819               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
820                 access="${build.javadoc.access}"
821               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
822               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
823               source="5"               source="5"
# Line 747  Line 829 
829    
830    
831    <target name="jsr166xdist"    <target name="jsr166xdist"
832            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
833            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
834    
835    
# Line 766  Line 848 
848    
849    
850    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
851            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
852      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
853      </target>
854    
855      <target name="jsr166xdist-docs"
856              depends="jsr166xclean, jsr166xdocs">
857        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
858    </target>    </target>
859    
860    <!-- jsr166y -->    <!-- jsr166y -->
# Line 803  Line 888 
888    </target>    </target>
889    
890    
891    <target name="jsr166y-jar"    <target name="jsr166yjar"
892            depends="jsr166ycompile"            depends="jsr166ycompile"
893            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
894    
# Line 817  Line 902 
902    <target name="jsr166ydocs"    <target name="jsr166ydocs"
903            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
904    
905      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
906      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
907    
908      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
909               packagenames="jsr166y.*"               packagenames="jsr166y.*"
910               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
911                 access="${build.javadoc.access}"
912               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
913               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
914               source="6"               source="6"
# Line 834  Line 920 
920    
921    
922    <target name="jsr166ydist"    <target name="jsr166ydist"
923            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
924            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
925    
926    
# Line 852  Line 938 
938    </target>    </target>
939    
940    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
941            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
942      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
943      </target>
944    
945      <target name="jsr166ydist-docs"
946              depends="jsr166yclean, jsr166ydocs">
947        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
948    </target>    </target>
949    
950    
# Line 863  Line 952 
952    
953    
954    <target name="extra166ycompile"    <target name="extra166ycompile"
955            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
956            description="Compiles extra166y sources">            description="Compiles extra166y sources">
957    
958      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 890  Line 979 
979    </target>    </target>
980    
981    
982    <target name="extra166y-jar"    <target name="extra166yjar"
983            depends="extra166ycompile"            depends="extra166ycompile"
984            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
985    
# Line 904  Line 993 
993    <target name="extra166ydocs"    <target name="extra166ydocs"
994            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
995    
996      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
997      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
998    
999      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1000               packagenames="extra166y.*"               packagenames="extra166y.*"
1001               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1002                 access="${build.javadoc.access}"
1003               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1004               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1005               source="6"               source="6"
# Line 921  Line 1011 
1011    
1012    
1013    <target name="extra166ydist"    <target name="extra166ydist"
1014            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1015            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1016    
1017    
# Line 939  Line 1029 
1029    </target>    </target>
1030    
1031    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1032            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
1033      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1034      </target>
1035    
1036      <target name="extra166ydist-docs"
1037              depends="extra166yclean, extra166ydocs">
1038        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1039    </target>    </target>
1040    
1041    <!-- jsr166e -->    <!-- jsr166e -->
# Line 974  Line 1067 
1067    </target>    </target>
1068    
1069    
1070    <target name="jsr166e-jar"    <target name="jsr166ejar"
1071            depends="jsr166ecompile"            depends="jsr166ecompile"
1072            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1073    
# Line 988  Line 1081 
1081    <target name="jsr166edocs"    <target name="jsr166edocs"
1082            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1083    
1084      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1085      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1086    
1087      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1088               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1089               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1090                 access="${build.javadoc.access}"
1091               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1092               source="7"               source="7"
1093               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1003  Line 1097 
1097    </target>    </target>
1098    
1099    
1100      <target name="jsr166e-test-tck"
1101              depends="jsr166ejar"
1102              description="Runs tck tests for jsr166e">
1103    
1104        <run-tck-tests
1105          tck.src.dir="${test.src.dir}/tck-jsr166e"
1106          source="7"
1107          target="8"
1108          workdir="${build.jsr166e.dir}"
1109          classes="${jsr166e.jar}"/>
1110      </target>
1111    
1112    
1113    <target name="jsr166edist"    <target name="jsr166edist"
1114            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1115            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1116    
1117    
1118    <target name="jsr166eclean"    <target name="jsr166eclean"
1119            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1120      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1121    </target>    </target>
1122    
1123    
# Line 1022  Line 1127 
1127    </target>    </target>
1128    
1129    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1130            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1131      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1132      </target>
1133    
1134      <target name="jsr166edist-docs"
1135              depends="jsr166eclean, jsr166edocs">
1136        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1137    </target>    </target>
1138    
1139    
1140    <!-- Find buglets that can be detected by static build tools -->
1141    
1142      <target name="lint">
1143        <antcall target="dists">
1144          <param name="build.javadoc.access" value="private"/>
1145        </antcall>
1146      </target>
1147    
1148    
1149  </project>  </project>
Legend:
Removed from v.1.119  
changed lines
  Added in v.1.137
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27