ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.138 by jsr166, Fri Mar 22 18:04:56 2013 UTC vs.
Revision 1.227 by jsr166, Sat Dec 17 22:18:25 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines