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

Diff of /jsr166/build.xml

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

revision 1.124, Tue Jan 22 21:22:57 2013 UTC revision 1.148, Sat Jul 20 18:26:16 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">    <!-- Display main targets by running 'ant -projecthelp' -->
30      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
31        <java classname="org.apache.tools.ant.Main">
32          <arg value="-projecthelp" />
33        </java>
34    </target>    </target>
35    
36    
# Line 39  Line 43 
43    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
44    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
45    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
46      <property name="build.javadoc.access" value="protected"/>
47    
48      <!-- Tck options; see JSR166TestCase.java -->
49      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
50      <property name="jsr166.profileTests"     value="false"/>
51      <property name="jsr166.profileThreshold" value="100"/>
52      <property name="jsr166.runsPerTest"      value="1"/>
53      <!-- Allow running an individual tck test class -->
54      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
55      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
56    
57    <!-- Build locations -->    <!-- Build locations -->
58    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 86  Line 100 
100      </sequential>      </sequential>
101    </macrodef>    </macrodef>
102    
103      <macrodef name="mirror-dir">
104        <attribute name="src"/>
105        <attribute name="dst"/>
106        <sequential>
107        <delete dir="@{dst}"/>
108        <mkdir dir="@{dst}"/>
109        <copy todir="@{dst}" preservelastmodified="true">
110          <fileset dir="@{src}"/>
111        </copy>
112        </sequential>
113      </macrodef>
114    
115    <defjdklocations v="6"/>    <defjdklocations v="6"/>
116    <defjdklocations v="7"/>    <defjdklocations v="7"/>
117    <defjdklocations v="8"/>    <defjdklocations v="8"/>
# Line 105  Line 131 
131    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
132    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
133    
134    <!-- Distribution locations -->    <!-- Javadoc locations -->
135    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
136    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
137    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
138    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
139    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
140    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
141    
142      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
143      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
144      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
145      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
146      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
147      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
148    
149    <!-- Jar locations -->    <!-- Jar locations -->
150    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 147  Line 180 
180    
181    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
182      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
183      <attribute name="target"/>      <attribute name="target"/>
184        <attribute name="compile-target" default="@{target}"/>
185      <attribute name="workdir"/>      <attribute name="workdir"/>
186      <attribute name="classes"/>      <attribute name="classes"/>
187      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
188        <element name="javac-elements" optional="true"/>
189      <sequential>      <sequential>
190    
191      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 161  Line 195 
195             debug="${build.debug}"             debug="${build.debug}"
196             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
197             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
198             source="@{source}"             source="@{compile-target}"
199               target="@{compile-target}"
200             classpath="${junit.jar}"             classpath="${junit.jar}"
201             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
202             includeAntRuntime="false"             includeAntRuntime="false"
203             includeJavaRuntime="false"             includeJavaRuntime="false"
204             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
205             fork="true">             fork="true">
206    
207        <include name="*.java"/>        <include name="*.java"/>
208        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
209        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
210        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
211          <javac-elements/>
212    
213      </javac>      </javac>
214    
215      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
216            failonerror="true"            failonerror="true"
217            jvm="${java@{target}}"            jvm="${java@{target}}"
218            fork="true">            fork="true">
219          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
220          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
221            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
222            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
223            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
224          <classpath>          <classpath>
225            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
226            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 191  Line 230 
230      </sequential>      </sequential>
231    </macrodef>    </macrodef>
232    
233      <macrodef name="run-jtreg-tests">
234        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
235        <attribute name="source" default="7"/>
236        <attribute name="target"/>
237        <attribute name="workdir"/>
238        <attribute name="classes"/>
239        <attribute name="jtregflags" default=""/>
240        <sequential>
241        <delete dir="@{workdir}/JTwork"   quiet="true"/>
242        <delete dir="@{workdir}/JTreport" quiet="true"/>
243        <mkdir dir="@{workdir}/JTwork/scratch"/>
244        <mkdir dir="@{workdir}/JTreport"/>
245        <jtreg dir="@{jtreg.src.dir}"
246               jdk="${jdk@{target}.home}"
247               workDir="@{workdir}/JTwork"
248               reportDir="@{workdir}/JTreport">
249    
250          <arg value="-Xbootclasspath/p:@{classes}"/>
251          <arg value="-agentvm"/>
252          <arg value="-v:nopass,fail"/>
253          <arg value="-vmoptions:-esa -ea"/>
254          <arg value="-automatic"/>
255          <arg value="-k:!ignore"/>
256          <arg line="@{jtregflags}"/>
257        </jtreg>
258        </sequential>
259      </macrodef>
260    
261    <!-- ALoops classpath -->    <!-- ALoops classpath -->
262    <path id="loops.classpath">    <path id="loops.classpath">
263      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 224  Line 291 
291             fork="true">             fork="true">
292    
293        <include name="**/*.java"/>        <include name="**/*.java"/>
294          <compilerarg value="-Xprefer:source"/>
295        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
296        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
297          <compilerarg value="-Xdoclint:all/protected"/>
298          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
299        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
300    
301      </javac>      </javac>
# Line 242  Line 312 
312    </target>    </target>
313    
314    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
315    <target name="docs"    <target name="docs"
316            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
317    
318      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
319      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
320    
321      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
322      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
323    
324      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
325               packagenames="none"               packagenames="none"
326               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
327               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
328                 access="${build.javadoc.access}"
329               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
330               classpath=""               classpath=""
331               executable="${javadoc8}">               executable="${javadoc8}">
332        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
333          <include name="**/*.java"/>          <include name="**/*.java"/>
334        </fileset>        </fileset>
335          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
336        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
337        <arg value="-tag"/>        <arg value="-tag"/>
338        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
339          <arg value="-tag"/>
340          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
341          <arg value="-tag"/>
342          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
343          <arg value="-tag"/>
344          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
345      </javadoc>      </javadoc>
346    </target>    </target>
347    
348    
349    <target name="dist"    <target name="dist"
350            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
351            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
352    
353    
# Line 307  Line 380 
380    <target name="dist-clean"    <target name="dist-clean"
381            description="Removes all build and distribution products">            description="Removes all build and distribution products">
382    
383        <delete dir="${build.dir}"/>
384      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
385    
386    </target>    </target>
387    
388    
   <!-- Internal targets -->  
   
   
