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

Diff of /jsr166/build.xml

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

revision 1.113 by jsr166, Sun Jan 20 03:51:38 2013 UTC revision 1.180 by jsr166, Sun Sep 13 03:41:53 2015 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if" xmlns:unless="ant:unless">
3    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 16  Line 17 
17    $HOME/jdk/jdk6    $HOME/jdk/jdk6
18    $HOME/jdk/jdk7    $HOME/jdk/jdk7
19    $HOME/jdk/jdk8    $HOME/jdk/jdk8
20      $HOME/jdk/jdk9
21    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
22    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
23    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
24    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
25      $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
28    
29      Alternatively, define ant variables thus:
30      ant -Djdk$N.home=...
31      for $N in 6 7 8 9 ...
32  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
33    </description>    </description>
34    
35    <target name="usage" description="Advises user to run with -projecthelp">    <!-- Display main targets by running 'ant -projecthelp' -->
36      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
37        <java classname="org.apache.tools.ant.Main">
38          <arg value="-projecthelp" />
39        </java>
40    </target>    </target>
41    
42      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43    
44    <!-- User-specific settings -->    <!-- User-specific settings -->
45    <property file="user.properties"/>    <property file="user.properties"/>
46    
47    
48    <!-- Compilation options -->    <!-- Compilation options -->
49    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
50    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
51    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
52    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
53      <property name="build.javadoc.access" value="protected"/>
54    
55      <!-- Tck options; see JSR166TestCase.java
56       To profile a single tck test class:
57       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58       To stress test a single tck test class:
59       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60      -->
61      <property name="jsr166.profileTests"     value="false"/>
62      <property name="jsr166.profileThreshold" value="100"/>
63      <property name="jsr166.runsPerTest"      value="1"/>
64      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65    
66    <!-- Build locations -->    <!-- Build locations -->
67    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 57  Line 80 
80    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
81    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
82    
83    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
84      <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
85      <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
86      <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
87    
88      <!-- JDK locations -->
89    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
90    
91    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 67  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98      <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>      <available property="jdk@{v}.have.java.base"
99      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>        file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100      <property name="bootclasspath@{v}"      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>        if:set="jdk@{v}.have.java.base"/>
102        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103          unless:set="jdk@{v}.have.java.base"/>
104        <local name="boot.jar.dir"/>
105        <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106        <path id="bootclasspath@{v}">
107          <pathelement path="${boot.jar.dir}/resources.jar"/>
108          <pathelement path="${boot.jar.dir}/rt.jar"/>
109          <pathelement path="${boot.jar.dir}/jsse.jar"/>
110          <pathelement path="${boot.jar.dir}/jce.jar"/>
111          <pathelement path="${boot.jar.dir}/charsets.jar"/>
112        </path>
113        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
114      </sequential>      </sequential>
115    </macrodef>    </macrodef>
116    
117    <defjdklocations v="6"/>    <macrodef name="mirror-dir">
118    <defjdklocations v="7"/>      <attribute name="src"/>
119    <defjdklocations v="8"/>      <attribute name="dst"/>
   
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
120      <sequential>      <sequential>
121      <java classname="JSR166TestCase"      <delete dir="@{dst}"/>
122            jvm="@{jvm}" fork="true">      <mkdir dir="@{dst}"/>
123          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>      <copy todir="@{dst}" preservelastmodified="true">
124          <jvmarg line="@{jvmflags}"/>        <fileset dir="@{src}"/>
125          <classpath>      </copy>
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
126      </sequential>      </sequential>
127    </macrodef>    </macrodef>
128    
129      <defjdklocations v="6"/>
130      <defjdklocations v="7"/>
131      <defjdklocations v="8"/>
132      <defjdklocations v="9"/>
133    
134    <!-- Source locations -->    <!-- Source locations -->
135    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
136    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
137    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
138    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
139    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
140      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
141      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
142      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
143    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
144    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
145    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 111  Line 149 
149    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
150    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
151    
152    <!-- Distribution locations -->    <!-- Javadoc locations -->
153    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
154    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
155    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
156    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
157    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
158    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
159    
160      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
161      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
162      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
163      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
164      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
165      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
166    
167    <!-- Jar locations -->    <!-- Jar locations -->
168    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 173 
173    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
174    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
175    
176    <!-- Bootclasspath argument -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
177    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
178      <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
179      <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
180      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
181      <!-- The expected canonical location does not yet exist as of 2014-07 -->
182      <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
183      <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
184      <!-- Default jdk doc location (latest stable release seems best) -->
185      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
186    
187    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
188    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
189    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
190    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
191      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
192    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
193    <!-- The below does not yet exist as of 2012-11 -->    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
194    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->  
195      <!-- Define the "jtreg" task -->
196    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- See the docs in "jtreg -onlineHelp" -->
197    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
198               classpath="${lib.dir}/jtreg.jar" />
199    
200    <!-- Test classpath -->    <!-- Test classpath -->
201    <path id="test.classpath">    <path id="test.classpath">
# Line 149  Line 203 
203      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
204    </path>    </path>
205    
206      <macrodef name="run-tck-tests">
207        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
208        <attribute name="target"/>
209        <attribute name="compile-target" default="@{target}"/>
210        <attribute name="workdir"/>
211        <attribute name="classes"/>
212        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213        <element name="javac-elements" optional="true"/>
214        <sequential>
215    
216        <mkdir dir="@{workdir}/tck-classes"/>
217    
218        <javac srcdir="@{tck.src.dir}"
219               destdir="@{workdir}/tck-classes"
220               debug="${build.debug}"
221               debuglevel="${build.debuglevel}"
222               deprecation="${build.deprecation}"
223               source="@{compile-target}"
224               target="@{compile-target}"
225               classpath="${junit.jar}"
226               includeAntRuntime="false"
227               includeJavaRuntime="false"
228               executable="${javac@{compile-target}}"
229               fork="true">
230    
231          <include name="*.java"/>
232          <compilerarg value="-XDignore.symbol.file=true"/>
233          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
234          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
235          <compilerarg line="${build.args}"/>
236          <javac-elements/>
237    
238        </javac>
239    
240        <java classname="${jsr166.tckTestClass}"
241              failonerror="true"
242              jvm="${java@{target}}"
243              fork="true">
244            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
245            <jvmarg line="@{jvmflags}"/>
246    
247            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250            </syspropertyset>
251    
252            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
255            <classpath>
256              <pathelement location="${junit.jar}"/>
257              <pathelement location="@{workdir}/tck-classes"/>
258            </classpath>
259        </java>
260    
261        </sequential>
262      </macrodef>
263    
264      <!-- Define jtreg test sets for different jdk versions -->
265      <fileset dir="${jtreg9.src.dir}">
266        <patternset id="jdk9.jtreg.tests">
267          <include name="**/*.java"/>
268        </patternset>
269      </fileset>
270    
271      <fileset dir="${jtreg8.src.dir}">
272        <patternset id="jdk8.jtreg.tests">
273          <include name="**/*.java"/>
274          <exclude name="**/SpliteratorCharacteristics.java"/>
275          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
276          <exclude name="**/GCDuringIteration.java"/>
277        </patternset>
278      </fileset>
279    
280      <fileset dir="${jtreg7.src.dir}">
281        <patternset id="jdk7.jtreg.tests">
282          <include name="**/*.java"/>
283        </patternset>
284      </fileset>
285    
286      <macrodef name="run-jtreg-tests">
287        <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
288        <attribute name="source" default="7"/>
289        <attribute name="target"/>
290        <attribute name="workdir"/>
291        <attribute name="classes"/>
292        <attribute name="jtregflags" default=""/>
293        <sequential>
294        <delete dir="@{workdir}/JTwork"   quiet="true"/>
295        <delete dir="@{workdir}/JTreport" quiet="true"/>
296        <mkdir dir="@{workdir}/JTwork/scratch"/>
297        <mkdir dir="@{workdir}/JTreport"/>
298        <jtreg dir="${jtreg@{target}.src.dir}"
299               jdk="${jdk@{target}.home}"
300               workDir="@{workdir}/JTwork"
301               reportDir="@{workdir}/JTreport">
302          <patternset refid="jdk@{target}.jtreg.tests"/>
303          <arg value="-Xbootclasspath/p:@{classes}"/>
304          <arg value="-agentvm"/>
305          <arg value="-v:nopass,fail"/>
306          <arg value="-vmoptions:-esa -ea"/>
307          <arg value="-automatic"/>
308          <arg value="-k:!ignore"/>
309          <arg line="@{jtregflags}"/>
310        </jtreg>
311        </sequential>
312      </macrodef>
313    
314    <!-- ALoops classpath -->    <!-- ALoops classpath -->
315    <path id="loops.classpath">    <path id="loops.classpath">
316      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
317    </path>    </path>
318    
319    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
320    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
321    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
322    
323    <!-- Main targets -->    <!-- Main targets -->
324    
325      <property name="build.main.java.version" value="9"/>
326      <property name="build.main.javac" value="${javac9}"/>
327    
328    <target name="dists"    <target name="dists"
329            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
330            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 181  Line 343 
343             classpath=""             classpath=""
344             includeAntRuntime="false"             includeAntRuntime="false"
345             includeJavaRuntime="false"             includeJavaRuntime="false"
346             executable="${javac8}"             executable="${build.main.javac}"
347             fork="true">             fork="true">
348    
349        <include name="**/*.java"/>        <include name="**/*.java"/>
350        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
352        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
353          <compilerarg value="-Werror"/>
354  <!--        <compilerarg value="-Xdoclint:all/protected"/>
355        <exclude name="java/lang/**"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
356        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
357    
358      </javac>      </javac>
   
359    </target>    </target>
360    
361    
   
362    <target name="jar"    <target name="jar"
363            depends="compile"            depends="compile"
364            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
365    
366      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
367        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
368          <manifest>
369            <attribute name="Built-By" value="${user.name}"/>
370            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
371          </manifest>
372      </jar>      </jar>
   
373    </target>    </target>
374    
375    
   
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
   
376    <target name="docs"    <target name="docs"
377            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
378    
379      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
380      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
381    
382      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
383      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
384    
385      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
386               packagenames="none"               packagenames="none"
387               link="${jdkapi8docs.url}"               link="${java9.api.url}"
388               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
389               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
390                 sourcepath="${src.dir}:${jdk9src.dir}"
391               classpath=""               classpath=""
392               executable="${javadoc8}">               executable="${javadoc9}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
393        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
394          <include name="**/*.java"/>          <include name="**/*.java"/>
395        </fileset>        </fileset>
396          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
397          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
398          <arg value="-XDignore.symbol.file=true"/>
399          <arg value="-tag"/>
400          <arg value="${javadoc.jls.option}"/>
401          <arg value="-tag"/>
402          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
403          <arg value="-tag"/>
404          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
405          <arg value="-tag"/>
406          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
407      </javadoc>      </javadoc>
   
408    </target>    </target>
409    
410    
   
411    <target name="dist"    <target name="dist"
412            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
413            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
414    
415    
# Line 266  Line 427 
427        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
429        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
430          <manifest>
431            <attribute name="Built-By" value="${user.name}"/>
432            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
433          </manifest>
434      </jar>      </jar>
   
435    </target>    </target>
436    
437    
   
438    <target name="clean"    <target name="clean"
439            description="Removes all build products">            description="Removes all build products">
440    
# Line 280  Line 443 
443    </target>    </target>
444    
445    
   
446    <target name="dist-clean"    <target name="dist-clean"
447            description="Removes all build and distribution products">            description="Removes all build and distribution products">
448    
449        <delete dir="${build.dir}"/>
450      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
451    
452    </target>    </target>
453    
454    
   
   <!-- Internal targets -->  
   
   
455    <target name="dist-jar"    <target name="dist-jar"
456            depends="clean, jar">            depends="clean, jar">
   
457      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
458    </target>    </target>
459    
460      <target name="dist-docs"
461    <target name="compile-tests"            depends="clean, docs">
462            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 line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </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 line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </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="${bootclasspath.args}"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
     </javac>  
 -->  
   
463    </target>    </target>
464    
465      <target name="tck"
466              depends="jar"
467              description="Runs tck tests for main directly">
468    
469    <target name="run-tests"      <run-tck-tests
470            depends="compile-tests">        target="${build.main.java.version}"
471          workdir="${build.dir}"
472      <!-- May be overridden by user.properties -->        classes="${product.jar}"/>
473      <property name="testcase" value="*"/>    </target>
474    
475      <mkdir dir="${build.reports.dir}"/>    <target name="tck-parallelism-1"
476              description="Runs tck with given common pool parallelism">
477      <junit printsummary="true"      <antcall target="tck">
478               showoutput="true"        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479            errorProperty="junit.failed"      </antcall>
480          failureProperty="junit.failed"    </target>
481                      dir="${build.reports.dir}"  
482                      jvm="${java8}"    <target name="tck-parallelism-0"
483                     fork="true">            description="Runs tck with given common pool parallelism">
484        <antcall target="tck">
485        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486        <jvmarg value="-server"/>      </antcall>
487        <jvmarg value="-showversion"/>    </target>
488    
489        <classpath refid="test.classpath"/>    <target name="jtreg"
490              depends="jar"
491              description="Runs jtreg tests for main using the jtreg ant task">
492        <run-jtreg-tests
493           target="${build.main.java.version}"
494           workdir="${build.dir}"
495           classes="${product.jar}"/>
496      </target>
497    
498        <formatter type="xml"/>    <target name="test"
499              depends="tck, tck-parallelism-1, jtreg"
500              description="Runs tck and jtreg tests for main">
501      </target>
502    
503        <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>  
 -->  
504    
505      </junit>      <antcall target="jtreg">
506          <param name="build.main.java.version" value="8"/>
507          <param name="build.main.javac" value="${javac8}"/>
508        </antcall>
509    
510    </target>    </target>
511    
512      <target name="test89"
513              description="Runs tck and jtreg tests for main for multiple java versions">
514    
515    <target name="report-tests"      <antcall target="clean"/>
516            depends="run-tests">      <antcall target="test">
517          <param name="build.main.java.version" value="8"/>
518      <!-- Sets junit.report.format to frames if redirection is present,        <param name="build.main.javac" value="${javac8}"/>
519           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>  
520    
521      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
522        <antcall target="test">
523          <param name="build.main.java.version" value="9"/>
524          <param name="build.main.javac" value="${javac9}"/>
525        </antcall>
526    
527    </target>    </target>
528    
529    
530    
531    <target name="configure-compiler">    <target name="configure-compiler">
532        <fail message="ant version too old">
533          <condition>
534            <not> <antversion atleast="1.9.1"/> </not>
535          </condition>
536        </fail>
537    
538      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
539    
# Line 456  Line 550 
550    </target>    </target>
551    
552    
   <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>  
   
553    
554    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
555    
# Line 509  Line 580 
580    </target>    </target>
581    
582    
583    <!-- jsr166 4jdk7 -->    <target name="compile-test-loops" depends="jar"
584              description="compile all the perf tests in src/test/loops">
585    
586        <mkdir dir="${build.dir}/test/loops"/>
587    
588        <javac srcdir="${basedir}/src/test/loops"
589               destdir="${build.dir}/test/loops"
590               debug="${build.debug}"
591               debuglevel="${build.debuglevel}"
592               deprecation="${build.deprecation}"
593               includeAntRuntime="false"
594               includeJavaRuntime="false"
595               executable="${javac9}"
596               fork="true">
597    
598          <include name="*.java"/>
599          <compilerarg value="-XDignore.symbol.file=true"/>
600          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
601          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
602          <compilerarg line="${build.args}"/>
603    
604        </javac>
605    
606      </target>
607    
608    
609      <!-- jsr166 4jdk7 -->
610    
611    <target name="4jdk7compile"    <target name="4jdk7compile"
612            depends="configure-compiler"            depends="configure-compiler"
# Line 532  Line 628 
628             fork="true">             fork="true">
629    
630        <include name="**/*.java"/>        <include name="**/*.java"/>
631        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
632        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
633        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
634          <compilerarg value="-Werror"/>
635          <compilerarg line="${build.args}"/>
636    
637      </javac>      </javac>
638      </target>
639    
640      <jar destfile="${4jdk7product.jar}" index="true">    <target name="4jdk7doclint"
641        <fileset dir="${build.4jdk7.classes.dir}"/>            depends="configure-compiler"
642      </jar>            description="Finds doclint warnings">
643    
644      <mkdir dir="${build.4jdk7.tck.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
645    
646      <javac srcdir="${tck.src.dir}"      <javac srcdir="${4jdk7src.dir}"
647             destdir="${build.4jdk7.tck.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
648             debug="${build.debug}"             debug="${build.debug}"
649             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
650             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
651             source="6"             source="6"
652             classpath="${junit.jar}"             classpath=""
653             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"             bootclasspath="${bootclasspath7}"
654             includeAntRuntime="false"             includeAntRuntime="false"
655             includeJavaRuntime="false"             includeJavaRuntime="false"
656             executable="${javac7}"             executable="${javac8}"
657             fork="true">             fork="true">
658    
659        <include name="**/*.java"/>        <include name="**/*.java"/>
660        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
661        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
662        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all"/>
663          <compilerarg value="-Xdoclint:all/protected"/>
664          <compilerarg line="${build.args}"/>
665    
666      </javac>      </javac>
667      </target>
668    
669    
670      <target name="4jdk7jar"
671              depends="4jdk7compile"
672              description="Builds library jar from compiled sources">
673    
674        <jar destfile="${4jdk7product.jar}">
675          <fileset dir="${build.4jdk7.classes.dir}"/>
676          <manifest>
677            <attribute name="Built-By" value="${user.name}"/>
678            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
679          </manifest>
680        </jar>
681    
682    </target>    </target>
683    
684    
685    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
686            depends="4jdk7compile"            depends="4jdk7jar"
687            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
688    
689      <run-tck-tests      <run-tck-tests
690        jvm="${java7}"        target="7"
691        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
692        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
693          <javac-elements>
694            <!-- JDK8+ test classes -->
695            <exclude name="*8Test.java"/>
696            <exclude name="*9Test.java"/>
697            <exclude name="*10Test.java"/>
698            <exclude name="DoubleAccumulatorTest.java"/>
699            <exclude name="DoubleAdderTest.java"/>
700            <exclude name="LongAccumulatorTest.java"/>
701            <exclude name="LongAdderTest.java"/>
702            <exclude name="CompletableFutureTest.java"/>
703            <exclude name="SplittableRandomTest.java"/>
704            <exclude name="StampedLockTest.java"/>
705            <exclude name="SubmissionPublisherTest.java"/>
706          </javac-elements>
707        </run-tck-tests>
708    </target>    </target>
709    
710    
711    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
712            depends="4jdk7compile"            depends="4jdk7compile"
713            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
714    
# Line 599  Line 730 
730    
731        <formatter type="brief"/>        <formatter type="brief"/>
732    
733        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
734        </test>        </test>
735    
736      </junit>      </junit>
737    </target>    </target>
738    
739      <target name="4jdk7-jtreg"
740              depends="4jdk7jar"
741              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
742        <run-jtreg-tests
743           target="7"
744           workdir="${build.4jdk7.dir}"
745           classes="${4jdk7product.jar}"/>
746      </target>
747    
748    
749      <target name="4jdk7-test"
750              depends="4jdk7-tck, 4jdk7-jtreg"
751              description="Runs tck and jtreg tests for jsr166-4jdk7">
752      </target>
753    
754    
755    <target name="4jdk7docs"    <target name="4jdk7docs"
756            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
757    
758      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
759      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
760    
761      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
762               packagenames="none"               packagenames="none"
763               link="${jdkapi7docs.url}"               link="${java7.api.url}"
764               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
765                 access="${build.javadoc.access}"
766               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
767               classpath=""               classpath=""
768               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
769        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
770          <include name="**/*.java"/>          <include name="**/*.java"/>
771        </fileset>        </fileset>
772          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
773          <arg value="-XDignore.symbol.file=true"/>
774      </javadoc>      </javadoc>
   
775    </target>    </target>
776    
777    
778    <target name="4jdk7dist"    <target name="4jdk7dist"
779            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
780            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
781    
782    
   
783    <target name="4jdk7clean"    <target name="4jdk7clean"
784            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
785    
# Line 642  Line 788 
788    </target>    </target>
789    
790    
   
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
791    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
792            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
793      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
794      </target>
795    
796    
797      <target name="4jdk7dist-docs"
798              depends="4jdk7clean, 4jdk7docs">
799        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
800    </target>    </target>
801    
802    
# Line 662  Line 806 
806            depends="configure-compiler"            depends="configure-compiler"
807            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
808    
809      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
810    
811      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
812             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
813             debug="${build.debug}"             debug="${build.debug}"
814             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
815             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
816             classpath=""             classpath=""
            source="5"  
817             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
818               source="5"
819             includeAntRuntime="false"             includeAntRuntime="false"
820             includeJavaRuntime="false"             includeJavaRuntime="false"
821             executable="${javac7}"             executable="${javac7}"
822             fork="true">             fork="true">
823    
824        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
825        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
826        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
827          <compilerarg value="-Werror"/>
828          <compilerarg line="${build.args}"/>
829    
830      </javac>      </javac>
   
831    </target>    </target>
832    
833    
   
834    <target name="jsr166xjar"    <target name="jsr166xjar"
835            depends="jsr166xcompile"            depends="jsr166xcompile"
836            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
837    
838      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
839        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
840          <manifest>
841            <attribute name="Built-By" value="${user.name}"/>
842            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
843          </manifest>
844      </jar>      </jar>
845    
846    </target>    </target>
847    
848    
   
849    <target name="jsr166xdocs"    <target name="jsr166xdocs"
850            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
851    
852      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
853      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
854    
855      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
856               packagenames="jsr166x.*"               packagenames="jsr166x.*"
857               link="${jdkapidocs.url}"               link="${java.api.url}"
858               source="5"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
859               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
860               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
861               additionalparam="-XDignore.symbol.file=true" />               source="5"
862                 executable="${javadoc7}">
863          <arg line="-Xdocrootparent ${java.docroot.url}"/>
864          <arg value="-XDignore.symbol.file=true"/>
865    
866        </javadoc>
867    </target>    </target>
868    
869    
870    <target name="jsr166xdist"    <target name="jsr166xdist"
871            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
872            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
873    
874    
   
875    <target name="jsr166xclean"    <target name="jsr166xclean"
876            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
877    
# Line 732  Line 880 
880    </target>    </target>
881    
882    
   
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
883    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
884            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
   
885      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
886      </target>
887    
888      <target name="jsr166xdist-docs"
889              depends="jsr166xclean, jsr166xdocs">
890        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
891    </target>    </target>
892    
893    <!-- jsr166y -->    <!-- jsr166y -->
# Line 753  Line 897 
897            depends="configure-compiler"            depends="configure-compiler"
898            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
899    
900      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
901    
902      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
903             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
904             debug="${build.debug}"             debug="${build.debug}"
905             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
906             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 769  Line 913 
913             fork="true">             fork="true">
914    
915        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
916        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
917        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
918          <compilerarg value="-Werror"/>
919          <compilerarg line="${build.args}"/>
920    
921      </javac>      </javac>
922    </target>    </target>
923    
# Line 781  Line 927 
927            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
928    
929      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
930        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
931          <manifest>
932            <attribute name="Built-By" value="${user.name}"/>
933            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934          </manifest>
935      </jar>      </jar>
936    
937    </target>    </target>
938    
939    
   
940    <target name="jsr166ydocs"    <target name="jsr166ydocs"
941            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
942    
943      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
944      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
945    
946      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
947               packagenames="jsr166y.*"               packagenames="jsr166y.*"
948               link="${jdkapidocs.url}"               link="${java.api.url}"
949               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
950               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
951               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
952               additionalparam="-XDignore.symbol.file=true" />               source="6"
953                 executable="${javadoc7}">
954          <arg line="-Xdocrootparent ${java.docroot.url}"/>
955          <arg value="-XDignore.symbol.file=true"/>
956    
957        </javadoc>
958    </target>    </target>
959    
960    
961    <target name="jsr166ydist"    <target name="jsr166ydist"
962            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
963            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
964    
965    
   
966    <target name="jsr166yclean"    <target name="jsr166yclean"
967            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
968    
# Line 820  Line 971 
971    </target>    </target>
972    
973    
   
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
974    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
975            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
   
976      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
977      </target>
978    
979      <target name="jsr166ydist-docs"
980              depends="jsr166yclean, jsr166ydocs">
981        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
982    </target>    </target>
983    
984    
# Line 841  Line 989 
989            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
990            description="Compiles extra166y sources">            description="Compiles extra166y sources">
991    
992      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
993    
994      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
995             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
996             debug="${build.debug}"             debug="${build.debug}"
997             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
998             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
999               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1000             classpath=""             classpath=""
1001             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
1002             includeAntRuntime="false"             includeAntRuntime="false"
1003             includeJavaRuntime="false"             includeJavaRuntime="false"
1004             executable="${javac7}"             executable="${javac7}"
1005             fork="true">             fork="true">
1006    
1007        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1008        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1009        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1010          <compilerarg value="-Werror"/>
1011          <compilerarg line="${build.args}"/>
1012    
1013      </javac>      </javac>
   
1014    </target>    </target>
1015    
1016    
   
1017    <target name="extra166yjar"    <target name="extra166yjar"
1018            depends="extra166ycompile"            depends="extra166ycompile"
1019            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1020    
1021      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1022        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1023          <manifest>
1024            <attribute name="Built-By" value="${user.name}"/>
1025            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1026          </manifest>
1027      </jar>      </jar>
1028    
1029    </target>    </target>
1030    
1031    
   
1032    <target name="extra166ydocs"    <target name="extra166ydocs"
1033            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1034    
1035      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1036      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1037    
1038      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1039               packagenames="extra166y.*"               packagenames="extra166y.*"
1040               link="${jdkapidocs.url}"               link="${java.api.url}"
1041               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
1042               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1043               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
1044               additionalparam="-XDignore.symbol.file=true" />               source="6"
1045                 executable="${javadoc7}">
1046          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1047          <arg value="-XDignore.symbol.file=true"/>
1048    
1049        </javadoc>
1050    </target>    </target>
1051    
1052    
1053    <target name="extra166ydist"    <target name="extra166ydist"
1054            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1055            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1056    
1057    
   
1058    <target name="extra166yclean"    <target name="extra166yclean"
1059            description="Removes all extra166y build products">            description="Removes all extra166y build products">
1060    
# Line 911  Line 1063 
1063    </target>    </target>
1064    
1065    
   
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1066    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1067            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
   
1068      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1069      </target>
1070    
1071      <target name="extra166ydist-docs"
1072              depends="extra166yclean, extra166ydocs">
1073        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1074    </target>    </target>
1075    
1076    <!-- jsr166e -->    <!-- jsr166e -->
1077    
1078      <property name="build.jsr166e.java.version" value="6"/>
1079      <property name="build.jsr166e.javac" value="${javac6}"/>
1080    
1081    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1082            depends="configure-compiler"            depends="configure-compiler"
1083            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
1084    
1085      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1086    
1087      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
1088             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
1089             debug="${build.debug}"             debug="${build.debug}"
1090             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1091             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1092             source="7"             source="${build.jsr166e.java.version}"
1093             classpath=""             classpath=""
1094             includeAntRuntime="false"             includeAntRuntime="false"
1095             includeJavaRuntime="false"             includeJavaRuntime="false"
1096             executable="${javac7}"             executable="${build.jsr166e.javac}"
1097             fork="true">             fork="true">
1098    
1099        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1100        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1101        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1102          <compilerarg value="-Werror"/>
1103          <compilerarg line="${build.args}"/>
1104    
1105      </javac>      </javac>
   
1106    </target>    </target>
1107    
1108      <!-- jsr166e: find doclint errors -->
1109      <target name="jsr166edoclint">
1110    
1111        <mkdir dir="${build.jsr166e.classes.dir}"/>
1112    
1113        <javac srcdir="${topsrc.dir}"
1114               destdir="${build.jsr166e.classes.dir}"
1115               debug="${build.debug}"
1116               debuglevel="${build.debuglevel}"
1117               deprecation="${build.deprecation}"
1118               source="${build.jsr166e.java.version}"
1119               classpath=""
1120               bootclasspath="${bootclasspath7}"
1121               includeAntRuntime="false"
1122               includeJavaRuntime="false"
1123               executable="${javac8}"
1124               fork="true">
1125    
1126          <include name="jsr166e/**/*.java"/>
1127          <compilerarg value="-XDignore.symbol.file=true"/>
1128          <compilerarg value="-Xlint:all"/>
1129          <compilerarg value="-Werror"/>
1130          <compilerarg value="-Xdoclint:all/protected"/>
1131    
1132        </javac>
1133      </target>
1134    
1135    
1136    <target name="jsr166ejar"    <target name="jsr166ejar"
# Line 960  Line 1138 
1138            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1139    
1140      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1141        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1142          <manifest>
1143            <attribute name="Built-By" value="${user.name}"/>
1144            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1145          </manifest>
1146      </jar>      </jar>
1147    
1148    </target>    </target>
1149    
1150    
   
1151    <target name="jsr166edocs"    <target name="jsr166edocs"
1152            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1153    
1154      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1155      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1156    
1157      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1158               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1159               link="${jdkapidocs.url}"               link="${java.api.url}"
1160               source="7"               access="${build.javadoc.access}"
1161               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1162               executable="${javadoc7}"               source="${build.jsr166e.java.version}"
1163               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1164          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1165          <arg value="-XDignore.symbol.file=true"/>
1166    
1167      </javadoc>      </javadoc>
1168      </target>
1169    
1170    
1171      <target name="jsr166e-tck-one-java-version"
1172              depends="jsr166ejar">
1173    
1174        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1175    
1176        <run-tck-tests
1177          tck.src.dir="${test.src.dir}/tck-jsr166e"
1178          target="${build.jsr166e.java.version}"
1179          workdir="${build.jsr166e.dir}"
1180          classes="${jsr166e.jar}"/>
1181      </target>
1182    
1183      <target name="jsr166e-tck"
1184              description="Runs tck tests for jsr166e for multiple java versions">
1185    
1186    <!--     <antcall target="clean"/> -->
1187    <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1188    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1189    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1190    <!--     </antcall> -->
1191    
1192        <antcall target="clean"/>
1193        <antcall target="jsr166e-tck-one-java-version">
1194          <param name="build.jsr166e.java.version" value="7"/>
1195          <param name="build.jsr166e.javac" value="${javac7}"/>
1196        </antcall>
1197    
1198        <antcall target="clean"/>
1199        <antcall target="jsr166e-tck-one-java-version">
1200          <param name="build.jsr166e.java.version" value="6"/>
1201          <param name="build.jsr166e.javac" value="${javac6}"/>
1202        </antcall>
1203    </target>    </target>
1204    
1205    
1206      <target name="jsr166e-test"
1207              depends="jsr166e-tck"
1208              description="Runs all tests for jsr166e">
1209      </target>
1210    
1211    <target name="jsr166edist"    <target name="jsr166edist"
1212            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1213            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1214    
1215    
   
1216    <target name="jsr166eclean"    <target name="jsr166eclean"
1217            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1218      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1219    </target>    </target>
1220    
1221    
1222    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
1223            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1224        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1225      </target>
1226    
1227      <target name="jsr166edist-docs"
1228              depends="jsr166eclean, jsr166edocs">
1229        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1230    </target>    </target>
1231    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
1232    
1233      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1234    
1235      <target name="lint">
1236        <antcall target="dists">
1237          <param name="build.javadoc.access" value="public"/>
1238        </antcall>
1239    </target>    </target>
1240    
1241    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1242      <target name="lint-private">
1243        <antcall target="dist">
1244          <param name="build.javadoc.access" value="private"/>
1245        </antcall>
1246      </target>
1247    
1248    
1249  </project>  </project>

Legend:
Removed from v.1.113  
changed lines
  Added in v.1.180

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