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

Diff of /jsr166/build.xml

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

revision 1.123 by jsr166, Tue Jan 22 20:22:00 2013 UTC revision 1.145 by jsr166, Sun Jul 14 22:39:31 2013 UTC
# Line 22  Line 22 
22    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
25    As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
27    </description>    </description>
28    
29    <target name="usage" description="Advises user to run with -projecthelp">    <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30      <echo>Run "ant -projecthelp" for full usage information.</echo>      <java classname="org.apache.tools.ant.Main">
31          <arg value="-projecthelp" />
32        </java>
33    </target>    </target>
34    
35    
# Line 39  Line 42 
42    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45      <property name="build.javadoc.access" value="protected"/>
46    
47      <!-- Tck options; see JSR166TestCase.java -->
48      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49      <property name="jsr166.profileTests"     value="false"/>
50      <property name="jsr166.profileThreshold" value="100"/>
51      <property name="jsr166.runsPerTest"      value="1"/>
52      <!-- Allow running an individual tck test class -->
53      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55    
56    <!-- Build locations -->    <!-- Build locations -->
57    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 57  Line 70 
70    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72    
73    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74    <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>    <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77    
78    <!-- JDK locations -->    <!-- JDK locations -->
79    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 86  Line 99 
99      </sequential>      </sequential>
100    </macrodef>    </macrodef>
101    
102      <macrodef name="mirror-dir">
103        <attribute name="src"/>
104        <attribute name="dst"/>
105        <sequential>
106        <delete dir="@{dst}"/>
107        <mkdir dir="@{dst}"/>
108        <copy todir="@{dst}" preservelastmodified="true">
109          <fileset dir="@{src}"/>
110        </copy>
111        </sequential>
112      </macrodef>
113    
114    <defjdklocations v="6"/>    <defjdklocations v="6"/>
115    <defjdklocations v="7"/>    <defjdklocations v="7"/>
116    <defjdklocations v="8"/>    <defjdklocations v="8"/>
# Line 105  Line 130 
130    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132    
133    <!-- Distribution locations -->    <!-- Javadoc locations -->
134    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
135    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140    
141      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147    
148    <!-- Jar locations -->    <!-- Jar locations -->
149    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 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 269  Line 332 
332        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
333        <arg value="-tag"/>        <arg value="-tag"/>
334        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
335          <arg value="-tag"/>
336          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
337          <arg value="-tag"/>
338          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
339          <arg value="-tag"/>
340          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
341      </javadoc>      </javadoc>
342    </target>    </target>
343    
344    
345    <target name="dist"    <target name="dist"
346            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
347            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
348    
349    
# Line 312  Line 381 
381    </target>    </target>
382    
383    
   <!-- Internal targets -->  
   
   
384    <target name="dist-jar"    <target name="dist-jar"
385            depends="clean, jar">            depends="clean, jar">
   
386      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
387    </target>    </target>
388    
389      <target name="dist-docs"
390    <target name="compile-tests"            depends="clean, docs">
391            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>  
 -->  
   
392    </target>    </target>
393    
394    
395    <target name="run-tests"    <target name="test-tck"
396            depends="compile-tests">            depends="jar"
397              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>  
398    
399        <run-tck-tests
400          target="8"
401          workdir="${build.dir}"
402          classes="${product.jar}"/>
403    </target>    </target>
404    
405      <target name="test-jtreg"
406              depends="jar"
407              description="Runs jtreg tests for main using the jtreg ant task">
408        <run-jtreg-tests
409           target="8"
410           workdir="${build.dir}"
411           classes="${product.jar}"/>
412      </target>
413    
414    <target name="report-tests"    <target name="test"
415            depends="run-tests">            depends="test-tck, test-jtreg"
416              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"/>  
   
417    </target>    </target>
418    
419    
420    
421    <target name="configure-compiler">    <target name="configure-compiler">
422    
423      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 435 
435    </target>    </target>
436    
437    
   <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>  
   
438    
439    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
440    
# Line 552  Line 487 
487             fork="true">             fork="true">
488    
489        <include name="**/*.java"/>        <include name="**/*.java"/>
490          <compilerarg value="-Xprefer:source"/>
491        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
492        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
493        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 560  Line 496 
496    </target>    </target>
497    
498    
499    <target name="4jdk7-jar"    <target name="4jdk7jar"
500            depends="4jdk7compile"            depends="4jdk7compile"
501            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
502    
# Line 572  Line 508 
508    
509    
510    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
511            depends="4jdk7-jar"            depends="4jdk7jar"
512            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
513    
514      <run-tck-tests      <run-tck-tests
515        target="7"        target="7"
516        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
517        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
518          <javac-elements>
519            <!-- JDK8+ test classes -->
520            <exclude name="*8Test.java"/>
521            <exclude name="DoubleAccumulatorTest.java"/>
522            <exclude name="DoubleAdderTest.java"/>
523            <exclude name="LongAccumulatorTest.java"/>
524            <exclude name="LongAdderTest.java"/>
525            <exclude name="CompletableFutureTest.java"/>
526            <exclude name="SplittableRandomTest.java"/>
527            <exclude name="StampedLockTest.java"/>
528          </javac-elements>
529        </run-tck-tests>
530    </target>    </target>
531    
532    
# Line 604  Line 552 
552    
553        <formatter type="brief"/>        <formatter type="brief"/>
554    
555        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
556        </test>        </test>
557    
558      </junit>      </junit>
559    </target>    </target>
560    
561    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
562            depends="4jdk7compile"            depends="4jdk7jar"
563            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
564      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
565      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
566      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
567      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
568      <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>  
569    </target>    </target>
570    
571    
# Line 641  Line 578 
578    <target name="4jdk7docs"    <target name="4jdk7docs"
579            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
580    
581      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
582      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
583    
584      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
585               packagenames="none"               packagenames="none"
586               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
587               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
588                 access="${build.javadoc.access}"
589               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
590               classpath=""               classpath=""
591               executable="${javadoc7}">               executable="${javadoc7}">
# Line 660  Line 598 
598    
599    
600    <target name="4jdk7dist"    <target name="4jdk7dist"
601            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
602            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
603    
604    
# Line 678  Line 616 
616    </target>    </target>
617    
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 765  Line 708 
708    
709    
710    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
711            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
712      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
713      </target>
714    
715      <target name="jsr166xdist-docs"
716              depends="jsr166xclean, jsr166xdocs">
717        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
718    </target>    </target>
719    
720    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 748 
748    </target>    </target>
749    
750    
751    <target name="jsr166y-jar"    <target name="jsr166yjar"
752            depends="jsr166ycompile"            depends="jsr166ycompile"
753            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
754    
# Line 816  Line 762 
762    <target name="jsr166ydocs"    <target name="jsr166ydocs"
763            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
764    
765      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
766      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
767    
768      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
769               packagenames="jsr166y.*"               packagenames="jsr166y.*"
770               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
771                 access="${build.javadoc.access}"
772               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
773               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
774               source="6"               source="6"
# Line 833  Line 780 
780    
781    
782    <target name="jsr166ydist"    <target name="jsr166ydist"
783            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
784            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
785    
786    
# Line 851  Line 798 
798    </target>    </target>
799    
800    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
801            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
802      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
803      </target>
804    
805      <target name="jsr166ydist-docs"
806              depends="jsr166yclean, jsr166ydocs">
807        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
808    </target>    </target>
809    
810    
# Line 862  Line 812 
812    
813    
814    <target name="extra166ycompile"    <target name="extra166ycompile"
815            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
816            description="Compiles extra166y sources">            description="Compiles extra166y sources">
817    
818      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 839 
839    </target>    </target>
840    
841    
842    <target name="extra166y-jar"    <target name="extra166yjar"
843            depends="extra166ycompile"            depends="extra166ycompile"
844            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
845    
# Line 903  Line 853 
853    <target name="extra166ydocs"    <target name="extra166ydocs"
854            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
855    
856      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
857      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
858    
859      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
860               packagenames="extra166y.*"               packagenames="extra166y.*"
861               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
862                 access="${build.javadoc.access}"
863               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
864               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
865               source="6"               source="6"
# Line 920  Line 871 
871    
872    
873    <target name="extra166ydist"    <target name="extra166ydist"
874            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
875            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
876    
877    
# Line 938  Line 889 
889    </target>    </target>
890    
891    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
892            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
893      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
894      </target>
895    
896      <target name="extra166ydist-docs"
897              depends="extra166yclean, extra166ydocs">
898        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
899    </target>    </target>
900    
901    <!-- jsr166e -->    <!-- jsr166e -->
902    
903      <property name="build.jsr166e.java.version" value="6"/>
904      <property name="build.jsr166e.javac" value="${javac6}"/>
905    
906    <target name="jsr166ecompile"    <target name="jsr166ecompile"
907            depends="configure-compiler"            depends="configure-compiler"
908            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 957  Line 914 
914             debug="${build.debug}"             debug="${build.debug}"
915             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
916             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
917             source="7"             source="${build.jsr166e.java.version}"
918             classpath=""             classpath=""
919             includeAntRuntime="false"             includeAntRuntime="false"
920             includeJavaRuntime="false"             includeJavaRuntime="false"
921             executable="${javac7}"             executable="${build.jsr166e.javac}"
922             fork="true">             fork="true">
923    
924        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 973  Line 930 
930    </target>    </target>
931    
932    
933    <target name="jsr166e-jar"    <target name="jsr166ejar"
934            depends="jsr166ecompile"            depends="jsr166ecompile"
935            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
936    
# Line 987  Line 944 
944    <target name="jsr166edocs"    <target name="jsr166edocs"
945            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
946    
947      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
948      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
949    
950      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
951               packagenames="jsr166e.*"               packagenames="jsr166e.*"
952               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
953               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
954               source="7"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
955                 source="${build.jsr166e.java.version}"
956               executable="${javadoc7}">               executable="${javadoc7}">
957        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
958    
# Line 1002  Line 960 
960    </target>    </target>
961    
962    
963    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
964            depends="jsr166e-jar"            depends="jsr166ejar"
965            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
966    
967        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
968    
969      <run-tck-tests      <run-tck-tests
970        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
971        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
972        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
973        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
974    </target>    </target>
975    
976      <target name="jsr166e-test-tck"
977              description="Runs tck tests for jsr166e for multiple java versions">
978    
979    <!--     <antcall target="clean"/> -->
980    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
981    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
982    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
983    <!--     </antcall> -->
984    
985        <antcall target="clean"/>
986        <antcall target="jsr166e-test-tck-one-java-version">
987          <param name="build.jsr166e.java.version" value="7"/>
988          <param name="build.jsr166e.javac" value="${javac7}"/>
989        </antcall>
990    
991        <antcall target="clean"/>
992        <antcall target="jsr166e-test-tck-one-java-version">
993          <param name="build.jsr166e.java.version" value="6"/>
994          <param name="build.jsr166e.javac" value="${javac6}"/>
995        </antcall>
996      </target>
997    
998    
999    <target name="jsr166edist"    <target name="jsr166edist"
1000            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1001            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1002    
1003    
1004    <target name="jsr166eclean"    <target name="jsr166eclean"
1005            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1006      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1007    </target>    </target>
1008    
1009    
# Line 1034  Line 1013 
1013    </target>    </target>
1014    
1015    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1016            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1017      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1018      </target>
1019    
1020      <target name="jsr166edist-docs"
1021              depends="jsr166eclean, jsr166edocs">
1022        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1023      </target>
1024    
1025    
1026    <!-- Find buglets that can be detected by static build tools -->
1027    
1028      <target name="lint">
1029        <antcall target="dists">
1030          <param name="build.javadoc.access" value="private"/>
1031        </antcall>
1032    </target>    </target>
1033    
1034    
1035  </project>  </project>

Legend:
Removed from v.1.123  
changed lines
  Added in v.1.145

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