389    <target name="dist-jar"    <target name="dist-jar"
390            depends="clean, jar">            depends="clean, jar">
   
391      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
392    </target>    </target>
393    
394      <target name="dist-docs"
395    <target name="compile-tests"            depends="clean, docs">
396            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>  
 -->  
   
397    </target>    </target>
398    
399    
400    <target name="run-tests"    <target name="test-tck"
401            depends="compile-tests">            depends="jar"
402              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>  
403    
404        <run-tck-tests
405          target="8"
406          workdir="${build.dir}"
407          classes="${product.jar}"/>
408    </target>    </target>
409    
410      <target name="test-jtreg"
411              depends="jar"
412              description="Runs jtreg tests for main using the jtreg ant task">
413        <run-jtreg-tests
414           target="8"
415           workdir="${build.dir}"
416           classes="${product.jar}"/>
417      </target>
418    
419    <target name="report-tests"    <target name="test"
420            depends="run-tests">            depends="test-tck, test-jtreg"
421              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"/>  
   
422    </target>    </target>
423    
424    
425    
426    <target name="configure-compiler">    <target name="configure-compiler">
427    
428      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 440 
440    </target>    </target>
441    
442    
   <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>  
   
443    
444    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
445    
# Line 552  Line 492 
492             fork="true">             fork="true">
493    
494        <include name="**/*.java"/>        <include name="**/*.java"/>
495          <compilerarg value="-Xprefer:source"/>
496        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
497        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
498        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 560  Line 501 
501    </target>    </target>
502    
503    
504    <target name="4jdk7-jar"    <target name="4jdk7jar"
505            depends="4jdk7compile"            depends="4jdk7compile"
506            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
507    
# Line 572  Line 513 
513    
514    
515    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
516            depends="4jdk7-jar"            depends="4jdk7jar"
517            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
518    
519      <run-tck-tests      <run-tck-tests
520        target="7"        target="7"
521        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
522        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
523          <javac-elements>
524            <!-- JDK8+ test classes -->
525            <exclude name="*8Test.java"/>
526            <exclude name="DoubleAccumulatorTest.java"/>
527            <exclude name="DoubleAdderTest.java"/>
528            <exclude name="LongAccumulatorTest.java"/>
529            <exclude name="LongAdderTest.java"/>
530            <exclude name="CompletableFutureTest.java"/>
531            <exclude name="SplittableRandomTest.java"/>
532            <exclude name="StampedLockTest.java"/>
533          </javac-elements>
534        </run-tck-tests>
535    </target>    </target>
536    
537    
# Line 604  Line 557 
557    
558        <formatter type="brief"/>        <formatter type="brief"/>
559    
560        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
561        </test>        </test>
562    
563      </junit>      </junit>
564    </target>    </target>
565    
566    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
567            depends="4jdk7compile"            depends="4jdk7jar"
568            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
569      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
570      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
571      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
572      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
573      <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>  
574    </target>    </target>
575    
576    
# Line 641  Line 583 
583    <target name="4jdk7docs"    <target name="4jdk7docs"
584            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
585    
586      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
587      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
588    
589      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
590               packagenames="none"               packagenames="none"
591               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
592               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
593                 access="${build.javadoc.access}"
594               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
595               classpath=""               classpath=""
596               executable="${javadoc7}">               executable="${javadoc7}">
# Line 660  Line 603 
603    
604    
605    <target name="4jdk7dist"    <target name="4jdk7dist"
606            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
607            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
608    
609    
# Line 672  Line 615 
615    </target>    </target>
616    
617    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
618    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
619            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
620      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
621      </target>
622    
623    
624      <target name="4jdk7dist-docs"
625              depends="4jdk7clean, 4jdk7docs">
626        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
627    </target>    </target>
628    
629    
# Line 715  Line 657 
657    </target>    </target>
658    
659    
660    <target name="jsr166x-jar"    <target name="jsr166xjar"
661            depends="jsr166xcompile"            depends="jsr166xcompile"
662            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
663    
# Line 729  Line 671 
671    <target name="jsr166xdocs"    <target name="jsr166xdocs"
672            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
673    
674      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
675      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
676    
677      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
678               packagenames="jsr166x.*"               packagenames="jsr166x.*"
679               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
680                 access="${build.javadoc.access}"
681               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
682               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
683               source="5"               source="5"
# Line 746  Line 689 
689    
690    
691    <target name="jsr166xdist"    <target name="jsr166xdist"
692            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
693            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
694    
695    
# Line 758  Line 701 
701    </target>    </target>
702    
703    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
704    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
705            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
706      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
707      </target>
708    
709      <target name="jsr166xdist-docs"
710              depends="jsr166xclean, jsr166xdocs">
711        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
712    </target>    </target>
713    
714    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 742 
742    </target>    </target>
743    
744    
745    <target name="jsr166y-jar"    <target name="jsr166yjar"
746            depends="jsr166ycompile"            depends="jsr166ycompile"
747            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
748    
# Line 816  Line 756 
756    <target name="jsr166ydocs"    <target name="jsr166ydocs"
757            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
758    
759      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
760      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
761    
762      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
763               packagenames="jsr166y.*"               packagenames="jsr166y.*"
764               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
765                 access="${build.javadoc.access}"
766               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
767               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
768               source="6"               source="6"
# Line 833  Line 774 
774    
775    
776    <target name="jsr166ydist"    <target name="jsr166ydist"
777            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
778            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
779    
780    
# Line 845  Line 786 
786    </target>    </target>
787    
788    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
789    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
790            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
791      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
792      </target>
793    
794      <target name="jsr166ydist-docs"
795              depends="jsr166yclean, jsr166ydocs">
796        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
797    </target>    </target>
798    
799    
# Line 862  Line 801 
801    
802    
803    <target name="extra166ycompile"    <target name="extra166ycompile"
804            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
805            description="Compiles extra166y sources">            description="Compiles extra166y sources">
806    
807      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 828 
828    </target>    </target>
829    
830    
831    <target name="extra166y-jar"    <target name="extra166yjar"
832            depends="extra166ycompile"            depends="extra166ycompile"
833            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
834    
# Line 903  Line 842 
842    <target name="extra166ydocs"    <target name="extra166ydocs"
843            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
844    
845      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
846      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
847    
848      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
849               packagenames="extra166y.*"               packagenames="extra166y.*"
850               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
851                 access="${build.javadoc.access}"
852               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
853               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
854               source="6"               source="6"
# Line 920  Line 860 
860    
861    
862    <target name="extra166ydist"    <target name="extra166ydist"
863            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
864            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
865    
866    
# Line 932  Line 872 
872    </target>    </target>
873    
874    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
875    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
876            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
877      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
878      </target>
879    
880      <target name="extra166ydist-docs"
881              depends="extra166yclean, extra166ydocs">
882        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
883    </target>    </target>
884    
885    <!-- jsr166e -->    <!-- jsr166e -->
886    
887      <property name="build.jsr166e.java.version" value="6"/>
888      <property name="build.jsr166e.javac" value="${javac6}"/>
889    
890    <target name="jsr166ecompile"    <target name="jsr166ecompile"
891            depends="configure-compiler"            depends="configure-compiler"
892            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 957  Line 898 
898             debug="${build.debug}"             debug="${build.debug}"
899             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
900             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
901             source="7"             source="${build.jsr166e.java.version}"
902             classpath=""             classpath=""
903             includeAntRuntime="false"             includeAntRuntime="false"
904             includeJavaRuntime="false"             includeJavaRuntime="false"
905             executable="${javac7}"             executable="${build.jsr166e.javac}"
906             fork="true">             fork="true">
907    
908        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 973  Line 914 
914    </target>    </target>
915    
916    
917    <target name="jsr166e-jar"    <target name="jsr166ejar"
918            depends="jsr166ecompile"            depends="jsr166ecompile"
919            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
920    
# Line 987  Line 928 
928    <target name="jsr166edocs"    <target name="jsr166edocs"
929            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
930    
931      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
932      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
933    
934      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
935               packagenames="jsr166e.*"               packagenames="jsr166e.*"
936               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
937               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
938               source="7"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
939                 source="${build.jsr166e.java.version}"
940               executable="${javadoc7}">               executable="${javadoc7}">
941        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
942    
# Line 1002  Line 944 
944    </target>    </target>
945    
946    
947    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
948            depends="jsr166e-jar"            depends="jsr166ejar">
949            description="Runs tck tests for jsr166e">  
950        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
951    
952      <run-tck-tests      <run-tck-tests
953        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
954        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
955        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
956        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
957    </target>    </target>
958    
959      <target name="jsr166e-test-tck"
960              description="Runs tck tests for jsr166e for multiple java versions">
961    
962    <!--     <antcall target="clean"/> -->
963    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
964    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
965    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
966    <!--     </antcall> -->
967    
968        <antcall target="clean"/>
969        <antcall target="jsr166e-test-tck-one-java-version">
970          <param name="build.jsr166e.java.version" value="7"/>
971          <param name="build.jsr166e.javac" value="${javac7}"/>
972        </antcall>
973    
974        <antcall target="clean"/>
975        <antcall target="jsr166e-test-tck-one-java-version">
976          <param name="build.jsr166e.java.version" value="6"/>
977          <param name="build.jsr166e.javac" value="${javac6}"/>
978        </antcall>
979      </target>
980    
981    
982      <target name="jsr166e-test"
983              depends="jsr166e-test-tck"
984              description="Runs all tests for jsr166e">
985      </target>
986    
987    <target name="jsr166edist"    <target name="jsr166edist"
988            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
989            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
990    
991    
992    <target name="jsr166eclean"    <target name="jsr166eclean"
993            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
994      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
995    </target>    </target>
996    
997    
998    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
999            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1000        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1001      </target>
1002    
1003      <target name="jsr166edist-docs"
1004              depends="jsr166eclean, jsr166edocs">
1005        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1006    </target>    </target>
1007    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166e-jar">  
1008    
1009      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1010    
1011      <target name="lint">
1012        <antcall target="dists">
1013          <param name="build.javadoc.access" value="private"/>
1014        </antcall>
1015    </target>    </target>
1016    
1017    
1018  </project>  </project>

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8