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

Diff of /jsr166/build.xml

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

revision 1.127 by jsr166, Wed Jan 23 06:57:08 2013 UTC revision 1.288 by jsr166, Sat Nov 24 17:39:35 2018 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if"
3      xmlns:unless="ant:unless"
4      xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
7  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 6  Line 9 
9    
10    Usage: ant [target]    Usage: ant [target]
11    
12      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13      more details.
14    
15    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
17    
# Line 13  Line 19 
19    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk6  
   $HOME/jdk/jdk7  
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23      $HOME/jdk/jdk9
24      $HOME/jdk/jdk10
25      $HOME/jdk/jdk11
26      $HOME/jdk/jdk12
27    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
   $HOME/jdk/src/jdk6  
   $HOME/jdk/src/jdk7  
28    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
29      $HOME/jdk/src/jdk9
30      $HOME/jdk/src/jdk10
31      $HOME/jdk/src/jdk11
32      $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
35    
36      Alternatively, define ant variables thus:
37      ant -Djdk$N.home=... -Djdk$N.src.home=...
38      for $N in 8 9 10 ...
39    
40      As of 2016-03, the sources in src/main are for jdk9+ only.
41  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
42    </description>    </description>
43    
44    <target name="usage" description="Advises user to run with -projecthelp">    <!-- Run 'ant -projecthelp' (default target) -->
45      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
46        <java classname="org.apache.tools.ant.Main">
47          <arg value="-projecthelp" />
48        </java>
49    </target>    </target>
50    
51      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
52    
53    <!-- User-specific settings -->    <!-- User-specific settings -->
54    <property file="user.properties"/>    <property file="user.properties"/>
55    
56    
57    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
58    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
59    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
60    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
61      <property name="build.javadoc.access" value="protected"/>
62    
63    <!-- Build locations -->    <!-- Build locations -->
64    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
65    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
66    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
67    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
68    
69    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
70    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
71    <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"/>
72    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
73    
74      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
75      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
76      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
77      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
78    
79    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
80    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
81    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 68  Line 92 
92    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
93      <attribute name="v"/>      <attribute name="v"/>
94      <sequential>      <sequential>
95      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
96      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
97      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
98      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
99      <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}"/>
100        <local name="have.java.base"/>
101        <available property="have.java.base"
102          file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
103        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
104          if:set="have.java.base"/>
105        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106          unless:set="have.java.base"/>
107        <local name="modules"/>
108        <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
110      <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"/>
111      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
112        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
113        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
114        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
115        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
116        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
117      </path>      </path>
118      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
119      </sequential>      </sequential>
120    </macrodef>    </macrodef>
121    
# Line 101  Line 134 
134    <defjdklocations v="6"/>    <defjdklocations v="6"/>
135    <defjdklocations v="7"/>    <defjdklocations v="7"/>
136    <defjdklocations v="8"/>    <defjdklocations v="8"/>
137      <defjdklocations v="9"/>
138      <defjdklocations v="10"/>
139      <defjdklocations v="11"/>
140      <defjdklocations v="12"/>
141    
142    <!-- Source locations -->    <!-- Source locations -->
143    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
144    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
145    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
146    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
147    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
148      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150      <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
151      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
152      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
153      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
154    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
155    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
156    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
157    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
158      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
159    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
160    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
161    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 120  Line 164 
164    <!-- Javadoc locations -->    <!-- Javadoc locations -->
165    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
166    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
167      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
168    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
169    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
170    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 127  Line 172 
172    
173    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
174    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
175      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
176    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
177    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
178    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 135  Line 181 
181    <!-- Jar locations -->    <!-- Jar locations -->
182    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
183    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
184      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
185    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
186    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
187    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
188    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
189    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
190    
191    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
192    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
193    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
194    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
195      <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
196    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197    <!-- The below does not yet exist as of 2013-01 -->    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199      <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200      <!-- The location of jdk early access docs (RIP) -->
201      <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202      <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203      <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204      <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205      <!-- Default jdk doc location (latest stable release seems best) -->
206      <!-- But pin to jdk 10 until fix for -->
207      <!-- 8211194: javadoc -link doesn't take module path into consideration -->
208      <property name="java.docroot.url"   value="${java10.docroot.url}"/>
209    
210    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
212      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
213      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
214      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
219      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
220    
221    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
222    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
223    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
224             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
225    
226    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
227    <path id="test.classpath">     To profile a single tck test class:
228      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
229      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
230    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
231       To stress test a single tck test method:
232       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
233      -->
234      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
235    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
236      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
237      <attribute name="target"/>      <attribute name="target"/>
238        <attribute name="compile-target" default="@{target}"/>
239      <attribute name="workdir"/>      <attribute name="workdir"/>
240      <attribute name="classes"/>      <attribute name="classes"/>
241      <attribute name="jvmflags" default=""/>      <!--
242            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
243        -->
244            <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
245        <element name="javac-elements" optional="true"/>
246    
247      <sequential>      <sequential>
248    
249        <local name="modules"/>
250        <condition property="modules">
251          <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252        </condition>
253    
254        <local name="use-doclint"/>
255        <condition property="use-doclint">
256          <not> <equals arg1="@{target}" arg2="7"/> </not>
257        </condition>
258    
259      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
260    
261      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 180  Line 263 
263             debug="${build.debug}"             debug="${build.debug}"
264             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
265             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
266             source="@{source}"             source="@{compile-target}"
267               target="@{compile-target}"
268             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{source}}"  
269             includeAntRuntime="false"             includeAntRuntime="false"
270             includeJavaRuntime="false"             includeJavaRuntime="false"
271             executable="${javac@{target}}"             encoding="ASCII"
272               executable="${javac@{compile-target}}"
273             fork="true">             fork="true">
274    
275        <include name="*.java"/>        <include name="*.java"/>
276        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
277        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
278          <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
279          <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280          <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
281        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
282          <javac-elements/>
283    
284      </javac>      </javac>
285    
286      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
287            failonerror="true"            failonerror="true"
288            jvm="${java@{target}}"            jvm="${java@{target}}"
289            fork="true">            fork="true">
290          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
291            <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
292            <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
293            <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
294            <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
295            <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
296            <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
297          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
298            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
299            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
300    
301            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
302            <syspropertyset id="system-properties-used-by-tck">
303              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
304              <propertyref prefix="jsr166."/>
305              <propertyref name="test.timeout.factor"/>
306            </syspropertyset>
307    
308          <classpath>          <classpath>
309            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
310            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 210  Line 314 
314      </sequential>      </sequential>
315    </macrodef>    </macrodef>
316    
317      <!-- Define jtreg test sets for different jdk versions -->
318      <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
319      <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
320      <property name="jtreg.test.pattern" value="**/*.java"/>
321      <macrodef name="defjtregtests">
322        <attribute name="v"/>
323        <sequential>
324          <fileset dir="${jtreg@{v}.src.dir}">
325            <patternset id="jdk@{v}.jtreg.tests">
326              <include name="${jtreg.test.pattern}"/>
327            </patternset>
328          </fileset>
329        </sequential>
330      </macrodef>
331    
332      <defjtregtests v="12"/>
333      <defjtregtests v="11"/>
334      <defjtregtests v="10"/>
335      <defjtregtests v="9"/>
336      <defjtregtests v="8"/>
337      <defjtregtests v="7"/>
338    
339      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
340      <property name="jtreg.flags" value=""/>
341    
342      <macrodef name="run-jtreg-tests">
343        <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
344        <attribute name="target"/>
345        <attribute name="workdir"/>
346        <attribute name="classes"/>
347        <attribute name="verbose" default="${jtreg.verbose}"/>
348        <attribute name="jtregflags" default=""/>
349        <element name="jtreg-elements" optional="true"/>
350    
351        <sequential>
352    
353        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
354        <property name="jtreg.verbose" value="nopass,fail,error"/>
355    
356        <local name="modules"/>
357        <condition property="modules">
358          <available file="${jdk@{target}.home}/lib/modules" type="file"/>
359        </condition>
360    
361        <delete dir="@{workdir}/JTwork"   quiet="true"/>
362        <jtreg dir="${jtreg@{target}.src.dir}"
363               jdk="${jdk@{target}.home}"
364               workDir="@{workdir}/JTwork">
365          <patternset refid="jdk@{target}.jtreg.tests"/>
366          <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
367          <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368          <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369          <arg value="-agentvm"/>
370          <arg value="-noreport"/>
371          <arg value="-verbose:@{verbose}"/>
372          <arg value="-vmoptions:-esa -ea"/>
373          <arg value="-automatic"/>
374          <arg value="-k:!ignore"/>
375          <arg line="@{jtregflags}"/>
376          <arg line="${jtreg.flags}"/>
377          <jtreg-elements/>
378        </jtreg>
379        </sequential>
380      </macrodef>
381    
382    <!-- ALoops classpath -->    <!-- ALoops classpath -->
383    <path id="loops.classpath">    <path id="loops.classpath">
384      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 221  Line 390 
390    
391    <!-- Main targets -->    <!-- Main targets -->
392    
393      <!-- Default values: may seem strange ... -->
394      <!-- At runtime, target latest LTS, i.e. jdk11 -->
395      <!-- But at build time, target jdk9, for maximal binary portability -->
396      <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
397      <property name="build.main.java.version" value="11"/>
398      <property name="build.main.java" value="${java11}"/>
399      <property name="build.main.javac" value="${javac9}"/>
400      <property name="build.main.javadoc" value="${javadoc12}"/>
401    
402    <target name="dists"    <target name="dists"
403            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
404            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
405              <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406    
407    <target name="compile"    <target name="compile"
408            depends="configure-compiler"            depends="configure-compiler"
409            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
410    
411      <mkdir dir="${build.classes.dir}"/>      <local name="destdir"/>
412        <property name="destdir" value="${build.classes.dir}/java.base"/>
413    
414        <mkdir dir="${destdir}"/>
415    
416      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
417             destdir="${build.classes.dir}"             destdir="${destdir}"
418             debug="${build.debug}"             debug="${build.debug}"
419             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
420             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
421             classpath=""             classpath=""
422             includeAntRuntime="false"             includeAntRuntime="false"
423             includeJavaRuntime="false"             includeJavaRuntime="false"
424             executable="${javac8}"             encoding="ASCII"
425               executable="${build.main.javac}"
426             fork="true">             fork="true">
427    
428        <include name="**/*.java"/>        <include name="**/*.java"/>
429          <compilerarg value="--patch-module=java.base=${src.dir}"/>
430          <compilerarg value="-Xprefer:source"/>
431        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
432        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
433          <compilerarg line="--doclint-format html5"/>
434          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
435          <compilerarg value="-Werror"/>
436          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
437        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
438    
439      </javac>      </javac>
# Line 253  Line 442 
442    
443    <target name="jar"    <target name="jar"
444            depends="compile"            depends="compile"
445            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
446        <local name="subdir"/>
447        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
448      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
449        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
450          <manifest>
451            <attribute name="Built-By" value="${user.name}"/>
452            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
453          </manifest>
454      </jar>      </jar>
455    </target>    </target>
456    
457    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
458    <target name="docs"    <target name="docs"
459            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
460    
# Line 275  Line 464 
464      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
465      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
466    
467    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
468    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
469    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
470    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
471    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
472      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
473               packagenames="none"               packagenames="none"
474               link="${jdkapi8docs.url}"               link="${java11.api.url}"
475               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
476               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
477                 sourcepath="${src.dir}"
478               classpath=""               classpath=""
479               executable="${javadoc8}">               source="11"
480                 executable="${build.main.javadoc}">
481        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
482          <include name="**/*.java"/>          <include name="**/*.java"/>
483        </fileset>        </fileset>
484          <arg line="-Xdocrootparent ${java10.docroot.url}"/>
485          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
486        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
487        <arg value="-tag"/>        <arg value="-html5"/>
488        <arg value="${javadoc.jls.option}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
489          <arg value="--frames"/>
490          <arg value="--override-methods=summary"/>
491          <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492          <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
493          <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
494          <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
495    <!-- tags added in jdk9: currently unused -->
496    <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
497    <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
498      </javadoc>      </javadoc>
499    </target>    </target>
500    
# Line 297  Line 504 
504            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
505    
506    
   <target name="release"  
           depends="dist"  
           description="Puts entire CVS tree, plus distribution productions, in a jar">  
   
     <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>  
   
     <jar basedir="${basedir}" destfile="${release.jar}">  
       <!-- <exclude name="build/**"/> -->  
       <exclude name="${release.jar}"/>  
       <exclude name="user.properties"/>  
       <exclude name="etc/notes/**"/>  
       <exclude name="src/emulation/**"/>  
       <exclude name="**/SyntaxTest.java"/>  
       <exclude name="**/SuperfluousAbstract.java"/>  
     </jar>  
   </target>  
   
   
507    <target name="clean"    <target name="clean"
508            description="Removes all build products">            description="Removes all build products">
   
509      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
510    </target>    </target>
511    
512    
513    <target name="dist-clean"    <target name="dist-clean"
514            description="Removes all build and distribution products">            description="Removes all build and distribution products">
515        <delete dir="${build.dir}"/>
516      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
517    </target>    </target>
518    
519    
   <!-- Internal targets -->  
   
   
520    <target name="dist-jar"    <target name="dist-jar"
521            depends="clean, jar">            depends="clean, jar">
522      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 344  Line 527 
527      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
528    </target>    </target>
529    
530      <target name="tck"
531              depends="jar"
532              description="Runs tck tests for src/main directly">
533    
534        <run-tck-tests
535          target="${build.main.java.version}"
536          workdir="${build.dir}"
537          classes="${product.jar}">
538          <javac-elements>
539            <compilerarg value="-Werror"/>
540          </javac-elements>
541        </run-tck-tests>
542      </target>
543    
544      <target name="tck-parallelism-1"
545              description="Runs tck with common pool parallelism 1">
546        <antcall target="tck">
547          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
548        </antcall>
549      </target>
550    
551      <target name="tck-parallelism-0"
552              description="Runs tck with common pool parallelism 0">
553        <antcall target="tck">
554          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
555        </antcall>
556      </target>
557    
558      <target name="tck-security-manager"
559              description="Runs tck with a security manager">
560        <antcall target="tck">
561          <param name="jsr166.useSecurityManager" value="true"/>
562        </antcall>
563      </target>
564    
565      <target name="jtreg"
566              depends="jar"
567              description="Runs jtreg tests for src/main using the jtreg ant task">
568        <run-jtreg-tests
569           target="${build.main.java.version}"
570           workdir="${build.dir}"
571           classes="${product.jar}"/>
572      </target>
573    
574      <target name="test"
575              depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
576              description="Runs tck and jtreg tests for src/main"/>
577    
578      <target name="test-version-permutations"
579              depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
580      </target>
581    
582      <target name="test9">
583        <antcall target="clean"/>
584        <antcall>
585          <param name="build.main.java.version" value="9"/>
586          <param name="build.main.java" value="${java9}"/>
587          <param name="build.main.javac" value="${javac9}"/>
588          <target name="test"/>
589        </antcall>
590      </target>
591    
592      <target name="test10">
593        <antcall target="clean"/>
594        <antcall>
595          <param name="build.main.java.version" value="10"/>
596          <param name="build.main.java" value="${java10}"/>
597          <param name="build.main.javac" value="${javac10}"/>
598          <param name="build.main.javadoc" value="${javadoc10}"/>
599          <target name="test"/>
600          <target name="docs"/>
601        </antcall>
602      </target>
603    
604      <target name="test11">
605        <antcall target="clean"/>
606        <antcall>
607          <param name="build.main.java.version" value="11"/>
608          <param name="build.main.java" value="${java11}"/>
609          <param name="build.main.javac" value="${javac11}"/>
610          <param name="build.main.javadoc" value="${javadoc11}"/>
611          <target name="test"/>
612          <target name="docs"/>
613        </antcall>
614      </target>
615    
616      <target name="test12">
617        <antcall target="clean"/>
618        <antcall>
619          <param name="build.main.java.version" value="12"/>
620          <param name="build.main.java" value="${java12}"/>
621          <param name="build.main.javac" value="${javac12}"/>
622          <param name="build.main.javadoc" value="${javadoc12}"/>
623          <target name="test"/>
624          <target name="docs"/>
625        </antcall>
626      </target>
627    
628      <target name="test9-11">
629        <antcall target="clean"/>
630        <antcall>
631          <param name="build.main.java.version" value="11"/>
632          <param name="build.main.java" value="${java11}"/>
633          <param name="build.main.javac" value="${javac9}"/>
634          <param name="build.main.javadoc" value="${javadoc11}"/>
635          <target name="test"/>
636          <target name="docs"/>
637        </antcall>
638      </target>
639    
640      <target name="test9-12">
641        <antcall target="clean"/>
642        <antcall>
643          <param name="build.main.java.version" value="12"/>
644          <param name="build.main.java" value="${java12}"/>
645          <param name="build.main.javac" value="${javac9}"/>
646          <param name="build.main.javadoc" value="${javadoc12}"/>
647          <target name="test"/>
648          <target name="docs"/>
649        </antcall>
650      </target>
651    
652    
653      <target name="configure-compiler">
654        <fail message="ant version too old">
655          <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
656        </fail>
657    
658        <property name="unchecked.option" value="-Xlint:unchecked"/>
659    
660        <condition property="warnunchecked.arg" value="${unchecked.option}">
661          <istrue value="${build.warnunchecked}"/>
662        </condition>
663    
664        <property name="warnunchecked.arg" value=""/>
665    
666    
667        <!-- Common options in javac invocations -->
668        <property name="build.args" value="${warnunchecked.arg}"/>
669    
670      </target>
671    
672    
673    <target name="compile-tests"    <target name="compile-test-loops" depends="jar"
674            depends="jar">            description="Compiles all the perf tests in src/test/loops">
675    
676      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.dir}/test/loops"/>
677    
678      <javac srcdir="${tck.src.dir}"      <javac srcdir="${basedir}/src/test/loops"
679             destdir="${build.testcases.dir}"             destdir="${build.dir}/test/loops"
680             debug="${build.debug}"             debug="${build.debug}"
681             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
682             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
683             includeAntRuntime="false"             includeAntRuntime="false"
684             includeJavaRuntime="false"             includeJavaRuntime="false"
685             executable="${javac8}"             encoding="ASCII"
686               executable="${build.main.javac}"
687             fork="true">             fork="true">
688    
689        <include name="**/*.java"/>        <include name="*.java"/>
690        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
691        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
692          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
693        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
694      </javac>      </javac>
695      </target>
696    
697    
698      <!-- jsr166 4jdk8 -->
699    
700      <javac srcdir="${test.src.dir}"    <target name="4jdk8compile"
701             destdir="${build.testcases.dir}"            depends="configure-compiler"
702              description="Compiles src/jdk8 sources, targeting jdk8">
703    
704        <mkdir dir="${build.4jdk8.classes.dir}"/>
705    
706        <javac srcdir="${4jdk8src.dir}"
707               destdir="${build.4jdk8.classes.dir}"
708             debug="${build.debug}"             debug="${build.debug}"
709             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
710             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
711             source="6"             source="8"
712               target="8"
713             classpath=""             classpath=""
714             bootclasspath="@{product.jar}:${bootclasspath6}"             bootclasspath="${bootclasspath8}"
715             includeAntRuntime="false"             includeAntRuntime="false"
716             includeJavaRuntime="false"             includeJavaRuntime="false"
717               encoding="ASCII"
718             executable="${javac8}"             executable="${javac8}"
719             fork="true">             fork="true">
720          <include name="**/*.java"/>
721        <include name="jsr166/test/**/*.java"/>        <compilerarg value="-Xprefer:source"/>
722        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
723        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all"/>
724          <compilerarg value="-Werror"/>
725        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
726      </javac>      </javac>
727      </target>
728    
729  <!--    <target name="4jdk8doclint"
730      <javac srcdir="${jtreg.src.dir}"            depends="configure-compiler"
731            destdir="${build.testcases.dir}"            description="Finds doclint warnings">
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
732    
733        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>      <mkdir dir="${build.4jdk8.classes.dir}"/>
734    
735        <javac srcdir="${4jdk8src.dir}"
736               destdir="${build.4jdk8.classes.dir}"
737               debug="${build.debug}"
738               debuglevel="${build.debuglevel}"
739               deprecation="${build.deprecation}"
740               source="8"
741               target="8"
742               classpath=""
743               bootclasspath="${bootclasspath8}"
744               includeAntRuntime="false"
745               includeJavaRuntime="false"
746               encoding="ASCII"
747               executable="${javac8}"
748               fork="true">
749          <include name="**/*.java"/>
750          <compilerarg value="-Xprefer:source"/>
751        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
752          <compilerarg value="-Xlint:all"/>
753          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
754        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
755      </javac>      </javac>
 -->  
   
756    </target>    </target>
757    
758    
759    <target name="run-tests"    <target name="4jdk8jar"
760            depends="compile-tests">            depends="4jdk8compile"
761              description="Builds library jar from compiled sources">
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
   
     <mkdir dir="${build.reports.dir}"/>  
   
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                     jvm="${java8}"  
                    fork="true">  
   
       <jvmarg value="-Xbootclasspath/p:${product.jar}"/>  
       <jvmarg value="-server"/>  
       <jvmarg value="-showversion"/>  
   
       <classpath refid="test.classpath"/>  
   
       <formatter type="xml"/>  
   
       <batchtest todir="${build.reports.dir}" unless="no.test.tck">  
         <fileset dir="${tck.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
 <!--  
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
   
     </junit>  
762    
763        <jar destfile="${4jdk8product.jar}">
764          <fileset dir="${build.4jdk8.classes.dir}"/>
765          <manifest>
766            <attribute name="Built-By" value="${user.name}"/>
767            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
768          </manifest>
769        </jar>
770    </target>    </target>
771    
772    
773    <target name="report-tests"    <target name="4jdk8-tck"
774            depends="run-tests">            depends="4jdk8jar"
775              description="Runs tck tests for jsr166-4jdk8 directly">
     <!-- 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>  
   
     <fail message="Test Cases Failed" if="junit.failed"/>  
776    
777        <run-tck-tests
778          target="8"
779          workdir="${build.4jdk8.dir}"
780          classes="${4jdk8product.jar}">
781          <javac-elements>
782            <!-- JDK9+ test classes -->
783            <exclude name="*9Test.java"/>
784            <exclude name="*10Test.java"/>
785            <compilerarg value="-Werror"/>
786          </javac-elements>
787        </run-tck-tests>
788    </target>    </target>
789    
790    
791    <target name="configure-compiler">    <target name="4jdk8-jtreg"
792              depends="4jdk8jar"
793              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
794        <run-jtreg-tests
795           target="8"
796           workdir="${build.4jdk8.dir}"
797           classes="${4jdk8product.jar}"/>
798      </target>
799    
     <property name="unchecked.option" value="-Xlint:unchecked"/>  
800    
801      <condition property="warnunchecked.arg" value="${unchecked.option}">    <target name="4jdk8-test"
802        <istrue value="${build.warnunchecked}"/>            depends="4jdk8-tck, 4jdk8-jtreg"
803      </condition>            description="Runs tck and jtreg tests for jsr166-4jdk8"/>
804    
     <property name="warnunchecked.arg" value=""/>  
805    
806      <target name="4jdk8docs"
807              description="Builds javadocs for src/jdk8 to dist dir">
808    
809      <!-- Common options in javac invocations -->      <delete dir="${4jdk8docs.dir}"/>
810      <property name="build.args" value="${warnunchecked.arg}"/>      <mkdir dir="${4jdk8docs.dir}"/>
811    
812        <javadoc destdir="${4jdk8docs.dir}"
813                 packagenames="none"
814                 link="${java8.api.url}"
815                 overview="${4jdk8src.dir}/intro.html"
816                 access="${build.javadoc.access}"
817                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
818                 classpath=""
819                 source="8"
820                 executable="${javadoc8}"
821                 failonerror = "true">
822          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
823            <include name="**/*.java"/>
824          </fileset>
825          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
826          <arg value="-XDignore.symbol.file=true"/>
827          <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
828          <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
829          <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
830    <!-- @apiNote tag currently unused -->
831    <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
832        </javadoc>
833    </target>    </target>
834    
835    
836    <target name="configure-tests"    <target name="4jdk8dist"
837         depends="configure-compiler">            depends="4jdk8dist-jar, 4jdk8dist-docs"
838              description="Puts all distributable products in single hierarchy"/>
     <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->  
     <available property="junit.available"  
                classname="junit.framework.Protectable"/>  
   
     <!-- Xalan -->  
     <available property="xalan.available"  
                classname="org.apache.xalan.Version"/>  
