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

Diff of /jsr166/build.xml

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

revision 1.116 by jsr166, Sun Jan 20 07:24:52 2013 UTC revision 1.173 by jsr166, Thu Sep 3 01:24:31 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 binary locations -->    <!-- JDK locations -->
87    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
88    
89    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 72  Line 93 
93      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
94      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
95      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
     <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>  
96      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
97      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
98       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
99        <path id="bootclasspath@{v}">
100          <pathelement path="${boot.jar.dir}/resources.jar"/>
101          <pathelement path="${boot.jar.dir}/rt.jar"/>
102          <pathelement path="${boot.jar.dir}/jsse.jar"/>
103          <pathelement path="${boot.jar.dir}/jce.jar"/>
104          <pathelement path="${boot.jar.dir}/charsets.jar"/>
105        </path>
106        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
107      </sequential>      </sequential>
108    </macrodef>    </macrodef>
109    
110    <defjdklocations v="6"/>    <macrodef name="mirror-dir">
111    <defjdklocations v="7"/>      <attribute name="src"/>
112    <defjdklocations v="8"/>      <attribute name="dst"/>
   
   <macrodef name="run-tck-tests">  
     <attribute name="target"/>  
     <attribute name="workdir"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
113      <sequential>      <sequential>
114        <delete dir="@{dst}"/>
115      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{dst}"/>
116        <copy todir="@{dst}" preservelastmodified="true">
117      <javac srcdir="${tck.src.dir}"        <fileset dir="@{src}"/>
118             destdir="@{workdir}/tck-classes"      </copy>
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac@{target}}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   
     <java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">  
         <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>  
         <jvmarg line="@{jvmflags}"/>  
         <classpath>  
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{workdir}/tck-classes"/>  
         </classpath>  
     </java>  
   
119      </sequential>      </sequential>
120    </macrodef>    </macrodef>
121    
122      <defjdklocations v="6"/>
123      <defjdklocations v="7"/>
124      <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"/>
129    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
130    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
131    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
132    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
133      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
134      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
135      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
136    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
137    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
138    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 138  Line 142 
142    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
143    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
144    
145    <!-- Distribution locations -->    <!-- Javadoc locations -->
146    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
147    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
148    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
149    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
150    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
151    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
152    
153      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
154      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
155      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
156      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
157      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
158      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
159    
160    <!-- Jar locations -->    <!-- Jar locations -->
161    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 155  Line 166 
166    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
167    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
168    
169    <!-- Bootclasspath argument -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
170    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
171      <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
172      <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
173      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
174      <!-- The expected canonical location does not yet exist as of 2014-07 -->
175      <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
176      <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
177      <!-- Default jdk doc location (latest stable release seems best) -->
178      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
179    
180    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
181    <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/"/>
182    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
183    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
184      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
185    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
186    <!-- The below does not yet exist as of 2012-11 -->    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
   <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->  
   
   <!-- Default jdk api doc location (latest stable release seems best) -->  
   <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>  
187    
188    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
189    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 181  Line 196 
196      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
197    </path>    </path>
198    
199      <macrodef name="run-tck-tests">
200        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
201        <attribute name="target"/>
202        <attribute name="compile-target" default="@{target}"/>
203        <attribute name="workdir"/>
204        <attribute name="classes"/>
205        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
206        <element name="javac-elements" optional="true"/>
207        <sequential>
208    
209        <mkdir dir="@{workdir}/tck-classes"/>
210    
211        <javac srcdir="@{tck.src.dir}"
212               destdir="@{workdir}/tck-classes"
213               debug="${build.debug}"
214               debuglevel="${build.debuglevel}"
215               deprecation="${build.deprecation}"
216               source="@{compile-target}"
217               target="@{compile-target}"
218               classpath="${junit.jar}"
219               includeAntRuntime="false"
220               includeJavaRuntime="false"
221               executable="${javac@{compile-target}}"
222               fork="true">
223    
224          <include name="*.java"/>
225          <compilerarg value="-XDignore.symbol.file=true"/>
226          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
227          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
228          <compilerarg line="${build.args}"/>
229          <javac-elements/>
230    
231        </javac>
232    
233        <java classname="${jsr166.tckTestClass}"
234              failonerror="true"
235              jvm="${java@{target}}"
236              fork="true">
237            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
238            <jvmarg line="@{jvmflags}"/>
239    
240            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
241            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
242              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
243            </syspropertyset>
244    
245            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
246            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
247            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
248            <classpath>
249              <pathelement location="${junit.jar}"/>
250              <pathelement location="@{workdir}/tck-classes"/>
251            </classpath>
252        </java>
253    
254        </sequential>
255      </macrodef>
256    
257      <!-- Define jtreg test sets for different jdk versions -->
258      <fileset dir="${jtreg9.src.dir}">
259        <patternset id="jdk9.jtreg.tests">
260          <include name="**/*.java"/>
261        </patternset>
262      </fileset>
263    
264      <fileset dir="${jtreg8.src.dir}">
265        <patternset id="jdk8.jtreg.tests">
266          <include name="**/*.java"/>
267          <exclude name="**/SpliteratorCharacteristics.java"/>
268          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
269          <exclude name="**/GCDuringIteration.java"/>
270        </patternset>
271      </fileset>
272    
273      <fileset dir="${jtreg7.src.dir}">
274        <patternset id="jdk7.jtreg.tests">
275          <include name="**/*.java"/>
276        </patternset>
277      </fileset>
278    
279      <macrodef name="run-jtreg-tests">
280        <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
281        <attribute name="source" default="7"/>
282        <attribute name="target"/>
283        <attribute name="workdir"/>
284        <attribute name="classes"/>
285        <attribute name="jtregflags" default=""/>
286        <sequential>
287        <delete dir="@{workdir}/JTwork"   quiet="true"/>
288        <delete dir="@{workdir}/JTreport" quiet="true"/>
289        <mkdir dir="@{workdir}/JTwork/scratch"/>
290        <mkdir dir="@{workdir}/JTreport"/>
291        <jtreg dir="${jtreg@{target}.src.dir}"
292               jdk="${jdk@{target}.home}"
293               workDir="@{workdir}/JTwork"
294               reportDir="@{workdir}/JTreport">
295          <patternset refid="jdk@{target}.jtreg.tests"/>
296          <arg value="-Xbootclasspath/p:@{classes}"/>
297          <arg value="-agentvm"/>
298          <arg value="-v:nopass,fail"/>
299          <arg value="-vmoptions:-esa -ea"/>
300          <arg value="-automatic"/>
301          <arg value="-k:!ignore"/>
302          <arg line="@{jtregflags}"/>
303        </jtreg>
304        </sequential>
305      </macrodef>
306    
307    <!-- ALoops classpath -->    <!-- ALoops classpath -->
308    <path id="loops.classpath">    <path id="loops.classpath">
309      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
310    </path>    </path>
311    
312    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
313    <!-- 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"/>  
314    <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;:"/>
315    
316    <!-- Main targets -->    <!-- Main targets -->
317    
318      <property name="build.main.java.version" value="9"/>
319      <property name="build.main.javac" value="${javac9}"/>
320    
321    <target name="dists"    <target name="dists"
322            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
323            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 213  Line 336 
336             classpath=""             classpath=""
337             includeAntRuntime="false"             includeAntRuntime="false"
338             includeJavaRuntime="false"             includeJavaRuntime="false"
339             executable="${javac8}"             executable="${build.main.javac}"
340             fork="true">             fork="true">
341    
342        <include name="**/*.java"/>        <include name="**/*.java"/>
343        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
345        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
346          <compilerarg value="-Werror"/>
347  <!--        <compilerarg value="-Xdoclint:all/protected"/>
348        <exclude name="java/lang/**"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
349        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
350    
351      </javac>      </javac>
   
352    </target>    </target>
353    
354    
   
355    <target name="jar"    <target name="jar"
356            depends="compile"            depends="compile"
357            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 240  Line 359 
359      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
360        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
361      </jar>      </jar>
   
362    </target>    </target>
363    
364    
   
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
   
