/[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.169 by jsr166, Wed Sep 2 03:45:13 2015 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      Alternatively, define ant variables thus:
29      ant -Djdk$N.home=...
30      for $N in 6 7 8 9 ...
31  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
32    </description>    </description>
33    
34    <target name="usage" description="Advises user to run with -projecthelp">    <!-- Display main targets by running 'ant -projecthelp' -->
35      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
36        <java classname="org.apache.tools.ant.Main">
37          <arg value="-projecthelp" />
38        </java>
39    </target>    </target>
40    
41    
# Line 39  Line 48 
48    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
49    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
50    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
51      <property name="build.javadoc.access" value="protected"/>
52    
53      <!-- Tck options; see JSR166TestCase.java
54       To profile a single tck test class:
55       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56       To stress test a single tck test class:
57       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58      -->
59      <property name="jsr166.profileTests"     value="false"/>
60      <property name="jsr166.profileThreshold" value="100"/>
61      <property name="jsr166.runsPerTest"      value="1"/>
62      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63    
64    <!-- Build locations -->    <!-- Build locations -->
65    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 57  Line 78 
78    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
79    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
80    
81    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
82    <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>    <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
83    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
84    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
85    
86    <!-- JDK locations -->    <!-- JDK locations -->
87    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 86  Line 107 
107      </sequential>      </sequential>
108    </macrodef>    </macrodef>
109    
110      <macrodef name="mirror-dir">
111        <attribute name="src"/>
112        <attribute name="dst"/>
113        <sequential>
114        <delete dir="@{dst}"/>
115        <mkdir dir="@{dst}"/>
116        <copy todir="@{dst}" preservelastmodified="true">
117          <fileset dir="@{src}"/>
118        </copy>
119        </sequential>
120      </macrodef>
121    
122    <defjdklocations v="6"/>    <defjdklocations v="6"/>
123    <defjdklocations v="7"/>    <defjdklocations v="7"/>
124    <defjdklocations v="8"/>    <defjdklocations v="8"/>
125      <defjdklocations v="9"/>
126    
127    <!-- Source locations -->    <!-- Source locations -->
128    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 105  Line 139 
139    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
140    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
141    
142    <!-- Distribution locations -->    <!-- Javadoc locations -->
143    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
144    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
145    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
146    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
147    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
148    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
149    
150      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
151      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
152      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
153      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
154      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
155      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
156    
157    <!-- Jar locations -->    <!-- Jar locations -->
158    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 122  Line 163 
163    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165    
166    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
172    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174      <!-- Default jdk doc location (latest stable release seems best) -->
175      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
176    
177    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
184    
185    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
186    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 147  Line 195 
195    
196    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
197      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
198      <attribute name="target"/>      <attribute name="target"/>
199        <attribute name="compile-target" default="@{target}"/>
200      <attribute name="workdir"/>      <attribute name="workdir"/>
201      <attribute name="classes"/>      <attribute name="classes"/>
202      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203        <element name="javac-elements" optional="true"/>
204      <sequential>      <sequential>
205    
206      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 161  Line 210 
210             debug="${build.debug}"             debug="${build.debug}"
211             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
212             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
213             source="@{source}"             source="@{compile-target}"
214               target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{source}}"  
216             includeAntRuntime="false"             includeAntRuntime="false"
217             includeJavaRuntime="false"             includeJavaRuntime="false"
218             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
219             fork="true">             fork="true">
220    
221        <include name="*.java"/>        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
226          <javac-elements/>
227    
228      </javac>      </javac>
229    
230      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
231            failonerror="true"            failonerror="true"
232            jvm="${java@{target}}"            jvm="${java@{target}}"
233            fork="true">            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
236    
237            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240            </syspropertyset>
241    
242            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245          <classpath>          <classpath>
246            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
247            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 191  Line 251 
251      </sequential>      </sequential>
252    </macrodef>    </macrodef>
253    
254      <!-- Define jtreg test sets for different jdk versions -->
255      <fileset dir="${jtreg.src.dir}">
256        <patternset id="jdk9.jtreg.tests">
257          <include name="**/*.java"/>
258        </patternset>
259      </fileset>
260    
261      <fileset dir="${jtreg.src.dir}">
262        <patternset id="jdk8.jtreg.tests">
263          <include name="**/*.java"/>
264          <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266          <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267        </patternset>
268      </fileset>
269    
270      <fileset dir="${jtreg.src.dir}">
271        <patternset id="jdk7.jtreg.tests">
272          <include name="**/*.java"/>
273          <exclude name="util/Collection/CollectionDefaults.java"/>
274          <exclude name="util/List/ListDefaults.java"/>
275          <exclude name="util/Spliterator/**/*.java"/>
276          <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
277          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279          <exclude name="util/concurrent/atomic/Serial.java"/>
280        </patternset>
281      </fileset>
282    
283      <macrodef name="run-jtreg-tests">
284        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
285        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
286        <attribute name="source" default="7"/>
287        <attribute name="target"/>
288        <attribute name="workdir"/>
289        <attribute name="classes"/>
290        <attribute name="jtregflags" default=""/>
291        <sequential>
292        <delete dir="@{workdir}/JTwork"   quiet="true"/>
293        <delete dir="@{workdir}/JTreport" quiet="true"/>
294        <mkdir dir="@{workdir}/JTwork/scratch"/>
295        <mkdir dir="@{workdir}/JTreport"/>
296        <jtreg dir="@{jtreg.src.dir}"
297               jdk="${jdk@{target}.home}"
298               workDir="@{workdir}/JTwork"
299               reportDir="@{workdir}/JTreport">
300          <patternset refid="jdk@{target}.jtreg.tests"/>
301          <arg value="-Xbootclasspath/p:@{classes}"/>
302          <arg value="-agentvm"/>
303          <arg value="-v:nopass,fail"/>
304          <arg value="-vmoptions:-esa -ea"/>
305          <arg value="-automatic"/>
306          <arg value="-k:!ignore"/>
307          <arg line="@{jtregflags}"/>
308        </jtreg>
309        </sequential>
310      </macrodef>
311    
312    <!-- ALoops classpath -->    <!-- ALoops classpath -->
313    <path id="loops.classpath">    <path id="loops.classpath">
314      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 202  Line 320 
320    
321    <!-- Main targets -->    <!-- Main targets -->
322    
323      <property name="build.main.java.version" value="9"/>
324      <property name="build.main.javac" value="${javac9}"/>
325    
326    <target name="dists"    <target name="dists"
327            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
328            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 220  Line 341 
341             classpath=""             classpath=""
342             includeAntRuntime="false"             includeAntRuntime="false"
343             includeJavaRuntime="false"             includeJavaRuntime="false"
344             executable="${javac8}"             executable="${build.main.javac}"
345             fork="true">             fork="true">
346    
347        <include name="**/*.java"/>        <include name="**/*.java"/>
348          <compilerarg value="-Xprefer:source"/>
349        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
350        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
351          <compilerarg value="-Werror"/>
352          <compilerarg value="-Xdoclint:all/protected"/>
353          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
354        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
355    
356      </javac>      </javac>
# Line 242  Line 367 
367    </target>    </target>
368    
369    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
370    <target name="docs"    <target name="docs"
371            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
372    
373      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
374      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
375    
376      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
377      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
378    
379      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
380               packagenames="none"               packagenames="none"
381               link="${jdkapi8docs.url}"               link="${java9.api.url}"
382               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
383               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
384                 sourcepath="${src.dir}:${jdk9src.dir}"
385               classpath=""               classpath=""
386               executable="${javadoc8}">               executable="${javadoc9}">
387        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
388          <include name="**/*.java"/>          <include name="**/*.java"/>
389        </fileset>        </fileset>
390          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
391          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
392        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
393        <arg value="-tag"/>        <arg value="-tag"/>
394        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
395          <arg value="-tag"/>
396          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
397          <arg value="-tag"/>
398          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
399          <arg value="-tag"/>
400          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
401      </javadoc>      </javadoc>
402    </target>    </target>
403    
404    
405    <target name="dist"    <target name="dist"
406            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
407            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
408    
409    
# Line 307  Line 436 
436    <target name="dist-clean"    <target name="dist-clean"
437            description="Removes all build and distribution products">            description="Removes all build and distribution products">
438    
439        <delete dir="${build.dir}"/>
440      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
441    
442    </target>    </target>
443    
444    
   <!-- Internal targets -->  
   
   
445    <target name="dist-jar"    <target name="dist-jar"
446            depends="clean, jar">            depends="clean, jar">
   
447      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
448    </target>    </target>
449    
450      <target name="dist-docs"
451    <target name="compile-tests"            depends="clean, docs">
452            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>  
 -->  
   
453    </target>    </target>
454    
455      <target name="tck" depends="test-tck" description="alias for test-tck"/>
456      <target name="test-tck"
457              depends="jar"
458              description="Runs tck tests for main directly">
459    
460    <target name="run-tests"      <run-tck-tests
461            depends="compile-tests">        target="${build.main.java.version}"
462          workdir="${build.dir}"
463      <!-- May be overridden by user.properties -->        classes="${product.jar}"/>
464      <property name="testcase" value="*"/>    </target>
465    
466      <mkdir dir="${build.reports.dir}"/>    <target name="test-tck-parallelism-1"
467              description="Runs test-tck with given common pool parallelism">
468      <junit printsummary="true"      <antcall target="test-tck">
469               showoutput="true"        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
470            errorProperty="junit.failed"      </antcall>
471          failureProperty="junit.failed"    </target>
472                      dir="${build.reports.dir}"  
473                      jvm="${java8}"    <target name="test-tck-parallelism-0"
474                     fork="true">            description="Runs test-tck with given common pool parallelism">
475        <antcall target="test-tck">
476        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
477        <jvmarg value="-server"/>      </antcall>
478        <jvmarg value="-showversion"/>    </target>
479    
480        <classpath refid="test.classpath"/>    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
481      <target name="test-jtreg"
482              depends="jar"
483              description="Runs jtreg tests for main using the jtreg ant task">
484        <run-jtreg-tests
485           target="${build.main.java.version}"
486           workdir="${build.dir}"
487           classes="${product.jar}"/>
488      </target>
489    
490        <formatter type="xml"/>    <target name="test"
491              depends="test-tck, test-tck-parallelism-1, test-jtreg"
492              description="Runs tck and jtreg tests for main">
493      </target>
494    
495        <batchtest todir="${build.reports.dir}" unless="no.test.tck">    <target name="jtreg8" description="Runs jtreg tests with jdk8">
         <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>  
 -->  
496    
497      </junit>      <antcall target="jtreg">
498          <param name="build.main.java.version" value="8"/>
499          <param name="build.main.javac" value="${javac8}"/>
500        </antcall>
501    
502    </target>    </target>
503    
504      <target name="test89"
505              description="Runs tck and jtreg tests for main for multiple java versions">
506    
507    <target name="report-tests"      <antcall target="clean"/>
508            depends="run-tests">      <antcall target="test">
509          <param name="build.main.java.version" value="8"/>
510      <!-- Sets junit.report.format to frames if redirection is present,        <param name="build.main.javac" value="${javac8}"/>
511           otherwise sets it to noframes. -->      </antcall>
     <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>  
512    
513      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
514        <antcall target="test">
515          <param name="build.main.java.version" value="9"/>
516          <param name="build.main.javac" value="${javac9}"/>
517        </antcall>
518    
519    </target>    </target>
520    
521    
522    
523    <target name="configure-compiler">    <target name="configure-compiler">
524    
525      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 537 
537    </target>    </target>
538    
539    
   <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>  
   
540    
541    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
542    
# Line 530  Line 567 
567    </target>    </target>
568    
569    
570      <target name="compile-test-loops" depends="jar"
571              description="compile all the perf tests in src/test/loops">
572    
573        <mkdir dir="${build.dir}/test/loops"/>
574    
575        <javac srcdir="${basedir}/src/test/loops"
576               destdir="${build.dir}/test/loops"
577               debug="${build.debug}"
578               debuglevel="${build.debuglevel}"
579               deprecation="${build.deprecation}"
580               includeAntRuntime="false"
581               includeJavaRuntime="false"
582               executable="${javac9}"
583               fork="true">
584    
585          <include name="*.java"/>
586          <compilerarg value="-XDignore.symbol.file=true"/>
587          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
588          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
589          <compilerarg line="${build.args}"/>
590    
591        </javac>
592    
593      </target>
594    
595    
596    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
597    
598    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 552  Line 615 
615             fork="true">             fork="true">
616    
617        <include name="**/*.java"/>        <include name="**/*.java"/>
618          <compilerarg value="-Xprefer:source"/>
619        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
620        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
621          <compilerarg value="-Werror"/>
622        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
623    
624      </javac>      </javac>
625    </target>    </target>
626    
627      <target name="4jdk7doclint"
628              depends="configure-compiler"
629              description="Finds doclint warnings">
630    
631        <mkdir dir="${build.4jdk7.classes.dir}"/>
632    
633        <javac srcdir="${4jdk7src.dir}"
634               destdir="${build.4jdk7.classes.dir}"
635               debug="${build.debug}"
636               debuglevel="${build.debuglevel}"
637               deprecation="${build.deprecation}"
638               source="6"
639               classpath=""
640               bootclasspath="${bootclasspath7}"
641               includeAntRuntime="false"
642               includeJavaRuntime="false"
643               executable="${javac8}"
644               fork="true">
645    
646    <target name="4jdk7-jar"        <include name="**/*.java"/>
647          <compilerarg value="-Xprefer:source"/>
648          <compilerarg value="-XDignore.symbol.file=true"/>
649          <compilerarg value="-Xlint:all"/>
650          <compilerarg value="-Xdoclint:all/protected"/>
651          <compilerarg line="${build.args}"/>
652    
653        </javac>
654      </target>
655    
656    
657      <target name="4jdk7jar"
658            depends="4jdk7compile"            depends="4jdk7compile"
659            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
660    
# Line 572  Line 666 
666    
667    
668    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
669            depends="4jdk7-jar"            depends="4jdk7jar"
670            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
671    
672      <run-tck-tests      <run-tck-tests
673        target="7"        target="7"
674        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
675        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
676          <javac-elements>
677            <!-- JDK8+ test classes -->
678            <exclude name="*8Test.java"/>
679            <exclude name="*9Test.java"/>
680            <exclude name="DoubleAccumulatorTest.java"/>
681            <exclude name="DoubleAdderTest.java"/>
682            <exclude name="LongAccumulatorTest.java"/>
683            <exclude name="LongAdderTest.java"/>
684            <exclude name="CompletableFutureTest.java"/>
685            <exclude name="SplittableRandomTest.java"/>
686            <exclude name="StampedLockTest.java"/>
687          </javac-elements>
688        </run-tck-tests>
689    </target>    </target>
690    
691    
# Line 604  Line 711 
711    
712        <formatter type="brief"/>        <formatter type="brief"/>
713    
714        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
715        </test>        </test>
716    
717      </junit>      </junit>
718    </target>    </target>
719    
720    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
721            depends="4jdk7compile"            depends="4jdk7jar"
722            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
723      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
724      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
725      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
726      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            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>  
727    </target>    </target>
728    
729    
# Line 641  Line 736 
736    <target name="4jdk7docs"    <target name="4jdk7docs"
737            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
738    
739      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
740      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
741    
742      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
743               packagenames="none"               packagenames="none"
744               link="${jdkapi7docs.url}"               link="${java7.api.url}"
745               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
746                 access="${build.javadoc.access}"
747               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
748               classpath=""               classpath=""
749               executable="${javadoc7}">               executable="${javadoc7}">
750        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
751          <include name="**/*.java"/>          <include name="**/*.java"/>
752        </fileset>        </fileset>
753          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
754        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
755      </javadoc>      </javadoc>
756    </target>    </target>
757    
758    
759    <target name="4jdk7dist"    <target name="4jdk7dist"
760            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
761            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
762    
763    
# Line 672  Line 769 
769    </target>    </target>
770    
771    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
772    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
773            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
774      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
775      </target>
776    
777    
778      <target name="4jdk7dist-docs"
779              depends="4jdk7clean, 4jdk7docs">
780        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
781    </target>    </target>
782    
783    
# Line 709  Line 805 
805        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
806        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
807        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
808          <compilerarg value="-Werror"/>
809        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
810    
811      </javac>      </javac>
812    </target>    </target>
813    
814    
815    <target name="jsr166x-jar"    <target name="jsr166xjar"
816            depends="jsr166xcompile"            depends="jsr166xcompile"
817            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
818    
# Line 729  Line 826 
826    <target name="jsr166xdocs"    <target name="jsr166xdocs"
827            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
828    
829      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
830      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
831    
832      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
833               packagenames="jsr166x.*"               packagenames="jsr166x.*"
834               link="${jdkapidocs.url}"               link="${java.api.url}"
835                 access="${build.javadoc.access}"
836               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
837               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
838               source="5"               source="5"
839               executable="${javadoc7}">               executable="${javadoc7}">
840          <arg line="-Xdocrootparent ${java.docroot.url}"/>
841        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
842    
843      </javadoc>      </javadoc>
# Line 746  Line 845 
845    
846    
847    <target name="jsr166xdist"    <target name="jsr166xdist"
848            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
849            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
850    
851    
# Line 758  Line 857 
857    </target>    </target>
858    
859    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
860    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
861            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
862      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
863      </target>
864    
865      <target name="jsr166xdist-docs"
866              depends="jsr166xclean, jsr166xdocs">
867        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
868    </target>    </target>
869    
870    <!-- jsr166y -->    <!-- jsr166y -->
# Line 796  Line 892 
892        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
893        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
894        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
895          <compilerarg value="-Werror"/>
896        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
897    
898      </javac>      </javac>
899    </target>    </target>
900    
901    
902    <target name="jsr166y-jar"    <target name="jsr166yjar"
903            depends="jsr166ycompile"            depends="jsr166ycompile"
904            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
905    
# Line 816  Line 913 
913    <target name="jsr166ydocs"    <target name="jsr166ydocs"
914            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
915    
916      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
917      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
918    
919      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
920               packagenames="jsr166y.*"               packagenames="jsr166y.*"
921               link="${jdkapidocs.url}"               link="${java.api.url}"
922                 access="${build.javadoc.access}"
923               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
924               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
925               source="6"               source="6"
926               executable="${javadoc7}">               executable="${javadoc7}">
927          <arg line="-Xdocrootparent ${java.docroot.url}"/>
928        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
929    
930      </javadoc>      </javadoc>
# Line 833  Line 932 
932    
933    
934    <target name="jsr166ydist"    <target name="jsr166ydist"
935            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
936            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
937    
938    
# Line 845  Line 944 
944    </target>    </target>
945    
946    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
947    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
948            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
949      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
950      </target>
951    
952      <target name="jsr166ydist-docs"
953              depends="jsr166yclean, jsr166ydocs">
954        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
955    </target>    </target>
956    
957    
# Line 862  Line 959 
959    
960    
961    <target name="extra166ycompile"    <target name="extra166ycompile"
962            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
963            description="Compiles extra166y sources">            description="Compiles extra166y sources">
964    
965      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 883  Line 980 
980        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
981        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
982        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
983          <compilerarg value="-Werror"/>
984        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
985    
986      </javac>      </javac>
987    </target>    </target>
988    
989    
990    <target name="extra166y-jar"    <target name="extra166yjar"
991            depends="extra166ycompile"            depends="extra166ycompile"
992            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
993    
# Line 903  Line 1001 
1001    <target name="extra166ydocs"    <target name="extra166ydocs"
1002            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1003    
1004      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1005      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1006    
1007      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1008               packagenames="extra166y.*"               packagenames="extra166y.*"
1009               link="${jdkapidocs.url}"               link="${java.api.url}"
1010                 access="${build.javadoc.access}"
1011               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1012               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1013               source="6"               source="6"
1014               executable="${javadoc7}">               executable="${javadoc7}">
1015          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1016        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1017    
1018      </javadoc>      </javadoc>
# Line 920  Line 1020 
1020    
1021    
1022    <target name="extra166ydist"    <target name="extra166ydist"
1023            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1024            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1025    
1026    
# Line 932  Line 1032 
1032    </target>    </target>
1033    
1034    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1035    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1036            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
1037      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1038      </target>
1039    
1040      <target name="extra166ydist-docs"
1041              depends="extra166yclean, extra166ydocs">
1042        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1043    </target>    </target>
1044    
1045    <!-- jsr166e -->    <!-- jsr166e -->
1046    
1047      <property name="build.jsr166e.java.version" value="6"/>
1048      <property name="build.jsr166e.javac" value="${javac6}"/>
1049    
1050    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1051            depends="configure-compiler"            depends="configure-compiler"
1052            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 957  Line 1058 
1058             debug="${build.debug}"             debug="${build.debug}"
1059             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1060             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1061             source="7"             source="${build.jsr166e.java.version}"
1062             classpath=""             classpath=""
1063             includeAntRuntime="false"             includeAntRuntime="false"
1064             includeJavaRuntime="false"             includeJavaRuntime="false"
1065             executable="${javac7}"             executable="${build.jsr166e.javac}"
1066             fork="true">             fork="true">
1067    
1068        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1069        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1070        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1071          <compilerarg value="-Werror"/>
1072        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1073    
1074      </javac>      </javac>
1075    </target>    </target>
1076    
1077      <!-- jsr166e: find doclint errors -->
1078      <target name="jsr166edoclint">
1079    
1080        <mkdir dir="${build.jsr166e.classes.dir}"/>
1081    
1082        <javac srcdir="${topsrc.dir}"
1083               destdir="${build.jsr166e.classes.dir}"
1084               debug="${build.debug}"
1085               debuglevel="${build.debuglevel}"
1086               deprecation="${build.deprecation}"
1087               source="${build.jsr166e.java.version}"
1088               classpath=""
1089               bootclasspath="${bootclasspath7}"
1090               includeAntRuntime="false"
1091               includeJavaRuntime="false"
1092               executable="${javac8}"
1093               fork="true">
1094    
1095    <target name="jsr166e-jar"        <include name="jsr166e/**/*.java"/>
1096          <compilerarg value="-XDignore.symbol.file=true"/>
1097          <compilerarg value="-Xlint:all"/>
1098          <compilerarg value="-Werror"/>
1099          <compilerarg value="-Xdoclint:all/protected"/>
1100    
1101        </javac>
1102      </target>
1103    
1104    
1105      <target name="jsr166ejar"
1106            depends="jsr166ecompile"            depends="jsr166ecompile"
1107            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1108    
# Line 987  Line 1116 
1116    <target name="jsr166edocs"    <target name="jsr166edocs"
1117            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1118    
1119      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1120      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1121    
1122      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1123               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1124               link="${jdkapidocs.url}"               link="${java.api.url}"
1125               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
1126               source="7"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1127                 source="${build.jsr166e.java.version}"
1128               executable="${javadoc7}">               executable="${javadoc7}">
1129          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1130        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1131    
1132      </javadoc>      </javadoc>
1133    </target>    </target>
1134    
1135    
1136    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1137            depends="jsr166e-jar"            depends="jsr166ejar">
1138            description="Runs tck tests for jsr166e">  
1139        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1140    
1141      <run-tck-tests      <run-tck-tests
1142        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1143        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1144        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1145        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1146    </target>    </target>
1147    
1148      <target name="jsr166e-test-tck"
1149              description="Runs tck tests for jsr166e for multiple java versions">
1150    
1151    <!--     <antcall target="clean"/> -->
1152    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1153    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1154    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1155    <!--     </antcall> -->
1156    
1157        <antcall target="clean"/>
1158        <antcall target="jsr166e-test-tck-one-java-version">
1159          <param name="build.jsr166e.java.version" value="7"/>
1160          <param name="build.jsr166e.javac" value="${javac7}"/>
1161        </antcall>
1162    
1163        <antcall target="clean"/>
1164        <antcall target="jsr166e-test-tck-one-java-version">
1165          <param name="build.jsr166e.java.version" value="6"/>
1166          <param name="build.jsr166e.javac" value="${javac6}"/>
1167        </antcall>
1168      </target>
1169    
1170    
1171      <target name="jsr166e-test"
1172              depends="jsr166e-test-tck"
1173              description="Runs all tests for jsr166e">
1174      </target>
1175    
1176    <target name="jsr166edist"    <target name="jsr166edist"
1177            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1178            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1179    
1180    
1181    <target name="jsr166eclean"    <target name="jsr166eclean"
1182            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1183      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1184    </target>    </target>
1185    
1186    
1187    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
1188            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1189        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1190      </target>
1191    
1192      <target name="jsr166edist-docs"
1193              depends="jsr166eclean, jsr166edocs">
1194        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1195    </target>    </target>
1196    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166e-jar">  
1197    
1198      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1199    
1200      <target name="lint">
1201        <antcall target="dists">
1202          <param name="build.javadoc.access" value="public"/>
1203        </antcall>
1204    </target>    </target>
1205    
1206    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1207      <target name="lint-private">
1208        <antcall target="dist">
1209          <param name="build.javadoc.access" value="private"/>
1210        </antcall>
1211      </target>
1212    
1213    
1214  </project>  </project>

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

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