839    
840    
841      <!-- Ant 1.6beta and later don't need or want this check -->    <target name="4jdk8clean"
842      <!--            description="Removes all 4jdk8 build products">
843      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"      <delete dir="${build.4jdk8.dir}"/>
844            unless="junit.available"/>    </target>
845    
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
846    
847      <target name="4jdk8dist-jar"
848              depends="4jdk8clean, 4jdk8jar">
849        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
850    </target>    </target>
851    
852    
853    <!-- Various demos and test programs -->    <target name="4jdk8dist-docs"
854              depends="4jdk8clean, 4jdk8docs">
855        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
856      </target>
857    
858    
859    <target name="loops" depends="configure-compiler"    <!-- jsr166 4jdk7 (no longer maintained) -->
           description="Benchmark from Doug Lea's AQS paper">  
860    
861      <mkdir dir="${build.loops.dir}"/>    <target name="4jdk7compile" depends="configure-compiler">
862        <mkdir dir="${build.4jdk7.classes.dir}"/>
863    
864      <javac srcdir="${loops.src.dir}"      <javac srcdir="${4jdk7src.dir}"
865            destdir="${build.loops.dir}"             destdir="${build.4jdk7.classes.dir}"
866              debug="${build.debug}"             debug="${build.debug}"
867         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
868        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
869             source="${build.sourcelevel}"             source="6"
870               fork="true">             target="6"
871               classpath=""
872               bootclasspath="${bootclasspath6}"
873               includeAntRuntime="false"
874               includeJavaRuntime="false"
875               encoding="ASCII"
876               executable="${javac7}"
877               fork="true">
878    
879        <compilerarg line="${build.args}"/>        <include name="**/*.java"/>
880        <classpath refid="loops.classpath"/>        <compilerarg value="-Xprefer:source"/>
881        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
882          <compilerarg value="-Xlint:all"/>
883          <compilerarg value="-Werror"/>
884          <compilerarg line="${build.args}"/>
885      </javac>      </javac>
   
     <java classname="ALoops" fork="true">  
       <classpath refid="loops.classpath"/>  
     </java>  
   
886    </target>    </target>
887    
888      <target name="4jdk7doclint" depends="configure-compiler">
   <!-- jsr166 4jdk7 -->  
   
   <target name="4jdk7compile"  
           depends="configure-compiler"  
           description="Compiles src/jdk7 sources, targeting jdk7">  
   
889      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
890    
891      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 566  Line 894 
894             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
895             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
896             source="6"             source="6"
897               target="6"
898             classpath=""             classpath=""
899             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
900             includeAntRuntime="false"             includeAntRuntime="false"
901             includeJavaRuntime="false"             includeJavaRuntime="false"
902             executable="${javac7}"             encoding="ASCII"
903               executable="${javac8}"
904             fork="true">             fork="true">
905    
906        <include name="**/*.java"/>        <include name="**/*.java"/>
907          <compilerarg value="-Xprefer:source"/>
908        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
909        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
910          <compilerarg value="-Xdoclint:all/protected"/>
911        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
912      </javac>      </javac>
913    </target>    </target>
914    
915      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7-jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
916      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
917        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
918          <manifest>
919            <attribute name="Built-By" value="${user.name}"/>
920            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
921          </manifest>
922      </jar>      </jar>
   
923    </target>    </target>
924    
925      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-test-tck"  
           depends="4jdk7-jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
926      <run-tck-tests      <run-tck-tests
927        target="7"        target="7"
928        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
929        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
930          <javac-elements>
931            <!-- JDK8+ test classes -->
932            <exclude name="*8Test.java"/>
933            <exclude name="*9Test.java"/>
934            <exclude name="*10Test.java"/>
935            <exclude name="DoubleAccumulatorTest.java"/>
936            <exclude name="DoubleAdderTest.java"/>
937            <exclude name="LongAccumulatorTest.java"/>
938            <exclude name="LongAdderTest.java"/>
939            <exclude name="CompletableFutureTest.java"/>
940            <exclude name="SplittableRandomTest.java"/>
941            <exclude name="StampedLockTest.java"/>
942            <exclude name="SubmissionPublisherTest.java"/>
943            <compilerarg value="-Werror"/>
944          </javac-elements>
945        </run-tck-tests>
946    </target>    </target>
947    
948      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
949    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit" depends="4jdk7compile">
           depends="4jdk7compile"  
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
950    
951      <junit printsummary="true"      <junit printsummary="true"
952             showoutput="true"             showoutput="true"
# Line 626  Line 966 
966    
967        <formatter type="brief"/>        <formatter type="brief"/>
968    
969        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
970        </test>        </test>
   
971      </junit>      </junit>
972    </target>    </target>
973    
974    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
975            depends="4jdk7compile"      <run-jtreg-tests
976            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">         target="7"
977      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>         workdir="${build.4jdk7.dir}"
978      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         classes="${4jdk7product.jar}"/>
     <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>  
     <mkdir dir="${build.4jdk7.dir}/JTreport"/>  
     <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      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
