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

Diff of /jsr166/build.xml

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

revision 1.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC revision 1.212 by jsr166, Sat May 21 00:35:58 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="Display main targets by running 'ant -projecthelp'">    <!-- Run 'ant -projecthelp' (default target) -->
42      <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
45      </java>      </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 55  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 71  Line 91 
91    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
92      <attribute name="v"/>      <attribute name="v"/>
93      <sequential>      <sequential>
94      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
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="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99        <local name="have.java.base"/>
100        <available property="have.java.base"
101          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"/>      <local name="boot.jar.dir"/>
109      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
111        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
112        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
113        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
114        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
115        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
116      </path>      </path>
117      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118      </sequential>      </sequential>
119    </macrodef>    </macrodef>
120    
# Line 104  Line 133 
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 -->    <!-- Source locations -->
139    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
140    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
141    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
142    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <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"/>    <property name="lib.dir"              location="${basedir}/lib"/>
148    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
149    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
150    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <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"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 123  Line 157 
157    <!-- Javadoc locations -->    <!-- Javadoc locations -->
158    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
159    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <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"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 130  Line 165 
165    
166    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <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"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 138  Line 174 
174    <!-- Jar locations -->    <!-- Jar locations -->
175    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <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"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
181    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
182    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
183    
184    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
185    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
186    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <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    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <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    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
196    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <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 -->    <!-- Define the "jtreg" task -->
204    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
205    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
206             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
207    
208    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
209    <path id="test.classpath">     To profile a single tck test class:
210      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
211      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
212    </path>     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}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
219      <attribute name="target"/>      <attribute name="target"/>
220        <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>      <attribute name="workdir"/>
222      <attribute name="classes"/>      <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}"
# Line 183  Line 240 
240             debug="${build.debug}"             debug="${build.debug}"
241             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
242             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
243             source="@{source}"             source="@{compile-target}"
244               target="@{compile-target}"
245             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{source}}"  
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:@{classes}"/>          <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 213  Line 282 
282      </sequential>      </sequential>
283    </macrodef>    </macrodef>
284    
285      <!-- Define jtreg test sets for different jdk versions -->
286      <fileset dir="${jtreg9.src.dir}">
287        <patternset id="jdk9.jtreg.tests">
288          <include name="**/*.java"/>
289        </patternset>
290      </fileset>
291    
292      <fileset dir="${jtreg8.src.dir}">
293        <patternset id="jdk8.jtreg.tests">
294          <include name="**/*.java"/>
295          <exclude name="**/SpliteratorCharacteristics.java"/>
296          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297          <exclude name="**/GCDuringIteration.java"/>
298        </patternset>
299      </fileset>
300    
301      <fileset dir="${jtreg7.src.dir}">
302        <patternset id="jdk7.jtreg.tests">
303          <include name="**/*.java"/>
304        </patternset>
305      </fileset>
306    
307      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
308      <property name="jtreg.flags" value=""/>
309    
310      <macrodef name="run-jtreg-tests">
311        <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312        <attribute name="source" default="7"/>
313        <attribute name="target"/>
314        <attribute name="workdir"/>
315        <attribute name="classes"/>
316        <attribute name="jtregflags" default=""/>
317    
318        <sequential>
319    
320        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
321        <property name="jtreg.verbose" value="nopass,fail,error"/>
322    
323        <local name="modules"/>
324        <condition property="modules">
325          <available file="${jdk@{target}.home}/jmods" type="dir"/>
326        </condition>
327    
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">
350      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 224  Line 356 
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 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          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
403        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
404    
405      </javac>      </javac>
# Line 256  Line 408 
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    
# Line 280  Line 432 
432    
433      <javadoc destdir="${docs.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               access="${build.javadoc.access}"               access="${build.javadoc.access}"
438               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9.src.dir}"
439               classpath=""               classpath=""
440               executable="${javadoc8}">               executable="${javadoc9}">
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"/>        <arg value="-XDignore.symbol.file=true"/>
447    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
448        <arg value="-tag"/>        <arg value="-tag"/>
449        <arg value="${javadoc.jls.option}"/>        <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    
# Line 315  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    
# Line 330  Line 500 
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    
   <!-- Internal targets -->  
   
   
509    <target name="dist-jar"    <target name="dist-jar"
510            depends="clean, jar">            depends="clean, jar">
511      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 348  Line 516 
516      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
517    </target>    </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="jtreg"
544              depends="jar"
545              description="Runs jtreg tests for src/main using the jtreg ant task">
546        <run-jtreg-tests
547           target="${build.main.java.version}"
548           workdir="${build.dir}"
549           classes="${product.jar}"/>
550      </target>
551    
552      <target name="test"
553              depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
554              description="Runs tck and jtreg tests for src/main">
555      </target>
556    
557    <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
558    
559    <!--     <antcall target="jtreg"> -->
560    <!--       <param name="build.main.java.version" value="8"/> -->
561    <!--       <param name="build.main.javac" value="${javac8}"/> -->
562    <!--     </antcall> -->
563    
564    <!--   </target> -->
565    
566    <!--   <target name="test89" -->
567    <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
568    
569    <target name="compile-tests"  <!--     <antcall target="clean"/> -->
570            depends="jar">  <!--     <antcall target="test"> -->
571    <!--       <param name="build.main.java.version" value="8"/> -->
572    <!--       <param name="build.main.javac" value="${javac8}"/> -->
573    <!--     </antcall> -->
574    
575      <mkdir dir="${build.testcases.dir}"/>  <!--     <antcall target="clean"/> -->
576    <!--     <antcall target="test"> -->
577    <!--       <param name="build.main.java.version" value="9"/> -->
578    <!--       <param name="build.main.javac" value="${javac9}"/> -->
579    <!--     </antcall> -->
580    
581    <!--   </target> -->
582    
583    
584    
585      <target name="configure-compiler">
586        <fail message="ant version too old">
587          <condition>
588            <not> <antversion atleast="1.9.1"/> </not>
589          </condition>
590        </fail>
591    
592      <javac srcdir="${tck.src.dir}"      <property name="unchecked.option" value="-Xlint:unchecked"/>
593             destdir="${build.testcases.dir}"  
594        <condition property="warnunchecked.arg" value="${unchecked.option}">
595          <istrue value="${build.warnunchecked}"/>
596        </condition>
597    
598        <property name="warnunchecked.arg" value=""/>
599    
600    
601        <!-- Common options in javac invocations -->
602        <property name="build.args" value="${warnunchecked.arg}"/>
603    
604      </target>
605    
606    
607    
608      <!-- Various demos and test programs -->
609    
610    
611      <!-- description="Benchmark from Doug Lea's AQS paper" -->
612      <target name="loops" depends="configure-compiler">
613    
614        <mkdir dir="${build.loops.dir}"/>
615    
616        <javac srcdir="${loops.src.dir}"
617              destdir="${build.loops.dir}"
618                debug="${build.debug}"
619           debuglevel="${build.debuglevel}"
620          deprecation="${build.deprecation}"
621               source="${build.sourcelevel}"
622               target="${build.sourcelevel}"
623                 fork="true">
624    
625          <compilerarg line="${build.args}"/>
626          <classpath refid="loops.classpath"/>
627          <compilerarg value="-XDignore.symbol.file=true"/>
628    
629        </javac>
630    
631        <java classname="ALoops" fork="true">
632          <classpath refid="loops.classpath"/>
633        </java>
634    
635      </target>
636    
637    
638      <target name="compile-test-loops" depends="jar"
639              description="compile all the perf tests in src/test/loops">
640    
641        <mkdir dir="${build.dir}/test/loops"/>
642    
643        <javac srcdir="${basedir}/src/test/loops"
644               destdir="${build.dir}/test/loops"
645             debug="${build.debug}"             debug="${build.debug}"
646             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
647             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
648             includeAntRuntime="false"             includeAntRuntime="false"
649             includeJavaRuntime="false"             includeJavaRuntime="false"
650             executable="${javac8}"             executable="${javac9}"
651             fork="true">             fork="true">
652    
653        <include name="**/*.java"/>        <include name="*.java"/>
654        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
655        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
656          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
657        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
658    
659      </javac>      </javac>
660    
661      <javac srcdir="${test.src.dir}"    </target>
662             destdir="${build.testcases.dir}"  
663    
664      <!-- jsr166 4jdk8 -->
665    
666      <target name="4jdk8compile"
667              depends="configure-compiler"
668              description="Compiles src/jdk8 sources, targeting jdk8">
669    
670        <mkdir dir="${build.4jdk8.classes.dir}"/>
671    
672        <javac srcdir="${4jdk8src.dir}"
673               destdir="${build.4jdk8.classes.dir}"
674             debug="${build.debug}"             debug="${build.debug}"
675             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
676             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
677             source="6"             source="8"
678               target="8"
679             classpath=""             classpath=""
680             bootclasspath="@{product.jar}:${bootclasspath6}"             bootclasspath="${bootclasspath8}"
681             includeAntRuntime="false"             includeAntRuntime="false"
682             includeJavaRuntime="false"             includeJavaRuntime="false"
683             executable="${javac8}"             executable="${javac8}"
684             fork="true">             fork="true">
685    
686        <include name="jsr166/test/**/*.java"/>        <include name="**/*.java"/>
687          <compilerarg value="-Xprefer:source"/>
688        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
689        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all"/>
690          <compilerarg value="-Werror"/>
691        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
692    
693      </javac>      </javac>
694      </target>
695    
696  <!--    <target name="4jdk8doclint"
697      <javac srcdir="${jtreg.src.dir}"            depends="configure-compiler"
698            destdir="${build.testcases.dir}"            description="Finds doclint warnings">
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
699    
700        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>      <mkdir dir="${build.4jdk8.classes.dir}"/>
701    
702        <javac srcdir="${4jdk8src.dir}"
703               destdir="${build.4jdk8.classes.dir}"
704               debug="${build.debug}"
705               debuglevel="${build.debuglevel}"
706               deprecation="${build.deprecation}"
707               source="8"
708               target="8"
709               classpath=""
710               bootclasspath="${bootclasspath8}"
711               includeAntRuntime="false"
712               includeJavaRuntime="false"
713               executable="${javac8}"
714               fork="true">
715    
716          <include name="**/*.java"/>
717          <compilerarg value="-Xprefer:source"/>
718        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
719          <compilerarg value="-Xlint:all"/>
720          <compilerarg value="-Xdoclint:all/protected"/>
721        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
722    
723      </javac>      </javac>
 -->  
   
724    </target>    </target>
725    
726    
727    <target name="run-tests"    <target name="4jdk8jar"
728            depends="compile-tests">            depends="4jdk8compile"
729              description="Builds library jar from compiled sources">
730    
731      <!-- May be overridden by user.properties -->      <jar destfile="${4jdk8product.jar}">
732      <property name="testcase" value="*"/>        <fileset dir="${build.4jdk8.classes.dir}"/>
733          <manifest>
734            <attribute name="Built-By" value="${user.name}"/>
735            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
736          </manifest>
737        </jar>
738    
739      <mkdir dir="${build.reports.dir}"/>    </target>
740    
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                     jvm="${java8}"  
                    fork="true">  
741    
742        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>    <target name="4jdk8-tck"
743        <jvmarg value="-server"/>            depends="4jdk8jar"
744        <jvmarg value="-showversion"/>            description="Runs tck tests for jsr166-4jdk8 directly">
745    
746        <classpath refid="test.classpath"/>      <run-tck-tests
747          target="8"
748          workdir="${build.4jdk8.dir}"
749          classes="${4jdk8product.jar}">
750          <javac-elements>
751            <!-- JDK9+ test classes -->
752            <exclude name="*9Test.java"/>
753            <exclude name="*10Test.java"/>
754          </javac-elements>
755        </run-tck-tests>
756      </target>
757    
       <formatter type="xml"/>  
758    
759        <batchtest todir="${build.reports.dir}" unless="no.test.tck">    <target name="4jdk8-jtreg"
760          <fileset dir="${tck.src.dir}">            depends="4jdk8jar"
761            <include name="**/${testcase}Test.java"/>            description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
762          </fileset>      <run-jtreg-tests
763        </batchtest>         target="8"
764           workdir="${build.4jdk8.dir}"
765        <batchtest todir="${build.reports.dir}" if="do.test.old">         classes="${4jdk8product.jar}"/>
766          <fileset dir="${test.src.dir}">    </target>
           <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>  
 -->  
767    
     </junit>  
768    
769      <target name="4jdk8-test"
770              depends="4jdk8-tck, 4jdk8-jtreg"
771              description="Runs tck and jtreg tests for jsr166-4jdk8">
772    </target>    </target>
773    
774    
775    <target name="report-tests"    <target name="4jdk8docs"
776            depends="run-tests">            description="Builds javadocs for src/jdk8 to dist dir">
   
     <!-- Sets junit.report.format to frames if redirection is present,  
          otherwise sets it to noframes. -->  
     <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>  
777    
778      <fail message="Test Cases Failed" if="junit.failed"/>      <delete dir="${4jdk8docs.dir}"/>
779        <mkdir dir="${4jdk8docs.dir}"/>
780    
781        <javadoc destdir="${4jdk8docs.dir}"
782                 packagenames="none"
783                 link="${java8.api.url}"
784                 overview="${4jdk8src.dir}/intro.html"
785                 access="${build.javadoc.access}"
786                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
787                 classpath=""
788                 executable="${javadoc8}"
789                 failonerror = "true">
790          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
791            <include name="**/*.java"/>
792          </fileset>
793          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
794          <arg value="-XDignore.symbol.file=true"/>
795          <arg value="-tag"/>
796          <arg value="${javadoc.jls.option}"/>
797          <arg value="-tag"/>
798          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
799          <arg value="-tag"/>
800          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
801          <arg value="-tag"/>
802          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
803        </javadoc>
804    </target>    </target>
805    
806    
807    <target name="configure-compiler">    <target name="4jdk8dist"
808              depends="4jdk8dist-jar, 4jdk8dist-docs"
809      <property name="unchecked.option" value="-Xlint:unchecked"/>            description="Puts all distributable products in single hierarchy"/>
   
     <condition property="warnunchecked.arg" value="${unchecked.option}">  
       <istrue value="${build.warnunchecked}"/>  
     </condition>  
810    
     <property name="warnunchecked.arg" value=""/>  
811    
812      <target name="4jdk8clean"
813              description="Removes all 4jdk8 build products">
814    
815      <!-- Common options in javac invocations -->      <delete dir="${build.4jdk8.dir}"/>
     <property name="build.args" value="${warnunchecked.arg}"/>  
816    
817    </target>    </target>
818    
819    
820    <target name="configure-tests"    <target name="4jdk8dist-jar"
821         depends="configure-compiler">            depends="4jdk8clean, 4jdk8jar">
822        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
823      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->    </target>
     <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"/>  
824    
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
825    
826      <target name="4jdk8dist-docs"
827              depends="4jdk8clean, 4jdk8docs">
828        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
829    </target>    </target>
830    
831    
   <!-- Various demos and test programs -->  
832    
833      <!-- jsr166 4jdk7 -->
834    
835    <target name="loops" depends="configure-compiler"    <target name="4jdk7compile"
836            description="Benchmark from Doug Lea's AQS paper">            depends="configure-compiler"
837              description="Compiles src/jdk7 sources, targeting jdk7">
838    
839      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
840    
841      <javac srcdir="${loops.src.dir}"      <javac srcdir="${4jdk7src.dir}"
842            destdir="${build.loops.dir}"             destdir="${build.4jdk7.classes.dir}"
843              debug="${build.debug}"             debug="${build.debug}"
844         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
845        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
846             source="${build.sourcelevel}"             source="6"
847               fork="true">             target="6"
848               classpath=""
849               bootclasspath="${bootclasspath6}"
850               includeAntRuntime="false"
851               includeJavaRuntime="false"
852               executable="${javac7}"
853               fork="true">
854    
855        <compilerarg line="${build.args}"/>        <include name="**/*.java"/>
856        <classpath refid="loops.classpath"/>        <compilerarg value="-Xprefer:source"/>
857        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
858          <compilerarg value="-Xlint:all"/>
859          <compilerarg value="-Werror"/>
860          <compilerarg line="${build.args}"/>
861    
862      </javac>      </javac>
   
     <java classname="ALoops" fork="true">  
       <classpath refid="loops.classpath"/>  
     </java>  
   
863    </target>    </target>
864    
865      <target name="4jdk7doclint"
   <!-- jsr166 4jdk7 -->  
   
   <target name="4jdk7compile"  
866            depends="configure-compiler"            depends="configure-compiler"
867            description="Compiles src/jdk7 sources, targeting jdk7">            description="Finds doclint warnings">
868    
869      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
870    
# Line 570  Line 874 
874             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
875             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
876             source="6"             source="6"
877               target="6"
878             classpath=""             classpath=""
879             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
880             includeAntRuntime="false"             includeAntRuntime="false"
881             includeJavaRuntime="false"             includeJavaRuntime="false"
882             executable="${javac7}"             executable="${javac8}"
883             fork="true">             fork="true">
884    
885        <include name="**/*.java"/>        <include name="**/*.java"/>
886          <compilerarg value="-Xprefer:source"/>
887        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
888        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
889          <compilerarg value="-Xdoclint:all/protected"/>
890        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
891    
892      </javac>      </javac>
# Line 592  Line 899 
899    
900      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
901        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
902          <manifest>
903            <attribute name="Built-By" value="${user.name}"/>
904            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
905          </manifest>
906      </jar>      </jar>
907    
908    </target>    </target>
909    
910    
911    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
912            depends="4jdk7jar"            depends="4jdk7jar"
913            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
914    
915      <run-tck-tests      <run-tck-tests
916        target="7"        target="7"
917        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
918        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
919          <javac-elements>
920            <!-- JDK8+ test classes -->
921            <exclude name="*8Test.java"/>
922            <exclude name="*9Test.java"/>
923            <exclude name="*10Test.java"/>
924            <exclude name="DoubleAccumulatorTest.java"/>
925            <exclude name="DoubleAdderTest.java"/>
926            <exclude name="LongAccumulatorTest.java"/>
927            <exclude name="LongAdderTest.java"/>
928            <exclude name="CompletableFutureTest.java"/>
929            <exclude name="SplittableRandomTest.java"/>
930            <exclude name="StampedLockTest.java"/>
931            <exclude name="SubmissionPublisherTest.java"/>
932          </javac-elements>
933        </run-tck-tests>
934    </target>    </target>
935    
936    
937    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
938            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
939            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
940    
941      <junit printsummary="true"      <junit printsummary="true"
942             showoutput="true"             showoutput="true"
# Line 630  Line 956 
956    
957        <formatter type="brief"/>        <formatter type="brief"/>
958    
959        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
960        </test>        </test>
961    
962      </junit>      </junit>
963    </target>    </target>
964    
965    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
966            depends="4jdk7compile"            depends="4jdk7jar"
967            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
968      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
969      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
970      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
971      <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>  
972    </target>    </target>
973    
974    
975    <target name="4jdk7-test"    <target name="4jdk7-test"
976            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
977            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
978    </target>    </target>
979    
# Line 672  Line 986 
986    
987      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
988               packagenames="none"               packagenames="none"
989               link="${jdkapi7docs.url}"               link="${java7.api.url}"
990               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
991               access="${build.javadoc.access}"               access="${build.javadoc.access}"
992               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
993               classpath=""               classpath=""
994               executable="${javadoc7}">               executable="${javadoc7}"
995                 failonerror = "true">
996        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
997          <include name="**/*.java"/>          <include name="**/*.java"/>
998        </fileset>        </fileset>
999          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1000        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1001      </javadoc>      </javadoc>
1002    </target>    </target>
# Line 699  Line 1015 
1015    </target>    </target>
1016    
1017    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1018    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
1019            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
1020      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 732  Line 1043 
1043             classpath=""             classpath=""
1044             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1045             source="5"             source="5"
1046               target="5"
1047             includeAntRuntime="false"             includeAntRuntime="false"
1048             includeJavaRuntime="false"             includeJavaRuntime="false"
1049             executable="${javac7}"             executable="${javac7}"
# Line 740  Line 1052 
1052        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1053        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1054        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1055          <compilerarg value="-Werror"/>
1056        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1057    
1058      </javac>      </javac>
# Line 752  Line 1065 
1065    
1066      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1067        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1068          <manifest>
1069            <attribute name="Built-By" value="${user.name}"/>
1070            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1071          </manifest>
1072      </jar>      </jar>
1073    
1074    </target>    </target>
# Line 765  Line 1082 
1082    
1083      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
1084               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1085               link="${jdkapidocs.url}"               link="${java.api.url}"
1086               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1087               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1088               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1089               source="5"               source="5"
1090               executable="${javadoc7}">               executable="${javadoc7}"
1091                 failonerror = "true">
1092          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1093        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1094    
1095      </javadoc>      </javadoc>
# Line 790  Line 1109 
1109    </target>    </target>
1110    
1111    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
1112    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
1113            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
1114      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 821  Line 1134 
1134             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1135             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1136             source="6"             source="6"
1137               target="6"
1138             classpath=""             classpath=""
1139             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1140             includeAntRuntime="false"             includeAntRuntime="false"
# Line 831  Line 1145 
1145        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
1146        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1147        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1148          <compilerarg value="-Werror"/>
1149        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1150    
1151      </javac>      </javac>
# Line 843  Line 1158 
1158    
1159      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1160        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1161          <manifest>
1162            <attribute name="Built-By" value="${user.name}"/>
1163            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1164          </manifest>
1165      </jar>      </jar>
1166    
1167    </target>    </target>
# Line 856  Line 1175 
1175    
1176      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
1177               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1178               link="${jdkapidocs.url}"               link="${java.api.url}"
1179               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1180               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1182               source="6"               source="6"
1183               executable="${javadoc7}">               executable="${javadoc7}"
1184                 failonerror = "true">
1185          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1186        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1187    
1188      </javadoc>      </javadoc>
# Line 881  Line 1202 
1202    </target>    </target>
1203    
1204    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1205    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
1206            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
1207      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 914  Line 1230 
1230             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1231             classpath=""             classpath=""
1232             source="6"             source="6"
1233               target="6"
1234             includeAntRuntime="false"             includeAntRuntime="false"
1235             includeJavaRuntime="false"             includeJavaRuntime="false"
1236             executable="${javac7}"             executable="${javac7}"
# Line 922  Line 1239 
1239        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1240        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1241        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1242          <compilerarg value="-Werror"/>
1243        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1244    
1245      </javac>      </javac>
# Line 934  Line 1252 
1252    
1253      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1254        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1255          <manifest>
1256            <attribute name="Built-By" value="${user.name}"/>
1257            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1258          </manifest>
1259      </jar>      </jar>
1260    
1261    </target>    </target>
# Line 947  Line 1269 
1269    
1270      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1271               packagenames="extra166y.*"               packagenames="extra166y.*"
1272               link="${jdkapidocs.url}"               link="${java.api.url}"
1273               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1274               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1275               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1276               source="6"               source="6"
1277               executable="${javadoc7}">               executable="${javadoc7}">
1278          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1279        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1280    
1281      </javadoc>      </javadoc>
# Line 972  Line 1295 
1295    </target>    </target>
1296    
1297    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1298    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1299            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1300      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 989  Line 1307 
1307    
1308    <!-- jsr166e -->    <!-- jsr166e -->
1309    
1310      <property name="build.jsr166e.java.version" value="6"/>
1311      <property name="build.jsr166e.javac" value="${javac6}"/>
1312    
1313    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1314            depends="configure-compiler"            depends="configure-compiler"
1315            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1000  Line 1321 
1321             debug="${build.debug}"             debug="${build.debug}"
1322             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1323             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1324             source="7"             source="${build.jsr166e.java.version}"
1325               target="${build.jsr166e.java.version}"
1326             classpath=""             classpath=""
1327             includeAntRuntime="false"             includeAntRuntime="false"
1328             includeJavaRuntime="false"             includeJavaRuntime="false"
1329             executable="${javac7}"             executable="${build.jsr166e.javac}"
1330             fork="true">             fork="true">
1331    
1332        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1333        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1334        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1335          <compilerarg value="-Werror"/>
1336        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1337    
1338      </javac>      </javac>
1339    </target>    </target>
1340    
1341      <!-- jsr166e: find doclint errors -->
1342      <target name="jsr166edoclint">
1343    
1344        <mkdir dir="${build.jsr166e.classes.dir}"/>
1345    
1346        <javac srcdir="${topsrc.dir}"
1347               destdir="${build.jsr166e.classes.dir}"
1348               debug="${build.debug}"
1349               debuglevel="${build.debuglevel}"
1350               deprecation="${build.deprecation}"
1351               source="${build.jsr166e.java.version}"
1352               target="${build.jsr166e.java.version}"
1353               classpath=""
1354               bootclasspath="${bootclasspath6}"
1355               includeAntRuntime="false"
1356               includeJavaRuntime="false"
1357               executable="${javac8}"
1358               fork="true">
1359    
1360          <include name="jsr166e/**/*.java"/>
1361          <compilerarg value="-XDignore.symbol.file=true"/>
1362          <compilerarg value="-Xlint:all"/>
1363          <compilerarg value="-Werror"/>
1364          <compilerarg value="-Xdoclint:all/protected"/>
1365    
1366        </javac>
1367      </target>
1368    
1369    
1370    <target name="jsr166ejar"    <target name="jsr166ejar"
1371            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1022  Line 1373 
1373    
1374      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1375        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1376          <manifest>
1377            <attribute name="Built-By" value="${user.name}"/>
1378            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1379          </manifest>
1380      </jar>      </jar>
1381    
1382    </target>    </target>
# Line 1035  Line 1390 
1390    
1391      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1392               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1393               link="${jdkapidocs.url}"               link="${java.api.url}"
1394               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1395               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1396               source="7"               source="${build.jsr166e.java.version}"
1397               executable="${javadoc7}">               executable="${javadoc7}"
1398                 failonerror = "true">
1399          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1400        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1401    
1402      </javadoc>      </javadoc>
1403    </target>    </target>
1404    
1405    
1406    <target name="jsr166e-test-tck"    <target name="jsr166e-tck-one-java-version"
1407            depends="jsr166ejar"            depends="jsr166ejar">
1408            description="Runs tck tests for jsr166e">  
1409        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1410    
1411      <run-tck-tests      <run-tck-tests
1412        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1413        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1414        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1415        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1416    </target>    </target>
1417    
1418      <target name="jsr166e-tck"
1419              description="Runs tck tests for jsr166e for multiple java versions">
1420    
1421    <!--     <antcall target="clean"/> -->
1422    <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1423    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1424    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1425    <!--     </antcall> -->
1426    
1427        <antcall target="clean"/>
1428        <antcall target="jsr166e-tck-one-java-version">
1429          <param name="build.jsr166e.java.version" value="7"/>
1430          <param name="build.jsr166e.javac" value="${javac7}"/>
1431        </antcall>
1432    
1433        <antcall target="clean"/>
1434        <antcall target="jsr166e-tck-one-java-version">
1435          <param name="build.jsr166e.java.version" value="6"/>
1436          <param name="build.jsr166e.javac" value="${javac6}"/>
1437        </antcall>
1438      </target>
1439    
1440    
1441      <target name="jsr166e-test"
1442              depends="jsr166e-tck"
1443              description="Runs all tests for jsr166e">
1444      </target>
1445    
1446    <target name="jsr166edist"    <target name="jsr166edist"
1447            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1070  Line 1454 
1454    </target>    </target>
1455    
1456    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1457    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1458            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1459      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1090  Line 1469 
1469    
1470    <target name="lint">    <target name="lint">
1471      <antcall target="dists">      <antcall target="dists">
1472          <param name="build.javadoc.access" value="public"/>
1473        </antcall>
1474      </target>
1475    
1476    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1477      <target name="lint-private">
1478        <antcall target="dist">
1479        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1480      </antcall>      </antcall>
1481    </target>    </target>

Legend:
Removed from v.1.130  
changed lines
  Added in v.1.212

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