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

Diff of /jsr166/build.xml

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

revision 1.121 by jsr166, Mon Jan 21 22:03:09 2013 UTC revision 1.136 by jsr166, Tue Feb 5 03:39:35 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}}"
# Line 171  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 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}"/>
# Line 222  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 248  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 272  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 315  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 384  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 550  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 558  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 570  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="StampedLockTest.java"/>
667            <exclude name="ForkJoinPool8Test.java"/>
668          </javac-elements>
669        </run-tck-tests>
670    </target>    </target>
671    
672    
# Line 609  Line 699 
699    </target>    </target>
700    
701    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
702            depends="4jdk7compile"            depends="4jdk7jar"
703            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
704      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
705      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
706      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
707      <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>  
708    </target>    </target>
709    
710    
# Line 639  Line 717 
717    <target name="4jdk7docs"    <target name="4jdk7docs"
718            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
719    
720      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
721      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
722    
723      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
724               packagenames="none"               packagenames="none"
725               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
726               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
727                 access="${build.javadoc.access}"
728               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
729               classpath=""               classpath=""
730               executable="${javadoc7}">               executable="${javadoc7}">
# Line 658  Line 737 
737    
738    
739    <target name="4jdk7dist"    <target name="4jdk7dist"
740            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
741            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
742    
743    
# Line 676  Line 755 
755    </target>    </target>
756    
757    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
758            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
759      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
760      </target>
761    
762    
763      <target name="4jdk7dist-docs"
764              depends="4jdk7clean, 4jdk7docs">
765        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
766    </target>    </target>
767    
768    
# Line 713  Line 796 
796    </target>    </target>
797    
798    
799    <target name="jsr166x-jar"    <target name="jsr166xjar"
800            depends="jsr166xcompile"            depends="jsr166xcompile"
801            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
802    
# Line 727  Line 810 
810    <target name="jsr166xdocs"    <target name="jsr166xdocs"
811            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
812    
813      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
814      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
815    
816      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
817               packagenames="jsr166x.*"               packagenames="jsr166x.*"
818               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
819                 access="${build.javadoc.access}"
820               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
821               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
822               source="5"               source="5"
# Line 744  Line 828 
828    
829    
830    <target name="jsr166xdist"    <target name="jsr166xdist"
831            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
832            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
833    
834    
# Line 763  Line 847 
847    
848    
849    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
850            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
851      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
852      </target>
853    
854      <target name="jsr166xdist-docs"
855              depends="jsr166xclean, jsr166xdocs">
856        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
857    </target>    </target>
858    
859    <!-- jsr166y -->    <!-- jsr166y -->
# Line 800  Line 887 
887    </target>    </target>
888    
889    
890    <target name="jsr166y-jar"    <target name="jsr166yjar"
891            depends="jsr166ycompile"            depends="jsr166ycompile"
892            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
893    
# Line 814  Line 901 
901    <target name="jsr166ydocs"    <target name="jsr166ydocs"
902            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
903    
904      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
905      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
906    
907      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
908               packagenames="jsr166y.*"               packagenames="jsr166y.*"
909               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
910                 access="${build.javadoc.access}"
911               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
912               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
913               source="6"               source="6"
# Line 831  Line 919 
919    
920    
921    <target name="jsr166ydist"    <target name="jsr166ydist"
922            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
923            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
924    
925    
# Line 849  Line 937 
937    </target>    </target>
938    
939    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
940            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
941      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
942      </target>
943    
944      <target name="jsr166ydist-docs"
945              depends="jsr166yclean, jsr166ydocs">
946        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
947    </target>    </target>
948    
949    
# Line 860  Line 951 
951    
952    
953    <target name="extra166ycompile"    <target name="extra166ycompile"
954            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
955            description="Compiles extra166y sources">            description="Compiles extra166y sources">
956    
957      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 887  Line 978 
978    </target>    </target>
979    
980    
981    <target name="extra166y-jar"    <target name="extra166yjar"
982            depends="extra166ycompile"            depends="extra166ycompile"
983            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
984    
# Line 901  Line 992 
992    <target name="extra166ydocs"    <target name="extra166ydocs"
993            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
994    
995      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
996      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
997    
998      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
999               packagenames="extra166y.*"               packagenames="extra166y.*"
1000               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1001                 access="${build.javadoc.access}"
1002               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1003               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1004               source="6"               source="6"
# Line 918  Line 1010 
1010    
1011    
1012    <target name="extra166ydist"    <target name="extra166ydist"
1013            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1014            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1015    
1016    
# Line 936  Line 1028 
1028    </target>    </target>
1029    
1030    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1031            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
1032      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1033      </target>
1034    
1035      <target name="extra166ydist-docs"
1036              depends="extra166yclean, extra166ydocs">
1037        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1038    </target>    </target>
1039    
1040    <!-- jsr166e -->    <!-- jsr166e -->
# Line 971  Line 1066 
1066    </target>    </target>
1067    
1068    
1069    <target name="jsr166e-jar"    <target name="jsr166ejar"
1070            depends="jsr166ecompile"            depends="jsr166ecompile"
1071            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1072    
# Line 985  Line 1080 
1080    <target name="jsr166edocs"    <target name="jsr166edocs"
1081            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1082    
1083      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1084      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1085    
1086      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1087               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1088               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1089                 access="${build.javadoc.access}"
1090               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1091               source="7"               source="7"
1092               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1000  Line 1096 
1096    </target>    </target>
1097    
1098    
1099      <target name="jsr166e-test-tck"
1100              depends="jsr166ejar"
1101              description="Runs tck tests for jsr166e">
1102    
1103        <run-tck-tests
1104          tck.src.dir="${test.src.dir}/tck-jsr166e"
1105          source="7"
1106          target="8"
1107          workdir="${build.jsr166e.dir}"
1108          classes="${jsr166e.jar}"/>
1109      </target>
1110    
1111    
1112    <target name="jsr166edist"    <target name="jsr166edist"
1113            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1114            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1115    
1116    
1117    <target name="jsr166eclean"    <target name="jsr166eclean"
1118            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1119      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1120    </target>    </target>
1121    
1122    
# Line 1019  Line 1126 
1126    </target>    </target>
1127    
1128    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1129            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1130      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1131      </target>
1132    
1133      <target name="jsr166edist-docs"
1134              depends="jsr166eclean, jsr166edocs">
1135        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1136    </target>    </target>
1137    
1138    
1139    <!-- Find buglets that can be detected by static build tools -->
1140    
1141      <target name="lint">
1142        <antcall target="dists">
1143          <param name="build.javadoc.access" value="private"/>
1144        </antcall>
1145      </target>
1146    
1147    
1148  </project>  </project>

Legend:
Removed from v.1.121  
changed lines
  Added in v.1.136

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