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.112 by jsr166, Sun Jan 20 03:44:54 2013 UTC vs.
Revision 1.198 by jsr166, Thu Mar 24 20:44:47 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 16 | Line 17
17    $HOME/jdk/jdk6
18    $HOME/jdk/jdk7
19    $HOME/jdk/jdk8
20 +  $HOME/jdk/jdk9
21    where each of the above is a JDK or a symlink to same, and
22    $HOME/jdk/src/jdk6
23    $HOME/jdk/src/jdk7
24    $HOME/jdk/src/jdk8
25 +  $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.
28 +
29 +  Alternatively, define ant variables thus:
30 +  ant -Djdk$N.home=...
31 +  for $N in 6 7 8 9 ...
32 +
33 +  As of 2015-09, there is incomplete hacky support for jigsaw
34 +  Build for jigsaw using something like:
35 +  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 +  "docs" target is still broken.
37   ------------------------------------------------------------------------------
38    </description>
39  
40 <  <target name="usage" description="Advises user to run with -projecthelp">
41 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
40 >  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <target name="usage">
42 >    <java classname="org.apache.tools.ant.Main">
43 >      <arg value="-projecthelp" />
44 >    </java>
45    </target>
46  
47 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48  
49    <!-- User-specific settings -->
50    <property file="user.properties"/>
51  
52  
53    <!-- Compilation options -->
54 <  <property name="build.sourcelevel"    value="1.6"/>
54 >  <property name="build.sourcelevel"    value="6"/>
55    <property name="build.debug"          value="true"/>
56    <property name="build.debuglevel"     value="source,lines,vars"/>
57    <property name="build.deprecation"    value="false"/>
58 +  <property name="build.javadoc.access" value="protected"/>
59  
60    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>
# Line 49 | Line 66
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"/>
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.jsr166x.dir"           location="${build.dir}/jsr166x"/>
# Line 57 | Line 74
74    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
75    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
76  
77 <  <!-- JDK binary locations -->
77 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
78 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
79 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
80 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
81 >
82 >  <!-- JDK locations -->
83    <property name="jdks.home"  location="${user.home}/jdk"/>
84  
85    <macrodef name="defjdklocations">
# Line 67 | Line 89
89      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92 <    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
93 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
94 <    <property name="bootclasspath@{v}"
95 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
92 >    <local name="have.java.base"/>
93 >    <available property="have.java.base"
94 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96 >      if:set="have.java.base"/>
97 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98 >      unless:set="have.java.base"/>
99 >    <local name="modules"/>
100 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101 >    <local name="boot.jar.dir"/>
102 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103 >    <path id="bootclasspath@{v}" unless:set="modules">
104 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
105 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
106 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
107 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
108 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
109 >    </path>
110 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111      </sequential>
112    </macrodef>
113  
114 <  <defjdklocations v="6"/>
115 <  <defjdklocations v="7"/>
116 <  <defjdklocations v="8"/>
80 <
81 <  <macrodef name="run-tck-tests">
82 <    <attribute name="jvm"/>
83 <    <attribute name="tck.classes"/>
84 <    <attribute name="product.jar" default="${product.jar}"/>
85 <    <attribute name="jvmflags" default=""/>
114 >  <macrodef name="mirror-dir">
115 >    <attribute name="src"/>
116 >    <attribute name="dst"/>
117      <sequential>
118 <    <java classname="JSR166TestCase"
119 <          jvm="@{jvm}" fork="true">
120 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
121 <        <jvmarg line="@{jvmflags}"/>
122 <        <classpath>
92 <          <pathelement location="${junit.jar}"/>
93 <          <pathelement location="@{tck.classes}"/>
94 <        </classpath>
95 <    </java>
118 >    <delete dir="@{dst}"/>
119 >    <mkdir dir="@{dst}"/>
120 >    <copy todir="@{dst}" preservelastmodified="true">
121 >      <fileset dir="@{src}"/>
122 >    </copy>
123      </sequential>
124    </macrodef>
125  
126 +  <defjdklocations v="6"/>
127 +  <defjdklocations v="7"/>
128 +  <defjdklocations v="8"/>
129 +  <defjdklocations v="9"/>
130 +
131    <!-- Source locations -->
132    <property name="src.dir"              location="${basedir}/src/main"/>
133    <property name="test.src.dir"         location="${basedir}/src/test"/>
134    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
135    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
136 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
136 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
137 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
138 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
139 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
140    <property name="lib.dir"              location="${basedir}/lib"/>
141    <property name="dist.dir"             location="${basedir}/dist"/>
142    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 111 | Line 146
146    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
147    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
148  
149 <  <!-- Distribution locations -->
150 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
151 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
152 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
153 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
154 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
155 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
149 >  <!-- Javadoc locations -->
150 >  <property name="docs.dir"          location="${build.dir}/docs"/>
151 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
152 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
153 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
154 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
155 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
156 >
157 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
158 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
159 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
160 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
161 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
162 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
163  
164    <!-- Jar locations -->
165    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128 | Line 170
170    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
171    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
172  
173 <  <!-- Bootclasspath argument -->
174 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
173 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
174 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
175 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
177 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178 >  <!-- The expected canonical location does not yet exist as of 2015-11 -->
179 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181 >  <!-- Default jdk doc location (latest stable release seems best) -->
182 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
183  
184    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
185 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
186 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
187 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
188 <
189 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
190 <  <!-- The below does not yet exist as of 2012-11 -->
191 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
192 <
193 <  <!-- Default jdk api doc location (latest stable release seems best) -->
194 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
195 <
196 <  <!-- Test classpath -->
197 <  <path id="test.classpath">
198 <    <pathelement location="${build.testcases.dir}"/>
199 <    <pathelement location="${junit.jar}"/>
200 <  </path>
185 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
186 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
187 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
188 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
189 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
190 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
191 >
192 >  <!-- Define the "jtreg" task -->
193 >  <!-- See the docs in "jtreg -onlineHelp" -->
194 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195 >           classpath="${lib.dir}/jtreg.jar" />
196 >
197 >  <!-- Tck options; see JSR166TestCase.java
198 >   To profile a single tck test class:
199 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200 >   To stress test a single tck test class:
201 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202 >   To stress test a single tck test method:
203 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204 >  -->
205 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206 >  <macrodef name="run-tck-tests">
207 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
208 >    <attribute name="target"/>
209 >    <attribute name="compile-target" default="@{target}"/>
210 >    <attribute name="workdir"/>
211 >    <attribute name="classes"/>
212 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213 >    <element name="javac-elements" optional="true"/>
214 >
215 >    <sequential>
216 >
217 >    <local name="modules"/>
218 >    <condition property="modules">
219 >      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220 >    </condition>
221 >
222 >    <mkdir dir="@{workdir}/tck-classes"/>
223 >
224 >    <javac srcdir="@{tck.src.dir}"
225 >           destdir="@{workdir}/tck-classes"
226 >           debug="${build.debug}"
227 >           debuglevel="${build.debuglevel}"
228 >           deprecation="${build.deprecation}"
229 >           source="@{compile-target}"
230 >           target="@{compile-target}"
231 >           classpath="${junit.jar}"
232 >           includeAntRuntime="false"
233 >           includeJavaRuntime="false"
234 >           executable="${javac@{compile-target}}"
235 >           fork="true">
236 >
237 >      <include name="*.java"/>
238 >      <compilerarg value="-XDignore.symbol.file=true"/>
239 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241 >      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
242 >      <compilerarg line="${build.args}"/>
243 >      <javac-elements/>
244 >
245 >    </javac>
246 >
247 >    <java classname="${jsr166.tckTestClass}"
248 >          failonerror="true"
249 >          jvm="${java@{target}}"
250 >          fork="true">
251 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252 >        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
253 >        <jvmarg line="@{jvmflags}"/>
254 >
255 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256 >        <syspropertyset id="system-properties-used-by-tck">
257 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258 >          <propertyref prefix="jsr166."/>
259 >          <propertyref name="test.timeout.factor"/>
260 >        </syspropertyset>
261 >
262 >        <classpath>
263 >          <pathelement location="${junit.jar}"/>
264 >          <pathelement location="@{workdir}/tck-classes"/>
265 >        </classpath>
266 >    </java>
267 >
268 >    </sequential>
269 >  </macrodef>
270 >
271 >  <!-- Define jtreg test sets for different jdk versions -->
272 >  <fileset dir="${jtreg9.src.dir}">
273 >    <patternset id="jdk9.jtreg.tests">
274 >      <include name="**/*.java"/>
275 >    </patternset>
276 >  </fileset>
277 >
278 >  <fileset dir="${jtreg8.src.dir}">
279 >    <patternset id="jdk8.jtreg.tests">
280 >      <include name="**/*.java"/>
281 >      <exclude name="**/SpliteratorCharacteristics.java"/>
282 >      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
283 >      <exclude name="**/GCDuringIteration.java"/>
284 >    </patternset>
285 >  </fileset>
286 >
287 >  <fileset dir="${jtreg7.src.dir}">
288 >    <patternset id="jdk7.jtreg.tests">
289 >      <include name="**/*.java"/>
290 >    </patternset>
291 >  </fileset>
292 >
293 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
294 >  <property name="jtreg.flags" value=""/>
295 >
296 >  <macrodef name="run-jtreg-tests">
297 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
298 >    <attribute name="source" default="7"/>
299 >    <attribute name="target"/>
300 >    <attribute name="workdir"/>
301 >    <attribute name="classes"/>
302 >    <attribute name="jtregflags" default=""/>
303 >
304 >    <sequential>
305 >
306 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
307 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
308 >
309 >    <local name="modules"/>
310 >    <condition property="modules">
311 >      <available file="${jdk@{target}.home}/jmods" type="dir"/>
312 >    </condition>
313 >
314 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
315 >    <delete dir="@{workdir}/JTreport" quiet="true"/>
316 >    <mkdir dir="@{workdir}/JTwork/scratch"/>
317 >    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
318 >    <mkdir dir="@{workdir}/JTreport/html"/>
319 >    <mkdir dir="@{workdir}/JTreport/text"/>
320 >    <jtreg dir="${jtreg@{target}.src.dir}"
321 >           jdk="${jdk@{target}.home}"
322 >           workDir="@{workdir}/JTwork"
323 >           reportDir="@{workdir}/JTreport">
324 >      <patternset refid="jdk@{target}.jtreg.tests"/>
325 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
326 >      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
327 >      <arg value="-agentvm"/>
328 >      <arg value="-verbose:${jtreg.verbose}"/>
329 >      <arg value="-vmoptions:-esa -ea"/>
330 >      <arg value="-automatic"/>
331 >      <arg value="-k:!ignore"/>
332 >      <arg line="@{jtregflags}"/>
333 >      <arg line="${jtreg.flags}"/>
334 >    </jtreg>
335 >    </sequential>
336 >  </macrodef>
337  
338    <!-- ALoops classpath -->
339    <path id="loops.classpath">
# Line 155 | Line 341
341    </path>
342  
343    <!-- Support @jls tag, used in jdk8+ javadoc -->
344 <  <!-- TODO: How do we get &trade to work? -->
159 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
160 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
344 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
345    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
346  
347    <!-- Main targets -->
348  
349 +  <property name="build.main.java.version" value="9"/>
350 +  <property name="build.main.javac" value="${javac9}"/>
351 +
352    <target name="dists"
353            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
354            description="Builds all public jars and docs"/>
# Line 171 | Line 357
357            depends="configure-compiler"
358            description="Compiles src/main sources to build dir">
359  
360 <    <mkdir dir="${build.classes.dir}"/>
360 >    <local name="modules"/>
361 >    <condition property="modules">
362 >      <and>
363 >        <available file="${jdk9.home}/jmods" type="dir"/>
364 >        <equals arg1="9" arg2="${build.main.java.version}"/>
365 >      </and>
366 >    </condition>
367 >
368 >    <local name="destdir"/>
369 >    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
370 >    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
371 >
372 >    <mkdir dir="${destdir}"/>
373  
374      <javac srcdir="${src.dir}"
375 <           destdir="${build.classes.dir}"
375 >           destdir="${destdir}"
376             debug="${build.debug}"
377             debuglevel="${build.debuglevel}"
378             deprecation="${build.deprecation}"
379             classpath=""
380             includeAntRuntime="false"
381             includeJavaRuntime="false"
382 <           executable="${javac8}"
382 >           executable="${build.main.javac}"
383             fork="true">
384  
385        <include name="**/*.java"/>
386 <      <compilerarg line="${build.args}"/>
386 >      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
387 >      <compilerarg value="-Xprefer:source"/>
388        <compilerarg value="-XDignore.symbol.file=true"/>
389        <compilerarg value="-Xlint:all"/>
390 <
391 < <!--
392 <      <exclude name="java/lang/**"/>
390 >      <compilerarg value="-Werror"/>
391 >      <compilerarg value="-Xdoclint:all/protected"/>
392 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
393        <compilerarg line="${build.args}"/>
195      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
196 -->
394  
395      </javac>
396  
397 +    <!-- We need jdk9's Contended annotation, but at compile time only -->
398 +    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
399    </target>
400  
401  
203
402    <target name="jar"
403            depends="compile"
404            description="Builds library jar from compiled sources">
405  
406      <jar destfile="${product.jar}">
407        <fileset dir="${build.classes.dir}"/>
408 +      <manifest>
409 +        <attribute name="Built-By" value="${user.name}"/>
410 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
411 +      </manifest>
412      </jar>
211
413    </target>
414  
415  
215
216  <target name="test"
217          depends="configure-tests, report-tests"
218          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219
220
221
416    <target name="docs"
417            description="Builds javadocs for src/main to dist dir">
418  
419 <    <delete dir="${dist.javadocs.dir}"/>
420 <    <mkdir dir="${dist.javadocs.dir}"/>
419 >    <delete dir="${docs.dir}"/>
420 >    <mkdir dir="${docs.dir}"/>
421  
422      <!-- the packagenames="none" hack below prevents scanning the -->
423      <!-- sourcepath for packages -->
424  
425 <    <javadoc destdir="${dist.javadocs.dir}"
425 >    <javadoc destdir="${docs.dir}"
426               packagenames="none"
427 <             link="${jdkapi8docs.url}"
427 >             link="${java9.api.url}"
428               overview="${src.dir}/intro.html"
429 <             sourcepath="${src.dir}:${jdk8src.dir}"
429 >             access="${build.javadoc.access}"
430 >             sourcepath="${src.dir}:${jdk9src.dir}"
431               classpath=""
432 <             executable="${javadoc8}">
238 <      <arg value="-XDignore.symbol.file=true"/>
239 <      <arg value="-tag"/>
240 <      <arg value="${javadoc.jls.option}"/>
432 >             executable="${javadoc9}">
433        <fileset dir="${src.dir}" defaultexcludes="yes">
434          <include name="**/*.java"/>
435        </fileset>
436 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
437 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438 +      <arg value="-XDignore.symbol.file=true"/>
439 + <!--  TODO     <arg value="-Xmodule:java.base"/> -->
440 +      <arg value="-tag"/>
441 +      <arg value="${javadoc.jls.option}"/>
442 +      <arg value="-tag"/>
443 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
444 +      <arg value="-tag"/>
445 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
446 +      <arg value="-tag"/>
447 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
448 + <!-- tags added in jdk9 -->
449 +      <arg value="-tag"/>
450 +      <arg value="revised:X"/>
451 +      <arg value="-tag"/>
452 +      <arg value="spec:X"/>
453      </javadoc>
245
454    </target>
455  
456  
249
457    <target name="dist"
458 <          depends="dist-clean, dist-jar, docs"
458 >          depends="dist-clean, dist-jar, dist-docs"
459            description="Puts all distributable products in single hierarchy"/>
460  
461  
# Line 266 | Line 473
473        <exclude name="src/emulation/**"/>
474        <exclude name="**/SyntaxTest.java"/>
475        <exclude name="**/SuperfluousAbstract.java"/>
476 +      <manifest>
477 +        <attribute name="Built-By" value="${user.name}"/>
478 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
479 +      </manifest>
480      </jar>
270
481    </target>
482  
483  
274
484    <target name="clean"
485            description="Removes all build products">
486  
# Line 280 | Line 489
489    </target>
490  
491  
283
492    <target name="dist-clean"
493            description="Removes all build and distribution products">
494  
495 +    <delete dir="${build.dir}"/>
496      <delete dir="${dist.dir}"/>
497  
498    </target>
499  
500  
292
293  <!-- Internal targets -->
294
295
501    <target name="dist-jar"
502            depends="clean, jar">
298
503      <copy file="${product.jar}" todir="${dist.dir}"/>
300
504    </target>
505  
506 <
507 <  <target name="compile-tests"
508 <          depends="jar">
306 <
307 <    <mkdir dir="${build.testcases.dir}"/>
308 <
309 <    <javac srcdir="${tck.src.dir}"
310 <           destdir="${build.testcases.dir}"
311 <           debug="${build.debug}"
312 <           debuglevel="${build.debuglevel}"
313 <           deprecation="${build.deprecation}"
314 <           source="6"
315 <           classpath="${junit.jar}"
316 <           bootclasspath="${product.jar}:${bootclasspath6}"
317 <           includeAntRuntime="false"
318 <           includeJavaRuntime="false"
319 <           executable="${javac8}"
320 <           fork="true">
321 <
322 <      <include name="**/*.java"/>
323 <      <compilerarg line="${build.args}"/>
324 <      <compilerarg value="-XDignore.symbol.file=true"/>
325 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326 <
327 <    </javac>
328 <
329 <    <javac srcdir="${test.src.dir}"
330 <           destdir="${build.testcases.dir}"
331 <           debug="${build.debug}"
332 <           debuglevel="${build.debuglevel}"
333 <           deprecation="${build.deprecation}"
334 <           source="6"
335 <           classpath=""
336 <           bootclasspath="${product.jar}:${bootclasspath6}"
337 <           includeAntRuntime="false"
338 <           includeJavaRuntime="false"
339 <           executable="${javac8}"
340 <           fork="true">
341 <
342 <      <include name="jsr166/test/**/*.java"/>
343 <
344 <      <compilerarg line="${build.args}"/>
345 <      <compilerarg value="-XDignore.symbol.file=true"/>
346 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347 <
348 <    </javac>
349 <
350 < <!--
351 <    <javac srcdir="${jtreg.src.dir}"
352 <          destdir="${build.testcases.dir}"
353 <            debug="${build.debug}"
354 <       debuglevel="${build.debuglevel}"
355 <      deprecation="${build.deprecation}"
356 <           source="${build.sourcelevel}"
357 <             fork="true">
358 <
359 <      <compilerarg value="${bootclasspath.args}"/>
360 <      <compilerarg line="${build.args}"/>
361 <      <compilerarg value="-XDignore.symbol.file=true"/>
362 <
363 <    </javac>
364 < -->
365 <
506 >  <target name="dist-docs"
507 >          depends="clean, docs">
508 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
509    </target>
510  
511 +  <target name="tck"
512 +          depends="jar"
513 +          description="Runs tck tests for main directly">
514  
515 <  <target name="run-tests"
516 <          depends="compile-tests">
517 <
518 <    <!-- May be overridden by user.properties -->
519 <    <property name="testcase" value="*"/>
520 <
521 <    <mkdir dir="${build.reports.dir}"/>
522 <
523 <    <junit printsummary="true"
524 <             showoutput="true"
525 <          errorProperty="junit.failed"
526 <        failureProperty="junit.failed"
527 <                    dir="${build.reports.dir}"
528 <                    jvm="${java8}"
529 <                   fork="true">
530 <
531 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
532 <      <jvmarg value="-server"/>
533 <      <jvmarg value="-showversion"/>
534 <
535 <      <classpath refid="test.classpath"/>
515 >    <run-tck-tests
516 >      target="${build.main.java.version}"
517 >      workdir="${build.dir}"
518 >      classes="${product.jar}"/>
519 >  </target>
520 >
521 >  <target name="tck-parallelism-1"
522 >          description="Runs tck with given common pool parallelism">
523 >    <antcall target="tck">
524 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
525 >    </antcall>
526 >  </target>
527 >
528 >  <target name="tck-parallelism-0"
529 >          description="Runs tck with given common pool parallelism">
530 >    <antcall target="tck">
531 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
532 >    </antcall>
533 >  </target>
534 >
535 >  <target name="jtreg"
536 >          depends="jar"
537 >          description="Runs jtreg tests for main using the jtreg ant task">
538 >    <run-jtreg-tests
539 >       target="${build.main.java.version}"
540 >       workdir="${build.dir}"
541 >       classes="${product.jar}"/>
542 >  </target>
543  
544 <      <formatter type="xml"/>
544 >  <target name="test"
545 >          depends="tck, tck-parallelism-1, jtreg"
546 >          description="Runs tck and jtreg tests for main">
547 >  </target>
548  
549 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
394 <        <fileset dir="${tck.src.dir}">
395 <          <include name="**/${testcase}Test.java"/>
396 <        </fileset>
397 <      </batchtest>
398 <
399 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
400 <        <fileset dir="${test.src.dir}">
401 <          <include name="jsr166/test/**/${testcase}Test.java"/>
402 <        </fileset>
403 <      </batchtest>
404 <
405 < <!--
406 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
407 <        <fileset dir="${jtreg.src.dir}">
408 <          <include name="**/${testcase}Test.java"/>
409 <        </fileset>
410 <      </batchtest>
411 < -->
549 >  <target name="jtreg8" description="Runs jtreg tests with jdk8">
550  
551 <    </junit>
551 >    <antcall target="jtreg">
552 >      <param name="build.main.java.version" value="8"/>
553 >      <param name="build.main.javac" value="${javac8}"/>
554 >    </antcall>
555  
556    </target>
557  
558 +  <target name="test89"
559 +          description="Runs tck and jtreg tests for main for multiple java versions">
560  
561 <  <target name="report-tests"
562 <          depends="run-tests">
563 <
564 <    <!-- Sets junit.report.format to frames if redirection is present,
565 <         otherwise sets it to noframes. -->
423 <    <available property="junit.report.format"
424 <                  value="frames"
425 <              classname="org.apache.xalan.lib.Redirect"
426 <    />
427 <    <property name="junit.report.format" value="noframes"/>
428 <
429 <    <junitreport todir="${build.reports.dir}">
430 <      <fileset dir="${build.reports.dir}">
431 <        <include name="TEST-*.xml"/>
432 <      </fileset>
433 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
434 <      />
435 <    </junitreport>
561 >    <antcall target="clean"/>
562 >    <antcall target="test">
563 >      <param name="build.main.java.version" value="8"/>
564 >      <param name="build.main.javac" value="${javac8}"/>
565 >    </antcall>
566  
567 <    <fail message="Test Cases Failed" if="junit.failed"/>
567 >    <antcall target="clean"/>
568 >    <antcall target="test">
569 >      <param name="build.main.java.version" value="9"/>
570 >      <param name="build.main.javac" value="${javac9}"/>
571 >    </antcall>
572  
573    </target>
574  
575  
576 +
577    <target name="configure-compiler">
578 +    <fail message="ant version too old">
579 +      <condition>
580 +        <not> <antversion atleast="1.9.1"/> </not>
581 +      </condition>
582 +    </fail>
583  
584      <property name="unchecked.option" value="-Xlint:unchecked"/>
585  
# Line 456 | Line 596
596    </target>
597  
598  
459  <target name="configure-tests"
460       depends="configure-compiler">
461
462    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
463    <available property="junit.available"
464               classname="junit.framework.Protectable"/>
465
466    <!-- Xalan -->
467    <available property="xalan.available"
468               classname="org.apache.xalan.Version"/>
469
470
471    <!-- Ant 1.6beta and later don't need or want this check -->
472    <!--
473    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
474          unless="junit.available"/>
475
476    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
477          unless="xalan.available"/>
478    -->
479
480  </target>
481
599  
600    <!-- Various demos and test programs -->
601  
# Line 494 | Line 611
611         debuglevel="${build.debuglevel}"
612        deprecation="${build.deprecation}"
613             source="${build.sourcelevel}"
614 +           target="${build.sourcelevel}"
615               fork="true">
616  
617        <compilerarg line="${build.args}"/>
# Line 509 | Line 627
627    </target>
628  
629  
630 <  <!-- jsr166 4jdk7 -->
630 >  <target name="compile-test-loops" depends="jar"
631 >          description="compile all the perf tests in src/test/loops">
632  
633 +    <mkdir dir="${build.dir}/test/loops"/>
634 +
635 +    <javac srcdir="${basedir}/src/test/loops"
636 +           destdir="${build.dir}/test/loops"
637 +           debug="${build.debug}"
638 +           debuglevel="${build.debuglevel}"
639 +           deprecation="${build.deprecation}"
640 +           includeAntRuntime="false"
641 +           includeJavaRuntime="false"
642 +           executable="${javac9}"
643 +           fork="true">
644 +
645 +      <include name="*.java"/>
646 +      <compilerarg value="-XDignore.symbol.file=true"/>
647 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
648 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
649 +      <compilerarg line="${build.args}"/>
650 +
651 +    </javac>
652 +
653 +  </target>
654 +
655 +
656 +  <!-- jsr166 4jdk7 -->
657  
658    <target name="4jdk7compile"
659            depends="configure-compiler"
# Line 524 | Line 667
667             debuglevel="${build.debuglevel}"
668             deprecation="${build.deprecation}"
669             source="6"
670 +           target="6"
671             classpath=""
672             bootclasspath="${bootclasspath6}"
673             includeAntRuntime="false"
# Line 532 | Line 676
676             fork="true">
677  
678        <include name="**/*.java"/>
679 <      <compilerarg line="${build.args}"/>
679 >      <compilerarg value="-Xprefer:source"/>
680        <compilerarg value="-XDignore.symbol.file=true"/>
681        <compilerarg value="-Xlint:all"/>
682 +      <compilerarg value="-Werror"/>
683 +      <compilerarg line="${build.args}"/>
684  
685      </javac>
686 +  </target>
687  
688 <    <jar destfile="${4jdk7product.jar}" index="true">
689 <      <fileset dir="${build.4jdk7.classes.dir}"/>
690 <    </jar>
688 >  <target name="4jdk7doclint"
689 >          depends="configure-compiler"
690 >          description="Finds doclint warnings">
691  
692 <    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
692 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
693  
694 <    <javac srcdir="${tck.src.dir}"
695 <           destdir="${build.4jdk7.tck.classes.dir}"
694 >    <javac srcdir="${4jdk7src.dir}"
695 >           destdir="${build.4jdk7.classes.dir}"
696             debug="${build.debug}"
697             debuglevel="${build.debuglevel}"
698             deprecation="${build.deprecation}"
699             source="6"
700 <           classpath="${junit.jar}"
701 <           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
700 >           target="6"
701 >           classpath=""
702 >           bootclasspath="${bootclasspath6}"
703             includeAntRuntime="false"
704             includeJavaRuntime="false"
705 <           executable="${javac7}"
705 >           executable="${javac8}"
706             fork="true">
707  
708        <include name="**/*.java"/>
709 <      <compilerarg line="${build.args}"/>
709 >      <compilerarg value="-Xprefer:source"/>
710        <compilerarg value="-XDignore.symbol.file=true"/>
711 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
711 >      <compilerarg value="-Xlint:all"/>
712 >      <compilerarg value="-Xdoclint:all/protected"/>
713 >      <compilerarg line="${build.args}"/>
714  
715      </javac>
716 +  </target>
717 +
718 +
719 +  <target name="4jdk7jar"
720 +          depends="4jdk7compile"
721 +          description="Builds library jar from compiled sources">
722 +
723 +    <jar destfile="${4jdk7product.jar}">
724 +      <fileset dir="${build.4jdk7.classes.dir}"/>
725 +      <manifest>
726 +        <attribute name="Built-By" value="${user.name}"/>
727 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
728 +      </manifest>
729 +    </jar>
730  
731    </target>
732  
733  
734 <  <target name="4jdk7-test-tck"
735 <          depends="4jdk7compile"
734 >  <target name="4jdk7-tck"
735 >          depends="4jdk7jar"
736            description="Runs tck tests for jsr166-4jdk7 directly">
737 +
738      <run-tck-tests
739 <      jvm="${java7}"
740 <      tck.classes="${build.4jdk7.tck.classes.dir}"
741 <      product.jar="${4jdk7product.jar}"/>
739 >      target="7"
740 >      workdir="${build.4jdk7.dir}"
741 >      classes="${4jdk7product.jar}">
742 >      <javac-elements>
743 >        <!-- JDK8+ test classes -->
744 >        <exclude name="*8Test.java"/>
745 >        <exclude name="*9Test.java"/>
746 >        <exclude name="*10Test.java"/>
747 >        <exclude name="DoubleAccumulatorTest.java"/>
748 >        <exclude name="DoubleAdderTest.java"/>
749 >        <exclude name="LongAccumulatorTest.java"/>
750 >        <exclude name="LongAdderTest.java"/>
751 >        <exclude name="CompletableFutureTest.java"/>
752 >        <exclude name="SplittableRandomTest.java"/>
753 >        <exclude name="StampedLockTest.java"/>
754 >        <exclude name="SubmissionPublisherTest.java"/>
755 >      </javac-elements>
756 >    </run-tck-tests>
757    </target>
758  
759  
760 <  <target name="4jdk7-test-tck-junit"
760 >  <target name="4jdk7-tck-junit"
761            depends="4jdk7compile"
762            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
763  
# Line 599 | Line 779
779  
780        <formatter type="brief"/>
781  
782 <      <test name="JSR166TestCase" haltonfailure="no">
782 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
783        </test>
784  
785      </junit>
786    </target>
787  
788 +  <target name="4jdk7-jtreg"
789 +          depends="4jdk7jar"
790 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
791 +    <run-jtreg-tests
792 +       target="7"
793 +       workdir="${build.4jdk7.dir}"
794 +       classes="${4jdk7product.jar}"/>
795 +  </target>
796 +
797 +
798 +  <target name="4jdk7-test"
799 +          depends="4jdk7-tck, 4jdk7-jtreg"
800 +          description="Runs tck and jtreg tests for jsr166-4jdk7">
801 +  </target>
802 +
803  
804    <target name="4jdk7docs"
805            description="Builds javadocs for src/jdk7 to dist dir">
806  
807 <    <delete dir="${dist.4jdk7.docs.dir}"/>
808 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
807 >    <delete dir="${4jdk7docs.dir}"/>
808 >    <mkdir dir="${4jdk7docs.dir}"/>
809  
810 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
810 >    <javadoc destdir="${4jdk7docs.dir}"
811               packagenames="none"
812 <             link="${jdkapi7docs.url}"
812 >             link="${java7.api.url}"
813               overview="${4jdk7src.dir}/intro.html"
814 +             access="${build.javadoc.access}"
815               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
816               classpath=""
817               executable="${javadoc7}">
622      <arg value="-XDignore.symbol.file=true"/>
818        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
819          <include name="**/*.java"/>
820        </fileset>
821 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
822 +      <arg value="-XDignore.symbol.file=true"/>
823      </javadoc>
627
824    </target>
825  
826  
827    <target name="4jdk7dist"
828 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
828 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
829            description="Puts all distributable products in single hierarchy"/>
830  
831  
636
832    <target name="4jdk7clean"
833            description="Removes all 4jdk7 build products">
834  
# Line 642 | Line 837
837    </target>
838  
839  
645
646  <target name="4jdk7dist-clean"
647          description="Removes all build and distribution products">
648
649  </target>
650
840    <target name="4jdk7dist-jar"
841 <          depends="4jdk7clean, 4jdk7compile">
653 <
841 >          depends="4jdk7clean, 4jdk7jar">
842      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
843 +  </target>
844 +
845  
846 +  <target name="4jdk7dist-docs"
847 +          depends="4jdk7clean, 4jdk7docs">
848 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
849    </target>
850  
851  
# Line 662 | Line 855
855            depends="configure-compiler"
856            description="Compiles jsr166x sources to build dir">
857  
858 <    <mkdir dir="${build.jsr166x.dir}"/>
858 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
859  
860      <javac srcdir="${topsrc.dir}"
861 <           destdir="${build.jsr166x.dir}"
861 >           destdir="${build.jsr166x.classes.dir}"
862             debug="${build.debug}"
863             debuglevel="${build.debuglevel}"
864             deprecation="${build.deprecation}"
865             classpath=""
673           source="5"
866             bootclasspath="${bootclasspath6}"
867 +           source="5"
868 +           target="5"
869             includeAntRuntime="false"
870             includeJavaRuntime="false"
871             executable="${javac7}"
872             fork="true">
873  
874        <include name="jsr166x/**/*.java"/>
681      <compilerarg line="${build.args}"/>
875        <compilerarg value="-XDignore.symbol.file=true"/>
876        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
877 +      <compilerarg value="-Werror"/>
878 +      <compilerarg line="${build.args}"/>
879  
880      </javac>
686
881    </target>
882  
883  
690
884    <target name="jsr166xjar"
885            depends="jsr166xcompile"
886            description="Builds library jar from compiled sources">
887  
888      <jar destfile="${jsr166x.jar}">
889 <      <fileset dir="${build.jsr166x.dir}"/>
889 >      <fileset dir="${build.jsr166x.classes.dir}"/>
890 >      <manifest>
891 >        <attribute name="Built-By" value="${user.name}"/>
892 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
893 >      </manifest>
894      </jar>
895  
896    </target>
897  
898  
702
899    <target name="jsr166xdocs"
900            description="Builds javadocs to dist dir">
901  
902 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
903 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
902 >    <delete dir="${jsr166xdocs.dir}"/>
903 >    <mkdir dir="${jsr166xdocs.dir}"/>
904  
905 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
905 >    <javadoc destdir="${jsr166xdocs.dir}"
906               packagenames="jsr166x.*"
907 <             link="${jdkapidocs.url}"
908 <             source="5"
713 <             bootclasspath="${bootclasspath6}"
907 >             link="${java.api.url}"
908 >             access="${build.javadoc.access}"
909               sourcepath="${topsrc.dir}:${jdk6src.dir}"
910 <             executable="${javadoc7}"
911 <             additionalparam="-XDignore.symbol.file=true" />
910 >             bootclasspath="${bootclasspath6}"
911 >             source="5"
912 >             executable="${javadoc7}">
913 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
914 >      <arg value="-XDignore.symbol.file=true"/>
915  
916 +    </javadoc>
917    </target>
918  
919  
920    <target name="jsr166xdist"
921 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
921 >          depends="jsr166xdist-jar, jsr166xdist-docs"
922            description="Puts all distributable products in single hierarchy"/>
923  
924  
726
925    <target name="jsr166xclean"
926            description="Removes all jsr166x build products">
927  
# Line 732 | Line 930
930    </target>
931  
932  
735
736  <target name="jsr166xdist-clean"
737          description="Removes all build and distribution products">
738
739  </target>
740
741
933    <target name="jsr166xdist-jar"
934            depends="jsr166xclean, jsr166xjar">
744
935      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
936 +  </target>
937  
938 +  <target name="jsr166xdist-docs"
939 +          depends="jsr166xclean, jsr166xdocs">
940 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
941    </target>
942  
943    <!-- jsr166y -->
# Line 753 | Line 947
947            depends="configure-compiler"
948            description="Compiles jsr166y sources">
949  
950 <    <mkdir dir="${build.jsr166y.dir}"/>
950 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
951  
952      <javac srcdir="${topsrc.dir}"
953 <           destdir="${build.jsr166y.dir}"
953 >           destdir="${build.jsr166y.classes.dir}"
954             debug="${build.debug}"
955             debuglevel="${build.debuglevel}"
956             deprecation="${build.deprecation}"
957             source="6"
958 +           target="6"
959             classpath=""
960             bootclasspath="${bootclasspath6}"
961             includeAntRuntime="false"
# Line 769 | Line 964
964             fork="true">
965  
966        <include name="jsr166y/**/*.java"/>
772      <compilerarg line="${build.args}"/>
967        <compilerarg value="-XDignore.symbol.file=true"/>
968        <compilerarg value="-Xlint:all"/>
969 +      <compilerarg value="-Werror"/>
970 +      <compilerarg line="${build.args}"/>
971 +
972      </javac>
973    </target>
974  
# Line 781 | Line 978
978            description="Builds library jar from compiled sources">
979  
980      <jar destfile="${jsr166y.jar}" index="true">
981 <      <fileset dir="${build.jsr166y.dir}"/>
981 >      <fileset dir="${build.jsr166y.classes.dir}"/>
982 >      <manifest>
983 >        <attribute name="Built-By" value="${user.name}"/>
984 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
985 >      </manifest>
986      </jar>
987  
988    </target>
989  
990  
790
991    <target name="jsr166ydocs"
992            description="Builds javadocs to dist dir">
993  
994 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
995 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
994 >    <delete dir="${jsr166ydocs.dir}"/>
995 >    <mkdir dir="${jsr166ydocs.dir}"/>
996  
997 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
997 >    <javadoc destdir="${jsr166ydocs.dir}"
998               packagenames="jsr166y.*"
999 <             link="${jdkapidocs.url}"
1000 <             source="6"
801 <             bootclasspath="${bootclasspath6}"
999 >             link="${java.api.url}"
1000 >             access="${build.javadoc.access}"
1001               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002 <             executable="${javadoc7}"
1003 <             additionalparam="-XDignore.symbol.file=true" />
1002 >             bootclasspath="${bootclasspath6}"
1003 >             source="6"
1004 >             executable="${javadoc7}">
1005 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1006 >      <arg value="-XDignore.symbol.file=true"/>
1007  
1008 +    </javadoc>
1009    </target>
1010  
1011  
1012    <target name="jsr166ydist"
1013 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
1013 >          depends="jsr166ydist-jar, jsr166ydist-docs"
1014            description="Puts all distributable products in single hierarchy"/>
1015  
1016  
814
1017    <target name="jsr166yclean"
1018            description="Removes all jsr166y build products">
1019  
# Line 820 | Line 1022
1022    </target>
1023  
1024  
823
824  <target name="jsr166ydist-clean"
825          description="Removes all build and distribution products">
826
827  </target>
828
1025    <target name="jsr166ydist-jar"
1026            depends="jsr166yclean, jsr166yjar">
831
1027      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1028 +  </target>
1029  
1030 +  <target name="jsr166ydist-docs"
1031 +          depends="jsr166yclean, jsr166ydocs">
1032 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1033    </target>
1034  
1035  
# Line 841 | Line 1040
1040            depends="configure-compiler, jsr166yjar"
1041            description="Compiles extra166y sources">
1042  
1043 <    <mkdir dir="${build.extra166y.dir}"/>
1043 >    <mkdir dir="${build.extra166y.classes.dir}"/>
1044  
1045      <javac srcdir="${topsrc.dir}"
1046 <           destdir="${build.extra166y.dir}"
1046 >           destdir="${build.extra166y.classes.dir}"
1047             debug="${build.debug}"
1048             debuglevel="${build.debuglevel}"
1049             deprecation="${build.deprecation}"
1050 +           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1051             classpath=""
1052             source="6"
1053 <           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
1053 >           target="6"
1054             includeAntRuntime="false"
1055             includeJavaRuntime="false"
1056             executable="${javac7}"
1057             fork="true">
1058  
1059        <include name="extra166y/**/*.java"/>
860      <compilerarg line="${build.args}"/>
1060        <compilerarg value="-XDignore.symbol.file=true"/>
1061        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1062 +      <compilerarg value="-Werror"/>
1063 +      <compilerarg line="${build.args}"/>
1064  
1065      </javac>
865
1066    </target>
1067  
1068  
869
1069    <target name="extra166yjar"
1070            depends="extra166ycompile"
1071            description="Builds library jar from compiled sources">
1072  
1073      <jar destfile="${extra166y.jar}" index="true">
1074 <      <fileset dir="${build.extra166y.dir}"/>
1074 >      <fileset dir="${build.extra166y.classes.dir}"/>
1075 >      <manifest>
1076 >        <attribute name="Built-By" value="${user.name}"/>
1077 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1078 >      </manifest>
1079      </jar>
1080  
1081    </target>
1082  
1083  
881
1084    <target name="extra166ydocs"
1085            description="Builds javadocs to build dir">
1086  
1087 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
1088 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
1087 >    <delete dir="${extra166ydocs.dir}"/>
1088 >    <mkdir dir="${extra166ydocs.dir}"/>
1089  
1090 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
1090 >    <javadoc destdir="${extra166ydocs.dir}"
1091               packagenames="extra166y.*"
1092 <             link="${jdkapidocs.url}"
1093 <             source="6"
892 <             bootclasspath="${bootclasspath6}"
1092 >             link="${java.api.url}"
1093 >             access="${build.javadoc.access}"
1094               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1095 <             executable="${javadoc7}"
1096 <             additionalparam="-XDignore.symbol.file=true" />
1095 >             bootclasspath="${bootclasspath6}"
1096 >             source="6"
1097 >             executable="${javadoc7}">
1098 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1099 >      <arg value="-XDignore.symbol.file=true"/>
1100  
1101 +    </javadoc>
1102    </target>
1103  
1104  
1105    <target name="extra166ydist"
1106 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
1106 >          depends="extra166ydist-jar, extra166ydist-docs"
1107            description="Puts all distributable products in single hierarchy"/>
1108  
1109  
905
1110    <target name="extra166yclean"
1111            description="Removes all extra166y build products">
1112  
# Line 911 | Line 1115
1115    </target>
1116  
1117  
914
915  <target name="extra166ydist-clean"
916          description="Removes all build and distribution products">
917
918  </target>
919
1118    <target name="extra166ydist-jar"
1119            depends="extra166yclean, extra166yjar">
922
1120      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1121 +  </target>
1122  
1123 +  <target name="extra166ydist-docs"
1124 +          depends="extra166yclean, extra166ydocs">
1125 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1126    </target>
1127  
1128    <!-- jsr166e -->
1129  
1130 +  <property name="build.jsr166e.java.version" value="6"/>
1131 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1132 +
1133    <target name="jsr166ecompile"
1134            depends="configure-compiler"
1135            description="Compiles jsr166e sources">
1136  
1137 <    <mkdir dir="${build.jsr166e.dir}"/>
1137 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1138  
1139      <javac srcdir="${topsrc.dir}"
1140 <           destdir="${build.jsr166e.dir}"
1140 >           destdir="${build.jsr166e.classes.dir}"
1141             debug="${build.debug}"
1142             debuglevel="${build.debuglevel}"
1143             deprecation="${build.deprecation}"
1144 <           source="7"
1144 >           source="${build.jsr166e.java.version}"
1145 >           target="${build.jsr166e.java.version}"
1146             classpath=""
1147             includeAntRuntime="false"
1148             includeJavaRuntime="false"
1149 <           executable="${javac7}"
1149 >           executable="${build.jsr166e.javac}"
1150             fork="true">
1151  
1152        <include name="jsr166e/**/*.java"/>
948      <compilerarg line="${build.args}"/>
1153        <compilerarg value="-XDignore.symbol.file=true"/>
1154        <compilerarg value="-Xlint:all"/>
1155 +      <compilerarg value="-Werror"/>
1156 +      <compilerarg line="${build.args}"/>
1157  
1158      </javac>
953
1159    </target>
1160  
1161 +  <!-- jsr166e: find doclint errors -->
1162 +  <target name="jsr166edoclint">
1163 +
1164 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1165 +
1166 +    <javac srcdir="${topsrc.dir}"
1167 +           destdir="${build.jsr166e.classes.dir}"
1168 +           debug="${build.debug}"
1169 +           debuglevel="${build.debuglevel}"
1170 +           deprecation="${build.deprecation}"
1171 +           source="${build.jsr166e.java.version}"
1172 +           target="${build.jsr166e.java.version}"
1173 +           classpath=""
1174 +           bootclasspath="${bootclasspath6}"
1175 +           includeAntRuntime="false"
1176 +           includeJavaRuntime="false"
1177 +           executable="${javac8}"
1178 +           fork="true">
1179 +
1180 +      <include name="jsr166e/**/*.java"/>
1181 +      <compilerarg value="-XDignore.symbol.file=true"/>
1182 +      <compilerarg value="-Xlint:all"/>
1183 +      <compilerarg value="-Werror"/>
1184 +      <compilerarg value="-Xdoclint:all/protected"/>
1185 +
1186 +    </javac>
1187 +  </target>
1188  
1189  
1190    <target name="jsr166ejar"
# Line 960 | Line 1192
1192            description="Builds library jar from compiled sources">
1193  
1194      <jar destfile="${jsr166e.jar}" index="true">
1195 <      <fileset dir="${build.jsr166e.dir}"/>
1195 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1196 >      <manifest>
1197 >        <attribute name="Built-By" value="${user.name}"/>
1198 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1199 >      </manifest>
1200      </jar>
1201  
1202    </target>
1203  
1204  
969
1205    <target name="jsr166edocs"
1206            description="Builds javadocs to build dir">
1207  
1208 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1209 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1208 >    <delete dir="${jsr166edocs.dir}"/>
1209 >    <mkdir dir="${jsr166edocs.dir}"/>
1210  
1211 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1211 >    <javadoc destdir="${jsr166edocs.dir}"
1212               packagenames="jsr166e.*"
1213 <             link="${jdkapidocs.url}"
1214 <             source="7"
1215 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1216 <             executable="${javadoc7}"
1217 <             additionalparam="-XDignore.symbol.file=true" >
1213 >             link="${java.api.url}"
1214 >             access="${build.javadoc.access}"
1215 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1216 >             source="${build.jsr166e.java.version}"
1217 >             executable="${javadoc7}">
1218 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1219 >      <arg value="-XDignore.symbol.file=true"/>
1220 >
1221      </javadoc>
1222 +  </target>
1223 +
1224 +
1225 +  <target name="jsr166e-tck-one-java-version"
1226 +          depends="jsr166ejar">
1227  
1228 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1229 +
1230 +    <run-tck-tests
1231 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1232 +      target="${build.jsr166e.java.version}"
1233 +      workdir="${build.jsr166e.dir}"
1234 +      classes="${jsr166e.jar}"/>
1235 +  </target>
1236 +
1237 +  <target name="jsr166e-tck"
1238 +          description="Runs tck tests for jsr166e for multiple java versions">
1239 +
1240 + <!--     <antcall target="clean"/> -->
1241 + <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1242 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1243 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1244 + <!--     </antcall> -->
1245 +
1246 +    <antcall target="clean"/>
1247 +    <antcall target="jsr166e-tck-one-java-version">
1248 +      <param name="build.jsr166e.java.version" value="7"/>
1249 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1250 +    </antcall>
1251 +
1252 +    <antcall target="clean"/>
1253 +    <antcall target="jsr166e-tck-one-java-version">
1254 +      <param name="build.jsr166e.java.version" value="6"/>
1255 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1256 +    </antcall>
1257    </target>
1258  
1259  
1260 +  <target name="jsr166e-test"
1261 +          depends="jsr166e-tck"
1262 +          description="Runs all tests for jsr166e">
1263 +  </target>
1264 +
1265    <target name="jsr166edist"
1266 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1266 >          depends="jsr166edist-jar, jsr166edist-docs"
1267            description="Puts all distributable products in single hierarchy"/>
1268  
1269  
993
1270    <target name="jsr166eclean"
1271            description="Removes all jsr166e build products">
996
1272      <delete dir="${build.jsr166e.dir}"/>
998
1273    </target>
1274  
1275  
1276 <  <target name="jsr166edist-clean"
1277 <          description="Removes all build and distribution products">
1276 >  <target name="jsr166edist-jar"
1277 >          depends="jsr166eclean, jsr166ejar">
1278 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1279 >  </target>
1280  
1281 +  <target name="jsr166edist-docs"
1282 +          depends="jsr166eclean, jsr166edocs">
1283 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1284    </target>
1285  
1007  <target name="jsr166edist-jar"
1008          depends="jsr166eclean, jsr166ejar">
1286  
1287 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1287 > <!-- Find buglets that can be detected by static build tools -->
1288  
1289 +  <target name="lint">
1290 +    <antcall target="dists">
1291 +      <param name="build.javadoc.access" value="public"/>
1292 +    </antcall>
1293    </target>
1294  
1295 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1296 +  <target name="lint-private">
1297 +    <antcall target="dist">
1298 +      <param name="build.javadoc.access" value="private"/>
1299 +    </antcall>
1300 +  </target>
1301 +
1302 +
1303   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines