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

Diff of /jsr166/build.xml

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

revision 1.117, Sun Jan 20 07:43:30 2013 UTC revision 1.213, Sat Jun 4 23:49:29 2016 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if" xmlns:unless="ant:unless">
3    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 6  Line 7 
7    
8    Usage: ant [target]    Usage: ant [target]
9    
10      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11      more details.
12    
13    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
15    
# Line 16  Line 20 
20    $HOME/jdk/jdk6    $HOME/jdk/jdk6
21    $HOME/jdk/jdk7    $HOME/jdk/jdk7
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23      $HOME/jdk/jdk9
24    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
25    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
26    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
27    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
28      $HOME/jdk/src/jdk9
29    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
30    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
31    
32      Alternatively, define ant variables thus:
33      ant -Djdk$N.home=... -Djdk$N.src.home=...
34      for $N in 6 7 8 9 ...
35    
36      As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37      target is currently broken.
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <target name="usage" description="Advises user to run with -projecthelp">    <!-- Run 'ant -projecthelp' (default target) -->
42      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
43        <java classname="org.apache.tools.ant.Main">
44          <arg value="-projecthelp" />
45        </java>
46    </target>    </target>
47    
48      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
49    
50    <!-- User-specific settings -->    <!-- User-specific settings -->
51    <property file="user.properties"/>    <property file="user.properties"/>
# Line 39  Line 56 
56    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
57    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
58    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
59      <property name="build.javadoc.access" value="protected"/>
60    
61    <!-- Build locations -->    <!-- Build locations -->
62    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 52  Line 70 
70    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72    
73      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77    
78    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 62  Line 85 
85    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
86    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
87    
88    <!-- JDK binary locations -->    <!-- JDK locations -->
89    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
90    
91    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 72  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98      <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <local name="have.java.base"/>
100      <property name="bootclasspath@{v}"      <available property="have.java.base"
101       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>        file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103          if:set="have.java.base"/>
104        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105          unless:set="have.java.base"/>
106        <local name="modules"/>
107        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108        <local name="boot.jar.dir"/>
109        <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110        <path id="bootclasspath@{v}" unless:set="modules">
111          <pathelement path="${boot.jar.dir}/resources.jar"/>
112          <pathelement path="${boot.jar.dir}/rt.jar"/>
113          <pathelement path="${boot.jar.dir}/jsse.jar"/>
114          <pathelement path="${boot.jar.dir}/jce.jar"/>
115          <pathelement path="${boot.jar.dir}/charsets.jar"/>
116        </path>
117        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118        </sequential>
119      </macrodef>
120    
121      <macrodef name="mirror-dir">
122        <attribute name="src"/>
123        <attribute name="dst"/>
124        <sequential>
125        <delete dir="@{dst}"/>
126        <mkdir dir="@{dst}"/>
127        <copy todir="@{dst}" preservelastmodified="true">
128          <fileset dir="@{src}"/>
129        </copy>
130      </sequential>      </sequential>
131    </macrodef>    </macrodef>
132    
133    <defjdklocations v="6"/>    <defjdklocations v="6"/>
134    <defjdklocations v="7"/>    <defjdklocations v="7"/>
135    <defjdklocations v="8"/>    <defjdklocations v="8"/>
136      <defjdklocations v="9"/>
137    
138      <!-- Source locations -->
139      <property name="src.dir"              location="${basedir}/src/main"/>
140      <property name="test.src.dir"         location="${basedir}/src/test"/>
141      <property name="loops.src.dir"        location="${basedir}/src/loops"/>
142      <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143      <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147      <property name="lib.dir"              location="${basedir}/lib"/>
148      <property name="dist.dir"             location="${basedir}/dist"/>
149      <property name="topsrc.dir"           location="${basedir}/src"/>
150      <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152      <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153      <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154      <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
155      <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
156    
157      <!-- Javadoc locations -->
158      <property name="docs.dir"          location="${build.dir}/docs"/>
159      <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161      <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162      <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163      <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
164      <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
165    
166      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
172      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
173    
174      <!-- Jar locations -->
175      <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176      <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178      <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179      <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180      <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
181      <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
182      <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
183    
184      <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
185      <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
186      <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187      <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189      <!-- The expected canonical location does not yet exist as of 2016-04 -->
190      <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191      <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
192      <!-- Default jdk doc location (latest stable release seems best) -->
193      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
195      <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
196      <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
197      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
198      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
199      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
200      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
201      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
202    
203      <!-- Define the "jtreg" task -->
204      <!-- See the docs in "jtreg -onlineHelp" -->
205      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
206               classpath="${lib.dir}/jtreg.jar" />
207    
208      <!-- Tck options; see JSR166TestCase.java
209       To profile a single tck test class:
210       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
211       To stress test a single tck test class:
212       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
213       To stress test a single tck test method:
214       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
215      -->
216      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
217    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
218        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
219      <attribute name="target"/>      <attribute name="target"/>
220        <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>      <attribute name="workdir"/>
222      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="classes"/>
223      <attribute name="jvmflags" default=""/>      <!--
224            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225        -->
226            <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227        <element name="javac-elements" optional="true"/>
228    
229      <sequential>      <sequential>
230    
231        <local name="modules"/>
232        <condition property="modules">
233          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234        </condition>
235    
236      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
237    
238      <javac srcdir="${tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
239             destdir="@{workdir}/tck-classes"             destdir="@{workdir}/tck-classes"
240             debug="${build.debug}"             debug="${build.debug}"
241             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
242             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
243             source="6"             source="@{compile-target}"
244               target="@{compile-target}"
245             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{product.jar}:${bootclasspath6}"  
246             includeAntRuntime="false"             includeAntRuntime="false"
247             includeJavaRuntime="false"             includeJavaRuntime="false"
248             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
249             fork="true">             fork="true">
250    
251        <include name="**/*.java"/>        <include name="*.java"/>
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254          <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255          <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257          <javac-elements/>
258    
259      </javac>      </javac>
260    
261      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
262            failonerror="true"            failonerror="true"
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266            <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
268    
269            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
270            <syspropertyset id="system-properties-used-by-tck">
271              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
272              <propertyref prefix="jsr166."/>
273              <propertyref name="test.timeout.factor"/>
274            </syspropertyset>
275    
276          <classpath>          <classpath>
277            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
278            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 126  Line 282 
282      </sequential>      </sequential>
283    </macrodef>    </macrodef>
284    
285    <!-- Source locations -->    <!-- Define jtreg test sets for different jdk versions -->
286    <property name="src.dir"              location="${basedir}/src/main"/>    <fileset dir="${jtreg9.src.dir}">
287    <property name="test.src.dir"         location="${basedir}/src/test"/>      <patternset id="jdk9.jtreg.tests">
288    <property name="loops.src.dir"        location="${basedir}/src/loops"/>        <include name="**/*.java"/>
289    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>      </patternset>
290    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    </fileset>
   <property name="lib.dir"              location="${basedir}/lib"/>  
   <property name="dist.dir"             location="${basedir}/dist"/>  
   <property name="topsrc.dir"           location="${basedir}/src"/>  
   <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>  
   <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>  
   <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>  
   <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>  
   <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>  
291    
292    <!-- Distribution locations -->    <fileset dir="${jtreg8.src.dir}">
293    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>      <patternset id="jdk8.jtreg.tests">
294    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>        <include name="**/*.java"/>
295    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
296    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>        <exclude name="**/GCDuringIteration.java"/>
298    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>      </patternset>
299      </fileset>
300    
301    <!-- Jar locations -->    <fileset dir="${jtreg7.src.dir}">
302    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>      <patternset id="jdk7.jtreg.tests">
303    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>        <include name="**/*.java"/>
304    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>      </patternset>
305    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    </fileset>
   <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>  
   <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>  
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>  
306    
307    <!-- Bootclasspath argument -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
308    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="jtreg.flags" value=""/>
309    
310    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <macrodef name="run-jtreg-tests">
311    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>      <attribute name="source" default="7"/>
313    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>      <attribute name="target"/>
314        <attribute name="workdir"/>
315    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>      <attribute name="classes"/>
316    <!-- The below does not yet exist as of 2012-11 -->      <attribute name="jtregflags" default=""/>
   <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->  
317    
318    <!-- Default jdk api doc location (latest stable release seems best) -->      <sequential>
   <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>  
319    
320    <!-- Define the "jtreg" task -->      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
321    <!-- See the docs in "jtreg -onlineHelp" -->      <property name="jtreg.verbose" value="nopass,fail,error"/>
   <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"  
            classpath="${lib.dir}/jtreg.jar" />  
322    
323    <!-- Test classpath -->      <local name="modules"/>
324    <path id="test.classpath">      <condition property="modules">
325      <pathelement location="${build.testcases.dir}"/>        <available file="${jdk@{target}.home}/jmods" type="dir"/>
326      <pathelement location="${junit.jar}"/>      </condition>
327    </path>  
328        <delete dir="@{workdir}/JTwork"   quiet="true"/>
329        <delete dir="@{workdir}/JTreport" quiet="true"/>
330        <jtreg dir="${jtreg@{target}.src.dir}"
331               jdk="${jdk@{target}.home}"
332               workDir="@{workdir}/JTwork"
333               reportDir="@{workdir}/JTreport">
334          <patternset refid="jdk@{target}.jtreg.tests"/>
335          <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336          <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
337          <arg value="-agentvm"/>
338          <arg value="-verbose:${jtreg.verbose}"/>
339          <arg value="-vmoptions:-esa -ea"/>
340          <arg value="-automatic"/>
341          <arg value="-k:!ignore"/>
342          <arg line="@{jtregflags}"/>
343          <arg line="${jtreg.flags}"/>
344        </jtreg>
345        </sequential>
346      </macrodef>
347    
348    <!-- ALoops classpath -->    <!-- ALoops classpath -->
349    <path id="loops.classpath">    <path id="loops.classpath">
# Line 190  Line 351 
351    </path>    </path>
352    
353    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
354    <!-- 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"/>  
355    <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;:"/>
356    
357    <!-- Main targets -->    <!-- Main targets -->
358    
359      <property name="build.main.java.version" value="9"/>
360      <property name="build.main.javac" value="${javac9}"/>
361    
362    <target name="dists"    <target name="dists"
363            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
364            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
365    
366    <target name="compile"    <target name="compile"
367            depends="configure-compiler"            depends="configure-compiler"
368            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
369    
370      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
371        <condition property="modules">
372          <and>
373            <available file="${jdk9.home}/jmods" type="dir"/>
374            <equals arg1="9" arg2="${build.main.java.version}"/>
375          </and>
376        </condition>
377    
378        <local name="destdir"/>
379        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
381    
382        <mkdir dir="${destdir}"/>
383    
384      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
385             destdir="${build.classes.dir}"             destdir="${destdir}"
386             debug="${build.debug}"             debug="${build.debug}"
387             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
388             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
389             classpath=""             classpath=""
390             includeAntRuntime="false"             includeAntRuntime="false"
391             includeJavaRuntime="false"             includeJavaRuntime="false"
392             executable="${javac8}"             executable="${build.main.javac}"
393             fork="true">             fork="true">
394    
395        <include name="**/*.java"/>        <include name="**/*.java"/>
396        <compilerarg line="${build.args}"/>        <compilerarg value="-Xmodule:java.base" if:set="modules"/>
397          <compilerarg value="-Xprefer:source"/>
398        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
399        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
400          <compilerarg value="-Werror"/>
401  <!--        <compilerarg value="-Xdoclint:all/protected"/>
402        <exclude name="java/lang/**"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
403        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
404    
405      </javac>      </javac>
   
406    </target>    </target>
407    
408    
   
409    <target name="jar"    <target name="jar"
410            depends="compile"            depends="compile"
411            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
412        <local name="subdir"/>
413        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
414      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
415        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
416          <manifest>
417            <attribute name="Built-By" value="${user.name}"/>
418            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
419          </manifest>
420      </jar>      </jar>
   
421    </target>    </target>
422    
423    
   
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
   
424    <target name="docs"    <target name="docs"
425            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
426    
427      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
428      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
429    
430      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
431      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
432    
433      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
434               packagenames="none"               packagenames="none"
435               link="${jdkapi8docs.url}"               link="${java9.api.url}"
436               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
437               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
438                 sourcepath="${src.dir}:${jdk9.src.dir}"
439               classpath=""               classpath=""
440               executable="${javadoc8}">               executable="${javadoc9}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
441        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
442          <include name="**/*.java"/>          <include name="**/*.java"/>
443        </fileset>        </fileset>
444          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
445          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
446          <arg value="-XDignore.symbol.file=true"/>
447    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
448          <arg value="-tag"/>
449          <arg value="${javadoc.jls.option}"/>
450          <arg value="-tag"/>
451          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
452          <arg value="-tag"/>
453          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
454          <arg value="-tag"/>
455          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
456    <!-- tags added in jdk9 -->
457          <arg value="-tag"/>
458          <arg value="revised:X"/>
459          <arg value="-tag"/>
460          <arg value="spec:X"/>
461      </javadoc>      </javadoc>
   
462    </target>    </target>
463    
464    
   
465    <target name="dist"    <target name="dist"
466            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
467            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
468    
469    
# Line 301  Line 481 
481        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
482        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
483        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
484          <manifest>
485            <attribute name="Built-By" value="${user.name}"/>
486            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
487          </manifest>
488      </jar>      </jar>
   
489    </target>    </target>
490    
491    
   
492    <target name="clean"    <target name="clean"
493            description="Removes all build products">            description="Removes all build products">
494    
# Line 315  Line 497 
497    </target>    </target>
498    
499    
   
500    <target name="dist-clean"    <target name="dist-clean"
501            description="Removes all build and distribution products">            description="Removes all build and distribution products">
502    
503        <delete dir="${build.dir}"/>
504      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
505    
506    </target>    </target>
507    
508    
509      <target name="dist-jar"
510              depends="clean, jar">
511        <copy file="${product.jar}" todir="${dist.dir}"/>
512      </target>
513    
514    <!-- Internal targets -->    <target name="dist-docs"
515              depends="clean, docs">
516        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
517      </target>
518    
519      <target name="tck"
520              depends="jar"
521              description="Runs tck tests for src/main directly">
522    
523        <run-tck-tests
524          target="${build.main.java.version}"
525          workdir="${build.dir}"
526          classes="${product.jar}"/>
527      </target>
528    
529      <target name="tck-parallelism-1"
530              description="Runs tck with common pool parallelism 1">
531        <antcall target="tck">
532          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
533        </antcall>
534      </target>
535    
536      <target name="tck-parallelism-0"
537              description="Runs tck with common pool parallelism 0">
538        <antcall target="tck">
539          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
540        </antcall>
541      </target>
542    
543      <target name="tck-security-manager"
544              description="Runs tck with a security manager">
545        <antcall target="tck">
546          <param name="jsr166.useSecurityManager" value="true"/>
547        </antcall>
548      </target>
549    
550      <target name="jtreg"
551              depends="jar"
552              description="Runs jtreg tests for src/main using the jtreg ant task">
553        <run-jtreg-tests
554           target="${build.main.java.version}"
555           workdir="${build.dir}"
556           classes="${product.jar}"/>
557      </target>
558    
559      <target name="test"
560              depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
561              description="Runs tck and jtreg tests for src/main">
562      </target>
563    
564    <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
565    
566    <!--     <antcall target="jtreg"> -->
567    <!--       <param name="build.main.java.version" value="8"/> -->
568    <!--       <param name="build.main.javac" value="${javac8}"/> -->
569    <!--     </antcall> -->
570    
571    <!--   </target> -->
572    
573    <!--   <target name="test89" -->
574    <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
575    
576    <!--     <antcall target="clean"/> -->
577    <!--     <antcall target="test"> -->
578    <!--       <param name="build.main.java.version" value="8"/> -->
579    <!--       <param name="build.main.javac" value="${javac8}"/> -->
580    <!--     </antcall> -->
581    
582    <!--     <antcall target="clean"/> -->
583    <!--     <antcall target="test"> -->
584    <!--       <param name="build.main.java.version" value="9"/> -->
585    <!--       <param name="build.main.javac" value="${javac9}"/> -->
586    <!--     </antcall> -->
587    
588    <!--   </target> -->
589    
   <target name="dist-jar"  
           depends="clean, jar">  
590    
591      <copy file="${product.jar}" todir="${dist.dir}"/>  
592      <target name="configure-compiler">
593        <fail message="ant version too old">
594          <condition>
595            <not> <antversion atleast="1.9.1"/> </not>
596          </condition>
597        </fail>
598    
599        <property name="unchecked.option" value="-Xlint:unchecked"/>
600    
601        <condition property="warnunchecked.arg" value="${unchecked.option}">
602          <istrue value="${build.warnunchecked}"/>
603        </condition>
604    
605        <property name="warnunchecked.arg" value=""/>
606    
607    
608        <!-- Common options in javac invocations -->
609        <property name="build.args" value="${warnunchecked.arg}"/>
610    
611    </target>    </target>
612    
613    
   <target name="compile-tests"  
           depends="jar">  
614    
615      <mkdir dir="${build.testcases.dir}"/>    <!-- Various demos and test programs -->
616    
617    
618      <!-- description="Benchmark from Doug Lea's AQS paper" -->
619      <target name="loops" depends="configure-compiler">
620    
621      <javac srcdir="${tck.src.dir}"      <mkdir dir="${build.loops.dir}"/>
622             destdir="${build.testcases.dir}"  
623        <javac srcdir="${loops.src.dir}"
624              destdir="${build.loops.dir}"
625             debug="${build.debug}"             debug="${build.debug}"
626             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
627             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
628             source="6"             source="${build.sourcelevel}"
629             classpath="${junit.jar}"             target="${build.sourcelevel}"
            bootclasspath="${product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
630             fork="true">             fork="true">
631    
       <include name="**/*.java"/>  
632        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
633          <classpath refid="loops.classpath"/>
634        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
635    
636      </javac>      </javac>
637    
638      <javac srcdir="${test.src.dir}"      <java classname="ALoops" fork="true">
639             destdir="${build.testcases.dir}"        <classpath refid="loops.classpath"/>
640        </java>
641    
642      </target>
643    
644    
645      <target name="compile-test-loops" depends="jar"
646              description="compile all the perf tests in src/test/loops">
647    
648        <mkdir dir="${build.dir}/test/loops"/>
649    
650        <javac srcdir="${basedir}/src/test/loops"
651               destdir="${build.dir}/test/loops"
652             debug="${build.debug}"             debug="${build.debug}"
653             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
654             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
            source="6"  
            classpath=""  
            bootclasspath="${product.jar}:${bootclasspath6}"  
655             includeAntRuntime="false"             includeAntRuntime="false"
656             includeJavaRuntime="false"             includeJavaRuntime="false"
657             executable="${javac8}"             executable="${javac9}"
658             fork="true">             fork="true">
659    
660        <include name="jsr166/test/**/*.java"/>        <include name="*.java"/>
   
       <compilerarg line="${build.args}"/>  
661        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
662        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
663          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
664          <compilerarg line="${build.args}"/>
665    
666      </javac>      </javac>
667    
668  <!--    </target>
669      <javac srcdir="${jtreg.src.dir}"  
670            destdir="${build.testcases.dir}"  
671      <!-- jsr166 4jdk8 -->
672    
673      <target name="4jdk8compile"
674              depends="configure-compiler"
675              description="Compiles src/jdk8 sources, targeting jdk8">
676    
677        <mkdir dir="${build.4jdk8.classes.dir}"/>
678    
679        <javac srcdir="${4jdk8src.dir}"
680               destdir="${build.4jdk8.classes.dir}"
681              debug="${build.debug}"              debug="${build.debug}"
682         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
683        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
684             source="${build.sourcelevel}"             source="8"
685               target="8"
686               classpath=""
687               bootclasspath="${bootclasspath8}"
688               includeAntRuntime="false"
689               includeJavaRuntime="false"
690               executable="${javac8}"
691               fork="true">               fork="true">
692    
693        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
694        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
695        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
696          <compilerarg value="-Xlint:all"/>
697          <compilerarg value="-Werror"/>
698          <compilerarg line="${build.args}"/>
699    
700      </javac>      </javac>
 -->  
   
701    </target>    </target>
702    
703      <target name="4jdk8doclint"
704              depends="configure-compiler"
705              description="Finds doclint warnings">
706    
707    <target name="run-tests"      <mkdir dir="${build.4jdk8.classes.dir}"/>
           depends="compile-tests">  
   
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
   
     <mkdir dir="${build.reports.dir}"/>  
708    
709      <junit printsummary="true"      <javac srcdir="${4jdk8src.dir}"
710               showoutput="true"             destdir="${build.4jdk8.classes.dir}"
711            errorProperty="junit.failed"             debug="${build.debug}"
712          failureProperty="junit.failed"             debuglevel="${build.debuglevel}"
713                      dir="${build.reports.dir}"             deprecation="${build.deprecation}"
714                      jvm="${java8}"             source="8"
715               target="8"
716               classpath=""
717               bootclasspath="${bootclasspath8}"
718               includeAntRuntime="false"
719               includeJavaRuntime="false"
720               executable="${javac8}"
721                     fork="true">                     fork="true">
722    
723        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>        <include name="**/*.java"/>
724        <jvmarg value="-server"/>        <compilerarg value="-Xprefer:source"/>
725        <jvmarg value="-showversion"/>        <compilerarg value="-XDignore.symbol.file=true"/>
726          <compilerarg value="-Xlint:all"/>
727        <classpath refid="test.classpath"/>        <compilerarg value="-Xdoclint:all/protected"/>
728          <compilerarg line="${build.args}"/>
       <formatter type="xml"/>  
729    
730        <batchtest todir="${build.reports.dir}" unless="no.test.tck">      </javac>
731          <fileset dir="${tck.src.dir}">    </target>
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
732    
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
733    
734  <!--    <target name="4jdk8jar"
735        <batchtest todir="${build.reports.dir}" if="do.test.jtreg">            depends="4jdk8compile"
736          <fileset dir="${jtreg.src.dir}">            description="Builds library jar from compiled sources">
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
737    
738      </junit>      <jar destfile="${4jdk8product.jar}">
739          <fileset dir="${build.4jdk8.classes.dir}"/>
740          <manifest>
741            <attribute name="Built-By" value="${user.name}"/>
742            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
743          </manifest>
744        </jar>
745    
746    </target>    </target>
747    
748    
749    <target name="report-tests"    <target name="4jdk8-tck"
750            depends="run-tests">            depends="4jdk8jar"
751              description="Runs tck tests for jsr166-4jdk8 directly">
752    
753      <!-- Sets junit.report.format to frames if redirection is present,      <run-tck-tests
754           otherwise sets it to noframes. -->        target="8"
755      <available property="junit.report.format"        workdir="${build.4jdk8.dir}"
756                    value="frames"        classes="${4jdk8product.jar}">
757                classname="org.apache.xalan.lib.Redirect"        <javac-elements>
758      />          <!-- JDK9+ test classes -->
759      <property name="junit.report.format" value="noframes"/>          <exclude name="*9Test.java"/>
760            <exclude name="*10Test.java"/>
761      <junitreport todir="${build.reports.dir}">        </javac-elements>
762        <fileset dir="${build.reports.dir}">      </run-tck-tests>
763          <include name="TEST-*.xml"/>    </target>
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
764    
     <fail message="Test Cases Failed" if="junit.failed"/>  
765    
766      <target name="4jdk8-jtreg"
767              depends="4jdk8jar"
768              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
769        <run-jtreg-tests
770           target="8"
771           workdir="${build.4jdk8.dir}"
772           classes="${4jdk8product.jar}"/>
773    </target>    </target>
774    
775    
776    <target name="configure-compiler">    <target name="4jdk8-test"
777              depends="4jdk8-tck, 4jdk8-jtreg"
778              description="Runs tck and jtreg tests for jsr166-4jdk8">
779      </target>
780    
     <property name="unchecked.option" value="-Xlint:unchecked"/>  
781    
782      <condition property="warnunchecked.arg" value="${unchecked.option}">    <target name="4jdk8docs"
783        <istrue value="${build.warnunchecked}"/>            description="Builds javadocs for src/jdk8 to dist dir">
     </condition>  
784    
785      <property name="warnunchecked.arg" value=""/>      <delete dir="${4jdk8docs.dir}"/>
786        <mkdir dir="${4jdk8docs.dir}"/>
787    
788        <javadoc destdir="${4jdk8docs.dir}"
789                 packagenames="none"
790                 link="${java8.api.url}"
791                 overview="${4jdk8src.dir}/intro.html"
792                 access="${build.javadoc.access}"
793                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
794                 classpath=""
795                 executable="${javadoc8}"
796                 failonerror = "true">
797          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
798            <include name="**/*.java"/>
799          </fileset>
800          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
801          <arg value="-XDignore.symbol.file=true"/>
802          <arg value="-tag"/>
803          <arg value="${javadoc.jls.option}"/>
804          <arg value="-tag"/>
805          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
806          <arg value="-tag"/>
807          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808          <arg value="-tag"/>
809          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
810        </javadoc>
811      </target>
812    
     <!-- Common options in javac invocations -->  
     <property name="build.args" value="${warnunchecked.arg}"/>  
813    
814    </target>    <target name="4jdk8dist"
815              depends="4jdk8dist-jar, 4jdk8dist-docs"
816              description="Puts all distributable products in single hierarchy"/>
817    
818    
819    <target name="configure-tests"    <target name="4jdk8clean"
820         depends="configure-compiler">            description="Removes all 4jdk8 build products">
821    
822      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->      <delete dir="${build.4jdk8.dir}"/>
     <available property="junit.available"  
                classname="junit.framework.Protectable"/>  
823    
824      <!-- Xalan -->    </target>
     <available property="xalan.available"  
                classname="org.apache.xalan.Version"/>  
825    
826    
827      <!-- Ant 1.6beta and later don't need or want this check -->    <target name="4jdk8dist-jar"
828      <!--            depends="4jdk8clean, 4jdk8jar">
829      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"      <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
830            unless="junit.available"/>    </target>
831    
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
832    
833      <target name="4jdk8dist-docs"
834              depends="4jdk8clean, 4jdk8docs">
835        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
836    </target>    </target>
837    
838    
   <!-- Various demos and test programs -->  
839    
840      <!-- jsr166 4jdk7 -->
841    
842    <target name="loops" depends="configure-compiler"    <target name="4jdk7compile"
843            description="Benchmark from Doug Lea's AQS paper">            depends="configure-compiler"
844              description="Compiles src/jdk7 sources, targeting jdk7">
845    
846      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
847    
848      <javac srcdir="${loops.src.dir}"      <javac srcdir="${4jdk7src.dir}"
849            destdir="${build.loops.dir}"             destdir="${build.4jdk7.classes.dir}"
850              debug="${build.debug}"              debug="${build.debug}"
851         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
852        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
853             source="${build.sourcelevel}"             source="6"
854               target="6"
855               classpath=""
856               bootclasspath="${bootclasspath6}"
857               includeAntRuntime="false"
858               includeJavaRuntime="false"
859               executable="${javac7}"
860               fork="true">               fork="true">
861    
862        <compilerarg line="${build.args}"/>        <include name="**/*.java"/>
863        <classpath refid="loops.classpath"/>        <compilerarg value="-Xprefer:source"/>
864        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
865          <compilerarg value="-Xlint:all"/>
866          <compilerarg value="-Werror"/>
867          <compilerarg line="${build.args}"/>
868    
869      </javac>      </javac>
   
     <java classname="ALoops" fork="true">  
       <classpath refid="loops.classpath"/>  
     </java>  
   
870    </target>    </target>
871    
872      <target name="4jdk7doclint"
   <!-- jsr166 4jdk7 -->  
   
   
   <target name="4jdk7compile"  
873            depends="configure-compiler"            depends="configure-compiler"
874            description="Compiles src/jdk7 sources, targeting jdk7">            description="Finds doclint warnings">
875    
876      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
877    
# Line 559  Line 881 
881             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
882             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
883             source="6"             source="6"
884               target="6"
885             classpath=""             classpath=""
886             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
887             includeAntRuntime="false"             includeAntRuntime="false"
888             includeJavaRuntime="false"             includeJavaRuntime="false"
889             executable="${javac7}"             executable="${javac8}"
890             fork="true">             fork="true">
891    
892        <include name="**/*.java"/>        <include name="**/*.java"/>
893        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
894        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
895        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
896          <compilerarg value="-Xdoclint:all/protected"/>
897          <compilerarg line="${build.args}"/>
898    
899      </javac>      </javac>
   
900    </target>    </target>
901    
902    <target name="4jdk7-jar"  
903      <target name="4jdk7jar"
904            depends="4jdk7compile"            depends="4jdk7compile"
905            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
906    
907      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
908        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
909          <manifest>
910            <attribute name="Built-By" value="${user.name}"/>
911            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
912          </manifest>
913      </jar>      </jar>
914    
915    </target>    </target>
916    
917    
918    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
919            depends="4jdk7-jar"            depends="4jdk7jar"
920            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
921    
922      <run-tck-tests      <run-tck-tests
923        target="7"        target="7"
924        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
925        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
926          <javac-elements>
927            <!-- JDK8+ test classes -->
928            <exclude name="*8Test.java"/>
929            <exclude name="*9Test.java"/>
930            <exclude name="*10Test.java"/>
931            <exclude name="DoubleAccumulatorTest.java"/>
932            <exclude name="DoubleAdderTest.java"/>
933            <exclude name="LongAccumulatorTest.java"/>
934            <exclude name="LongAdderTest.java"/>
935            <exclude name="CompletableFutureTest.java"/>
936            <exclude name="SplittableRandomTest.java"/>
937            <exclude name="StampedLockTest.java"/>
938            <exclude name="SubmissionPublisherTest.java"/>
939          </javac-elements>
940        </run-tck-tests>
941    </target>    </target>
942    
943    
944    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
945            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
946            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
947    
948      <junit printsummary="true"      <junit printsummary="true"
949             showoutput="true"             showoutput="true"
# Line 619  Line 963 
963    
964        <formatter type="brief"/>        <formatter type="brief"/>
965    
966        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
967        </test>        </test>
968    
969      </junit>      </junit>
970    </target>    </target>
971    
972    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
973            depends="4jdk7compile"            depends="4jdk7jar"
974            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
975      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
976      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
977      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
978      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
979    </target>    </target>
980    
981    
982    <target name="4jdk7-test"    <target name="4jdk7-test"
983            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
984            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
985    </target>    </target>
986    
# Line 656  Line 988 
988    <target name="4jdk7docs"    <target name="4jdk7docs"
989            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
990    
991      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
992      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
993    
994      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
995               packagenames="none"               packagenames="none"
996               link="${jdkapi7docs.url}"               link="${java7.api.url}"
997               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
998               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
999                 sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1000               classpath=""               classpath=""
1001               executable="${javadoc7}">               executable="${javadoc7}"
1002        <arg value="-XDignore.symbol.file=true"/>               failonerror = "true">
1003        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1004          <include name="**/*.java"/>          <include name="**/*.java"/>
1005        </fileset>        </fileset>
1006          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1007          <arg value="-XDignore.symbol.file=true"/>
1008      </javadoc>      </javadoc>
   
1009    </target>    </target>
1010    
1011    
1012    <target name="4jdk7dist"    <target name="4jdk7dist"
1013            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
1014            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1015    
1016    
   
1017    <target name="4jdk7clean"    <target name="4jdk7clean"
1018            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
1019    
# Line 689  Line 1022 
1022    </target>    </target>
1023    
1024    
   
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1025    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
1026            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
1027      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1028      </target>
1029    
1030    
1031      <target name="4jdk7dist-docs"
1032              depends="4jdk7clean, 4jdk7docs">
1033        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1034    </target>    </target>
1035    
1036    
# Line 717  Line 1048 
1048             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1049             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1050             classpath=""             classpath=""
            source="5"  
1051             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1052               source="5"
1053               target="5"
1054             includeAntRuntime="false"             includeAntRuntime="false"
1055             includeJavaRuntime="false"             includeJavaRuntime="false"
1056             executable="${javac7}"             executable="${javac7}"
1057             fork="true">             fork="true">
1058    
1059        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1060        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1061        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1062          <compilerarg value="-Werror"/>
1063          <compilerarg line="${build.args}"/>
1064    
1065      </javac>      </javac>
   
1066    </target>    </target>
1067    
1068    
   
1069    <target name="jsr166xjar"    <target name="jsr166xjar"
1070            depends="jsr166xcompile"            depends="jsr166xcompile"
1071            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1072    
1073      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1074        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1075          <manifest>
1076            <attribute name="Built-By" value="${user.name}"/>
1077            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1078          </manifest>
1079      </jar>      </jar>
1080    
1081    </target>    </target>
1082    
1083    
   
1084    <target name="jsr166xdocs"    <target name="jsr166xdocs"
1085            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
1086    
1087      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1088      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1089    
1090      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
1091               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1092               link="${jdkapidocs.url}"               link="${java.api.url}"
1093               source="5"               access="${build.javadoc.access}"
1094                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1095               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1096               sourcepath="${topsrc.dir}:${jdk6src.dir}"               source="5"
1097               executable="${javadoc7}"               executable="${javadoc7}"
1098               additionalparam="-XDignore.symbol.file=true"/>               failonerror = "true">
1099          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1100          <arg value="-XDignore.symbol.file=true"/>
1101    
1102        </javadoc>
1103    </target>    </target>
1104    
1105    
1106    <target name="jsr166xdist"    <target name="jsr166xdist"
1107            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
1108            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1109    
1110    
   
1111    <target name="jsr166xclean"    <target name="jsr166xclean"
1112            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
1113    
# Line 779  Line 1116 
1116    </target>    </target>
1117    
1118    
   
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
1119    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
1120            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
   
1121      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1122      </target>
1123    
1124      <target name="jsr166xdist-docs"
1125              depends="jsr166xclean, jsr166xdocs">
1126        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1127    </target>    </target>
1128    
1129    <!-- jsr166y -->    <!-- jsr166y -->
# Line 808  Line 1141 
1141             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1142             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1143             source="6"             source="6"
1144               target="6"
1145             classpath=""             classpath=""
1146             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1147             includeAntRuntime="false"             includeAntRuntime="false"
# Line 816  Line 1150 
1150             fork="true">             fork="true">
1151    
1152        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1153        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1154        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1155          <compilerarg value="-Werror"/>
1156          <compilerarg line="${build.args}"/>
1157    
1158      </javac>      </javac>
1159    </target>    </target>
1160    
# Line 829  Line 1165 
1165    
1166      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1167        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1168          <manifest>
1169            <attribute name="Built-By" value="${user.name}"/>
1170            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1171          </manifest>
1172      </jar>      </jar>
1173    
1174    </target>    </target>
1175    
1176    
   
1177    <target name="jsr166ydocs"    <target name="jsr166ydocs"
1178            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
1179    
1180      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1181      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1182    
1183      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
1184               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1185               link="${jdkapidocs.url}"               link="${java.api.url}"
1186               source="6"               access="${build.javadoc.access}"
1187                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1188               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1189               sourcepath="${topsrc.dir}:${jdk6src.dir}"               source="6"
1190               executable="${javadoc7}"               executable="${javadoc7}"
1191               additionalparam="-XDignore.symbol.file=true"/>               failonerror = "true">
1192          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1193          <arg value="-XDignore.symbol.file=true"/>
1194    
1195        </javadoc>
1196    </target>    </target>
1197    
1198    
1199    <target name="jsr166ydist"    <target name="jsr166ydist"
1200            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
1201            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1202    
1203    
   
1204    <target name="jsr166yclean"    <target name="jsr166yclean"
1205            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
1206    
# Line 867  Line 1209 
1209    </target>    </target>
1210    
1211    
   
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1212    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
1213            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
   
1214      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1215      </target>
1216    
1217      <target name="jsr166ydist-docs"
1218              depends="jsr166yclean, jsr166ydocs">
1219        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1220    </target>    </target>
1221    
1222    
# Line 895  Line 1234 
1234             debug="${build.debug}"             debug="${build.debug}"
1235             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1236             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1237               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1238             classpath=""             classpath=""
1239             source="6"             source="6"
1240             bootclasspath="${jsr166y.jar}:${bootclasspath6}"             target="6"
1241             includeAntRuntime="false"             includeAntRuntime="false"
1242             includeJavaRuntime="false"             includeJavaRuntime="false"
1243             executable="${javac7}"             executable="${javac7}"
1244             fork="true">             fork="true">
1245    
1246        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1247        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1248        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1249          <compilerarg value="-Werror"/>
1250          <compilerarg line="${build.args}"/>
1251    
1252      </javac>      </javac>
   
1253    </target>    </target>
1254    
1255    
   
1256    <target name="extra166yjar"    <target name="extra166yjar"
1257            depends="extra166ycompile"            depends="extra166ycompile"
1258            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1259    
1260      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1261        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1262          <manifest>
1263            <attribute name="Built-By" value="${user.name}"/>
1264            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1265          </manifest>
1266      </jar>      </jar>
1267    
1268    </target>    </target>
1269    
1270    
   
1271    <target name="extra166ydocs"    <target name="extra166ydocs"
1272            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1273    
1274      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1275      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1276    
1277      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1278               packagenames="extra166y.*"               packagenames="extra166y.*"
1279               link="${jdkapidocs.url}"               link="${java.api.url}"
1280               source="6"               access="${build.javadoc.access}"
1281                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1282               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1283               sourcepath="${topsrc.dir}:${jdk6src.dir}"               source="6"
1284               executable="${javadoc7}"               executable="${javadoc7}">
1285               additionalparam="-XDignore.symbol.file=true"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1286          <arg value="-XDignore.symbol.file=true"/>
1287    
1288        </javadoc>
1289    </target>    </target>
1290    
1291    
1292    <target name="extra166ydist"    <target name="extra166ydist"
1293            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1294            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1295    
1296    
   
1297    <target name="extra166yclean"    <target name="extra166yclean"
1298            description="Removes all extra166y build products">            description="Removes all extra166y build products">
1299    
# Line 958  Line 1302 
1302    </target>    </target>
1303    
1304    
   
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1305    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1306            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
   
1307      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1308      </target>
1309    
1310      <target name="extra166ydist-docs"
1311              depends="extra166yclean, extra166ydocs">
1312        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1313    </target>    </target>
1314    
1315    <!-- jsr166e -->    <!-- jsr166e -->
1316    
1317      <property name="build.jsr166e.java.version" value="6"/>
1318      <property name="build.jsr166e.javac" value="${javac6}"/>
1319    
1320    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1321            depends="configure-compiler"            depends="configure-compiler"
1322            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 984  Line 1328 
1328             debug="${build.debug}"             debug="${build.debug}"
1329             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1330             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1331             source="7"             source="${build.jsr166e.java.version}"
1332               target="${build.jsr166e.java.version}"
1333             classpath=""             classpath=""
1334             includeAntRuntime="false"             includeAntRuntime="false"
1335             includeJavaRuntime="false"             includeJavaRuntime="false"
1336             executable="${javac7}"             executable="${build.jsr166e.javac}"
1337             fork="true">             fork="true">
1338    
1339        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1340        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1341        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1342          <compilerarg value="-Werror"/>
1343          <compilerarg line="${build.args}"/>
1344    
1345      </javac>      </javac>
   
1346    </target>    </target>
1347    
1348      <!-- jsr166e: find doclint errors -->
1349      <target name="jsr166edoclint">
1350    
1351        <mkdir dir="${build.jsr166e.classes.dir}"/>
1352    
1353        <javac srcdir="${topsrc.dir}"
1354               destdir="${build.jsr166e.classes.dir}"
1355               debug="${build.debug}"
1356               debuglevel="${build.debuglevel}"
1357               deprecation="${build.deprecation}"
1358               source="${build.jsr166e.java.version}"
1359               target="${build.jsr166e.java.version}"
1360               classpath=""
1361               bootclasspath="${bootclasspath6}"
1362               includeAntRuntime="false"
1363               includeJavaRuntime="false"
1364               executable="${javac8}"
1365               fork="true">
1366    
1367          <include name="jsr166e/**/*.java"/>
1368          <compilerarg value="-XDignore.symbol.file=true"/>
1369          <compilerarg value="-Xlint:all"/>
1370          <compilerarg value="-Werror"/>
1371          <compilerarg value="-Xdoclint:all/protected"/>
1372    
1373        </javac>
1374      </target>
1375    
1376    
1377    <target name="jsr166ejar"    <target name="jsr166ejar"
# Line 1008  Line 1380 
1380    
1381      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1382        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1383          <manifest>
1384            <attribute name="Built-By" value="${user.name}"/>
1385            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1386          </manifest>
1387      </jar>      </jar>
1388    
1389    </target>    </target>
1390    
1391    
   
1392    <target name="jsr166edocs"    <target name="jsr166edocs"
1393            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1394    
1395      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1396      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1397    
1398      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1399               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1400               link="${jdkapidocs.url}"               link="${java.api.url}"
1401               source="7"               access="${build.javadoc.access}"
1402               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1403                 source="${build.jsr166e.java.version}"
1404               executable="${javadoc7}"               executable="${javadoc7}"
1405               additionalparam="-XDignore.symbol.file=true" >               failonerror = "true">
1406          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1407          <arg value="-XDignore.symbol.file=true"/>
1408    
1409      </javadoc>      </javadoc>
1410      </target>
1411    
1412    
1413      <target name="jsr166e-tck-one-java-version"
1414              depends="jsr166ejar">
1415    
1416        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1417    
1418        <run-tck-tests
1419          tck.src.dir="${test.src.dir}/tck-jsr166e"
1420          target="${build.jsr166e.java.version}"
1421          workdir="${build.jsr166e.dir}"
1422          classes="${jsr166e.jar}"/>
1423      </target>
1424    
1425      <target name="jsr166e-tck"
1426              description="Runs tck tests for jsr166e for multiple java versions">
1427    
1428    <!--     <antcall target="clean"/> -->
1429    <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1430    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1431    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1432    <!--     </antcall> -->
1433    
1434        <antcall target="clean"/>
1435        <antcall target="jsr166e-tck-one-java-version">
1436          <param name="build.jsr166e.java.version" value="7"/>
1437          <param name="build.jsr166e.javac" value="${javac7}"/>
1438        </antcall>
1439    
1440        <antcall target="clean"/>
1441        <antcall target="jsr166e-tck-one-java-version">
1442          <param name="build.jsr166e.java.version" value="6"/>
1443          <param name="build.jsr166e.javac" value="${javac6}"/>
1444        </antcall>
1445    </target>    </target>
1446    
1447    
1448      <target name="jsr166e-test"
1449              depends="jsr166e-tck"
1450              description="Runs all tests for jsr166e">
1451      </target>
1452    
1453    <target name="jsr166edist"    <target name="jsr166edist"
1454            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1455            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1456    
1457    
   
1458    <target name="jsr166eclean"    <target name="jsr166eclean"
1459            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1460      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1461    </target>    </target>
1462    
1463    
1464    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
1465            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1466        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1467      </target>
1468    
1469      <target name="jsr166edist-docs"
1470              depends="jsr166eclean, jsr166edocs">
1471        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1472    </target>    </target>
1473    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
1474    
1475      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1476    
1477      <target name="lint">
1478        <antcall target="dists">
1479          <param name="build.javadoc.access" value="public"/>
1480        </antcall>
1481    </target>    </target>
1482    
1483    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1484      <target name="lint-private">
1485        <antcall target="dist">
1486          <param name="build.javadoc.access" value="private"/>
1487        </antcall>
1488      </target>
1489    
1490    
1491  </project>  </project>

Legend:
Removed from v.1.117  
changed lines
  Added in v.1.213

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8