/[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.151 by jsr166, Sun Feb 16 14:25:46 2014 UTC
# Line 16  Line 16 
16    $HOME/jdk/jdk6    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8    $HOME/jdk/jdk8
19      $HOME/jdk/jdk9
20    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
21    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
24      $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
27  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
28    </description>    </description>
29    
30    <target name="usage" description="Advises user to run with -projecthelp">    <!-- Display main targets by running 'ant -projecthelp' -->
31      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
32        <java classname="org.apache.tools.ant.Main">
33          <arg value="-projecthelp" />
34        </java>
35    </target>    </target>
36    
37    
# Line 39  Line 44 
44    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
45    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
46    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
47      <property name="build.javadoc.access" value="protected"/>
48    
49      <!-- Tck options; see JSR166TestCase.java -->
50      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51      <property name="jsr166.profileTests"     value="false"/>
52      <property name="jsr166.profileThreshold" value="100"/>
53      <property name="jsr166.runsPerTest"      value="1"/>
54      <!-- Allow running an individual tck test class -->
55      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57    
58    <!-- Build locations -->    <!-- Build locations -->
59    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 57  Line 72 
72    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
73    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
74    
75    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
76    <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>    <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
77    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
78    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
79    
80    <!-- JDK locations -->    <!-- JDK locations -->
81    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 86  Line 101 
101      </sequential>      </sequential>
102    </macrodef>    </macrodef>
103    
104      <macrodef name="mirror-dir">
105        <attribute name="src"/>
106        <attribute name="dst"/>
107        <sequential>
108        <delete dir="@{dst}"/>
109        <mkdir dir="@{dst}"/>
110        <copy todir="@{dst}" preservelastmodified="true">
111          <fileset dir="@{src}"/>
112        </copy>
113        </sequential>
114      </macrodef>
115    
116    <defjdklocations v="6"/>    <defjdklocations v="6"/>
117    <defjdklocations v="7"/>    <defjdklocations v="7"/>
118    <defjdklocations v="8"/>    <defjdklocations v="8"/>
119      <defjdklocations v="9"/>
120    
121    <!-- Source locations -->    <!-- Source locations -->
122    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 105  Line 133 
133    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
134    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
135    
136    <!-- Distribution locations -->    <!-- Javadoc locations -->
137    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
138    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
139    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
140    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
141    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
142    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
143    
144      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
145      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
146      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
147      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
148      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
149      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
150    
151    <!-- Jar locations -->    <!-- Jar locations -->
152    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 163 
163    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
164    
165    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
166    <!-- The below does not yet exist as of 2013-01 -->    <!-- The expected canonical location does not yet exist as of 2014-02 -->
167    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
168    
169      <property name="jdkapi9docs.url"      value="${jdkapi8docs.url}"/>
170      <!-- No published jdk9 docs exist as of 2014-02 -->
171      <!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> -->
172    
173    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
174    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
175    
# Line 147  Line 186 
186    
187    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
188      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
189      <attribute name="target"/>      <attribute name="target"/>
190        <attribute name="compile-target" default="@{target}"/>
191      <attribute name="workdir"/>      <attribute name="workdir"/>
192      <attribute name="classes"/>      <attribute name="classes"/>
193      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
194        <element name="javac-elements" optional="true"/>
195      <sequential>      <sequential>
196    
197      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 161  Line 201 
201             debug="${build.debug}"             debug="${build.debug}"
202             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
203             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
204             source="@{source}"             source="@{compile-target}"
205               target="@{compile-target}"
206             classpath="${junit.jar}"             classpath="${junit.jar}"
207             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
208             includeAntRuntime="false"             includeAntRuntime="false"
209             includeJavaRuntime="false"             includeJavaRuntime="false"
210             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
211             fork="true">             fork="true">
212    
213        <include name="*.java"/>        <include name="*.java"/>
214        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
215        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
216        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
217          <javac-elements/>
218    
219      </javac>      </javac>
220    
221      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
222            failonerror="true"            failonerror="true"
223            jvm="${java@{target}}"            jvm="${java@{target}}"
224            fork="true">            fork="true">
225          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
226          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
227            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
228            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
229            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
230          <classpath>          <classpath>
231            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
232            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 191  Line 236 
236      </sequential>      </sequential>
237    </macrodef>    </macrodef>
238    
239      <macrodef name="run-jtreg-tests">
240        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
241        <attribute name="source" default="7"/>
242        <attribute name="target"/>
243        <attribute name="workdir"/>
244        <attribute name="classes"/>
245        <attribute name="jtregflags" default=""/>
246        <sequential>
247        <delete dir="@{workdir}/JTwork"   quiet="true"/>
248        <delete dir="@{workdir}/JTreport" quiet="true"/>
249        <mkdir dir="@{workdir}/JTwork/scratch"/>
250        <mkdir dir="@{workdir}/JTreport"/>
251        <jtreg dir="@{jtreg.src.dir}"
252               jdk="${jdk@{target}.home}"
253               workDir="@{workdir}/JTwork"
254               reportDir="@{workdir}/JTreport">
255    
256          <arg value="-Xbootclasspath/p:@{classes}"/>
257          <arg value="-agentvm"/>
258          <arg value="-v:nopass,fail"/>
259          <arg value="-vmoptions:-esa -ea"/>
260          <arg value="-automatic"/>
261          <arg value="-k:!ignore"/>
262          <arg line="@{jtregflags}"/>
263        </jtreg>
264        </sequential>
265      </macrodef>
266    
267    <!-- ALoops classpath -->    <!-- ALoops classpath -->
268    <path id="loops.classpath">    <path id="loops.classpath">
269      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 202  Line 275 
275    
276    <!-- Main targets -->    <!-- Main targets -->
277    
278      <property name="build.main.java.version" value="9"/>
279      <property name="build.main.javac" value="${javac9}"/>
280    
281    <target name="dists"    <target name="dists"
282            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
283            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 220  Line 296 
296             classpath=""             classpath=""
297             includeAntRuntime="false"             includeAntRuntime="false"
298             includeJavaRuntime="false"             includeJavaRuntime="false"
299             executable="${javac8}"             executable="${build.main.javac}"
300             fork="true">             fork="true">
301    
302        <include name="**/*.java"/>        <include name="**/*.java"/>
303          <compilerarg value="-Xprefer:source"/>
304        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
305        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
306          <compilerarg value="-Xdoclint:all/protected"/>
307          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
308        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
309    
310      </javac>      </javac>
# Line 242  Line 321 
321    </target>    </target>
322    
323    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
324    <target name="docs"    <target name="docs"
325            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
326    
327      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
328      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
329    
330      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
331      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
332    
333      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
334               packagenames="none"               packagenames="none"
335               link="${jdkapi8docs.url}"               link="${jdkapi9docs.url}"
336               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
337               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
338                 sourcepath="${src.dir}:${jdk9src.dir}"
339               classpath=""               classpath=""
340               executable="${javadoc8}">               executable="${javadoc9}">
341        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
342          <include name="**/*.java"/>          <include name="**/*.java"/>
343        </fileset>        </fileset>
344          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
345        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
346        <arg value="-tag"/>        <arg value="-tag"/>
347        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
348          <arg value="-tag"/>
349          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
350          <arg value="-tag"/>
351          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
352          <arg value="-tag"/>
353          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
354      </javadoc>      </javadoc>
355    </target>    </target>
356    
357    
358    <target name="dist"    <target name="dist"
359            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
360            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
361    
362    
# Line 307  Line 389 
389    <target name="dist-clean"    <target name="dist-clean"
390            description="Removes all build and distribution products">            description="Removes all build and distribution products">
391    
392        <delete dir="${build.dir}"/>
393      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
394    
395    </target>    </target>
396    
397    
   <!-- Internal targets -->  
   
   
398    <target name="dist-jar"    <target name="dist-jar"
399            depends="clean, jar">            depends="clean, jar">
   
400      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
401    </target>    </target>
402    
403      <target name="dist-docs"
404    <target name="compile-tests"            depends="clean, docs">
405            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>  
 -->  
   
406    </target>    </target>
407    
408    
409    <target name="run-tests"    <target name="test-tck"
410            depends="compile-tests">            depends="jar"
411              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>  
412    
413        <run-tck-tests
414          target="${build.main.java.version}"
415          workdir="${build.dir}"
416          classes="${product.jar}"/>
417    </target>    </target>
418    
419      <target name="test-jtreg"
420              depends="jar"
421              description="Runs jtreg tests for main using the jtreg ant task">
422        <run-jtreg-tests
423           target="${build.main.java.version}"
424           workdir="${build.dir}"
425           classes="${product.jar}"/>
426      </target>
427    
428    <target name="report-tests"    <target name="test"
429            depends="run-tests">            depends="test-tck, test-jtreg"
430              description="Runs tck and jtreg tests for main">
431      </target>
432    
433      <!-- Sets junit.report.format to frames if redirection is present,    <target name="test89"
434           otherwise sets it to noframes. -->            description="Runs tck and jtreg tests for main for multiple java versions">
     <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>  
435    
436      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
437        <antcall target="test">
438          <param name="build.main.java.version" value="8"/>
439          <param name="build.main.javac" value="${javac8}"/>
440        </antcall>
441    
442        <antcall target="clean"/>
443        <antcall target="test">
444          <param name="build.main.java.version" value="9"/>
445          <param name="build.main.javac" value="${javac9}"/>
446        </antcall>
447    
448    </target>    </target>
449    
450    
451    
452    <target name="configure-compiler">    <target name="configure-compiler">
453    
454      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 466 
466    </target>    </target>
467    
468    
   <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>  
   
469    
470    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
471    
# Line 552  Line 518 
518             fork="true">             fork="true">
519    
520        <include name="**/*.java"/>        <include name="**/*.java"/>
521          <compilerarg value="-Xprefer:source"/>
522          <compilerarg value="-XDignore.symbol.file=true"/>
523          <compilerarg value="-Xlint:all"/>
524          <compilerarg line="${build.args}"/>
525    
526        </javac>
527      </target>
528    
529      <target name="4jdk7doclint"
530              depends="configure-compiler"
531              description="Finds doclint warnings">
532    
533        <mkdir dir="${build.4jdk7.classes.dir}"/>
534    
535        <javac srcdir="${4jdk7src.dir}"
536               destdir="${build.4jdk7.classes.dir}"
537               debug="${build.debug}"
538               debuglevel="${build.debuglevel}"
539               deprecation="${build.deprecation}"
540               source="6"
541               classpath=""
542               bootclasspath="${bootclasspath7}"
543               includeAntRuntime="false"
544               includeJavaRuntime="false"
545               executable="${javac8}"
546               fork="true">
547    
548          <include name="**/*.java"/>
549          <compilerarg value="-Xprefer:source"/>
550        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
551        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
552          <compilerarg value="-Xdoclint:all/protected"/>
553        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
554    
555      </javac>      </javac>
556    </target>    </target>
557    
558    
559    <target name="4jdk7-jar"    <target name="4jdk7jar"
560            depends="4jdk7compile"            depends="4jdk7compile"
561            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
562    
# Line 572  Line 568 
568    
569    
570    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
571            depends="4jdk7-jar"            depends="4jdk7jar"
572            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
573    
574      <run-tck-tests      <run-tck-tests
575        target="7"        target="7"
576        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
577        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
578          <javac-elements>
579            <!-- JDK8+ test classes -->
580            <exclude name="*8Test.java"/>
581            <exclude name="*9Test.java"/>
582            <exclude name="DoubleAccumulatorTest.java"/>
583            <exclude name="DoubleAdderTest.java"/>
584            <exclude name="LongAccumulatorTest.java"/>
585            <exclude name="LongAdderTest.java"/>
586            <exclude name="CompletableFutureTest.java"/>
587            <exclude name="SplittableRandomTest.java"/>
588            <exclude name="StampedLockTest.java"/>
589          </javac-elements>
590        </run-tck-tests>
591    </target>    </target>
592    
593    
# Line 604  Line 613 
613    
614        <formatter type="brief"/>        <formatter type="brief"/>
615    
616        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
617        </test>        </test>
618    
619      </junit>      </junit>
620    </target>    </target>
621    
622    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
623            depends="4jdk7compile"            depends="4jdk7jar"
624            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
625      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
626      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
627      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
628      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
629      <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>  
630    </target>    </target>
631    
632    
# Line 641  Line 639 
639    <target name="4jdk7docs"    <target name="4jdk7docs"
640            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
641    
642      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
643      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
644    
645      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
646               packagenames="none"               packagenames="none"
647               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
648               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
649                 access="${build.javadoc.access}"
650               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
651               classpath=""               classpath=""
652               executable="${javadoc7}">               executable="${javadoc7}">
# Line 660  Line 659 
659    
660    
661    <target name="4jdk7dist"    <target name="4jdk7dist"
662            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
663            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
664    
665    
# Line 672  Line 671 
671    </target>    </target>
672    
673    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
674    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
675            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
676      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
677      </target>
678    
679    
680      <target name="4jdk7dist-docs"
681              depends="4jdk7clean, 4jdk7docs">
682        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
683    </target>    </target>
684    
685    
# Line 715  Line 713 
713    </target>    </target>
714    
715    
716    <target name="jsr166x-jar"    <target name="jsr166xjar"
717            depends="jsr166xcompile"            depends="jsr166xcompile"
718            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
719    
# Line 729  Line 727 
727    <target name="jsr166xdocs"    <target name="jsr166xdocs"
728            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
729    
730      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
731      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
732    
733      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
734               packagenames="jsr166x.*"               packagenames="jsr166x.*"
735               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
736                 access="${build.javadoc.access}"
737               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
738               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
739               source="5"               source="5"
# Line 746  Line 745 
745    
746    
747    <target name="jsr166xdist"    <target name="jsr166xdist"
748            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
749            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
750    
751    
# Line 758  Line 757 
757    </target>    </target>
758    
759    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
760    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
761            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
762      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
763      </target>
764    
765      <target name="jsr166xdist-docs"
766              depends="jsr166xclean, jsr166xdocs">
767        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
768    </target>    </target>
769    
770    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 798 
798    </target>    </target>
799    
800    
801    <target name="jsr166y-jar"    <target name="jsr166yjar"
802            depends="jsr166ycompile"            depends="jsr166ycompile"
803            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
804    
# Line 816  Line 812 
812    <target name="jsr166ydocs"    <target name="jsr166ydocs"
813            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
814    
815      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
816      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
817    
818      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
819               packagenames="jsr166y.*"               packagenames="jsr166y.*"
820               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
821                 access="${build.javadoc.access}"
822               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
823               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
824               source="6"               source="6"
# Line 833  Line 830 
830    
831    
832    <target name="jsr166ydist"    <target name="jsr166ydist"
833            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
834            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
835    
836    
# Line 845  Line 842 
842    </target>    </target>
843    
844    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
845    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
846            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
847      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
848      </target>
849    
850      <target name="jsr166ydist-docs"
851              depends="jsr166yclean, jsr166ydocs">
852        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
853    </target>    </target>
854    
855    
# Line 862  Line 857 
857    
858    
859    <target name="extra166ycompile"    <target name="extra166ycompile"
860            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
861            description="Compiles extra166y sources">            description="Compiles extra166y sources">
862    
863      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 884 
884    </target>    </target>
885    
886    
887    <target name="extra166y-jar"    <target name="extra166yjar"
888            depends="extra166ycompile"            depends="extra166ycompile"
889            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
890    
# Line 903  Line 898 
898    <target name="extra166ydocs"    <target name="extra166ydocs"
899            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
900    
901      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
902      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
903    
904      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
905               packagenames="extra166y.*"               packagenames="extra166y.*"
906               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
907                 access="${build.javadoc.access}"
908               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
909               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
910               source="6"               source="6"
# Line 920  Line 916 
916    
917    
918    <target name="extra166ydist"    <target name="extra166ydist"
919            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
920            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
921    
922    
# Line 932  Line 928 
928    </target>    </target>
929    
930    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
931    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
932            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
933      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
934      </target>
935    
936      <target name="extra166ydist-docs"
937              depends="extra166yclean, extra166ydocs">
938        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
939    </target>    </target>
940    
941    <!-- jsr166e -->    <!-- jsr166e -->
942    
943      <property name="build.jsr166e.java.version" value="6"/>
944      <property name="build.jsr166e.javac" value="${javac6}"/>
945    
946    <target name="jsr166ecompile"    <target name="jsr166ecompile"
947            depends="configure-compiler"            depends="configure-compiler"
948            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 957  Line 954 
954             debug="${build.debug}"             debug="${build.debug}"
955             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
956             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
957             source="7"             source="${build.jsr166e.java.version}"
958             classpath=""             classpath=""
959             includeAntRuntime="false"             includeAntRuntime="false"
960             includeJavaRuntime="false"             includeJavaRuntime="false"
961             executable="${javac7}"             executable="${build.jsr166e.javac}"
962             fork="true">             fork="true">
963    
964        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 972  Line 969 
969      </javac>      </javac>
970    </target>    </target>
971    
972      <!-- jsr166e: find doclint errors -->
973      <target name="jsr166edoclint">
974    
975        <mkdir dir="${build.jsr166e.classes.dir}"/>
976    
977        <javac srcdir="${topsrc.dir}"
978               destdir="${build.jsr166e.classes.dir}"
979               debug="${build.debug}"
980               debuglevel="${build.debuglevel}"
981               deprecation="${build.deprecation}"
982               source="${build.jsr166e.java.version}"
983               classpath=""
984               bootclasspath="${bootclasspath7}"
985               includeAntRuntime="false"
986               includeJavaRuntime="false"
987               executable="${javac8}"
988               fork="true">
989    
990          <include name="jsr166e/**/*.java"/>
991          <compilerarg value="-XDignore.symbol.file=true"/>
992          <compilerarg value="-Xlint:all"/>
993          <compilerarg value="-Xdoclint:all/protected"/>
994    
995        </javac>
996      </target>
997    
998    
999    <target name="jsr166e-jar"    <target name="jsr166ejar"
1000            depends="jsr166ecompile"            depends="jsr166ecompile"
1001            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1002    
# Line 987  Line 1010 
1010    <target name="jsr166edocs"    <target name="jsr166edocs"
1011            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1012    
1013      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1014      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1015    
1016      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1017               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1018               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1019               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
1020               source="7"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1021                 source="${build.jsr166e.java.version}"
1022               executable="${javadoc7}">               executable="${javadoc7}">
1023        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1024    
# Line 1002  Line 1026 
1026    </target>    </target>
1027    
1028    
1029    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1030            depends="jsr166e-jar"            depends="jsr166ejar">
1031            description="Runs tck tests for jsr166e">  
1032        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1033    
1034      <run-tck-tests      <run-tck-tests
1035        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1036        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1037        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1038        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1039    </target>    </target>
1040    
1041      <target name="jsr166e-test-tck"
1042              description="Runs tck tests for jsr166e for multiple java versions">
1043    
1044    <!--     <antcall target="clean"/> -->
1045    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1046    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1047    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1048    <!--     </antcall> -->
1049    
1050        <antcall target="clean"/>
1051        <antcall target="jsr166e-test-tck-one-java-version">
1052          <param name="build.jsr166e.java.version" value="7"/>
1053          <param name="build.jsr166e.javac" value="${javac7}"/>
1054        </antcall>
1055    
1056        <antcall target="clean"/>
1057        <antcall target="jsr166e-test-tck-one-java-version">
1058          <param name="build.jsr166e.java.version" value="6"/>
1059          <param name="build.jsr166e.javac" value="${javac6}"/>
1060        </antcall>
1061      </target>
1062    
1063    
1064      <target name="jsr166e-test"
1065              depends="jsr166e-test-tck"
1066              description="Runs all tests for jsr166e">
1067      </target>
1068    
1069    <target name="jsr166edist"    <target name="jsr166edist"
1070            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1071            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1072    
1073    
1074    <target name="jsr166eclean"    <target name="jsr166eclean"
1075            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1076      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1077    </target>    </target>
1078    
1079    
1080    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
1081            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1082        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1083      </target>
1084    
1085      <target name="jsr166edist-docs"
1086              depends="jsr166eclean, jsr166edocs">
1087        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1088    </target>    </target>
1089    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166e-jar">  
1090    
1091      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1092    
1093      <target name="lint">
1094        <antcall target="dists">
1095          <param name="build.javadoc.access" value="private"/>
1096        </antcall>
1097    </target>    </target>
1098    
1099    
1100  </project>  </project>

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

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