[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.147, Sat Jul 20 17:21:45 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 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 value="-Xdoclint:all/protected"/>
297          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
298        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
299    
300      </javac>      </javac>
# Line 242  Line 311 
311    </target>    </target>
312    
313    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
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}">
331        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
332          <include name="**/*.java"/>          <include name="**/*.java"/>
333        </fileset>        </fileset>
334          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
335        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
336        <arg value="-tag"/>        <arg value="-tag"/>
337        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
338          <arg value="-tag"/>
339          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
340          <arg value="-tag"/>
341          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
342          <arg value="-tag"/>
343          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
344      </javadoc>      </javadoc>
345    </target>    </target>
346    
347    
348    <target name="dist"    <target name="dist"
349            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
350            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
351    
352    
# Line 312  Line 384 
384    </target>    </target>
385    
386    
   <!-- Internal targets -->  
   
   
387    <target name="dist-jar"    <target name="dist-jar"
388            depends="clean, jar">            depends="clean, jar">
   
389      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
390    </target>    </target>
391    
392      <target name="dist-docs"
393    <target name="compile-tests"            depends="clean, docs">
394            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>  
 -->  
   
395    </target>    </target>
396    
397    
398    <target name="run-tests"    <target name="test-tck"
399            depends="compile-tests">            depends="jar"
400              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>  
401    
402        <run-tck-tests
403          target="8"
404          workdir="${build.dir}"
405          classes="${product.jar}"/>
406    </target>    </target>
407    
408      <target name="test-jtreg"
409              depends="jar"
410              description="Runs jtreg tests for main using the jtreg ant task">
411        <run-jtreg-tests
412           target="8"
413           workdir="${build.dir}"
414           classes="${product.jar}"/>
415      </target>
416    
417    <target name="report-tests"    <target name="test"
418            depends="run-tests">            depends="test-tck, test-jtreg"
419              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"/>  
   
420    </target>    </target>
421    
422    
423    
424    <target name="configure-compiler">    <target name="configure-compiler">
425    
426      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 438 
438    </target>    </target>
439    
440    
   <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>  
   
441    
442    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
443    
# Line 552  Line 490 
490             fork="true">             fork="true">
491    
492        <include name="**/*.java"/>        <include name="**/*.java"/>
493          <compilerarg value="-Xprefer:source"/>
494        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
495        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
496        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 560  Line 499 
499    </target>    </target>
500    
501    
502    <target name="4jdk7-jar"    <target name="4jdk7jar"
503            depends="4jdk7compile"            depends="4jdk7compile"
504            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
505    
# Line 572  Line 511 
511    
512    
513    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
514            depends="4jdk7-jar"            depends="4jdk7jar"
515            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
516    
517      <run-tck-tests      <run-tck-tests
518        target="7"        target="7"
519        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
520        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
521          <javac-elements>
522            <!-- JDK8+ test classes -->
523            <exclude name="*8Test.java"/>
524            <exclude name="DoubleAccumulatorTest.java"/>
525            <exclude name="DoubleAdderTest.java"/>
526            <exclude name="LongAccumulatorTest.java"/>
527            <exclude name="LongAdderTest.java"/>
528            <exclude name="CompletableFutureTest.java"/>
529            <exclude name="SplittableRandomTest.java"/>
530            <exclude name="StampedLockTest.java"/>
531          </javac-elements>
532        </run-tck-tests>
533    </target>    </target>
534    
535    
# Line 604  Line 555 
555    
556        <formatter type="brief"/>        <formatter type="brief"/>
557    
558        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
559        </test>        </test>
560    
561      </junit>      </junit>
562    </target>    </target>
563    
564    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
565            depends="4jdk7compile"            depends="4jdk7jar"
566            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
567      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
568      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
569      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
570      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
571      <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>  
572    </target>    </target>
573    
574    
# Line 641  Line 581 
581    <target name="4jdk7docs"    <target name="4jdk7docs"
582            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
583    
584      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
585      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
586    
587      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
588               packagenames="none"               packagenames="none"
589               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
590               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
591                 access="${build.javadoc.access}"
592               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
593               classpath=""               classpath=""
594               executable="${javadoc7}">               executable="${javadoc7}">
# Line 660  Line 601 
601    
602    
603    <target name="4jdk7dist"    <target name="4jdk7dist"
604            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
605            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
606    
607    
# Line 678  Line 619 
619    </target>    </target>
620    
621    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
622            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
623      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
624      </target>
625    
626    
627      <target name="4jdk7dist-docs"
628              depends="4jdk7clean, 4jdk7docs">
629        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
630    </target>    </target>
631    
632    
# Line 715  Line 660 
660    </target>    </target>
661    
662    
663    <target name="jsr166x-jar"    <target name="jsr166xjar"
664            depends="jsr166xcompile"            depends="jsr166xcompile"
665            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
666    
# Line 729  Line 674 
674    <target name="jsr166xdocs"    <target name="jsr166xdocs"
675            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
676    
677      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
678      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
679    
680      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
681               packagenames="jsr166x.*"               packagenames="jsr166x.*"
682               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
683                 access="${build.javadoc.access}"
684               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
685               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
686               source="5"               source="5"
# Line 746  Line 692 
692    
693    
694    <target name="jsr166xdist"    <target name="jsr166xdist"
695            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
696            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
697    
698    
# Line 765  Line 711 
711    
712    
713    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
714            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
715      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
716      </target>
717    
718      <target name="jsr166xdist-docs"
719              depends="jsr166xclean, jsr166xdocs">
720        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
721    </target>    </target>
722    
723    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 751 
751    </target>    </target>
752    
753    
754    <target name="jsr166y-jar"    <target name="jsr166yjar"
755            depends="jsr166ycompile"            depends="jsr166ycompile"
756            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
757    
# Line 816  Line 765 
765    <target name="jsr166ydocs"    <target name="jsr166ydocs"
766            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
767    
768      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
769      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
770    
771      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
772               packagenames="jsr166y.*"               packagenames="jsr166y.*"
773               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
774                 access="${build.javadoc.access}"
775               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
776               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
777               source="6"               source="6"
# Line 833  Line 783 
783    
784    
785    <target name="jsr166ydist"    <target name="jsr166ydist"
786            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
787            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
788    
789    
# Line 851  Line 801 
801    </target>    </target>
802    
803    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
804            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
805      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
806      </target>
807    
808      <target name="jsr166ydist-docs"
809              depends="jsr166yclean, jsr166ydocs">
810        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
811    </target>    </target>
812    
813    
# Line 862  Line 815 
815    
816    
817    <target name="extra166ycompile"    <target name="extra166ycompile"
818            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
819            description="Compiles extra166y sources">            description="Compiles extra166y sources">
820    
821      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 842 
842    </target>    </target>
843    
844    
845    <target name="extra166y-jar"    <target name="extra166yjar"
846            depends="extra166ycompile"            depends="extra166ycompile"
847            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
848    
# Line 903  Line 856 
856    <target name="extra166ydocs"    <target name="extra166ydocs"
857            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
858    
859      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
860      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
861    
862      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
863               packagenames="extra166y.*"               packagenames="extra166y.*"
864               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
865                 access="${build.javadoc.access}"
866               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
867               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
868               source="6"               source="6"
# Line 920  Line 874 
874    
875    
876    <target name="extra166ydist"    <target name="extra166ydist"
877            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
878            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
879    
880    
# Line 938  Line 892 
892    </target>    </target>
893    
894    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
895            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
896      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
897      </target>
898    
899      <target name="extra166ydist-docs"
900              depends="extra166yclean, extra166ydocs">
901        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
902    </target>    </target>
903    
904    <!-- jsr166e -->    <!-- jsr166e -->
905    
906      <property name="build.jsr166e.java.version" value="6"/>
907      <property name="build.jsr166e.javac" value="${javac6}"/>
908    
909    <target name="jsr166ecompile"    <target name="jsr166ecompile"
910            depends="configure-compiler"            depends="configure-compiler"
911            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 957  Line 917 
917             debug="${build.debug}"             debug="${build.debug}"
918             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
919             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
920             source="7"             source="${build.jsr166e.java.version}"
921             classpath=""             classpath=""
922             includeAntRuntime="false"             includeAntRuntime="false"
923             includeJavaRuntime="false"             includeJavaRuntime="false"
924             executable="${javac7}"             executable="${build.jsr166e.javac}"
925             fork="true">             fork="true">
926    
927        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 973  Line 933 
933    </target>    </target>
934    
935    
936    <target name="jsr166e-jar"    <target name="jsr166ejar"
937            depends="jsr166ecompile"            depends="jsr166ecompile"
938            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
939    
# Line 987  Line 947 
947    <target name="jsr166edocs"    <target name="jsr166edocs"
948            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
949    
950      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
951      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
952    
953      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
954               packagenames="jsr166e.*"               packagenames="jsr166e.*"
955               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
956               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
957               source="7"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
958                 source="${build.jsr166e.java.version}"
959               executable="${javadoc7}">               executable="${javadoc7}">
960        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
961    
# Line 1002  Line 963 
963    </target>    </target>
964    
965    
966    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
967            depends="jsr166e-jar"            depends="jsr166ejar"
968            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
969    
970        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
971    
972      <run-tck-tests      <run-tck-tests
973        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
974        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
975        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
976        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
977    </target>    </target>
978    
979      <target name="jsr166e-test-tck"
980              description="Runs tck tests for jsr166e for multiple java versions">
981    
982    <!--     <antcall target="clean"/> -->
983    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
984    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
985    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
986    <!--     </antcall> -->
987    
988        <antcall target="clean"/>
989        <antcall target="jsr166e-test-tck-one-java-version">
990          <param name="build.jsr166e.java.version" value="7"/>
991          <param name="build.jsr166e.javac" value="${javac7}"/>
992        </antcall>
993    
994        <antcall target="clean"/>
995        <antcall target="jsr166e-test-tck-one-java-version">
996          <param name="build.jsr166e.java.version" value="6"/>
997          <param name="build.jsr166e.javac" value="${javac6}"/>
998        </antcall>
999      </target>
1000    
1001    
1002      <target name="jsr166e-test"
1003              depends="jsr166e-test-tck"
1004              description="Runs all tests for jsr166e">
1005      </target>
1006    
1007    <target name="jsr166edist"    <target name="jsr166edist"
1008            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1009            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1010    
1011    
1012    <target name="jsr166eclean"    <target name="jsr166eclean"
1013            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1014      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1015    </target>    </target>
1016    
1017    
# Line 1034  Line 1021 
1021    </target>    </target>
1022    
1023    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1024            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1025      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1026      </target>
1027    
1028      <target name="jsr166edist-docs"
1029              depends="jsr166eclean, jsr166edocs">
1030        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1031    </target>    </target>
1032    
1033    
1034    <!-- Find buglets that can be detected by static build tools -->
1035    
1036      <target name="lint">
1037        <antcall target="dists">
1038          <param name="build.javadoc.access" value="private"/>
1039        </antcall>
1040      </target>
1041    
1042    
1043  </project>  </project>

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8