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

Diff of /jsr166/build.xml

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

revision 1.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC revision 1.142 by jsr166, Tue Jun 18 20:54:57 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}/jsr166docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
135    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <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 147  Line 179 
179    
180    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
181      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
182      <attribute name="target"/>      <attribute name="target"/>
183        <attribute name="compile-target" default="@{target}"/>
184      <attribute name="workdir"/>      <attribute name="workdir"/>
185      <attribute name="classes"/>      <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"/>
# Line 161  Line 194 
194             debug="${build.debug}"             debug="${build.debug}"
195             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
196             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
197             source="@{source}"             source="@{compile-target}"
198               target="@{compile-target}"
199             classpath="${junit.jar}"             classpath="${junit.jar}"
200             bootclasspath="@{classes}:${bootclasspath@{source}}"             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="*.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:@{classes}"/>          <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 191  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 224  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 242  Line 309 
309    </target>    </target>
310    
311    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
312    <target name="docs"    <target name="docs"
313            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
314    
315      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
316      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
317    
318      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
319      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
320    
321      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
322               packagenames="none"               packagenames="none"
323               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
324               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
325                 access="${build.javadoc.access}"
326               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
327               classpath=""               classpath=""
328               executable="${javadoc8}">               executable="${javadoc8}">
# Line 274  Line 337 
337    
338    
339    <target name="dist"    <target name="dist"
340            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
341            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
342    
343    
# Line 312  Line 375 
375    </target>    </target>
376    
377    
   <!-- Internal targets -->  
   
   
378    <target name="dist-jar"    <target name="dist-jar"
379            depends="clean, jar">            depends="clean, jar">
   
380      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
381    </target>    </target>
382    
383      <target name="dist-docs"
384    <target name="compile-tests"            depends="clean, docs">
385            depends="jar">      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   
     <mkdir dir="${build.testcases.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
     <javac srcdir="${test.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath=""  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="jsr166/test/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
 <!--  
     <javac srcdir="${jtreg.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg value="-Xbootclasspath/p:${product.jar}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
 -->  
   
386    </target>    </target>
387    
388    
389    <target name="run-tests"    <target name="test-tck"
390            depends="compile-tests">            depends="jar"
391              description="Runs tck tests for main directly">
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
   
     <mkdir dir="${build.reports.dir}"/>  
   
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                     jvm="${java8}"  
                    fork="true">  
   
       <jvmarg value="-Xbootclasspath/p:${product.jar}"/>  
       <jvmarg value="-server"/>  
       <jvmarg value="-showversion"/>  
   
       <classpath refid="test.classpath"/>  
   
       <formatter type="xml"/>  
   
       <batchtest todir="${build.reports.dir}" unless="no.test.tck">  
         <fileset dir="${tck.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
 <!--  
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
   
     </junit>  
392    
393        <run-tck-tests
394          target="8"
395          workdir="${build.dir}"
396          classes="${product.jar}"/>
397    </target>    </target>
398    
399      <target name="test-jtreg"
400              depends="jar"
401              description="Runs jtreg tests for main using the jtreg ant task">
402        <run-jtreg-tests
403           target="8"
404           workdir="${build.dir}"
405           classes="${product.jar}"/>
406      </target>
407    
408    <target name="report-tests"    <target name="test"
409            depends="run-tests">            depends="test-tck, test-jtreg"
410              description="Runs tck and jtreg tests for main">
     <!-- Sets junit.report.format to frames if redirection is present,  
          otherwise sets it to noframes. -->  
     <available property="junit.report.format"  
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"  
     />  
     <property name="junit.report.format" value="noframes"/>  
   
     <junitreport todir="${build.reports.dir}">  
       <fileset dir="${build.reports.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
   
     <fail message="Test Cases Failed" if="junit.failed"/>  
   
411    </target>    </target>
412    
413    
414    
415    <target name="configure-compiler">    <target name="configure-compiler">
416    
417      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 429 
429    </target>    </target>
430    
431    
   <target name="configure-tests"  
        depends="configure-compiler">  
   
     <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->  
     <available property="junit.available"  
                classname="junit.framework.Protectable"/>  
   
     <!-- Xalan -->  
     <available property="xalan.available"  
                classname="org.apache.xalan.Version"/>  
   
   
     <!-- Ant 1.6beta and later don't need or want this check -->  
     <!--  
     <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"  
           unless="junit.available"/>  
   
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
   
   </target>  
   
432    
433    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
434    
# Line 552  Line 481 
481             fork="true">             fork="true">
482    
483        <include name="**/*.java"/>        <include name="**/*.java"/>
484          <compilerarg value="-Xprefer:source"/>
485        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
486        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
487        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 560  Line 490 
490    </target>    </target>
491    
492    
493    <target name="4jdk7-jar"    <target name="4jdk7jar"
494            depends="4jdk7compile"            depends="4jdk7compile"
495            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
496    
# Line 572  Line 502 
502    
503    
504    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
505            depends="4jdk7-jar"            depends="4jdk7jar"
506            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
507    
508      <run-tck-tests      <run-tck-tests
509        target="7"        target="7"
510        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
511        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
512          <javac-elements>
513            <!-- JDK8+ test classes -->
514            <exclude name="*8Test.java"/>
515            <exclude name="DoubleAccumulatorTest.java"/>
516            <exclude name="DoubleAdderTest.java"/>
517            <exclude name="LongAccumulatorTest.java"/>
518            <exclude name="LongAdderTest.java"/>
519            <exclude name="CompletableFutureTest.java"/>
520            <exclude name="StampedLockTest.java"/>
521          </javac-elements>
522        </run-tck-tests>
523    </target>    </target>
524    
525    
# Line 604  Line 545 
545    
546        <formatter type="brief"/>        <formatter type="brief"/>
547    
548        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
549        </test>        </test>
550    
551      </junit>      </junit>
552    </target>    </target>
553    
554    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
555            depends="4jdk7compile"            depends="4jdk7jar"
556            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
557      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
558      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
559      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
560      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
561      <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>  
562    </target>    </target>
563    
564    
# Line 641  Line 571 
571    <target name="4jdk7docs"    <target name="4jdk7docs"
572            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
573    
574      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
575      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
576    
577      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
578               packagenames="none"               packagenames="none"
579               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
580               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
581                 access="${build.javadoc.access}"
582               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
583               classpath=""               classpath=""
584               executable="${javadoc7}">               executable="${javadoc7}">
# Line 660  Line 591 
591    
592    
593    <target name="4jdk7dist"    <target name="4jdk7dist"
594            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
595            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
596    
597    
# Line 678  Line 609 
609    </target>    </target>
610    
611    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
612            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
613      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
614      </target>
615    
616    
617      <target name="4jdk7dist-docs"
618              depends="4jdk7clean, 4jdk7docs">
619        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
620    </target>    </target>
621    
622    
# Line 715  Line 650 
650    </target>    </target>
651    
652    
653    <target name="jsr166x-jar"    <target name="jsr166xjar"
654            depends="jsr166xcompile"            depends="jsr166xcompile"
655            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
656    
# Line 729  Line 664 
664    <target name="jsr166xdocs"    <target name="jsr166xdocs"
665            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
666    
667      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
668      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
669    
670      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
671               packagenames="jsr166x.*"               packagenames="jsr166x.*"
672               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
673                 access="${build.javadoc.access}"
674               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
675               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
676               source="5"               source="5"
# Line 746  Line 682 
682    
683    
684    <target name="jsr166xdist"    <target name="jsr166xdist"
685            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
686            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
687    
688    
# Line 765  Line 701 
701    
702    
703    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
704            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
705      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
706      </target>
707    
708      <target name="jsr166xdist-docs"
709              depends="jsr166xclean, jsr166xdocs">
710        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
711    </target>    </target>
712    
713    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 741 
741    </target>    </target>
742    
743    
744    <target name="jsr166y-jar"    <target name="jsr166yjar"
745            depends="jsr166ycompile"            depends="jsr166ycompile"
746            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
747    
# Line 816  Line 755 
755    <target name="jsr166ydocs"    <target name="jsr166ydocs"
756            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
757    
758      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
759      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
760    
761      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
762               packagenames="jsr166y.*"               packagenames="jsr166y.*"
763               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
764                 access="${build.javadoc.access}"
765               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
766               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
767               source="6"               source="6"
# Line 833  Line 773 
773    
774    
775    <target name="jsr166ydist"    <target name="jsr166ydist"
776            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
777            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
778    
779    
# Line 851  Line 791 
791    </target>    </target>
792    
793    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
794            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
795      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
796      </target>
797    
798      <target name="jsr166ydist-docs"
799              depends="jsr166yclean, jsr166ydocs">
800        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
801    </target>    </target>
802    
803    
# Line 862  Line 805 
805    
806    
807    <target name="extra166ycompile"    <target name="extra166ycompile"
808            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
809            description="Compiles extra166y sources">            description="Compiles extra166y sources">
810    
811      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 832 
832    </target>    </target>
833    
834    
835    <target name="extra166y-jar"    <target name="extra166yjar"
836            depends="extra166ycompile"            depends="extra166ycompile"
837            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
838    
# Line 903  Line 846 
846    <target name="extra166ydocs"    <target name="extra166ydocs"
847            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
848    
849      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
850      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
851    
852      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
853               packagenames="extra166y.*"               packagenames="extra166y.*"
854               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
855                 access="${build.javadoc.access}"
856               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
857               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
858               source="6"               source="6"
# Line 920  Line 864 
864    
865    
866    <target name="extra166ydist"    <target name="extra166ydist"
867            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
868            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
869    
870    
# Line 938  Line 882 
882    </target>    </target>
883    
884    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
885            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
886      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
887      </target>
888    
889      <target name="extra166ydist-docs"
890              depends="extra166yclean, extra166ydocs">
891        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
892    </target>    </target>
893    
894    <!-- jsr166e -->    <!-- jsr166e -->
# Line 973  Line 920 
920    </target>    </target>
921    
922    
923    <target name="jsr166e-jar"    <target name="jsr166ejar"
924            depends="jsr166ecompile"            depends="jsr166ecompile"
925            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
926    
# Line 987  Line 934 
934    <target name="jsr166edocs"    <target name="jsr166edocs"
935            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
936    
937      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
938      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
939    
940      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
941               packagenames="jsr166e.*"               packagenames="jsr166e.*"
942               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
943                 access="${build.javadoc.access}"
944               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
945               source="7"               source="7"
946               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1003  Line 951 
951    
952    
953    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck"
954            depends="jsr166e-jar"            depends="jsr166ejar"
955            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
956    
957      <run-tck-tests      <run-tck-tests
958        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
959        source="7"        target="7"
       target="8"  
960        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
961        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
962    </target>    </target>
963    
964    
965    <target name="jsr166edist"    <target name="jsr166edist"
966            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
967            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
968    
969    
970    <target name="jsr166eclean"    <target name="jsr166eclean"
971            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
972      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
973    </target>    </target>
974    
975    
# Line 1034  Line 979 
979    </target>    </target>
980    
981    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
982            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
983      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
984      </target>
985    
986      <target name="jsr166edist-docs"
987              depends="jsr166eclean, jsr166edocs">
988        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
989    </target>    </target>
990    
991    
992    <!-- Find buglets that can be detected by static build tools -->
993    
994      <target name="lint">
995        <antcall target="dists">
996          <param name="build.javadoc.access" value="private"/>
997        </antcall>
998      </target>
999    
1000    
1001  </project>  </project>

Legend:
Removed from v.1.124  
changed lines
  Added in v.1.142

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