982    
983    <target name="4jdk7-test"    <target name="4jdk7docs">
           depends="4jdk7-test-tck, 4jdk7-test-jtreg"  
           description="Runs tck and jtreg tests for jsr166-4jdk7">  
   </target>  
   
   
   <target name="4jdk7docs"  
           description="Builds javadocs for src/jdk7 to dist dir">  
   
984      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
985      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
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               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
992                 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>
1003    
1004      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1005    
1006    <target name="4jdk7dist"    <target name="4jdk7clean">
           depends="4jdk7dist-jar, 4jdk7dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="4jdk7clean"  
           description="Removes all 4jdk7 build products">  
   
1007      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1008    </target>    </target>
1009    
1010      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7-jar">  
1011      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1012    </target>    </target>
1013    
1014      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1015      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1016    </target>    </target>
1017    
1018    
1019    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1020    
1021      <target name="jsr166xcompile" depends="configure-compiler">
1022      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1023    
1024      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 727  Line 1029 
1029             classpath=""             classpath=""
1030             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1031             source="5"             source="5"
1032               target="5"
1033             includeAntRuntime="false"             includeAntRuntime="false"
1034             includeJavaRuntime="false"             includeJavaRuntime="false"
1035               encoding="ASCII"
1036             executable="${javac7}"             executable="${javac7}"
1037             fork="true">             fork="true">
   
1038        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1039        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1040        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1041          <compilerarg value="-Werror"/>
1042        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1043      </javac>      </javac>
1044    </target>    </target>
1045    
1046      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166x-jar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1047      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1048        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1049          <manifest>
1050            <attribute name="Built-By" value="${user.name}"/>
1051            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1052          </manifest>
1053      </jar>      </jar>
   
1054    </target>    </target>
1055    
1056      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1057      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1058      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1059    
1060      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
1061               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1062               link="${jdkapidocs.url}"               link="${java.api.url}"
1063               sourcepath="${topsrc.dir}:${jdk6src.dir}"               access="${build.javadoc.access}"
1064                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1065               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1066               source="5"               source="5"
1067               executable="${javadoc7}">               executable="${javadoc7}"
1068                 failonerror = "true">
1069          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1070        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1071      </javadoc>      </javadoc>
1072    </target>    </target>
1073    
1074      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1075    
1076    <target name="jsr166xdist"    <target name="jsr166xclean">
           depends="jsr166xdist-jar, jsr166xdist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166xclean"  
           description="Removes all jsr166x build products">  
   
1077      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
   </target>  
   
   
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
1078    </target>    </target>
1079    
1080      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166x-jar">  
1081      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1082    </target>    </target>
1083    
1084    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1085      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1086    </target>    </target>
1087    
   <!-- jsr166y -->  
   
1088    
1089    <target name="jsr166ycompile"    <!-- jsr166y (no longer maintained) -->
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
1090    
1091      <target name="jsr166ycompile" depends="configure-compiler">
1092      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1093    
1094      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 815  Line 1097 
1097             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1098             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1099             source="6"             source="6"
1100               target="6"
1101             classpath=""             classpath=""
1102             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1103             includeAntRuntime="false"             includeAntRuntime="false"
1104             includeJavaRuntime="false"             includeJavaRuntime="false"
1105               encoding="ASCII"
1106             executable="${javac7}"             executable="${javac7}"
1107             fork="true">             fork="true">
1108    
1109        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
1110        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1111        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1112          <compilerarg value="-Werror"/>
1113        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1114      </javac>      </javac>
1115    </target>    </target>
1116    
1117      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166y-jar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1118      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1119        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1120          <manifest>
1121            <attribute name="Built-By" value="${user.name}"/>
1122            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1123          </manifest>
1124      </jar>      </jar>
   
1125    </target>    </target>
1126    
1127      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1128      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1129      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1130    
1131      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
1132               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1133               link="${jdkapidocs.url}"               link="${java.api.url}"
1134               sourcepath="${topsrc.dir}:${jdk6src.dir}"               access="${build.javadoc.access}"
1135                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1136               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1137               source="6"               source="6"
1138               executable="${javadoc7}">               executable="${javadoc7}"
1139                 failonerror = "true">
1140          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1141        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1142      </javadoc>      </javadoc>
1143    </target>    </target>
1144    
1145      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1146    
1147    <target name="jsr166ydist"    <target name="jsr166yclean">
           depends="jsr166ydist-jar, jsr166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166yclean"  
           description="Removes all jsr166y build products">  
   
1148      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
   </target>  
   
   
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
1149    </target>    </target>
1150    
1151    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
           depends="jsr166yclean, jsr166y-jar">  
1152      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1153    </target>    </target>
1154    
1155    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1156      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1157    </target>    </target>
1158    
1159    
1160    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166y-jar"  
           description="Compiles extra166y sources">  
1161    
1162      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1163      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1164    
1165      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 907  Line 1170 
1170             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1171             classpath=""             classpath=""
1172             source="6"             source="6"
1173               target="6"
1174             includeAntRuntime="false"             includeAntRuntime="false"
1175             includeJavaRuntime="false"             includeJavaRuntime="false"
1176               encoding="ASCII"
1177             executable="${javac7}"             executable="${javac7}"
1178             fork="true">             fork="true">
1179    
1180        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1181        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1182        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1183          <compilerarg value="-Werror"/>
1184        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1185      </javac>      </javac>
1186    </target>    </target>
1187    
1188      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166y-jar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1189      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1190        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1191          <manifest>
1192            <attribute name="Built-By" value="${user.name}"/>
1193            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1194          </manifest>
1195      </jar>      </jar>
   
1196    </target>    </target>
1197    
1198      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1199      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1200      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1201    
1202      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1203               packagenames="extra166y.*"               packagenames="extra166y.*"
1204               link="${jdkapidocs.url}"               link="${java.api.url}"
1205               sourcepath="${topsrc.dir}:${jdk6src.dir}"               access="${build.javadoc.access}"
1206                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1207               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1208               source="6"               source="6"
1209               executable="${javadoc7}">               executable="${javadoc7}">
1210          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1211        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1212      </javadoc>      </javadoc>
1213    </target>    </target>
1214    
1215      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1216    
1217    <target name="extra166ydist"    <target name="extra166yclean">
           depends="extra166ydist-jar, extra166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="extra166yclean"  
           description="Removes all extra166y build products">  
   
1218      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1219    </target>    </target>
1220    
1221      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166y-jar">  
1222      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1223    </target>    </target>
1224    
1225    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1226      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1227    </target>    </target>
1228    
   <!-- jsr166e -->  
1229    
1230    <target name="jsr166ecompile"    <!-- jsr166e (no longer maintained) -->
1231            depends="configure-compiler"  
1232            description="Compiles jsr166e sources">    <property name="build.jsr166e.java.version" value="6"/>
1233      <property name="build.jsr166e.javac" value="${javac6}"/>
1234    
1235      <target name="jsr166ecompile" depends="configure-compiler">
1236      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1237    
1238      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 992  Line 1240 
1240             debug="${build.debug}"             debug="${build.debug}"
1241             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1242             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1243             source="7"             source="${build.jsr166e.java.version}"
1244               target="${build.jsr166e.java.version}"
1245             classpath=""             classpath=""
1246             includeAntRuntime="false"             includeAntRuntime="false"
1247             includeJavaRuntime="false"             includeJavaRuntime="false"
1248             executable="${javac7}"             executable="${build.jsr166e.javac}"
1249             fork="true">             fork="true">
1250    
1251        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1253        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1254          <compilerarg value="-Werror"/>
1255        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1256      </javac>      </javac>
1257    </target>    </target>
1258    
1259      <target name="jsr166edoclint">
1260        <mkdir dir="${build.jsr166e.classes.dir}"/>
1261    
1262    <target name="jsr166e-jar"      <javac srcdir="${topsrc.dir}"
1263            depends="jsr166ecompile"             destdir="${build.jsr166e.classes.dir}"
1264            description="Builds library jar from compiled sources">             debug="${build.debug}"
1265               debuglevel="${build.debuglevel}"
1266               deprecation="${build.deprecation}"
1267               source="${build.jsr166e.java.version}"
1268               target="${build.jsr166e.java.version}"
1269               classpath=""
1270               bootclasspath="${bootclasspath6}"
1271               includeAntRuntime="false"
1272               includeJavaRuntime="false"
1273               executable="${javac8}"
1274               fork="true">
1275    
1276          <include name="jsr166e/**/*.java"/>
1277          <compilerarg value="-XDignore.symbol.file=true"/>
1278          <compilerarg value="-Xlint:all"/>
1279          <compilerarg value="-Werror"/>
1280          <compilerarg value="-Xdoclint:all/protected"/>
1281        </javac>
1282      </target>
1283    
1284      <target name="jsr166ejar" depends="jsr166ecompile">
1285      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1286        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1287          <manifest>
1288            <attribute name="Built-By" value="${user.name}"/>
1289            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1290          </manifest>
1291      </jar>      </jar>
   
1292    </target>    </target>
1293    
1294      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1295      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1296      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1297    
1298      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1299               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1300               link="${jdkapidocs.url}"               link="${java.api.url}"
1301               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
1302               source="7"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1303               executable="${javadoc7}">               source="${build.jsr166e.java.version}"
1304                 executable="${javadoc7}"
1305                 failonerror = "true">
1306          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1307        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1308      </javadoc>      </javadoc>
1309    </target>    </target>
1310    
1311      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1312    <target name="jsr166e-test-tck"      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
           depends="jsr166e-jar"  
           description="Runs tck tests for jsr166e">  
   
1313      <run-tck-tests      <run-tck-tests
1314        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1315        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1316        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1317        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1318    </target>    </target>
1319    
1320      <target name="jsr166e-tck">
1321    
1322    <target name="jsr166edist"  <!--     <antcall target="clean"/> -->
1323            depends="jsr166edist-jar, jsr166edist-docs"  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1324            description="Puts all distributable products in single hierarchy"/>  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1325    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1326    <!--     </antcall> -->
1327    
1328        <antcall target="clean"/>
1329        <antcall target="jsr166e-tck-one-java-version">
1330          <param name="build.jsr166e.java.version" value="7"/>
1331          <param name="build.jsr166e.javac" value="${javac7}"/>
1332        </antcall>
1333    
1334    <target name="jsr166eclean"      <antcall target="clean"/>
1335            description="Removes all jsr166e build products">      <antcall target="jsr166e-tck-one-java-version">
1336      <delete dir="${build.jsr166e.dir}"/>        <param name="build.jsr166e.java.version" value="6"/>
1337          <param name="build.jsr166e.javac" value="${javac6}"/>
1338        </antcall>
1339    </target>    </target>
1340    
1341      <target name="jsr166e-test" depends="jsr166e-tck"/>
1342    
1343    <target name="jsr166edist-clean"    <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
           description="Removes all build and distribution products">  
