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

Diff of /jsr166/build.xml

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

revision 1.101 by jsr166, Sat Jan 19 17:30:36 2013 UTC revision 1.171 by jsr166, Wed Sep 2 04:46:40 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 35  Line 44 
44    
45    
46    <!-- Compilation options -->    <!-- Compilation options -->
47    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
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"/>
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
69    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
70    
71    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
73    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
74    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>  
75    
76    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
   
77    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
78    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
79    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
   <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
80    
81    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
82      <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
83      <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
84      <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
85    
86      <!-- 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 81  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="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
113      <sequential>      <sequential>
114      <java classname="JSR166TestCase"      <delete dir="@{dst}"/>
115            jvm="@{jvm}" fork="true">      <mkdir dir="@{dst}"/>
116          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>      <copy todir="@{dst}" preservelastmodified="true">
117          <jvmarg line="@{jvmflags}"/>        <fileset dir="@{src}"/>
118          <classpath>      </copy>
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{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"/>
# Line 124  Line 138 
138    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
139    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
140    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>  
141    
142    <!-- Distribution locations -->    <!-- Javadoc locations -->
143    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
144    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
145    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
146    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
147    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
148    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
149    
150      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
151      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
152      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
153      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
154      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
155      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
156    
157    <!-- Jar locations -->    <!-- Jar locations -->
158    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
159    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
160    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
161    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
162    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
163    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165    
166    <!-- Bootclasspath argument -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168      <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169      <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171      <!-- The expected canonical location does not yet exist as of 2014-07 -->
172      <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173      <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174      <!-- Default jdk doc location (latest stable release seems best) -->
175      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
176    
177    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178    <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/"/>
179    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183    <!-- The below does not yet exist as of 2012-11 -->    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
184    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->  
185    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <!-- Define the "jtreg" task -->
186      <!-- See the docs in "jtreg -onlineHelp" -->
187      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
188               classpath="${lib.dir}/jtreg.jar" />
189    
190    <!-- Test classpath -->    <!-- Test classpath -->
191    <path id="test.classpath">    <path id="test.classpath">
# Line 162  Line 193 
193      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
194    </path>    </path>
195    
196      <macrodef name="run-tck-tests">
197        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
198        <attribute name="target"/>
199        <attribute name="compile-target" default="@{target}"/>
200        <attribute name="workdir"/>
201        <attribute name="classes"/>
202        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203        <element name="javac-elements" optional="true"/>
204        <sequential>
205    
206        <mkdir dir="@{workdir}/tck-classes"/>
207    
208        <javac srcdir="@{tck.src.dir}"
209               destdir="@{workdir}/tck-classes"
210               debug="${build.debug}"
211               debuglevel="${build.debuglevel}"
212               deprecation="${build.deprecation}"
213               source="@{compile-target}"
214               target="@{compile-target}"
215               classpath="${junit.jar}"
216               includeAntRuntime="false"
217               includeJavaRuntime="false"
218               executable="${javac@{compile-target}}"
219               fork="true">
220    
221          <include name="*.java"/>
222          <compilerarg value="-XDignore.symbol.file=true"/>
223          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225          <compilerarg line="${build.args}"/>
226          <javac-elements/>
227    
228        </javac>
229    
230        <java classname="${jsr166.tckTestClass}"
231              failonerror="true"
232              jvm="${java@{target}}"
233              fork="true">
234            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235            <jvmarg line="@{jvmflags}"/>
236    
237            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240            </syspropertyset>
241    
242            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245            <classpath>
246              <pathelement location="${junit.jar}"/>
247              <pathelement location="@{workdir}/tck-classes"/>
248            </classpath>
249        </java>
250    
251        </sequential>
252      </macrodef>
253    
254      <!-- Define jtreg test sets for different jdk versions -->
255      <fileset dir="${jtreg.src.dir}">
256        <patternset id="jdk9.jtreg.tests">
257          <include name="**/*.java"/>
258        </patternset>
259      </fileset>
260    
261      <fileset dir="${jtreg.src.dir}">
262        <patternset id="jdk8.jtreg.tests">
263          <include name="**/*.java"/>
264          <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266          <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267        </patternset>
268      </fileset>
269    
270      <fileset dir="${jtreg.src.dir}">
271        <patternset id="jdk7.jtreg.tests">
272          <include name="**/*.java"/>
273          <exclude name="util/Collection/CollectionDefaults.java"/>
274          <exclude name="util/List/ListDefaults.java"/>
275          <exclude name="util/Spliterator/**/*.java"/>
276          <exclude name="**/CompletableFuture/**/*.java"/>
277          <exclude name="**/ConcurrentAssociateTest.java"/>
278          <exclude name="**/ConcurrentContainsKeyTest.java"/>
279          <exclude name="**/ConcurrentHashMap/ToArray.java"/>
280          <exclude name="**/ConcurrentRemoveIf.java"/>
281          <exclude name="**/COWSubList.java"/>
282          <exclude name="**/FutureTask/NegativeTimeout.java"/>
283          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
284          <exclude name="**/StampedLock/**/*.java"/>
285          <exclude name="**/AtomicReferenceTest.java"/>
286          <exclude name="util/concurrent/atomic/Serial.java"/>
287        </patternset>
288      </fileset>
289    
290      <macrodef name="run-jtreg-tests">
291        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
292        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
293        <attribute name="source" default="7"/>
294        <attribute name="target"/>
295        <attribute name="workdir"/>
296        <attribute name="classes"/>
297        <attribute name="jtregflags" default=""/>
298        <sequential>
299        <delete dir="@{workdir}/JTwork"   quiet="true"/>
300        <delete dir="@{workdir}/JTreport" quiet="true"/>
301        <mkdir dir="@{workdir}/JTwork/scratch"/>
302        <mkdir dir="@{workdir}/JTreport"/>
303        <jtreg dir="@{jtreg.src.dir}"
304               jdk="${jdk@{target}.home}"
305               workDir="@{workdir}/JTwork"
306               reportDir="@{workdir}/JTreport">
307          <patternset refid="jdk@{target}.jtreg.tests"/>
308          <arg value="-Xbootclasspath/p:@{classes}"/>
309          <arg value="-agentvm"/>
310          <arg value="-v:nopass,fail"/>
311          <arg value="-vmoptions:-esa -ea"/>
312          <arg value="-automatic"/>
313          <arg value="-k:!ignore"/>
314          <arg line="@{jtregflags}"/>
315        </jtreg>
316        </sequential>
317      </macrodef>
318    
319    <!-- ALoops classpath -->    <!-- ALoops classpath -->
320    <path id="loops.classpath">    <path id="loops.classpath">
321      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
322    </path>    </path>
323    
324    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
325    <!-- 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"/>  
326    <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;:"/>
327    
328    <!-- Main targets -->    <!-- Main targets -->
329    
330      <property name="build.main.java.version" value="9"/>
331      <property name="build.main.javac" value="${javac9}"/>
332    
333    <target name="dists"    <target name="dists"
334            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
335            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
336    
337    <target name="compile"    <target name="compile"
338            depends="configure-compiler"            depends="configure-compiler"
339            description="Compiles src/main sources to build folder">            description="Compiles src/main sources to build dir">
340    
341      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
342    
# Line 194  Line 348 
348             classpath=""             classpath=""
349             includeAntRuntime="false"             includeAntRuntime="false"
350             includeJavaRuntime="false"             includeJavaRuntime="false"
351             executable="${javac8}"             executable="${build.main.javac}"
352             fork="true">             fork="true">
353    
354        <include name="**/*.java"/>        <include name="**/*.java"/>
355        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
356        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
357        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
358          <compilerarg value="-Werror"/>
359  <!--        <compilerarg value="-Xdoclint:all/protected"/>
360        <exclude name="java/lang/**"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
361        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
362    
363      </javac>      </javac>
   
364    </target>    </target>
365    
366    
   
367    <target name="jar"    <target name="jar"
368            depends="compile"            depends="compile"
369            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
370    
     <mkdir dir="${build.lib.dir}"/>  
   
371      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
372        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
373      </jar>      </jar>
   
374    </target>    </target>
375    
376    
   
   <target name="test"  
           depends="init, configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
   
377    <target name="docs"    <target name="docs"
378            description="Builds javadocs for src/main">            description="Builds javadocs for src/main to dist dir">
379    
380      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
381      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
382    
383      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
384      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
385    
386      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
387               packagenames="none"               packagenames="none"
388               link="${jdkapi8docs.url}"               link="${java9.api.url}"
389               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
390               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
391                 sourcepath="${src.dir}:${jdk9src.dir}"
392               classpath=""               classpath=""
393               executable="${javadoc8}">               executable="${javadoc9}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
394        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
395          <include name="**/*.java"/>          <include name="**/*.java"/>
396        </fileset>        </fileset>
397          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
398          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
399          <arg value="-XDignore.symbol.file=true"/>
400          <arg value="-tag"/>
401          <arg value="${javadoc.jls.option}"/>
402          <arg value="-tag"/>
403          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
404          <arg value="-tag"/>
405          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
406          <arg value="-tag"/>
407          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
408      </javadoc>      </javadoc>
   
409    </target>    </target>
410    
411    
   
412    <target name="dist"    <target name="dist"
413            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
414            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
415    
416    
# Line 282  Line 429 
429        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
430        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
431      </jar>      </jar>
   
432    </target>    </target>
433    
434    
   
435    <target name="clean"    <target name="clean"
436            description="Removes all build products">            description="Removes all build products">
437    
438      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
439    
440    </target>    </target>
441    
442    
   
443    <target name="dist-clean"    <target name="dist-clean"
444            description="Removes all build and distribution products">            description="Removes all build and distribution products">
445    
446        <delete dir="${build.dir}"/>
447      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
448    
449    </target>    </target>
450    
451    
   
   <!-- Internal targets -->  
   
   
   <target name="init">  
   
     <!-- Version is kept in a separate file -->  
     <loadfile property="version" srcFile="version.properties"/>  
     <echo>Building JSR-166 version ${version}</echo>  
     <echo>java.home is ${java.home}</echo>  
   
   </target>  
   
   
452    <target name="dist-jar"    <target name="dist-jar"
453            depends="clean, jar">            depends="clean, jar">
   
454      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
455    </target>    </target>
456    
457      <target name="dist-docs"
458    <target name="compile-tests"            depends="clean, docs">
459            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="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg value="${bootclasspath.args}"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
       <classpath refid="test.classpath"/>  
   
     </javac>  
   
     <javac srcdir="${test.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <include name="jsr166/test/**"/>  
   
       <compilerarg value="${bootclasspath.args}"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
       <classpath refid="test.classpath"/>  
   
     </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"/>  
   
       <classpath refid="test.classpath"/>  
   
     </javac>  
 -->  
   
460    </target>    </target>
461    
462      <target name="tck" depends="test-tck" description="alias for test-tck"/>
463      <target name="test-tck"
464              depends="jar"
465              description="Runs tck tests for main directly">
466    
467    <target name="run-tests"      <run-tck-tests
468            depends="compile-tests">        target="${build.main.java.version}"
469          workdir="${build.dir}"
470      <!-- May be overridden by user.properties -->        classes="${product.jar}"/>
471      <property name="testcase" value="*"/>    </target>
472    
473      <mkdir dir="${build.reports.dir}"/>    <target name="test-tck-parallelism-1"
474              description="Runs test-tck with given common pool parallelism">
475      <junit printsummary="true"      <antcall target="test-tck">
476               showoutput="true"        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
477            errorProperty="junit.failed"      </antcall>
478          failureProperty="junit.failed"    </target>
479                      dir="${build.reports.dir}"  
480                     fork="true">    <target name="test-tck-parallelism-0"
481              description="Runs test-tck with given common pool parallelism">
482        <jvmarg value="${bootclasspath.args}"/>      <antcall target="test-tck">
483        <jvmarg value="-server"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
484        <jvmarg value="-showversion"/>      </antcall>
485      </target>
486        <classpath refid="test.classpath"/>  
487      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
488      <target name="test-jtreg"
489              depends="jar"
490              description="Runs jtreg tests for main using the jtreg ant task">
491        <run-jtreg-tests
492           target="${build.main.java.version}"
493           workdir="${build.dir}"
494           classes="${product.jar}"/>
495      </target>
496    
497        <formatter type="xml"/>    <target name="test"
498              depends="test-tck, test-tck-parallelism-1, test-jtreg"
499              description="Runs tck and jtreg tests for main">
500      </target>
501    
502        <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>  
 -->  
503    
504      </junit>      <antcall target="jtreg">
505          <param name="build.main.java.version" value="8"/>
506          <param name="build.main.javac" value="${javac8}"/>
507        </antcall>
508    
509    </target>    </target>
510    
511      <target name="test89"
512              description="Runs tck and jtreg tests for main for multiple java versions">
513    
514    <target name="report-tests"      <antcall target="clean"/>
515            depends="run-tests">      <antcall target="test">
516          <param name="build.main.java.version" value="8"/>
517          <param name="build.main.javac" value="${javac8}"/>
518        </antcall>
519    
520      <!-- Sets junit.report.format to frames if redirection is present,      <antcall target="clean"/>
521           otherwise sets it to noframes. -->      <antcall target="test">
522      <available property="junit.report.format"        <param name="build.main.java.version" value="9"/>
523                    value="frames"        <param name="build.main.javac" value="${javac9}"/>
524                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"/>  
525    
526    </target>    </target>
527    
528    
529    
530    <target name="configure-compiler">    <target name="configure-compiler">
531    
532      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 544 
544    </target>    </target>
545    
546    
   <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>  
   
547    
548    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
549    
550    
551    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
552            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
553    
554      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 530  Line 574 
574    </target>    </target>
575    
576    
577    <!-- jsr166 4jdk7 -->    <target name="compile-test-loops" depends="jar"
578              description="compile all the perf tests in src/test/loops">
579    
580        <mkdir dir="${build.dir}/test/loops"/>
581    
582        <javac srcdir="${basedir}/src/test/loops"
583               destdir="${build.dir}/test/loops"
584               debug="${build.debug}"
585               debuglevel="${build.debuglevel}"
586               deprecation="${build.deprecation}"
587               includeAntRuntime="false"
588               includeJavaRuntime="false"
589               executable="${javac9}"
590               fork="true">
591    
592          <include name="*.java"/>
593          <compilerarg value="-XDignore.symbol.file=true"/>
594          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
595          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
596          <compilerarg line="${build.args}"/>
597    
598        </javac>
599    
600      </target>
601    
602    
603      <!-- jsr166 4jdk7 -->
604    
605    <target name="4jdk7compile"    <target name="4jdk7compile"
606            depends="configure-compiler"            depends="configure-compiler"
607            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 544  Line 613 
613             debug="${build.debug}"             debug="${build.debug}"
614             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
615             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
616             source="1.6"             source="6"
617             classpath=""             classpath=""
618             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
619             includeAntRuntime="false"             includeAntRuntime="false"
# Line 553  Line 622 
622             fork="true">             fork="true">
623    
624        <include name="**/*.java"/>        <include name="**/*.java"/>
625        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
626        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
627        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
628          <compilerarg value="-Werror"/>
629          <compilerarg line="${build.args}"/>
630    
631      </javac>      </javac>
632      </target>
633    
634      <mkdir dir="${build.4jdk7.lib.dir}"/>    <target name="4jdk7doclint"
635              depends="configure-compiler"
636      <jar destfile="${4jdk7product.jar}" index="true">            description="Finds doclint warnings">
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
637    
638      <mkdir dir="${build.4jdk7.tck.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
639    
640      <javac srcdir="${tck.src.dir}"      <javac srcdir="${4jdk7src.dir}"
641             destdir="${build.4jdk7.tck.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
642             debug="${build.debug}"             debug="${build.debug}"
643             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
644             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
645             source="1.6"             source="6"
646             classpath="${junit.jar}"             classpath=""
647             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"             bootclasspath="${bootclasspath7}"
648             includeAntRuntime="false"             includeAntRuntime="false"
649             includeJavaRuntime="false"             includeJavaRuntime="false"
650             executable="${javac7}"             executable="${javac8}"
651             fork="true">             fork="true">
652    
653        <include name="**/*.java"/>        <include name="**/*.java"/>
654        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
655        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
656        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all"/>
657          <compilerarg value="-Xdoclint:all/protected"/>
658          <compilerarg line="${build.args}"/>
659    
660      </javac>      </javac>
661      </target>
662    
663    
664      <target name="4jdk7jar"
665              depends="4jdk7compile"
666              description="Builds library jar from compiled sources">
667    
668        <jar destfile="${4jdk7product.jar}">
669          <fileset dir="${build.4jdk7.classes.dir}"/>
670        </jar>
671    
672    </target>    </target>
673    
674    
675    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
676            depends="4jdk7compile"            depends="4jdk7jar"
677            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
678    
679      <run-tck-tests      <run-tck-tests
680        jvm="${java7}"        target="7"
681        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
682        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
683          <javac-elements>
684            <!-- JDK8+ test classes -->
685            <exclude name="*8Test.java"/>
686            <exclude name="*9Test.java"/>
687            <exclude name="DoubleAccumulatorTest.java"/>
688            <exclude name="DoubleAdderTest.java"/>
689            <exclude name="LongAccumulatorTest.java"/>
690            <exclude name="LongAdderTest.java"/>
691            <exclude name="CompletableFutureTest.java"/>
692            <exclude name="SplittableRandomTest.java"/>
693            <exclude name="StampedLockTest.java"/>
694          </javac-elements>
695        </run-tck-tests>
696    </target>    </target>
697    
698    
# Line 622  Line 718 
718    
719        <formatter type="brief"/>        <formatter type="brief"/>
720    
721        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
722        </test>        </test>
723    
724      </junit>      </junit>
725    </target>    </target>
726    
727      <target name="4jdk7-test-jtreg"
728              depends="4jdk7jar"
729              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
730        <run-jtreg-tests
731           target="7"
732           workdir="${build.4jdk7.dir}"
733           classes="${4jdk7product.jar}"/>
734      </target>
735    
736    
737      <target name="4jdk7-test"
738              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
739              description="Runs tck and jtreg tests for jsr166-4jdk7">
740      </target>
741    
742    
743    <target name="4jdk7docs"    <target name="4jdk7docs"
744            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
745    
746      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
747      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
748    
749      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
750               packagenames="none"               packagenames="none"
751               link="${jdkapi7docs.url}"               link="${java7.api.url}"
752               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
753                 access="${build.javadoc.access}"
754               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
755               classpath=""               classpath=""
756               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
757        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
758          <include name="**/*.java"/>          <include name="**/*.java"/>
759        </fileset>        </fileset>
760          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
761          <arg value="-XDignore.symbol.file=true"/>
762      </javadoc>      </javadoc>
   
763    </target>    </target>
764    
765    
766    <target name="4jdk7dist"    <target name="4jdk7dist"
767            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
768            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
769    
770    
   
771    <target name="4jdk7clean"    <target name="4jdk7clean"
772            description="Removes all build products">            description="Removes all 4jdk7 build products">
773    
774      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
775    
776    </target>    </target>
777    
778    
779      <target name="4jdk7dist-jar"
780    <target name="4jdk7dist-clean"            depends="4jdk7clean, 4jdk7jar">
781            description="Removes all build and distribution products">      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
   
782    </target>    </target>
783    
   <target name="4jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.4jdk7.docs.dir}"/>  
     <mkdir dir="${dist.4jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.4jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${4jdk7src.dir}/intro.html"  
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
784    
785      <target name="4jdk7dist-docs"
786              depends="4jdk7clean, 4jdk7docs">
787        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
788    </target>    </target>
789    
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7compile">  
   
     <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>  
   
   </target>  
790    
791    <!-- jsr166x -->    <!-- jsr166x -->
792    
   
793    <target name="jsr166xcompile"    <target name="jsr166xcompile"
794            depends="init, configure-compiler"            depends="configure-compiler"
795            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
796    
797      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
798    
799      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
800            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
801              debug="${build.debug}"             debug="${build.debug}"
802         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
803        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
804             source="${build.sourcelevel}"             classpath=""
805               fork="true">             bootclasspath="${bootclasspath6}"
806               source="5"
807               includeAntRuntime="false"
808               includeJavaRuntime="false"
809               executable="${javac7}"
810               fork="true">
811    
812        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
813        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
814          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
815          <compilerarg value="-Werror"/>
816          <compilerarg line="${build.args}"/>
817    
818      </javac>      </javac>
   
819    </target>    </target>
820    
821    
   
822    <target name="jsr166xjar"    <target name="jsr166xjar"
823            depends="jsr166xcompile"            depends="jsr166xcompile"
824            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
825    
826      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
827          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
828      </jar>      </jar>
829    
830    </target>    </target>
831    
832    
   
833    <target name="jsr166xdocs"    <target name="jsr166xdocs"
834            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
835    
836      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
837      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
838    
839      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
840               packagenames="jsr166x"               packagenames="jsr166x.*"
841               link="${jdkapidocs.url}"               link="${java.api.url}"
842               source="${build.sourcelevel}"               access="${build.javadoc.access}"
843               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
844               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
845                 source="5"
846                 executable="${javadoc7}">
847          <arg line="-Xdocrootparent ${java.docroot.url}"/>
848          <arg value="-XDignore.symbol.file=true"/>
849    
850        </javadoc>
851    </target>    </target>
852    
853    
854    <target name="jsr166xdist"    <target name="jsr166xdist"
855            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
856            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
857    
858    
   
859    <target name="jsr166xclean"    <target name="jsr166xclean"
860            description="Removes all build products">            description="Removes all jsr166x build products">
861    
862      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
863    
864    </target>    </target>
865    
866    
   
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
867    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
868            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
869        <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
870      </target>
871    
872      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166xdist-docs"
873              depends="jsr166xclean, jsr166xdocs">
874        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
875    </target>    </target>
876    
877    <!-- jsr166y -->    <!-- jsr166y -->
878    
879    
880    <target name="jsr166ycompile"    <target name="jsr166ycompile"
881            depends="init, configure-compiler"            depends="configure-compiler"
882            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
883    
884      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
885    
886      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
887            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
888              debug="${build.debug}"             debug="${build.debug}"
889         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
890        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
891             source="${build.sourcelevel}"             source="6"
892               fork="true">             classpath=""
893               bootclasspath="${bootclasspath6}"
894               includeAntRuntime="false"
895               includeJavaRuntime="false"
896               executable="${javac7}"
897               fork="true">
898    
899        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
900        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
901        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
902          <compilerarg value="-Werror"/>
903  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->        <compilerarg line="${build.args}"/>
904    
905      </javac>      </javac>
   
906    </target>    </target>
907    
908    
   
909    <target name="jsr166yjar"    <target name="jsr166yjar"
910            depends="jsr166ycompile"            depends="jsr166ycompile"
911            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
912    
913      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
914          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
915      </jar>      </jar>
916    
917    </target>    </target>
918    
919    
   
920    <target name="jsr166ydocs"    <target name="jsr166ydocs"
921            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
922    
923      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
924      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
925    
926      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
927               packagenames="jsr166y"               packagenames="jsr166y.*"
928               link="${jdkapidocs.url}"               link="${java.api.url}"
929               source="${build.sourcelevel}"               access="${build.javadoc.access}"
930               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
931               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
932                 source="6"
933                 executable="${javadoc7}">
934          <arg line="-Xdocrootparent ${java.docroot.url}"/>
935          <arg value="-XDignore.symbol.file=true"/>
936    
937        </javadoc>
938    </target>    </target>
939    
940    
941    <target name="jsr166ydist"    <target name="jsr166ydist"
942            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
943            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
944    
945    
   
946    <target name="jsr166yclean"    <target name="jsr166yclean"
947            description="Removes all build products">            description="Removes all jsr166y build products">
948    
949      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
   
   </target>  
   
   
   
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
950    
951    </target>    </target>
952    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
953    
954    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
955            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
956        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
957      </target>
958    
959      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166ydist-docs"
960              depends="jsr166yclean, jsr166ydocs">
961        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
962    </target>    </target>
963    
964    
# Line 909  Line 966 
966    
967    
968    <target name="extra166ycompile"    <target name="extra166ycompile"
969            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
970            description="Compiles extra166y sources">            description="Compiles extra166y sources">
971    
972      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
973    
974      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
975            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
976              debug="${build.debug}"             debug="${build.debug}"
977              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
978         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
979        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
980             source="${build.sourcelevel}"             classpath=""
981               fork="true">             source="6"
982               includeAntRuntime="false"
983               includeJavaRuntime="false"
984               executable="${javac7}"
985               fork="true">
986    
987        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
988        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
989        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
990          <compilerarg value="-Werror"/>
991  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->        <compilerarg line="${build.args}"/>
992    
993      </javac>      </javac>
   
994    </target>    </target>
995    
996    
   
997    <target name="extra166yjar"    <target name="extra166yjar"
998            depends="extra166ycompile"            depends="extra166ycompile"
999            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1000    
1001      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
1002          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
1003      </jar>      </jar>
1004    
1005    </target>    </target>
1006    
1007    
   
1008    <target name="extra166ydocs"    <target name="extra166ydocs"
1009            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1010    
1011      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1012      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1013    
1014      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1015               packagenames="extra166y"               packagenames="extra166y.*"
1016               link="${jdkapidocs.url}"               link="${java.api.url}"
1017               source="${build.sourcelevel}"               access="${build.javadoc.access}"
1018               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1019               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
1020                 source="6"
1021                 executable="${javadoc7}">
1022          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1023          <arg value="-XDignore.symbol.file=true"/>
1024    
1025        </javadoc>
1026    </target>    </target>
1027    
1028    
1029    <target name="extra166ydist"    <target name="extra166ydist"
1030            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
1031            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1032    
1033    
   
1034    <target name="extra166yclean"    <target name="extra166yclean"
1035            description="Removes all build products">            description="Removes all extra166y build products">
1036    
1037      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
1038    
1039    </target>    </target>
1040    
1041    
   
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   <target name="extra166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
1042    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1043            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1044        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1045      </target>
1046    
1047      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>    <target name="extra166ydist-docs"
1048              depends="extra166yclean, extra166ydocs">
1049        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1050    </target>    </target>
1051    
1052    <!-- jsr166e -->    <!-- jsr166e -->
1053    
1054      <property name="build.jsr166e.java.version" value="6"/>
1055      <property name="build.jsr166e.javac" value="${javac6}"/>
1056    
1057    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1058            depends="configure-compiler"            depends="configure-compiler"
1059            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
1060    
1061      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1062    
1063      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
1064             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
1065             debug="${build.debug}"             debug="${build.debug}"
1066             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1067             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1068             source="1.7"             source="${build.jsr166e.java.version}"
1069             classpath=""             classpath=""
1070             includeAntRuntime="false"             includeAntRuntime="false"
1071             includeJavaRuntime="false"             includeJavaRuntime="false"
1072             executable="${javac7}"             executable="${build.jsr166e.javac}"
1073             fork="true">             fork="true">
1074    
1075        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1076        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1077        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1078          <compilerarg value="-Werror"/>
1079          <compilerarg line="${build.args}"/>
1080    
1081      </javac>      </javac>
   
1082    </target>    </target>
1083    
1084      <!-- jsr166e: find doclint errors -->
1085      <target name="jsr166edoclint">
1086    
1087        <mkdir dir="${build.jsr166e.classes.dir}"/>
1088    
1089        <javac srcdir="${topsrc.dir}"
1090               destdir="${build.jsr166e.classes.dir}"
1091               debug="${build.debug}"
1092               debuglevel="${build.debuglevel}"
1093               deprecation="${build.deprecation}"
1094               source="${build.jsr166e.java.version}"
1095               classpath=""
1096               bootclasspath="${bootclasspath7}"
1097               includeAntRuntime="false"
1098               includeJavaRuntime="false"
1099               executable="${javac8}"
1100               fork="true">
1101    
1102          <include name="jsr166e/**/*.java"/>
1103          <compilerarg value="-XDignore.symbol.file=true"/>
1104          <compilerarg value="-Xlint:all"/>
1105          <compilerarg value="-Werror"/>
1106          <compilerarg value="-Xdoclint:all/protected"/>
1107    
1108        </javac>
1109      </target>
1110    
1111    
1112    <target name="jsr166ejar"    <target name="jsr166ejar"
1113            depends="jsr166ecompile"            depends="jsr166ecompile"
1114            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1115    
1116      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
1117          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
1118      </jar>      </jar>
1119    
1120    </target>    </target>
1121    
1122    
   
1123    <target name="jsr166edocs"    <target name="jsr166edocs"
1124            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1125    
1126      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1127      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1128    
1129        <javadoc destdir="${jsr166edocs.dir}"
1130                 packagenames="jsr166e.*"
1131                 link="${java.api.url}"
1132                 access="${build.javadoc.access}"
1133                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
1134                 source="${build.jsr166e.java.version}"
1135                 executable="${javadoc7}">
1136          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1137          <arg value="-XDignore.symbol.file=true"/>
1138    
     <javadoc destdir="${build.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapi7docs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
1139      </javadoc>      </javadoc>
1140      </target>
1141    
1142    
1143      <target name="jsr166e-test-tck-one-java-version"
1144              depends="jsr166ejar">
1145    
1146        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1147    
1148        <run-tck-tests
1149          tck.src.dir="${test.src.dir}/tck-jsr166e"
1150          target="${build.jsr166e.java.version}"
1151          workdir="${build.jsr166e.dir}"
1152          classes="${jsr166e.jar}"/>
1153      </target>
1154    
1155      <target name="jsr166e-test-tck"
1156              description="Runs tck tests for jsr166e for multiple java versions">
1157    
1158    <!--     <antcall target="clean"/> -->
1159    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1160    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1161    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1162    <!--     </antcall> -->
1163    
1164        <antcall target="clean"/>
1165        <antcall target="jsr166e-test-tck-one-java-version">
1166          <param name="build.jsr166e.java.version" value="7"/>
1167          <param name="build.jsr166e.javac" value="${javac7}"/>
1168        </antcall>
1169    
1170        <antcall target="clean"/>
1171        <antcall target="jsr166e-test-tck-one-java-version">
1172          <param name="build.jsr166e.java.version" value="6"/>
1173          <param name="build.jsr166e.javac" value="${javac6}"/>
1174        </antcall>
1175    </target>    </target>
1176    
1177    
1178      <target name="jsr166e-test"
1179              depends="jsr166e-test-tck"
1180              description="Runs all tests for jsr166e">
1181      </target>
1182    
1183    <target name="jsr166edist"    <target name="jsr166edist"
1184            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1185            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1186    
1187    
   
1188    <target name="jsr166eclean"    <target name="jsr166eclean"
1189            description="Removes all build products">            description="Removes all jsr166e build products">
   
1190      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
1191    </target>    </target>
1192    
1193    
1194      <target name="jsr166edist-jar"
1195    <target name="jsr166edist-clean"            depends="jsr166eclean, jsr166ejar">
1196            description="Removes all build and distribution products">      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
   
1197    </target>    </target>
1198    
1199    <target name="jsr166edist-docs"    <target name="jsr166edist-docs"
1200            description="Builds javadocs without custom tags to dist folder">            depends="jsr166eclean, jsr166edocs">
1201        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1202      </target>
1203    
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
1204    
1205      <javadoc destdir="${dist.jsr166ejavadocs.dir}"  <!-- Find buglets that can be detected by static build tools -->
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapidocs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
1206    
1207      <target name="lint">
1208        <antcall target="dists">
1209          <param name="build.javadoc.access" value="public"/>
1210        </antcall>
1211    </target>    </target>
1212    
1213    <target name="jsr166edist-jar"  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1214            depends="jsr166eclean, jsr166ejar">    <target name="lint-private">
1215        <antcall target="dist">
1216      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>        <param name="build.javadoc.access" value="private"/>
1217        </antcall>
1218    </target>    </target>
1219    
1220    
1221  </project>  </project>

Legend:
Removed from v.1.101  
changed lines
  Added in v.1.171

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