/[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.139 by jsr166, Thu May 2 21:38:03 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      <!-- Use via, e.g. 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    
53    <!-- Build locations -->    <!-- Build locations -->
54    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 57  Line 67 
67    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
68    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
69    
70    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
71    <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>    <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
72    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
73    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
74    
75    <!-- JDK locations -->    <!-- JDK locations -->
76    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 86  Line 96 
96      </sequential>      </sequential>
97    </macrodef>    </macrodef>
98    
99      <macrodef name="mirror-dir">
100        <attribute name="src"/>
101        <attribute name="dst"/>
102        <sequential>
103        <delete dir="@{dst}"/>
104        <mkdir dir="@{dst}"/>
105        <copy todir="@{dst}" preservelastmodified="true">
106          <fileset dir="@{src}"/>
107        </copy>
108        </sequential>
109      </macrodef>
110    
111    <defjdklocations v="6"/>    <defjdklocations v="6"/>
112    <defjdklocations v="7"/>    <defjdklocations v="7"/>
113    <defjdklocations v="8"/>    <defjdklocations v="8"/>
# Line 105  Line 127 
127    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
128    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
129    
130    <!-- Distribution locations -->    <!-- Javadoc locations -->
131    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
132    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
133    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
134    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
135    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
136    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
137    
138      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
139      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
140      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
141      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
142      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
143      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
144    
145    <!-- Jar locations -->    <!-- Jar locations -->
146    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 157 
157    <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/"/>
158    
159    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
160    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
161    <!-- <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/"/> -->
162    
163    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
# Line 146  Line 175 
175    </path>    </path>
176    
177    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
178        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
179      <attribute name="target"/>      <attribute name="target"/>
180        <attribute name="compile-target" default="@{target}"/>
181      <attribute name="workdir"/>      <attribute name="workdir"/>
182      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="classes"/>
183      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
184        <element name="javac-elements" optional="true"/>
185      <sequential>      <sequential>
186    
187      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
188    
189      <javac srcdir="${tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
190             destdir="@{workdir}/tck-classes"             destdir="@{workdir}/tck-classes"
191             debug="${build.debug}"             debug="${build.debug}"
192             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
193             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
194             source="6"             source="@{compile-target}"
195               target="@{compile-target}"
196             classpath="${junit.jar}"             classpath="${junit.jar}"
197             bootclasspath="@{product.jar}:${bootclasspath6}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
198             includeAntRuntime="false"             includeAntRuntime="false"
199             includeJavaRuntime="false"             includeJavaRuntime="false"
200             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
201             fork="true">             fork="true">
202    
203        <include name="JSR166TestCase.java"/>        <include name="*.java"/>
204        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
205        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
206        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
207          <javac-elements/>
208    
209      </javac>      </javac>
210    
# Line 178  Line 212 
212            failonerror="true"            failonerror="true"
213            jvm="${java@{target}}"            jvm="${java@{target}}"
214            fork="true">            fork="true">
215          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
216          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
217            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
218            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
219            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
220          <classpath>          <classpath>
221            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
222            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 189  Line 226 
226      </sequential>      </sequential>
227    </macrodef>    </macrodef>
228    
229      <macrodef name="run-jtreg-tests">
230        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
231        <attribute name="source" default="7"/>
232        <attribute name="target"/>
233        <attribute name="workdir"/>
234        <attribute name="classes"/>
235        <attribute name="jtregflags" default=""/>
236        <sequential>
237        <delete dir="@{workdir}/JTwork"   quiet="true"/>
238        <delete dir="@{workdir}/JTreport" quiet="true"/>
239        <mkdir dir="@{workdir}/JTwork/scratch"/>
240        <mkdir dir="@{workdir}/JTreport"/>
241        <jtreg dir="@{jtreg.src.dir}"
242               jdk="${jdk@{target}.home}"
243               workDir="@{workdir}/JTwork"
244               reportDir="@{workdir}/JTreport">
245    
246          <arg value="-Xbootclasspath/p:@{classes}"/>
247          <arg value="-agentvm"/>
248          <arg value="-v:nopass,fail"/>
249          <arg value="-vmoptions:-esa -ea"/>
250          <arg value="-automatic"/>
251          <arg value="-k:!ignore"/>
252          <arg line="@{jtregflags}"/>
253        </jtreg>
254        </sequential>
255      </macrodef>
256    
257    <!-- ALoops classpath -->    <!-- ALoops classpath -->
258    <path id="loops.classpath">    <path id="loops.classpath">
259      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 222  Line 287 
287             fork="true">             fork="true">
288    
289        <include name="**/*.java"/>        <include name="**/*.java"/>
290          <compilerarg value="-Xprefer:source"/>
291        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
292        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
293        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 248  Line 314 
314    <target name="docs"    <target name="docs"
315            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
316    
317      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
318      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
319    
320      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
321      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
322    
323      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
324               packagenames="none"               packagenames="none"
325               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
326               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
327                 access="${build.javadoc.access}"
328               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
329               classpath=""               classpath=""
330               executable="${javadoc8}">               executable="${javadoc8}">
# Line 272  Line 339 
339    
340    
341    <target name="dist"    <target name="dist"
342            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
343            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
344    
345    
# Line 315  Line 382 
382    
383    <target name="dist-jar"    <target name="dist-jar"
384            depends="clean, jar">            depends="clean, jar">
   
385      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
386      </target>
387    
388      <target name="dist-docs"
389              depends="clean, docs">
390        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
391    </target>    </target>
392    
393    
# Line 384  Line 454 
454    
455    </target>    </target>
456    
457      <target name="test-tck"
458              depends="jar"
459              description="Runs tck tests for main directly">
460    
461        <run-tck-tests
462          target="8"
463          workdir="${build.dir}"
464          classes="${product.jar}"/>
465      </target>
466    
467      <target name="test-jtreg"
468              depends="jar"
469              description="Runs jtreg tests for main using the jtreg ant task">
470        <run-jtreg-tests
471           target="8"
472           workdir="${build.dir}"
473           classes="${product.jar}"/>
474      </target>
475    
476      <target name="test-ng"
477              depends="test-tck, test-jtreg"
478              description="Runs tck and jtreg tests for main">
479      </target>
480    
481    <target name="run-tests"    <target name="run-tests"
482            depends="compile-tests">            depends="compile-tests">
# Line 550  Line 643 
643             fork="true">             fork="true">
644    
645        <include name="**/*.java"/>        <include name="**/*.java"/>
646          <compilerarg value="-Xprefer:source"/>
647        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
648        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
649        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 558  Line 652 
652    </target>    </target>
653    
654    
655    <target name="4jdk7-jar"    <target name="4jdk7jar"
656            depends="4jdk7compile"            depends="4jdk7compile"
657            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
658    
# Line 570  Line 664 
664    
665    
666    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
667            depends="4jdk7-jar"            depends="4jdk7jar"
668            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
669    
670      <run-tck-tests      <run-tck-tests
671        target="7"        target="7"
672        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
673        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
674          <javac-elements>
675            <!-- JDK8+ test classes -->
676            <exclude name="*8Test.java"/>
677            <exclude name="DoubleAccumulatorTest.java"/>
678            <exclude name="DoubleAdderTest.java"/>
679            <exclude name="LongAccumulatorTest.java"/>
680            <exclude name="LongAdderTest.java"/>
681            <exclude name="CompletableFutureTest.java"/>
682            <exclude name="StampedLockTest.java"/>
683          </javac-elements>
684        </run-tck-tests>
685    </target>    </target>
686    
687    
# Line 609  Line 714 
714    </target>    </target>
715    
716    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
717            depends="4jdk7compile"            depends="4jdk7jar"
718            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
719      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
720      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
721      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
722      <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>  
723    </target>    </target>
724    
725    
# Line 639  Line 732 
732    <target name="4jdk7docs"    <target name="4jdk7docs"
733            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
734    
735      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
736      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
737    
738      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
739               packagenames="none"               packagenames="none"
740               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
741               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
742                 access="${build.javadoc.access}"
743               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
744               classpath=""               classpath=""
745               executable="${javadoc7}">               executable="${javadoc7}">
# Line 658  Line 752 
752    
753    
754    <target name="4jdk7dist"    <target name="4jdk7dist"
755            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
756            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
757    
758    
# Line 676  Line 770 
770    </target>    </target>
771    
772    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
773            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
774      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
775      </target>
776    
777    
778      <target name="4jdk7dist-docs"
779              depends="4jdk7clean, 4jdk7docs">
780        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
781    </target>    </target>
782    
783    
# Line 713  Line 811 
811    </target>    </target>
812    
813    
814    <target name="jsr166x-jar"    <target name="jsr166xjar"
815            depends="jsr166xcompile"            depends="jsr166xcompile"
816            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
817    
# Line 727  Line 825 
825    <target name="jsr166xdocs"    <target name="jsr166xdocs"
826            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
827    
828      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
829      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
830    
831      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
832               packagenames="jsr166x.*"               packagenames="jsr166x.*"
833               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
834                 access="${build.javadoc.access}"
835               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
836               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
837               source="5"               source="5"
# Line 744  Line 843 
843    
844    
845    <target name="jsr166xdist"    <target name="jsr166xdist"
846            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
847            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
848    
849    
# Line 763  Line 862 
862    
863    
864    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
865            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
866      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
867      </target>
868    
869      <target name="jsr166xdist-docs"
870              depends="jsr166xclean, jsr166xdocs">
871        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
872    </target>    </target>
873    
874    <!-- jsr166y -->    <!-- jsr166y -->
# Line 800  Line 902 
902    </target>    </target>
903    
904    
905    <target name="jsr166y-jar"    <target name="jsr166yjar"
906            depends="jsr166ycompile"            depends="jsr166ycompile"
907            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
908    
# Line 814  Line 916 
916    <target name="jsr166ydocs"    <target name="jsr166ydocs"
917            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
918    
919      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
920      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
921    
922      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
923               packagenames="jsr166y.*"               packagenames="jsr166y.*"
924               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
925                 access="${build.javadoc.access}"
926               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
927               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
928               source="6"               source="6"
# Line 831  Line 934 
934    
935    
936    <target name="jsr166ydist"    <target name="jsr166ydist"
937            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
938            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
939    
940    
# Line 849  Line 952 
952    </target>    </target>
953    
954    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
955            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
956      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
957      </target>
958    
959      <target name="jsr166ydist-docs"
960              depends="jsr166yclean, jsr166ydocs">
961        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
962    </target>    </target>
963    
964    
# Line 860  Line 966 
966    
967    
968    <target name="extra166ycompile"    <target name="extra166ycompile"
969            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
970            description="Compiles extra166y sources">            description="Compiles extra166y sources">
971    
972      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 887  Line 993 
993    </target>    </target>
994    
995    
996    <target name="extra166y-jar"    <target name="extra166yjar"
997            depends="extra166ycompile"            depends="extra166ycompile"
998            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
999    
# Line 901  Line 1007 
1007    <target name="extra166ydocs"    <target name="extra166ydocs"
1008            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1009    
1010      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1011      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1012    
1013      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1014               packagenames="extra166y.*"               packagenames="extra166y.*"
1015               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1016                 access="${build.javadoc.access}"
1017               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1018               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1019               source="6"               source="6"
# Line 918  Line 1025 
1025    
1026    
1027    <target name="extra166ydist"    <target name="extra166ydist"
1028            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1029            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1030    
1031    
# Line 936  Line 1043 
1043    </target>    </target>
1044    
1045    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1046            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
1047      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1048      </target>
1049    
1050      <target name="extra166ydist-docs"
1051              depends="extra166yclean, extra166ydocs">
1052        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1053    </target>    </target>
1054    
1055    <!-- jsr166e -->    <!-- jsr166e -->
# Line 971  Line 1081 
1081    </target>    </target>
1082    
1083    
1084    <target name="jsr166e-jar"    <target name="jsr166ejar"
1085            depends="jsr166ecompile"            depends="jsr166ecompile"
1086            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1087    
# Line 985  Line 1095 
1095    <target name="jsr166edocs"    <target name="jsr166edocs"
1096            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1097    
1098      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1099      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1100    
1101      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1102               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1103               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1104                 access="${build.javadoc.access}"
1105               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1106               source="7"               source="7"
1107               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1000  Line 1111 
1111    </target>    </target>
1112    
1113    
1114      <target name="jsr166e-test-tck"
1115              depends="jsr166ejar"
1116              description="Runs tck tests for jsr166e">
1117    
1118        <run-tck-tests
1119          tck.src.dir="${test.src.dir}/tck-jsr166e"
1120          target="7"
1121          workdir="${build.jsr166e.dir}"
1122          classes="${jsr166e.jar}"/>
1123      </target>
1124    
1125    
1126    <target name="jsr166edist"    <target name="jsr166edist"
1127            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1128            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1129    
1130    
1131    <target name="jsr166eclean"    <target name="jsr166eclean"
1132            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1133      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1134    </target>    </target>
1135    
1136    
# Line 1019  Line 1140 
1140    </target>    </target>
1141    
1142    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1143            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1144      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1145      </target>
1146    
1147      <target name="jsr166edist-docs"
1148              depends="jsr166eclean, jsr166edocs">
1149        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1150    </target>    </target>
1151    
1152    
1153    <!-- Find buglets that can be detected by static build tools -->
1154    
1155      <target name="lint">
1156        <antcall target="dists">
1157          <param name="build.javadoc.access" value="private"/>
1158        </antcall>
1159      </target>
1160    
1161    
1162  </project>  </project>

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

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