1344    
1345      <target name="jsr166eclean">
1346        <delete dir="${build.jsr166e.dir}"/>
1347    </target>    </target>
1348    
1349    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1350            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
1351      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1352    </target>    </target>
1353    
1354    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1355      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1356    </target>    </target>
1357    
1358    
1359    <!-- Find buglets that can be detected by static build tools -->
1360    
1361    <!--   <target name="lint"> -->
1362    <!--     <antcall target="dists"> -->
1363    <!--       <param name="build.javadoc.access" value="protected"/> -->
1364    <!--     </antcall> -->
1365    <!--   </target> -->
1366    
1367    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1368      <target name="doclint-private">
1369        <antcall target="dist">
1370          <param name="build.javadoc.access" value="private"/>
1371        </antcall>
1372      </target>
1373    
1374    
1375    <!-- ==============================================================
1376      Experimental errorprone support
1377      https://errorprone.info
1378      https://errorprone.info/docs/installation
1379      https://github.com/google/error-prone/issues/1143
1380    =================================================================== -->
1381      <path id="errorprone.processorpath.path">
1382        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1383        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1384        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1385        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1386      </path>
1387      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1388      <property name="errorprone.jsr166.user.flags" value=""/>
1389      <property name="errorprone.jsr166.flags"
1390                value="-Xep:HashtableContains:OFF
1391                       -Xep:JdkObsolete:OFF
1392                       -Xep:MissingOverride:OFF
1393                       -Xep:MissingFail:OFF
1394                       -Xep:ThreadPriorityCheck:OFF
1395                       -Xep:MixedArrayDimensions:ERROR
1396                       -Xep:RemoveUnusedImports:ERROR
1397                       -Xep:EmptyIf:ERROR
1398                       -Xep:MultipleTopLevelClasses:ERROR
1399                       -Xep:ClassName:ERROR
1400                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1401                       -Xep:RedundantThrows:ERROR
1402                       -Xep:IdentityBinaryExpression:WARN
1403                       -Xep:ConstructorInvokesOverridable:WARN
1404                       -Xep:MethodCanBeStatic:WARN
1405                       ${errorprone.jsr166.user.flags}"/>
1406      <!-- -Xep:WildcardImport:ERROR -->
1407      <property name="errorprone.jsr166.test.flags"
1408                value="-Xep:StringSplitter:OFF
1409                       -Xep:BoxedPrimitiveConstructor:OFF
1410                       -Xep:ModifyingCollectionWithItself:OFF"/>
1411      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1412      <target name="errorprone"
1413              depends="clean, configure-compiler"
1414              description="Run errorprone over jsr166 source code (experimental)">
1415    
1416        <local name="destdir"/>
1417        <property name="destdir" value="${build.classes.dir}/java.base"/>
1418        <mkdir dir="${destdir}"/>
1419    
1420        <javac srcdir="${src.dir}"
1421               destdir="${destdir}"
1422               debug="${build.debug}"
1423               debuglevel="${build.debuglevel}"
1424               deprecation="${build.deprecation}"
1425               classpath=""
1426               includeAntRuntime="false"
1427               includeJavaRuntime="false"
1428               encoding="ASCII"
1429               executable="${build.main.javac}"
1430               fork="true">
1431    
1432          <include name="**/*.java"/>
1433          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1434          <compilerarg value="-J--illegal-access=permit"/>
1435          <compilerarg value="-XDcompilePolicy=simple"/>
1436          <compilerarg value="-processorpath"/>
1437          <compilerarg pathref="errorprone.processorpath.path"/>
1438          <compilerarg value="-Xplugin:ErrorProne
1439                              ${errorprone.jsr166.flags}"/>
1440          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1441          <compilerarg value="-Xprefer:source"/>
1442          <compilerarg value="-XDignore.symbol.file=true"/>
1443          <compilerarg value="-Xlint:all"/>
1444          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1445          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1446          <compilerarg line="${build.args}"/>
1447        </javac>
1448    
1449        <jar destfile="${product.jar}">
1450          <fileset dir="${destdir}"/>
1451        </jar>
1452    
1453        <run-tck-tests
1454          target="${build.main.java.version}"
1455          workdir="${build.dir}"
1456          classes="${product.jar}">
1457          <javac-elements>
1458            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1459            <compilerarg value="-J--illegal-access=permit"/>
1460            <compilerarg value="-XDcompilePolicy=simple"/>
1461            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1462            <compilerarg value="-Xplugin:ErrorProne
1463                                ${errorprone.jsr166.flags}
1464                                ${errorprone.jsr166.test.flags}"/>
1465            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1466          </javac-elements>
1467        </run-tck-tests>
1468      </target>
1469    
1470      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1471      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1472      <target name="errorprone-jtreg"
1473              depends="jar"
1474              description="Run errorprone over jtreg tests (experimental)">
1475    
1476        <run-jtreg-tests
1477           target="${build.main.java.version}"
1478           workdir="${build.dir}"
1479           classes="${product.jar}"
1480           verbose="all">
1481          <jtreg-elements>
1482            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1483            <arg value="-javacoption:-processorpath"/>
1484            <arg value="-javacoption:${errorprone.processorpath}"/>
1485            <arg value="-javacoption:-Xplugin:ErrorProne
1486                                ${errorprone.jsr166.flags}
1487                                ${errorprone.jsr166.test.flags}
1488                                -Xep:MultipleTopLevelClasses:WARN
1489                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1490          </jtreg-elements>
1491        </run-jtreg-tests>
1492      </target>
1493    
1494    
1495    <!-- ==============================================================
1496      Running guava tests against jsr166 code
1497    =================================================================== -->
1498    
1499    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1500    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1501    <!-- <property name="guava.version" value="21.0"/> -->
1502    
1503    <!-- HOWTO debug print a path id -->
1504    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1505    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1506    
1507    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1508    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1509    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1510    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1511    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1512    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1513    
1514    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1515    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1516    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1517    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1518    
1519    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1520    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1521    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1522    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1523    
1524    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1525    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1526    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1527    
1528      <target name="init-ivy">
1529        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1530             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1531        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1532                 classpath="${build.dir}/ivy.jar"/>
1533      </target>
1534    
1535      <target name="guava-tests" depends="jar, init-ivy"
1536              description="Guava tests run against jsr166 collections">
1537        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1538        <mkdir dir="${guava.dir}"/>
1539        <ivy:retrieve pathid="guava.testlib.classpath"
1540          type="jar,bundle" inline="true" conf="default,master"
1541          pattern="${guava.dir}/[artifact].[ext]"
1542          organisation="com.google.guava" module="guava-testlib"/>
1543        <property name="guava.version" value="21.0"/>
1544        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1545             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1546        <junit printsummary="true" showoutput="true" haltonfailure="true"
1547               jvm="${build.main.java}" fork="true">
1548          <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1549          <formatter type="brief"/>
1550          <classpath>
1551            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1552            <path refid="guava.testlib.classpath"/>
1553          </classpath>
1554    
1555          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1556          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1557        </junit>
1558      </target>
1559    
1560  </project>  </project>

Legend:
Removed from v.1.127  
changed lines
  Added in v.1.288

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