365    <target name="docs"    <target name="docs"
366            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
367    
368      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
369      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
370    
371      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
372      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
373    
374      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
375               packagenames="none"               packagenames="none"
376               link="${jdkapi8docs.url}"               link="${java9.api.url}"
377               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
378               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
379                 sourcepath="${src.dir}:${jdk9src.dir}"
380               classpath=""               classpath=""
381               executable="${javadoc8}">               executable="${javadoc9}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
382        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
383          <include name="**/*.java"/>          <include name="**/*.java"/>
384        </fileset>        </fileset>
385          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
386          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
387          <arg value="-XDignore.symbol.file=true"/>
388          <arg value="-tag"/>
389          <arg value="${javadoc.jls.option}"/>
390          <arg value="-tag"/>
391          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
392          <arg value="-tag"/>
393          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
394          <arg value="-tag"/>
395          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
396      </javadoc>      </javadoc>
   
397    </target>    </target>
398    
399    
   
400    <target name="dist"    <target name="dist"
401            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
402            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
403    
404    
# Line 299  Line 417 
417        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
418        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
419      </jar>      </jar>
   
420    </target>    </target>
421    
422    
   
423    <target name="clean"    <target name="clean"
424            description="Removes all build products">            description="Removes all build products">
425    
# Line 312  Line 428 
428    </target>    </target>
429    
430    
   
431    <target name="dist-clean"    <target name="dist-clean"
432            description="Removes all build and distribution products">            description="Removes all build and distribution products">
433    
434        <delete dir="${build.dir}"/>
435      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
436    
437    </target>    </target>
438    
439    
   
   <!-- Internal targets -->  
   
   
440    <target name="dist-jar"    <target name="dist-jar"
441            depends="clean, jar">            depends="clean, jar">
   
442      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
443    </target>    </target>
444    
445      <target name="dist-docs"
446    <target name="compile-tests"            depends="clean, docs">
447            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>  
 -->  
   
448    </target>    </target>
449    
450      <target name="tck" depends="test-tck" description="alias for test-tck"/>
451      <target name="test-tck"
452              depends="jar"
453              description="Runs tck tests for main directly">
454    
455    <target name="run-tests"      <run-tck-tests
456            depends="compile-tests">        target="${build.main.java.version}"
457          workdir="${build.dir}"
458      <!-- May be overridden by user.properties -->        classes="${product.jar}"/>
459      <property name="testcase" value="*"/>    </target>
460    
461      <mkdir dir="${build.reports.dir}"/>    <target name="test-tck-parallelism-1"
462              description="Runs test-tck with given common pool parallelism">
463      <junit printsummary="true"      <antcall target="test-tck">
464               showoutput="true"        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
465            errorProperty="junit.failed"      </antcall>
466          failureProperty="junit.failed"    </target>
467                      dir="${build.reports.dir}"  
468                      jvm="${java8}"    <target name="test-tck-parallelism-0"
469                     fork="true">            description="Runs test-tck with given common pool parallelism">
470        <antcall target="test-tck">
471        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
472        <jvmarg value="-server"/>      </antcall>
473        <jvmarg value="-showversion"/>    </target>
474    
475        <classpath refid="test.classpath"/>    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
476      <target name="test-jtreg"
477              depends="jar"
478              description="Runs jtreg tests for main using the jtreg ant task">
479        <run-jtreg-tests
480           target="${build.main.java.version}"
481           workdir="${build.dir}"
482           classes="${product.jar}"/>
483      </target>
484    
485        <formatter type="xml"/>    <target name="test"
486              depends="test-tck, test-tck-parallelism-1, test-jtreg"
487              description="Runs tck and jtreg tests for main">
488      </target>
489    
490        <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>  
 -->  
491    
492      </junit>      <antcall target="jtreg">
493          <param name="build.main.java.version" value="8"/>
494          <param name="build.main.javac" value="${javac8}"/>
495        </antcall>
496    
497    </target>    </target>
498    
499      <target name="test89"
500              description="Runs tck and jtreg tests for main for multiple java versions">
501    
502    <target name="report-tests"      <antcall target="clean"/>
503            depends="run-tests">      <antcall target="test">
504          <param name="build.main.java.version" value="8"/>
505          <param name="build.main.javac" value="${javac8}"/>
506        </antcall>
507    
508      <!-- Sets junit.report.format to frames if redirection is present,      <antcall target="clean"/>
509           otherwise sets it to noframes. -->      <antcall target="test">
510      <available property="junit.report.format"        <param name="build.main.java.version" value="9"/>
511                    value="frames"        <param name="build.main.javac" value="${javac9}"/>
512                classname="org.apache.xalan.lib.Redirect"      </antcall>
     />  
     <property name="junit.report.format" value="noframes"/>  
   
     <junitreport todir="${build.reports.dir}">  
       <fileset dir="${build.reports.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
   
     <fail message="Test Cases Failed" if="junit.failed"/>  
513    
514    </target>    </target>
515    
516    
517    
518    <target name="configure-compiler">    <target name="configure-compiler">
519    
520      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 488  Line 532 
532    </target>    </target>
533    
534    
   <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>  
   
535    
536    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
537    
# Line 541  Line 562 
562    </target>    </target>
563    
564    
565    <!-- jsr166 4jdk7 -->    <target name="compile-test-loops" depends="jar"
566              description="compile all the perf tests in src/test/loops">
567    
568        <mkdir dir="${build.dir}/test/loops"/>
569    
570        <javac srcdir="${basedir}/src/test/loops"
571               destdir="${build.dir}/test/loops"
572               debug="${build.debug}"
573               debuglevel="${build.debuglevel}"
574               deprecation="${build.deprecation}"
575               includeAntRuntime="false"
576               includeJavaRuntime="false"
577               executable="${javac9}"
578               fork="true">
579    
580          <include name="*.java"/>
581          <compilerarg value="-XDignore.symbol.file=true"/>
582          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
583          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
584          <compilerarg line="${build.args}"/>
585    
586        </javac>
587    
588      </target>
589    
590    
591      <!-- jsr166 4jdk7 -->
592    
593    <target name="4jdk7compile"    <target name="4jdk7compile"
594            depends="configure-compiler"            depends="configure-compiler"
# Line 564  Line 610 
610             fork="true">             fork="true">
611    
612        <include name="**/*.java"/>        <include name="**/*.java"/>
613        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
614        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
615        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
616          <compilerarg value="-Werror"/>
617          <compilerarg line="${build.args}"/>
618    
619      </javac>      </javac>
620      </target>
621    
622      <target name="4jdk7doclint"
623              depends="configure-compiler"
624              description="Finds doclint warnings">
625    
626        <mkdir dir="${build.4jdk7.classes.dir}"/>
627    
628        <javac srcdir="${4jdk7src.dir}"
629               destdir="${build.4jdk7.classes.dir}"
630               debug="${build.debug}"
631               debuglevel="${build.debuglevel}"
632               deprecation="${build.deprecation}"
633               source="6"
634               classpath=""
635               bootclasspath="${bootclasspath7}"
636               includeAntRuntime="false"
637               includeJavaRuntime="false"
638               executable="${javac8}"
639               fork="true">
640    
641          <include name="**/*.java"/>
642          <compilerarg value="-Xprefer:source"/>
643          <compilerarg value="-XDignore.symbol.file=true"/>
644          <compilerarg value="-Xlint:all"/>
645          <compilerarg value="-Xdoclint:all/protected"/>
646          <compilerarg line="${build.args}"/>
647    
648        </javac>
649    </target>    </target>
650    
651    <target name="4jdk7-jar"  
652      <target name="4jdk7jar"
653            depends="4jdk7compile"            depends="4jdk7compile"
654            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
655    
# Line 584  Line 661 
661    
662    
663    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
664            depends="4jdk7-jar"            depends="4jdk7jar"
665            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
666    
667      <run-tck-tests      <run-tck-tests
668        target="7"        target="7"
669        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
670        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
671          <javac-elements>
672            <!-- JDK8+ test classes -->
673            <exclude name="*8Test.java"/>
674            <exclude name="*9Test.java"/>
675            <exclude name="DoubleAccumulatorTest.java"/>
676            <exclude name="DoubleAdderTest.java"/>
677            <exclude name="LongAccumulatorTest.java"/>
678            <exclude name="LongAdderTest.java"/>
679            <exclude name="CompletableFutureTest.java"/>
680            <exclude name="SplittableRandomTest.java"/>
681            <exclude name="StampedLockTest.java"/>
682          </javac-elements>
683        </run-tck-tests>
684    </target>    </target>
685    
686    
# Line 616  Line 706 
706    
707        <formatter type="brief"/>        <formatter type="brief"/>
708    
709        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
710        </test>        </test>
711    
712      </junit>      </junit>
713    </target>    </target>
714    
715    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
716            depends="4jdk7compile"            depends="4jdk7jar"
717            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
718      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
719      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
720      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
721      <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>  
722    </target>    </target>
723    
724    
# Line 653  Line 731 
731    <target name="4jdk7docs"    <target name="4jdk7docs"
732            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
733    
734      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
735      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
736    
737      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
738               packagenames="none"               packagenames="none"
739               link="${jdkapi7docs.url}"               link="${java7.api.url}"
740               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
741                 access="${build.javadoc.access}"
742               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
743               classpath=""               classpath=""
744               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
745        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
746          <include name="**/*.java"/>          <include name="**/*.java"/>
747        </fileset>        </fileset>
748          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
749          <arg value="-XDignore.symbol.file=true"/>
750      </javadoc>      </javadoc>
   
751    </target>    </target>
752    
753    
754    <target name="4jdk7dist"    <target name="4jdk7dist"
755            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
756            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
757    
758    
   
759    <target name="4jdk7clean"    <target name="4jdk7clean"
760            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
761    
# Line 686  Line 764 
764    </target>    </target>
765    
766    
   
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
767    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
768            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
769      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
770      </target>
771    
772    
773      <target name="4jdk7dist-docs"
774              depends="4jdk7clean, 4jdk7docs">
775        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
776    </target>    </target>
777    
778    
# Line 714  Line 790 
790             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
791             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
792             classpath=""             classpath=""
            source="5"  
793             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
794               source="5"
795             includeAntRuntime="false"             includeAntRuntime="false"
796             includeJavaRuntime="false"             includeJavaRuntime="false"
797             executable="${javac7}"             executable="${javac7}"
798             fork="true">             fork="true">
799    
800        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
801        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
802        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
803          <compilerarg value="-Werror"/>
804          <compilerarg line="${build.args}"/>
805    
806      </javac>      </javac>
   
807    </target>    </target>
808    
809    
   
810    <target name="jsr166xjar"    <target name="jsr166xjar"
811            depends="jsr166xcompile"            depends="jsr166xcompile"
812            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 743  Line 818 
818    </target>    </target>
819    
820    
   
821    <target name="jsr166xdocs"    <target name="jsr166xdocs"
822            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
823    
824      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
825      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
826    
827      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
828               packagenames="jsr166x.*"               packagenames="jsr166x.*"
829               link="${jdkapidocs.url}"               link="${java.api.url}"
830               source="5"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
831               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
832               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
833               additionalparam="-XDignore.symbol.file=true"/>               source="5"
834                 executable="${javadoc7}">
835          <arg line="-Xdocrootparent ${java.docroot.url}"/>
836          <arg value="-XDignore.symbol.file=true"/>
837    
838        </javadoc>
839    </target>    </target>
840    
841    
842    <target name="jsr166xdist"    <target name="jsr166xdist"
843            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
844            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
845    
846    
   
847    <target name="jsr166xclean"    <target name="jsr166xclean"
848            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
849    
# Line 776  Line 852 
852    </target>    </target>
853    
854    
   
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
855    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
856            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
   
857      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
858      </target>
859    
860      <target name="jsr166xdist-docs"
861              depends="jsr166xclean, jsr166xdocs">
862        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
863    </target>    </target>
864    
865    <!-- jsr166y -->    <!-- jsr166y -->
# Line 813  Line 885 
885             fork="true">             fork="true">
886    
887        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
888        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
889        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
890          <compilerarg value="-Werror"/>
891          <compilerarg line="${build.args}"/>
892    
893      </javac>      </javac>
894    </target>    </target>
895    
# Line 831  Line 905 
905    </target>    </target>
906    
907    
   
908    <target name="jsr166ydocs"    <target name="jsr166ydocs"
909            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
910    
911      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
912      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
913    
914      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
915               packagenames="jsr166y.*"               packagenames="jsr166y.*"
916               link="${jdkapidocs.url}"               link="${java.api.url}"
917               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
918               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
919               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
920               additionalparam="-XDignore.symbol.file=true"/>               source="6"
921                 executable="${javadoc7}">
922          <arg line="-Xdocrootparent ${java.docroot.url}"/>
923          <arg value="-XDignore.symbol.file=true"/>
924    
925        </javadoc>
926    </target>    </target>
927    
928    
929    <target name="jsr166ydist"    <target name="jsr166ydist"
930            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
931            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
932    
933    
   
934    <target name="jsr166yclean"    <target name="jsr166yclean"
935            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
936    
# Line 864  Line 939 
939    </target>    </target>
940    
941    
   
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
942    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
943            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
   
944      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
945      </target>
946    
947      <target name="jsr166ydist-docs"
948              depends="jsr166yclean, jsr166ydocs">
949        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
950    </target>    </target>
951    
952    
# Line 892  Line 964 
964             debug="${build.debug}"             debug="${build.debug}"
965             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
966             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
967               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
968             classpath=""             classpath=""
969             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
970             includeAntRuntime="false"             includeAntRuntime="false"
971             includeJavaRuntime="false"             includeJavaRuntime="false"
972             executable="${javac7}"             executable="${javac7}"
973             fork="true">             fork="true">
974    
975        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
976        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
977        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
978          <compilerarg value="-Werror"/>
979          <compilerarg line="${build.args}"/>
980    
981      </javac>      </javac>
   
982    </target>    </target>
983    
984    
   
985    <target name="extra166yjar"    <target name="extra166yjar"
986            depends="extra166ycompile"            depends="extra166ycompile"
987            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 922  Line 993 
993    </target>    </target>
994    
995    
   
996    <target name="extra166ydocs"    <target name="extra166ydocs"
997            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
998    
999      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1000      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1001    
1002      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1003               packagenames="extra166y.*"               packagenames="extra166y.*"
1004               link="${jdkapidocs.url}"               link="${java.api.url}"
1005               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
1006               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1007               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
1008               additionalparam="-XDignore.symbol.file=true"/>               source="6"
1009                 executable="${javadoc7}">
1010          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1011          <arg value="-XDignore.symbol.file=true"/>
1012    
1013        </javadoc>
1014    </target>    </target>
1015    
1016    
1017    <target name="extra166ydist"    <target name="extra166ydist"
1018            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1019            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1020    
1021    
   
1022    <target name="extra166yclean"    <target name="extra166yclean"
1023            description="Removes all extra166y build products">            description="Removes all extra166y build products">
1024    
# Line 955  Line 1027 
1027    </target>    </target>
1028    
1029    
   
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1030    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1031            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
   
1032      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1033      </target>
1034    
1035      <target name="extra166ydist-docs"
1036              depends="extra166yclean, extra166ydocs">
1037        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1038    </target>    </target>
1039    
1040    <!-- jsr166e -->    <!-- jsr166e -->
1041    
1042      <property name="build.jsr166e.java.version" value="6"/>
1043      <property name="build.jsr166e.javac" value="${javac6}"/>
1044    
1045    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1046            depends="configure-compiler"            depends="configure-compiler"
1047            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 981  Line 1053 
1053             debug="${build.debug}"             debug="${build.debug}"
1054             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1055             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1056             source="7"             source="${build.jsr166e.java.version}"
1057             classpath=""             classpath=""
1058             includeAntRuntime="false"             includeAntRuntime="false"
1059             includeJavaRuntime="false"             includeJavaRuntime="false"
1060             executable="${javac7}"             executable="${build.jsr166e.javac}"
1061             fork="true">             fork="true">
1062    
1063        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1064        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1065        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1066          <compilerarg value="-Werror"/>
1067          <compilerarg line="${build.args}"/>
1068    
1069      </javac>      </javac>
   
1070    </target>    </target>
1071    
1072      <!-- jsr166e: find doclint errors -->
1073      <target name="jsr166edoclint">
1074    
1075        <mkdir dir="${build.jsr166e.classes.dir}"/>
1076    
1077        <javac srcdir="${topsrc.dir}"
1078               destdir="${build.jsr166e.classes.dir}"
1079               debug="${build.debug}"
1080               debuglevel="${build.debuglevel}"
1081               deprecation="${build.deprecation}"
1082               source="${build.jsr166e.java.version}"
1083               classpath=""
1084               bootclasspath="${bootclasspath7}"
1085               includeAntRuntime="false"
1086               includeJavaRuntime="false"
1087               executable="${javac8}"
1088               fork="true">
1089    
1090          <include name="jsr166e/**/*.java"/>
1091          <compilerarg value="-XDignore.symbol.file=true"/>
1092          <compilerarg value="-Xlint:all"/>
1093          <compilerarg value="-Werror"/>
1094          <compilerarg value="-Xdoclint:all/protected"/>
1095    
1096        </javac>
1097      </target>
1098    
1099    
1100    <target name="jsr166ejar"    <target name="jsr166ejar"
# Line 1010  Line 1108 
1108    </target>    </target>
1109    
1110    
   
1111    <target name="jsr166edocs"    <target name="jsr166edocs"
1112            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1113    
1114      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1115      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1116    
1117      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1118               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1119               link="${jdkapidocs.url}"               link="${java.api.url}"
1120               source="7"               access="${build.javadoc.access}"
1121               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1122               executable="${javadoc7}"               source="${build.jsr166e.java.version}"
1123               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1124          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1125          <arg value="-XDignore.symbol.file=true"/>
1126    
1127      </javadoc>      </javadoc>
1128      </target>
1129    
1130    
1131      <target name="jsr166e-test-tck-one-java-version"
1132              depends="jsr166ejar">
1133    
1134        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1135    
1136        <run-tck-tests
1137          tck.src.dir="${test.src.dir}/tck-jsr166e"
1138          target="${build.jsr166e.java.version}"
1139          workdir="${build.jsr166e.dir}"
1140          classes="${jsr166e.jar}"/>
1141      </target>
1142    
1143      <target name="jsr166e-test-tck"
1144              description="Runs tck tests for jsr166e for multiple java versions">
1145    
1146    <!--     <antcall target="clean"/> -->
1147    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1148    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1149    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1150    <!--     </antcall> -->
1151    
1152        <antcall target="clean"/>
1153        <antcall target="jsr166e-test-tck-one-java-version">
1154          <param name="build.jsr166e.java.version" value="7"/>
1155          <param name="build.jsr166e.javac" value="${javac7}"/>
1156        </antcall>
1157    
1158        <antcall target="clean"/>
1159        <antcall target="jsr166e-test-tck-one-java-version">
1160          <param name="build.jsr166e.java.version" value="6"/>
1161          <param name="build.jsr166e.javac" value="${javac6}"/>
1162        </antcall>
1163    </target>    </target>
1164    
1165    
1166      <target name="jsr166e-test"
1167              depends="jsr166e-test-tck"
1168              description="Runs all tests for jsr166e">
1169      </target>
1170    
1171    <target name="jsr166edist"    <target name="jsr166edist"
1172            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1173            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1174    
1175    
   
1176    <target name="jsr166eclean"    <target name="jsr166eclean"
1177            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1178      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1179    </target>    </target>
1180    
1181    
1182    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
1183            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1184        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1185      </target>
1186    
1187      <target name="jsr166edist-docs"
1188              depends="jsr166eclean, jsr166edocs">
1189        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1190    </target>    </target>
1191    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
1192    
1193      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1194    
1195      <target name="lint">
1196        <antcall target="dists">
1197          <param name="build.javadoc.access" value="public"/>
1198        </antcall>
1199    </target>    </target>
1200    
1201    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1202      <target name="lint-private">
1203        <antcall target="dist">
1204          <param name="build.javadoc.access" value="private"/>
1205        </antcall>
1206      </target>
1207    
1208    
1209  </project>  </project>

Legend:
Removed from v.1.116  
changed lines
  Added in v.1.173

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