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

Diff of /jsr166/build.xml

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

revision 1.97 by jsr166, Tue Jan 15 01:15:02 2013 UTC revision 1.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC
# Line 8  Line 8 
8    
9    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
11    
12      The repository contains all dependencies except for ant and the JDK
13      itself.  Because the JDK version matters and because different
14      targets require different JDKs, we assume that users have created a
15      hierarchy containing:
16      $HOME/jdk/jdk6
17      $HOME/jdk/jdk7
18      $HOME/jdk/jdk8
19      $HOME/jdk/jdk9
20      where each of the above is a JDK or a symlink to same, and
21      $HOME/jdk/src/jdk6
22      $HOME/jdk/src/jdk7
23      $HOME/jdk/src/jdk8
24      $HOME/jdk/src/jdk9
25      where each of the above is a complete JDK source tree
26      (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 21  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.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
73    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
74    <property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.jdk7.docs.dir"         location="${build.jdk7.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">
90      <attribute name="v"/>      <attribute name="v"/>
91      <sequential>      <sequential>
92      <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
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"/>
96      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <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 104  Line 133 
133    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
134    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
135    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
136    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
137    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
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.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <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="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.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 147  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="util/concurrent/CompletableFuture/**/*.java"/>
277          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279        </patternset>
280      </fileset>
281    
282      <macrodef name="run-jtreg-tests">
283        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
285        <attribute name="source" default="7"/>
286        <attribute name="target"/>
287        <attribute name="workdir"/>
288        <attribute name="classes"/>
289        <attribute name="jtregflags" default=""/>
290        <sequential>
291        <delete dir="@{workdir}/JTwork"   quiet="true"/>
292        <delete dir="@{workdir}/JTreport" quiet="true"/>
293        <mkdir dir="@{workdir}/JTwork/scratch"/>
294        <mkdir dir="@{workdir}/JTreport"/>
295        <jtreg dir="@{jtreg.src.dir}"
296               jdk="${jdk@{target}.home}"
297               workDir="@{workdir}/JTwork"
298               reportDir="@{workdir}/JTreport">
299          <patternset refid="jdk@{target}.jtreg.tests"/>
300          <arg value="-Xbootclasspath/p:@{classes}"/>
301          <arg value="-agentvm"/>
302          <arg value="-v:nopass,fail"/>
303          <arg value="-vmoptions:-esa -ea"/>
304          <arg value="-automatic"/>
305          <arg value="-k:!ignore"/>
306          <arg line="@{jtregflags}"/>
307        </jtreg>
308        </sequential>
309      </macrodef>
310    
311    <!-- ALoops classpath -->    <!-- ALoops classpath -->
312    <path id="loops.classpath">    <path id="loops.classpath">
313      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
314    </path>    </path>
315    
316      <!-- Support @jls tag, used in jdk8+ javadoc -->
317      <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
318      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
319    
320    <!-- Main targets -->    <!-- Main targets -->
321    
322      <property name="build.main.java.version" value="9"/>
323      <property name="build.main.javac" value="${javac9}"/>
324    
325    <target name="dists"    <target name="dists"
326            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
327            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
328    
329    <target name="compile"    <target name="compile"
330            depends="init, configure-compiler"            depends="configure-compiler"
331            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
332    
333      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
334    
335      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
336            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
337              debug="${build.debug}"             debug="${build.debug}"
338         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
339        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
340             source="${build.sourcelevel}"             classpath=""
341               fork="true">             includeAntRuntime="false"
342               includeJavaRuntime="false"
343               executable="${build.main.javac}"
344               fork="true">
345    
346        <include name="**/*.java"/>        <include name="**/*.java"/>
347          <compilerarg value="-Xprefer:source"/>
348        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
349          <compilerarg value="-Xlint:all"/>
350  <!--        <compilerarg value="-Werror"/>
351        <exclude name="java/lang/**"/>        <compilerarg value="-Xdoclint:all/protected"/>
352          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
353        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
354    
355      </javac>      </javac>
   
356    </target>    </target>
357    
358    
   
359    <target name="jar"    <target name="jar"
360            depends="compile"            depends="compile"
361            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
362    
     <mkdir dir="${build.lib.dir}"/>  
   
363      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
364        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
365      </jar>      </jar>
   
366    </target>    </target>
367    
368    
   
   <target name="test"  
           depends="init, configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
   
369    <target name="docs"    <target name="docs"
370            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
371    
372      <delete dir="${build.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
373      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
374    
375      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
376      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
377    
378      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${docs.dir}"
379               packagenames="none"               packagenames="none"
380               link="${jdkapidocs.url}"               link="${java9.api.url}"
381               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
382               sourcepath="${src.dir}:${jdksrc.dir}"               access="${build.javadoc.access}"
383               additionalparam="-XDignore.symbol.file=true" >               sourcepath="${src.dir}:${jdk9src.dir}"
384                 classpath=""
385                 executable="${javadoc9}">
386        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
387          <include name="**/*.java"/>          <include name="**/*.java"/>
388        </fileset>        </fileset>
389          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
390          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
391          <arg value="-XDignore.symbol.file=true"/>
392          <arg value="-tag"/>
393          <arg value="${javadoc.jls.option}"/>
394          <arg value="-tag"/>
395          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
396          <arg value="-tag"/>
397          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
398          <arg value="-tag"/>
399          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
400      </javadoc>      </javadoc>
   
401    </target>    </target>
402    
403    
   
404    <target name="dist"    <target name="dist"
405            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, dist-docs"
406            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
407    
408    
# Line 252  Line 421 
421        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
422        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
423      </jar>      </jar>
   
424    </target>    </target>
425    
426    
   
427    <target name="clean"    <target name="clean"
428            description="Removes all build products">            description="Removes all build products">
429    
430      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
431    
432    </target>    </target>
433    
434    
   
435    <target name="dist-clean"    <target name="dist-clean"
436            description="Removes all build and distribution products">            description="Removes all build and distribution products">
437    
438        <delete dir="${build.dir}"/>
439      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
440    
441    </target>    </target>
442    
443    
   
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <!-- the packagenames="none" hack below prevents scanning the -->  
     <!-- sourcepath for packages -->  
   
     <javadoc destdir="${dist.javadocs.dir}"  
              packagenames="none"  
              link="${jdkapidocs.url}"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
   <!-- 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>  
   
   
444    <target name="dist-jar"    <target name="dist-jar"
445            depends="clean, jar">            depends="clean, jar">
   
446      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
447    </target>    </target>
448    
449      <target name="dist-docs"
450    <target name="compile-tests"            depends="clean, docs">
451            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>  
 -->  
   
452    </target>    </target>
453    
454      <target name="tck" depends="test-tck" description="alias for test-tck"/>
455      <target name="test-tck"
456              depends="jar"
457              description="Runs tck tests for main directly">
458    
459    <target name="run-tests"      <run-tck-tests
460            depends="compile-tests">        target="${build.main.java.version}"
461          workdir="${build.dir}"
462      <!-- May be overridden by user.properties -->        classes="${product.jar}"/>
463      <property name="testcase" value="*"/>    </target>
464    
465      <mkdir dir="${build.reports.dir}"/>    <target name="test-tck-parallelism-1"
466              description="Runs test-tck with given common pool parallelism">
467      <junit printsummary="true"      <antcall target="test-tck">
468               showoutput="true"        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
469            errorProperty="junit.failed"      </antcall>
470          failureProperty="junit.failed"    </target>
471                      dir="${build.reports.dir}"  
472                     fork="true">    <target name="test-tck-parallelism-0"
473              description="Runs test-tck with given common pool parallelism">
474        <jvmarg value="${bootclasspath.args}"/>      <antcall target="test-tck">
475        <jvmarg value="-server"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
476        <jvmarg value="-showversion"/>      </antcall>
477      </target>
478        <classpath refid="test.classpath"/>  
479      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480      <target name="test-jtreg"
481              depends="jar"
482              description="Runs jtreg tests for main using the jtreg ant task">
483        <run-jtreg-tests
484           target="${build.main.java.version}"
485           workdir="${build.dir}"
486           classes="${product.jar}"/>
487      </target>
488    
489        <formatter type="xml"/>    <target name="test"
490              depends="test-tck, test-tck-parallelism-1, test-jtreg"
491              description="Runs tck and jtreg tests for main">
492      </target>
493    
494        <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>  
 -->  
495    
496      </junit>      <antcall target="jtreg">
497          <param name="build.main.java.version" value="8"/>
498          <param name="build.main.javac" value="${javac8}"/>
499        </antcall>
500    
501    </target>    </target>
502    
503      <target name="test89"
504              description="Runs tck and jtreg tests for main for multiple java versions">
505    
506    <target name="report-tests"      <antcall target="clean"/>
507            depends="run-tests">      <antcall target="test">
508          <param name="build.main.java.version" value="8"/>
509      <!-- Sets junit.report.format to frames if redirection is present,        <param name="build.main.javac" value="${javac8}"/>
510           otherwise sets it to noframes. -->      </antcall>
     <available property="junit.report.format"  
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"  
     />  
     <property name="junit.report.format" value="noframes"/>  
   
     <junitreport todir="${build.reports.dir}">  
       <fileset dir="${build.reports.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
511    
512      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
513        <antcall target="test">
514          <param name="build.main.java.version" value="9"/>
515          <param name="build.main.javac" value="${javac9}"/>
516        </antcall>
517    
518    </target>    </target>
519    
520    
521    
522    <target name="configure-compiler">    <target name="configure-compiler">
523    
524      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 471  Line 536 
536    </target>    </target>
537    
538    
   <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>  
   
539    
540    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
541    
542    
543    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
544            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
545    
546      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 524  Line 566 
566    </target>    </target>
567    
568    
569    <!-- jdk7 -->    <target name="compile-test-loops" depends="jar"
570              description="compile all the perf tests in src/test/loops">
571    
572        <mkdir dir="${build.dir}/test/loops"/>
573    
574        <javac srcdir="${basedir}/src/test/loops"
575               destdir="${build.dir}/test/loops"
576               debug="${build.debug}"
577               debuglevel="${build.debuglevel}"
578               deprecation="${build.deprecation}"
579               includeAntRuntime="false"
580               includeJavaRuntime="false"
581               executable="${javac9}"
582               fork="true">
583    
584          <include name="*.java"/>
585          <compilerarg value="-XDignore.symbol.file=true"/>
586          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
587          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
588          <compilerarg line="${build.args}"/>
589    
590        </javac>
591    
592      </target>
593    
594    
595    <target name="jdk7compile"    <!-- jsr166 4jdk7 -->
596    
597      <target name="4jdk7compile"
598            depends="configure-compiler"            depends="configure-compiler"
599            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
600    
601      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
602    
603      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
604             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
605             debug="${build.debug}"             debug="${build.debug}"
606             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
607             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
608             source="1.6"             source="6"
609             classpath=""             classpath=""
610             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
611             includeAntRuntime="false"             includeAntRuntime="false"
# Line 547  Line 614 
614             fork="true">             fork="true">
615    
616        <include name="**/*.java"/>        <include name="**/*.java"/>
617        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
618        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
619        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
620          <compilerarg value="-Werror"/>
621          <compilerarg line="${build.args}"/>
622    
623      </javac>      </javac>
624      </target>
625    
626      <mkdir dir="${build.jdk7.lib.dir}"/>    <target name="4jdk7doclint"
627              depends="configure-compiler"
628      <jar destfile="${jdk7product.jar}" index="true">            description="Finds doclint warnings">
       <fileset dir="${build.jdk7.classes.dir}"/>  
     </jar>  
629    
630      <mkdir dir="${build.jdk7.tck.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
631    
632      <javac srcdir="${tck.src.dir}"      <javac srcdir="${4jdk7src.dir}"
633             destdir="${build.jdk7.tck.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
634             debug="${build.debug}"             debug="${build.debug}"
635             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
636             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
637             source="1.6"             source="6"
638             classpath="${junit.jar}"             classpath=""
639             bootclasspath="${jdk7product.jar}:${bootclasspath6}"             bootclasspath="${bootclasspath7}"
640             includeAntRuntime="false"             includeAntRuntime="false"
641             includeJavaRuntime="false"             includeJavaRuntime="false"
642             executable="${javac7}"             executable="${javac8}"
643             fork="true">             fork="true">
644    
645        <include name="**/*.java"/>        <include name="**/*.java"/>
646        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
647        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
648        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all"/>
649          <compilerarg value="-Xdoclint:all/protected"/>
650          <compilerarg line="${build.args}"/>
651    
652      </javac>      </javac>
653      </target>
654    
655    
656      <target name="4jdk7jar"
657              depends="4jdk7compile"
658              description="Builds library jar from compiled sources">
659    
660        <jar destfile="${4jdk7product.jar}">
661          <fileset dir="${build.4jdk7.classes.dir}"/>
662        </jar>
663    
664    </target>    </target>
665    
666    
667    <target name="run-jdk7-tck-tests"    <target name="4jdk7-test-tck"
668            depends="jdk7compile"            depends="4jdk7jar"
669            description="Runs tck tests for jsr166-jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
670    
671      <run-tck-tests      <run-tck-tests
672        jvm="${java7}"        target="7"
673        tck.classes="${build.jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
674        product.jar="${jdk7product.jar}"/>        classes="${4jdk7product.jar}">
675          <javac-elements>
676            <!-- JDK8+ test classes -->
677            <exclude name="*8Test.java"/>
678            <exclude name="*9Test.java"/>
679            <exclude name="DoubleAccumulatorTest.java"/>
680            <exclude name="DoubleAdderTest.java"/>
681            <exclude name="LongAccumulatorTest.java"/>
682            <exclude name="LongAdderTest.java"/>
683            <exclude name="CompletableFutureTest.java"/>
684            <exclude name="SplittableRandomTest.java"/>
685            <exclude name="StampedLockTest.java"/>
686          </javac-elements>
687        </run-tck-tests>
688    </target>    </target>
689    
690    
691    <target name="run-jdk7-tck-tests-via-junit-task"    <target name="4jdk7-test-tck-junit"
692            depends="jdk7compile">            depends="4jdk7compile"
693              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
694    
695      <junit printsummary="true"      <junit printsummary="true"
696             showoutput="true"             showoutput="true"
# Line 605  Line 700 
700             jvm="${java7}"             jvm="${java7}"
701             fork="true">             fork="true">
702    
703        <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
704        <jvmarg value="-server"/>        <jvmarg value="-server"/>
705    
706        <classpath>        <classpath>
707          <pathelement location="${junit.jar}"/>          <pathelement location="${junit.jar}"/>
708          <pathelement location="${build.jdk7.tck.classes.dir}"/>          <pathelement location="${build.4jdk7.tck.classes.dir}"/>
709        </classpath>        </classpath>
710    
711        <formatter type="brief"/>        <formatter type="brief"/>
712    
713        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
714        </test>        </test>
715    
716      </junit>      </junit>
717    </target>    </target>
718    
719      <target name="4jdk7-test-jtreg"
720              depends="4jdk7jar"
721              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
722        <run-jtreg-tests
723           target="7"
724           workdir="${build.4jdk7.dir}"
725           classes="${4jdk7product.jar}"/>
726      </target>
727    
728    
729      <target name="4jdk7-test"
730              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
731              description="Runs tck and jtreg tests for jsr166-4jdk7">
732      </target>
733    
   <target name="jdk7docs"  
           description="Builds javadocs with custom tags to build folder">  
734    
735      <delete dir="${build.jdk7.docs.dir}"/>    <target name="4jdk7docs"
736      <mkdir dir="${build.jdk7.docs.dir}"/>            description="Builds javadocs for src/jdk7 to dist dir">
737    
738      <javadoc destdir="${build.jdk7.docs.dir}"      <delete dir="${4jdk7docs.dir}"/>
739        <mkdir dir="${4jdk7docs.dir}"/>
740    
741        <javadoc destdir="${4jdk7docs.dir}"
742               packagenames="none"               packagenames="none"
743               link="${jdkapi7docs.url}"               link="${java7.api.url}"
744               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
745               sourcepath="${jdk7src.dir}"               access="${build.javadoc.access}"
746               bootclasspath="${bootclasspath6}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
747               classpath=""               classpath=""
748               source="1.6"               executable="${javadoc7}">
749               executable="${javadoc7}"        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
750          <include name="**/*.java"/>          <include name="**/*.java"/>
751        </fileset>        </fileset>
752          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
753          <arg value="-XDignore.symbol.file=true"/>
754      </javadoc>      </javadoc>
   
755    </target>    </target>
756    
757    
758    <target name="jdk7dist"    <target name="4jdk7dist"
759            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
760            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
761    
762    
763      <target name="4jdk7clean"
764              description="Removes all 4jdk7 build products">
765    
766    <target name="jdk7clean"      <delete dir="${build.4jdk7.dir}"/>
           description="Removes all build products">  
   
     <delete dir="${build.jdk7.dir}"/>  
767    
768    </target>    </target>
769    
770    
771      <target name="4jdk7dist-jar"
772    <target name="jdk7dist-clean"            depends="4jdk7clean, 4jdk7jar">
773            description="Removes all build and distribution products">      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
   
774    </target>    </target>
775    
   <target name="jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jdk7.docs.dir}"/>  
     <mkdir dir="${dist.jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${jdk7src.dir}/intro.html"  
              sourcepath="${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}"  
              bootclasspath="${bootclasspath6}"  
              source="1.6">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
776    
777      <target name="4jdk7dist-docs"
778              depends="4jdk7clean, 4jdk7docs">
779        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
780    </target>    </target>
781    
   <target name="jdk7dist-jar"  
           depends="jdk7clean, jdk7compile">  
   
     <copy file="${jdk7product.jar}" todir="${dist.dir}"/>  
   
   </target>  
782    
783    <!-- jsr166x -->    <!-- jsr166x -->
784    
   
785    <target name="jsr166xcompile"    <target name="jsr166xcompile"
786            depends="init, configure-compiler"            depends="configure-compiler"
787            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
788    
789      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
790    
791      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
792            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
793              debug="${build.debug}"             debug="${build.debug}"
794         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
795        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
796             source="${build.sourcelevel}"             classpath=""
797               fork="true">             bootclasspath="${bootclasspath6}"
798               source="5"
799               includeAntRuntime="false"
800               includeJavaRuntime="false"
801               executable="${javac7}"
802               fork="true">
803    
804        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
805        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
806          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
807          <compilerarg value="-Werror"/>
808          <compilerarg line="${build.args}"/>
809    
810      </javac>      </javac>
   
811    </target>    </target>
812    
813    
   
814    <target name="jsr166xjar"    <target name="jsr166xjar"
815            depends="jsr166xcompile"            depends="jsr166xcompile"
816            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
817    
818      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
819          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
820      </jar>      </jar>
821    
822    </target>    </target>
823    
824    
   
825    <target name="jsr166xdocs"    <target name="jsr166xdocs"
826            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
827    
828      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
829      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
830    
831      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
832               packagenames="jsr166x"               packagenames="jsr166x.*"
833               link="${jdkapidocs.url}"               link="${java.api.url}"
834               source="${build.sourcelevel}"               access="${build.javadoc.access}"
835               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
836               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
837                 source="5"
838                 executable="${javadoc7}">
839          <arg line="-Xdocrootparent ${java.docroot.url}"/>
840          <arg value="-XDignore.symbol.file=true"/>
841    
842        </javadoc>
843    </target>    </target>
844    
845    
846    <target name="jsr166xdist"    <target name="jsr166xdist"
847            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
848            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
849    
850    
   
851    <target name="jsr166xclean"    <target name="jsr166xclean"
852            description="Removes all build products">            description="Removes all jsr166x build products">
853    
854      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
855    
856    </target>    </target>
857    
858    
   
   <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>  
   
859    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
860            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
861        <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
862      </target>
863    
864      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166xdist-docs"
865              depends="jsr166xclean, jsr166xdocs">
866        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
867    </target>    </target>
868    
869    <!-- jsr166y -->    <!-- jsr166y -->
870    
871    
872    <target name="jsr166ycompile"    <target name="jsr166ycompile"
873            depends="init, configure-compiler"            depends="configure-compiler"
874            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
875    
876      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
877    
878      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
879            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
880              debug="${build.debug}"             debug="${build.debug}"
881         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
882        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
883             source="${build.sourcelevel}"             source="6"
884               fork="true">             classpath=""
885               bootclasspath="${bootclasspath6}"
886               includeAntRuntime="false"
887               includeJavaRuntime="false"
888               executable="${javac7}"
889               fork="true">
890    
891        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
892        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
893        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
894          <compilerarg value="-Werror"/>
895  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->        <compilerarg line="${build.args}"/>
896    
897      </javac>      </javac>
   
898    </target>    </target>
899    
900    
   
901    <target name="jsr166yjar"    <target name="jsr166yjar"
902            depends="jsr166ycompile"            depends="jsr166ycompile"
903            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
904    
905      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
906          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
907      </jar>      </jar>
908    
909    </target>    </target>
910    
911    
   
912    <target name="jsr166ydocs"    <target name="jsr166ydocs"
913            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
914    
915      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
916      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
917    
918      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
919               packagenames="jsr166y"               packagenames="jsr166y.*"
920               link="${jdkapidocs.url}"               link="${java.api.url}"
921               source="${build.sourcelevel}"               access="${build.javadoc.access}"
922               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
923               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
924                 source="6"
925                 executable="${javadoc7}">
926          <arg line="-Xdocrootparent ${java.docroot.url}"/>
927          <arg value="-XDignore.symbol.file=true"/>
928    
929        </javadoc>
930    </target>    </target>
931    
932    
933    <target name="jsr166ydist"    <target name="jsr166ydist"
934            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
935            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
936    
937    
   
938    <target name="jsr166yclean"    <target name="jsr166yclean"
939            description="Removes all build products">            description="Removes all jsr166y build products">
940    
941      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
942    
943    </target>    </target>
944    
945    
   
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   <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>  
   
946    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
947            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
948        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
949      </target>
950    
951      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166ydist-docs"
952              depends="jsr166yclean, jsr166ydocs">
953        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
954    </target>    </target>
955    
956    
# Line 906  Line 958 
958    
959    
960    <target name="extra166ycompile"    <target name="extra166ycompile"
961            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
962            description="Compiles extra166y sources">            description="Compiles extra166y sources">
963    
964      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
965    
966      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
967            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
968              debug="${build.debug}"             debug="${build.debug}"
969              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
970         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
971        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
972             source="${build.sourcelevel}"             classpath=""
973               fork="true">             source="6"
974               includeAntRuntime="false"
975               includeJavaRuntime="false"
976               executable="${javac7}"
977               fork="true">
978    
979        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
980        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
981        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
982          <compilerarg value="-Werror"/>
983  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->        <compilerarg line="${build.args}"/>
984    
985      </javac>      </javac>
   
986    </target>    </target>
987    
988    
   
989    <target name="extra166yjar"    <target name="extra166yjar"
990            depends="extra166ycompile"            depends="extra166ycompile"
991            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
992    
993      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
994          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
995      </jar>      </jar>
996    
997    </target>    </target>
998    
999    
   
1000    <target name="extra166ydocs"    <target name="extra166ydocs"
1001            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1002    
1003      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1004      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1005    
1006      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1007               packagenames="extra166y"               packagenames="extra166y.*"
1008               link="${jdkapidocs.url}"               link="${java.api.url}"
1009               source="${build.sourcelevel}"               access="${build.javadoc.access}"
1010               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1011               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
1012                 source="6"
1013                 executable="${javadoc7}">
1014          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1015          <arg value="-XDignore.symbol.file=true"/>
1016    
1017        </javadoc>
1018    </target>    </target>
1019    
1020    
1021    <target name="extra166ydist"    <target name="extra166ydist"
1022            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
1023            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1024    
1025    
   
1026    <target name="extra166yclean"    <target name="extra166yclean"
1027            description="Removes all build products">            description="Removes all extra166y build products">
1028    
1029      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
1030    
1031    </target>    </target>
1032    
1033    
   
   <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>  
   
1034    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1035            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1036        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1037      </target>
1038    
1039      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>    <target name="extra166ydist-docs"
1040              depends="extra166yclean, extra166ydocs">
1041        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1042    </target>    </target>
1043    
1044    <!-- jsr166e -->    <!-- jsr166e -->
1045    
1046      <property name="build.jsr166e.java.version" value="6"/>
1047      <property name="build.jsr166e.javac" value="${javac6}"/>
1048    
1049    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1050            depends="configure-compiler"            depends="configure-compiler"
1051            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
1052    
1053      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1054    
1055      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
1056             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
1057             debug="${build.debug}"             debug="${build.debug}"
1058             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1059             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1060             source="1.7"             source="${build.jsr166e.java.version}"
1061             classpath=""             classpath=""
1062             includeAntRuntime="false"             includeAntRuntime="false"
1063             includeJavaRuntime="false"             includeJavaRuntime="false"
1064             executable="${javac7}"             executable="${build.jsr166e.javac}"
1065             fork="true">             fork="true">
1066    
1067        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1068        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1069        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1070          <compilerarg value="-Werror"/>
1071          <compilerarg line="${build.args}"/>
1072    
1073      </javac>      </javac>
   
1074    </target>    </target>
1075    
1076      <!-- jsr166e: find doclint errors -->
1077      <target name="jsr166edoclint">
1078    
1079        <mkdir dir="${build.jsr166e.classes.dir}"/>
1080    
1081        <javac srcdir="${topsrc.dir}"
1082               destdir="${build.jsr166e.classes.dir}"
1083               debug="${build.debug}"
1084               debuglevel="${build.debuglevel}"
1085               deprecation="${build.deprecation}"
1086               source="${build.jsr166e.java.version}"
1087               classpath=""
1088               bootclasspath="${bootclasspath7}"
1089               includeAntRuntime="false"
1090               includeJavaRuntime="false"
1091               executable="${javac8}"
1092               fork="true">
1093    
1094          <include name="jsr166e/**/*.java"/>
1095          <compilerarg value="-XDignore.symbol.file=true"/>
1096          <compilerarg value="-Xlint:all"/>
1097          <compilerarg value="-Werror"/>
1098          <compilerarg value="-Xdoclint:all/protected"/>
1099    
1100        </javac>
1101      </target>
1102    
1103    
1104    <target name="jsr166ejar"    <target name="jsr166ejar"
1105            depends="jsr166ecompile"            depends="jsr166ecompile"
1106            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1107    
1108      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
1109          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
1110      </jar>      </jar>
1111    
1112    </target>    </target>
1113    
1114    
   
1115    <target name="jsr166edocs"    <target name="jsr166edocs"
1116            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1117    
1118      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1119      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1120    
1121        <javadoc destdir="${jsr166edocs.dir}"
1122                 packagenames="jsr166e.*"
1123                 link="${java.api.url}"
1124                 access="${build.javadoc.access}"
1125                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
1126                 source="${build.jsr166e.java.version}"
1127                 executable="${javadoc7}">
1128          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1129          <arg value="-XDignore.symbol.file=true"/>
1130    
     <javadoc destdir="${build.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapi7docs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
1131      </javadoc>      </javadoc>
1132      </target>
1133    
1134    
1135      <target name="jsr166e-test-tck-one-java-version"
1136              depends="jsr166ejar">
1137    
1138        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1139    
1140        <run-tck-tests
1141          tck.src.dir="${test.src.dir}/tck-jsr166e"
1142          target="${build.jsr166e.java.version}"
1143          workdir="${build.jsr166e.dir}"
1144          classes="${jsr166e.jar}"/>
1145      </target>
1146    
1147      <target name="jsr166e-test-tck"
1148              description="Runs tck tests for jsr166e for multiple java versions">
1149    
1150    <!--     <antcall target="clean"/> -->
1151    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1152    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1153    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1154    <!--     </antcall> -->
1155    
1156        <antcall target="clean"/>
1157        <antcall target="jsr166e-test-tck-one-java-version">
1158          <param name="build.jsr166e.java.version" value="7"/>
1159          <param name="build.jsr166e.javac" value="${javac7}"/>
1160        </antcall>
1161    
1162        <antcall target="clean"/>
1163        <antcall target="jsr166e-test-tck-one-java-version">
1164          <param name="build.jsr166e.java.version" value="6"/>
1165          <param name="build.jsr166e.javac" value="${javac6}"/>
1166        </antcall>
1167    </target>    </target>
1168    
1169    
1170      <target name="jsr166e-test"
1171              depends="jsr166e-test-tck"
1172              description="Runs all tests for jsr166e">
1173      </target>
1174    
1175    <target name="jsr166edist"    <target name="jsr166edist"
1176            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1177            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1178    
1179    
   
1180    <target name="jsr166eclean"    <target name="jsr166eclean"
1181            description="Removes all build products">            description="Removes all jsr166e build products">
   
1182      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
1183    </target>    </target>
1184    
1185    
1186      <target name="jsr166edist-jar"
1187    <target name="jsr166edist-clean"            depends="jsr166eclean, jsr166ejar">
1188            description="Removes all build and distribution products">      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
   
1189    </target>    </target>
1190    
1191    <target name="jsr166edist-docs"    <target name="jsr166edist-docs"
1192            description="Builds javadocs without custom tags to dist folder">            depends="jsr166eclean, jsr166edocs">
1193        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1194      </target>
1195    
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
1196    
1197      <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" />  
1198    
1199      <target name="lint">
1200        <antcall target="dists">
1201          <param name="build.javadoc.access" value="public"/>
1202        </antcall>
1203    </target>    </target>
1204    
1205    <target name="jsr166edist-jar"  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1206            depends="jsr166eclean, jsr166ejar">    <target name="lint-private">
1207        <antcall target="dist">
1208      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>        <param name="build.javadoc.access" value="private"/>
1209        </antcall>
1210    </target>    </target>
1211    
1212    
1213  </project>  </project>

Legend:
Removed from v.1.97  
changed lines
  Added in v.1.168

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