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.99 by jsr166, Sat Jan 19 01:37:44 2013 UTC vs.
Revision 1.169 by jsr166, Wed Sep 2 03:45:13 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines