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

Diff of /jsr166/build.xml

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

revision 1.120 by jsr166, Mon Jan 21 02:34:44 2013 UTC revision 1.141 by jsr166, Tue Jun 18 19:03:50 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      <!-- Tck options; see JSR166TestCase.java -->
48      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49      <property name="jsr166.profileTests"     value="false"/>
50      <property name="jsr166.profileThreshold" value="100"/>
51      <property name="jsr166.runsPerTest"      value="1"/>
52      <!-- Allow running an individual tck test class -->
53      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55    
56    <!-- Build locations -->    <!-- Build locations -->
57    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 57  Line 70 
70    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72    
73    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74    <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>    <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77    
78    <!-- JDK locations -->    <!-- JDK locations -->
79    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 86  Line 99 
99      </sequential>      </sequential>
100    </macrodef>    </macrodef>
101    
102      <macrodef name="mirror-dir">
103        <attribute name="src"/>
104        <attribute name="dst"/>
105        <sequential>
106        <delete dir="@{dst}"/>
107        <mkdir dir="@{dst}"/>
108        <copy todir="@{dst}" preservelastmodified="true">
109          <fileset dir="@{src}"/>
110        </copy>
111        </sequential>
112      </macrodef>
113    
114    <defjdklocations v="6"/>    <defjdklocations v="6"/>
115    <defjdklocations v="7"/>    <defjdklocations v="7"/>
116    <defjdklocations v="8"/>    <defjdklocations v="8"/>
# Line 105  Line 130 
130    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132    
133    <!-- Distribution locations -->    <!-- Javadoc locations -->
134    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
135    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140    
141      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147    
148    <!-- Jar locations -->    <!-- Jar locations -->
149    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 160 
160    <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/"/>
161    
162    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
164    <!-- <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/"/> -->
165    
166    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
# Line 146  Line 178 
178    </path>    </path>
179    
180    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
181        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
182      <attribute name="target"/>      <attribute name="target"/>
183        <attribute name="compile-target" default="@{target}"/>
184      <attribute name="workdir"/>      <attribute name="workdir"/>
185      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="classes"/>
186      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
187        <element name="javac-elements" optional="true"/>
188      <sequential>      <sequential>
189    
190      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
191    
192      <javac srcdir="${tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
193             destdir="@{workdir}/tck-classes"             destdir="@{workdir}/tck-classes"
194             debug="${build.debug}"             debug="${build.debug}"
195             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
196             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
197             source="6"             source="@{compile-target}"
198               target="@{compile-target}"
199             classpath="${junit.jar}"             classpath="${junit.jar}"
200             bootclasspath="@{product.jar}:${bootclasspath6}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201             includeAntRuntime="false"             includeAntRuntime="false"
202             includeJavaRuntime="false"             includeJavaRuntime="false"
203             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
204             fork="true">             fork="true">
205    
206        <include name="JSR166TestCase.java"/>        <include name="*.java"/>
207        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
208        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
210          <javac-elements/>
211    
212      </javac>      </javac>
213    
214      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
215            failonerror="true"            failonerror="true"
216            jvm="${java@{target}}"            jvm="${java@{target}}"
217            fork="true">            fork="true">
218          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
219          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
220            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223          <classpath>          <classpath>
224            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
225            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 189  Line 229 
229      </sequential>      </sequential>
230    </macrodef>    </macrodef>
231    
232      <macrodef name="run-jtreg-tests">
233        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234        <attribute name="source" default="7"/>
235        <attribute name="target"/>
236        <attribute name="workdir"/>
237        <attribute name="classes"/>
238        <attribute name="jtregflags" default=""/>
239        <sequential>
240        <delete dir="@{workdir}/JTwork"   quiet="true"/>
241        <delete dir="@{workdir}/JTreport" quiet="true"/>
242        <mkdir dir="@{workdir}/JTwork/scratch"/>
243        <mkdir dir="@{workdir}/JTreport"/>
244        <jtreg dir="@{jtreg.src.dir}"
245               jdk="${jdk@{target}.home}"
246               workDir="@{workdir}/JTwork"
247               reportDir="@{workdir}/JTreport">
248    
249          <arg value="-Xbootclasspath/p:@{classes}"/>
250          <arg value="-agentvm"/>
251          <arg value="-v:nopass,fail"/>
252          <arg value="-vmoptions:-esa -ea"/>
253          <arg value="-automatic"/>
254          <arg value="-k:!ignore"/>
255          <arg line="@{jtregflags}"/>
256        </jtreg>
257        </sequential>
258      </macrodef>
259    
260    <!-- ALoops classpath -->    <!-- ALoops classpath -->
261    <path id="loops.classpath">    <path id="loops.classpath">
262      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 222  Line 290 
290             fork="true">             fork="true">
291    
292        <include name="**/*.java"/>        <include name="**/*.java"/>
293          <compilerarg value="-Xprefer:source"/>
294        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
295        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
296        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 248  Line 317 
317    <target name="docs"    <target name="docs"
318            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
319    
320      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
321      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
322    
323      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
324      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
325    
326      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
327               packagenames="none"               packagenames="none"
328               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
329               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
330                 access="${build.javadoc.access}"
331               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
332               classpath=""               classpath=""
333               executable="${javadoc8}">               executable="${javadoc8}">
# Line 272  Line 342 
342    
343    
344    <target name="dist"    <target name="dist"
345            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
346            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
347    
348    
# Line 315  Line 385 
385    
386    <target name="dist-jar"    <target name="dist-jar"
387            depends="clean, jar">            depends="clean, jar">
   
388      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
389      </target>
390    
391      <target name="dist-docs"
392              depends="clean, docs">
393        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
394    </target>    </target>
395    
396    
# Line 384  Line 457 
457    
458    </target>    </target>
459    
460      <target name="test-tck"
461              depends="jar"
462              description="Runs tck tests for main directly">
463    
464        <run-tck-tests
465          target="8"
466          workdir="${build.dir}"
467          classes="${product.jar}"/>
468      </target>
469    
470      <target name="test-jtreg"
471              depends="jar"
472              description="Runs jtreg tests for main using the jtreg ant task">
473        <run-jtreg-tests
474           target="8"
475           workdir="${build.dir}"
476           classes="${product.jar}"/>
477      </target>
478    
479      <target name="test-ng"
480              depends="test-tck, test-jtreg"
481              description="Runs tck and jtreg tests for main">
482      </target>
483    
484    <target name="run-tests"    <target name="run-tests"
485            depends="compile-tests">            depends="compile-tests">
# Line 550  Line 646 
646             fork="true">             fork="true">
647    
648        <include name="**/*.java"/>        <include name="**/*.java"/>
649          <compilerarg value="-Xprefer:source"/>
650        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
651        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
652        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 558  Line 655 
655    </target>    </target>
656    
657    
658    <target name="4jdk7-jar"    <target name="4jdk7jar"
659            depends="4jdk7compile"            depends="4jdk7compile"
660            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
661    
# Line 570  Line 667 
667    
668    
669    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
670            depends="4jdk7-jar"            depends="4jdk7jar"
671            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
672    
673      <run-tck-tests      <run-tck-tests
674        target="7"        target="7"
675        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
676        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
677          <javac-elements>
678            <!-- JDK8+ test classes -->
679            <exclude name="*8Test.java"/>
680            <exclude name="DoubleAccumulatorTest.java"/>
681            <exclude name="DoubleAdderTest.java"/>
682            <exclude name="LongAccumulatorTest.java"/>
683            <exclude name="LongAdderTest.java"/>
684            <exclude name="CompletableFutureTest.java"/>
685            <exclude name="StampedLockTest.java"/>
686          </javac-elements>
687        </run-tck-tests>
688    </target>    </target>
689    
690    
# Line 602  Line 710 
710    
711        <formatter type="brief"/>        <formatter type="brief"/>
712    
713        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
714        </test>        </test>
715    
716      </junit>      </junit>
717    </target>    </target>
718    
719    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
720            depends="4jdk7compile"            depends="4jdk7jar"
721            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
722      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
723      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
724      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
725      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
726      <jtreg dir="${jtreg.src.dir}"         jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
            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>  
727    </target>    </target>
728    
729    
# Line 639  Line 736 
736    <target name="4jdk7docs"    <target name="4jdk7docs"
737            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
738    
739      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
740      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
741    
742      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
743               packagenames="none"               packagenames="none"
744               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
745               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
746                 access="${build.javadoc.access}"
747               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
748               classpath=""               classpath=""
749               executable="${javadoc7}">               executable="${javadoc7}">
# Line 658  Line 756 
756    
757    
758    <target name="4jdk7dist"    <target name="4jdk7dist"
759            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
760            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
761    
762    
# Line 676  Line 774 
774    </target>    </target>
775    
776    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
777            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
778      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
779      </target>
780    
781    
782      <target name="4jdk7dist-docs"
783              depends="4jdk7clean, 4jdk7docs">
784        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
785    </target>    </target>
786    
787    
# Line 713  Line 815 
815    </target>    </target>
816    
817    
818    <target name="jsr166x-jar"    <target name="jsr166xjar"
819            depends="jsr166xcompile"            depends="jsr166xcompile"
820            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
821    
# Line 727  Line 829 
829    <target name="jsr166xdocs"    <target name="jsr166xdocs"
830            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
831    
832      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
833      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
834    
835      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
836               packagenames="jsr166x.*"               packagenames="jsr166x.*"
837               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
838                 access="${build.javadoc.access}"
839               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
840               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
841               source="5"               source="5"
# Line 744  Line 847 
847    
848    
849    <target name="jsr166xdist"    <target name="jsr166xdist"
850            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
851            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
852    
853    
# Line 763  Line 866 
866    
867    
868    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
869            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
870      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
871      </target>
872    
873      <target name="jsr166xdist-docs"
874              depends="jsr166xclean, jsr166xdocs">
875        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
876    </target>    </target>
877    
878    <!-- jsr166y -->    <!-- jsr166y -->
# Line 800  Line 906 
906    </target>    </target>
907    
908    
909    <target name="jsr166y-jar"    <target name="jsr166yjar"
910            depends="jsr166ycompile"            depends="jsr166ycompile"
911            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
912    
# Line 814  Line 920 
920    <target name="jsr166ydocs"    <target name="jsr166ydocs"
921            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
922    
923      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
924      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
925    
926      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
927               packagenames="jsr166y.*"               packagenames="jsr166y.*"
928               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
929                 access="${build.javadoc.access}"
930               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
931               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
932               source="6"               source="6"
# Line 831  Line 938 
938    
939    
940    <target name="jsr166ydist"    <target name="jsr166ydist"
941            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
942            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
943    
944    
# Line 849  Line 956 
956    </target>    </target>
957    
958    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
959            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
960      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
961      </target>
962    
963      <target name="jsr166ydist-docs"
964              depends="jsr166yclean, jsr166ydocs">
965        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
966    </target>    </target>
967    
968    
# Line 860  Line 970 
970    
971    
972    <target name="extra166ycompile"    <target name="extra166ycompile"
973            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
974            description="Compiles extra166y sources">            description="Compiles extra166y sources">
975    
976      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 887  Line 997 
997    </target>    </target>
998    
999    
1000    <target name="extra166y-jar"    <target name="extra166yjar"
1001            depends="extra166ycompile"            depends="extra166ycompile"
1002            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1003    
# Line 901  Line 1011 
1011    <target name="extra166ydocs"    <target name="extra166ydocs"
1012            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1013    
1014      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1015      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1016    
1017      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1018               packagenames="extra166y.*"               packagenames="extra166y.*"
1019               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1020                 access="${build.javadoc.access}"
1021               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1022               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1023               source="6"               source="6"
# Line 918  Line 1029 
1029    
1030    
1031    <target name="extra166ydist"    <target name="extra166ydist"
1032            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1033            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1034    
1035    
# Line 936  Line 1047 
1047    </target>    </target>
1048    
1049    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1050            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
1051      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1052      </target>
1053    
1054      <target name="extra166ydist-docs"
1055              depends="extra166yclean, extra166ydocs">
1056        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1057    </target>    </target>
1058    
1059    <!-- jsr166e -->    <!-- jsr166e -->
# Line 971  Line 1085 
1085    </target>    </target>
1086    
1087    
1088    <target name="jsr166e-jar"    <target name="jsr166ejar"
1089            depends="jsr166ecompile"            depends="jsr166ecompile"
1090            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1091    
# Line 985  Line 1099 
1099    <target name="jsr166edocs"    <target name="jsr166edocs"
1100            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1101    
1102      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1103      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1104    
1105      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1106               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1107               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1108                 access="${build.javadoc.access}"
1109               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1110               source="7"               source="7"
1111               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1000  Line 1115 
1115    </target>    </target>
1116    
1117    
1118      <target name="jsr166e-test-tck"
1119              depends="jsr166ejar"
1120              description="Runs tck tests for jsr166e">
1121    
1122        <run-tck-tests
1123          tck.src.dir="${test.src.dir}/tck-jsr166e"
1124          target="7"
1125          workdir="${build.jsr166e.dir}"
1126          classes="${jsr166e.jar}"/>
1127      </target>
1128    
1129    
1130    <target name="jsr166edist"    <target name="jsr166edist"
1131            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1132            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1133    
1134    
1135    <target name="jsr166eclean"    <target name="jsr166eclean"
1136            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1137      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1138    </target>    </target>
1139    
1140    
# Line 1019  Line 1144 
1144    </target>    </target>
1145    
1146    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1147            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1148      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1149      </target>
1150    
1151      <target name="jsr166edist-docs"
1152              depends="jsr166eclean, jsr166edocs">
1153        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1154    </target>    </target>
1155    
1156    
1157    <!-- Find buglets that can be detected by static build tools -->
1158    
1159      <target name="lint">
1160        <antcall target="dists">
1161          <param name="build.javadoc.access" value="private"/>
1162        </antcall>
1163      </target>
1164    
1165    
1166  </project>  </project>

Legend:
Removed from v.1.120  
changed lines
  Added in v.1.141

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