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 |
|
|
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"/> |
70 |
|
|
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"/> |
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"/> |
78 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
79 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
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"> |
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"/> |
70 |
– |
<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"/> |
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=""/> |
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> |
92 |
< |
<pathelement location="${junit.jar}"/> |
93 |
< |
<pathelement location="@{tck.classes}"/> |
94 |
< |
</classpath> |
95 |
< |
</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"/> |
139 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
140 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
141 |
|
|
142 |
< |
<!-- Distribution locations --> |
143 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
144 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
145 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
146 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
147 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
148 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
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.dir}/jsr166.jar"/> |
163 |
|
<property name="extra166y.jar" location="${build.extra166y.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}"/> |
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 |
< |
|
186 |
< |
<!-- Default jdk api doc location (latest stable release seems best) --> |
187 |
< |
<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"> |
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 |
+ |
</patternset> |
266 |
+ |
</fileset> |
267 |
+ |
|
268 |
+ |
<fileset dir="${jtreg.src.dir}"> |
269 |
+ |
<patternset id="jdk7.jtreg.tests"> |
270 |
+ |
<include name="**/*.java"/> |
271 |
+ |
<exclude name="util/Collection/CollectionDefaults.java"/> |
272 |
+ |
<exclude name="util/List/ListDefaults.java"/> |
273 |
+ |
<exclude name="util/Spliterator/**/*.java"/> |
274 |
+ |
<exclude name="util/concurrent/CompletableFuture/**/*.java"/> |
275 |
+ |
<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/> |
276 |
+ |
<exclude name="util/concurrent/locks/StampedLock/**/*.java"/> |
277 |
+ |
</patternset> |
278 |
+ |
</fileset> |
279 |
+ |
|
280 |
+ |
<macrodef name="run-jtreg-tests"> |
281 |
+ |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
282 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
283 |
+ |
<attribute name="source" default="7"/> |
284 |
+ |
<attribute name="target"/> |
285 |
+ |
<attribute name="workdir"/> |
286 |
+ |
<attribute name="classes"/> |
287 |
+ |
<attribute name="jtregflags" default=""/> |
288 |
+ |
<sequential> |
289 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
290 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
291 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
292 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
293 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
294 |
+ |
jdk="${jdk@{target}.home}" |
295 |
+ |
workDir="@{workdir}/JTwork" |
296 |
+ |
reportDir="@{workdir}/JTreport"> |
297 |
+ |
<patternset refid="jdk@{target}.jtreg.tests"/> |
298 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
299 |
+ |
<arg value="-agentvm"/> |
300 |
+ |
<arg value="-v:nopass,fail"/> |
301 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
302 |
+ |
<arg value="-automatic"/> |
303 |
+ |
<arg value="-k:!ignore"/> |
304 |
+ |
<arg line="@{jtregflags}"/> |
305 |
+ |
</jtreg> |
306 |
+ |
</sequential> |
307 |
+ |
</macrodef> |
308 |
+ |
|
309 |
|
<!-- ALoops classpath --> |
310 |
|
<path id="loops.classpath"> |
311 |
|
<pathelement location="${build.loops.dir}"/> |
312 |
|
</path> |
313 |
|
|
314 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
315 |
< |
<!-- 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™ Language Specification" --> |
161 |
< |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
315 |
> |
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
316 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
317 |
|
|
318 |
|
<!-- Main targets --> |
319 |
|
|
320 |
+ |
<property name="build.main.java.version" value="9"/> |
321 |
+ |
<property name="build.main.javac" value="${javac9}"/> |
322 |
+ |
|
323 |
|
<target name="dists" |
324 |
|
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
325 |
|
description="Builds all public jars and docs"/> |
338 |
|
classpath="" |
339 |
|
includeAntRuntime="false" |
340 |
|
includeJavaRuntime="false" |
341 |
< |
executable="${javac8}" |
341 |
> |
executable="${build.main.javac}" |
342 |
|
fork="true"> |
343 |
|
|
344 |
|
<include name="**/*.java"/> |
345 |
< |
<compilerarg line="${build.args}"/> |
345 |
> |
<compilerarg value="-Xprefer:source"/> |
346 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
347 |
|
<compilerarg value="-Xlint:all"/> |
348 |
< |
|
349 |
< |
<!-- |
350 |
< |
<exclude name="java/lang/**"/> |
348 |
> |
<compilerarg value="-Werror"/> |
349 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
350 |
> |
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
351 |
|
<compilerarg line="${build.args}"/> |
195 |
– |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
196 |
– |
--> |
352 |
|
|
353 |
|
</javac> |
199 |
– |
|
354 |
|
</target> |
355 |
|
|
356 |
|
|
203 |
– |
|
357 |
|
<target name="jar" |
358 |
|
depends="compile" |
359 |
|
description="Builds library jar from compiled sources"> |
361 |
|
<jar destfile="${product.jar}"> |
362 |
|
<fileset dir="${build.classes.dir}"/> |
363 |
|
</jar> |
211 |
– |
|
364 |
|
</target> |
365 |
|
|
366 |
|
|
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 |
– |
|
367 |
|
<target name="docs" |
368 |
|
description="Builds javadocs for src/main to dist dir"> |
369 |
|
|
370 |
< |
<delete dir="${dist.javadocs.dir}"/> |
371 |
< |
<mkdir dir="${dist.javadocs.dir}"/> |
370 |
> |
<delete dir="${docs.dir}"/> |
371 |
> |
<mkdir dir="${docs.dir}"/> |
372 |
|
|
373 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
374 |
|
<!-- sourcepath for packages --> |
375 |
|
|
376 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
376 |
> |
<javadoc destdir="${docs.dir}" |
377 |
|
packagenames="none" |
378 |
< |
link="${jdkapi8docs.url}" |
378 |
> |
link="${java9.api.url}" |
379 |
|
overview="${src.dir}/intro.html" |
380 |
< |
sourcepath="${src.dir}:${jdk8src.dir}" |
380 |
> |
access="${build.javadoc.access}" |
381 |
> |
sourcepath="${src.dir}:${jdk9src.dir}" |
382 |
|
classpath="" |
383 |
< |
executable="${javadoc8}"> |
238 |
< |
<arg value="-XDignore.symbol.file=true"/> |
239 |
< |
<arg value="-tag"/> |
240 |
< |
<arg value="${javadoc.jls.option}"/> |
383 |
> |
executable="${javadoc9}"> |
384 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
385 |
|
<include name="**/*.java"/> |
386 |
|
</fileset> |
387 |
+ |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
388 |
+ |
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
389 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
390 |
+ |
<arg value="-tag"/> |
391 |
+ |
<arg value="${javadoc.jls.option}"/> |
392 |
+ |
<arg value="-tag"/> |
393 |
+ |
<arg value="apiNote:a:<em>API Note:</em>"/> |
394 |
+ |
<arg value="-tag"/> |
395 |
+ |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
396 |
+ |
<arg value="-tag"/> |
397 |
+ |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
398 |
|
</javadoc> |
245 |
– |
|
399 |
|
</target> |
400 |
|
|
401 |
|
|
249 |
– |
|
402 |
|
<target name="dist" |
403 |
< |
depends="dist-clean, dist-jar, docs" |
403 |
> |
depends="dist-clean, dist-jar, dist-docs" |
404 |
|
description="Puts all distributable products in single hierarchy"/> |
405 |
|
|
406 |
|
|
419 |
|
<exclude name="**/SyntaxTest.java"/> |
420 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
421 |
|
</jar> |
270 |
– |
|
422 |
|
</target> |
423 |
|
|
424 |
|
|
274 |
– |
|
425 |
|
<target name="clean" |
426 |
|
description="Removes all build products"> |
427 |
|
|
430 |
|
</target> |
431 |
|
|
432 |
|
|
283 |
– |
|
433 |
|
<target name="dist-clean" |
434 |
|
description="Removes all build and distribution products"> |
435 |
|
|
436 |
+ |
<delete dir="${build.dir}"/> |
437 |
|
<delete dir="${dist.dir}"/> |
438 |
|
|
439 |
|
</target> |
440 |
|
|
441 |
|
|
292 |
– |
|
293 |
– |
<!-- Internal targets --> |
294 |
– |
|
295 |
– |
|
442 |
|
<target name="dist-jar" |
443 |
|
depends="clean, jar"> |
298 |
– |
|
444 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
300 |
– |
|
445 |
|
</target> |
446 |
|
|
447 |
< |
|
448 |
< |
<target name="compile-tests" |
449 |
< |
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 |
< |
|
447 |
> |
<target name="dist-docs" |
448 |
> |
depends="clean, docs"> |
449 |
> |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
450 |
|
</target> |
451 |
|
|
452 |
+ |
<target name="tck" depends="test-tck" description="alias for test-tck"/> |
453 |
+ |
<target name="test-tck" |
454 |
+ |
depends="jar" |
455 |
+ |
description="Runs tck tests for main directly"> |
456 |
|
|
457 |
< |
<target name="run-tests" |
458 |
< |
depends="compile-tests"> |
459 |
< |
|
460 |
< |
<!-- May be overridden by user.properties --> |
461 |
< |
<property name="testcase" value="*"/> |
462 |
< |
|
463 |
< |
<mkdir dir="${build.reports.dir}"/> |
464 |
< |
|
465 |
< |
<junit printsummary="true" |
466 |
< |
showoutput="true" |
467 |
< |
errorProperty="junit.failed" |
468 |
< |
failureProperty="junit.failed" |
469 |
< |
dir="${build.reports.dir}" |
470 |
< |
jvm="${java8}" |
471 |
< |
fork="true"> |
472 |
< |
|
473 |
< |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
474 |
< |
<jvmarg value="-server"/> |
475 |
< |
<jvmarg value="-showversion"/> |
476 |
< |
|
477 |
< |
<classpath refid="test.classpath"/> |
478 |
< |
|
479 |
< |
<formatter type="xml"/> |
480 |
< |
|
481 |
< |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
482 |
< |
<fileset dir="${tck.src.dir}"> |
483 |
< |
<include name="**/${testcase}Test.java"/> |
484 |
< |
</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 |
< |
--> |
412 |
< |
|
413 |
< |
</junit> |
414 |
< |
|
457 |
> |
<run-tck-tests |
458 |
> |
target="${build.main.java.version}" |
459 |
> |
workdir="${build.dir}" |
460 |
> |
classes="${product.jar}"/> |
461 |
> |
</target> |
462 |
> |
|
463 |
> |
<target name="test-tck-parallelism-1" |
464 |
> |
description="Runs test-tck with given common pool parallelism"> |
465 |
> |
<antcall target="test-tck"> |
466 |
> |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
467 |
> |
</antcall> |
468 |
> |
</target> |
469 |
> |
|
470 |
> |
<target name="test-tck-parallelism-0" |
471 |
> |
description="Runs test-tck with given common pool parallelism"> |
472 |
> |
<antcall target="test-tck"> |
473 |
> |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
474 |
> |
</antcall> |
475 |
> |
</target> |
476 |
> |
|
477 |
> |
<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/> |
478 |
> |
<target name="test-jtreg" |
479 |
> |
depends="jar" |
480 |
> |
description="Runs jtreg tests for main using the jtreg ant task"> |
481 |
> |
<run-jtreg-tests |
482 |
> |
target="${build.main.java.version}" |
483 |
> |
workdir="${build.dir}" |
484 |
> |
classes="${product.jar}"/> |
485 |
|
</target> |
486 |
|
|
487 |
+ |
<target name="test" |
488 |
+ |
depends="test-tck, test-tck-parallelism-1, test-jtreg" |
489 |
+ |
description="Runs tck and jtreg tests for main"> |
490 |
+ |
</target> |
491 |
|
|
492 |
< |
<target name="report-tests" |
493 |
< |
depends="run-tests"> |
420 |
< |
|
421 |
< |
<!-- Sets junit.report.format to frames if redirection is present, |
422 |
< |
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> |
492 |
> |
<target name="test89" |
493 |
> |
description="Runs tck and jtreg tests for main for multiple java versions"> |
494 |
|
|
495 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
495 |
> |
<antcall target="clean"/> |
496 |
> |
<antcall target="test"> |
497 |
> |
<param name="build.main.java.version" value="8"/> |
498 |
> |
<param name="build.main.javac" value="${javac8}"/> |
499 |
> |
<param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/> |
500 |
> |
</antcall> |
501 |
> |
|
502 |
> |
<antcall target="clean"/> |
503 |
> |
<antcall target="test"> |
504 |
> |
<param name="build.main.java.version" value="9"/> |
505 |
> |
<param name="build.main.javac" value="${javac9}"/> |
506 |
> |
</antcall> |
507 |
|
|
508 |
|
</target> |
509 |
|
|
510 |
|
|
511 |
+ |
|
512 |
|
<target name="configure-compiler"> |
513 |
|
|
514 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
526 |
|
</target> |
527 |
|
|
528 |
|
|
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 |
– |
|
529 |
|
|
530 |
|
<!-- Various demos and test programs --> |
531 |
|
|
558 |
|
|
559 |
|
<!-- jsr166 4jdk7 --> |
560 |
|
|
514 |
– |
|
561 |
|
<target name="4jdk7compile" |
562 |
|
depends="configure-compiler" |
563 |
|
description="Compiles src/jdk7 sources, targeting jdk7"> |
578 |
|
fork="true"> |
579 |
|
|
580 |
|
<include name="**/*.java"/> |
581 |
< |
<compilerarg line="${build.args}"/> |
581 |
> |
<compilerarg value="-Xprefer:source"/> |
582 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
583 |
|
<compilerarg value="-Xlint:all"/> |
584 |
+ |
<compilerarg value="-Werror"/> |
585 |
+ |
<compilerarg line="${build.args}"/> |
586 |
|
|
587 |
|
</javac> |
588 |
+ |
</target> |
589 |
|
|
590 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
591 |
< |
<fileset dir="${build.4jdk7.classes.dir}"/> |
592 |
< |
</jar> |
590 |
> |
<target name="4jdk7doclint" |
591 |
> |
depends="configure-compiler" |
592 |
> |
description="Finds doclint warnings"> |
593 |
|
|
594 |
< |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
594 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
595 |
|
|
596 |
< |
<javac srcdir="${tck.src.dir}" |
597 |
< |
destdir="${build.4jdk7.tck.classes.dir}" |
596 |
> |
<javac srcdir="${4jdk7src.dir}" |
597 |
> |
destdir="${build.4jdk7.classes.dir}" |
598 |
|
debug="${build.debug}" |
599 |
|
debuglevel="${build.debuglevel}" |
600 |
|
deprecation="${build.deprecation}" |
601 |
|
source="6" |
602 |
< |
classpath="${junit.jar}" |
603 |
< |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
602 |
> |
classpath="" |
603 |
> |
bootclasspath="${bootclasspath7}" |
604 |
|
includeAntRuntime="false" |
605 |
|
includeJavaRuntime="false" |
606 |
< |
executable="${javac7}" |
606 |
> |
executable="${javac8}" |
607 |
|
fork="true"> |
608 |
|
|
609 |
|
<include name="**/*.java"/> |
610 |
< |
<compilerarg line="${build.args}"/> |
610 |
> |
<compilerarg value="-Xprefer:source"/> |
611 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
612 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
612 |
> |
<compilerarg value="-Xlint:all"/> |
613 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
614 |
> |
<compilerarg line="${build.args}"/> |
615 |
|
|
616 |
|
</javac> |
617 |
+ |
</target> |
618 |
+ |
|
619 |
+ |
|
620 |
+ |
<target name="4jdk7jar" |
621 |
+ |
depends="4jdk7compile" |
622 |
+ |
description="Builds library jar from compiled sources"> |
623 |
+ |
|
624 |
+ |
<jar destfile="${4jdk7product.jar}"> |
625 |
+ |
<fileset dir="${build.4jdk7.classes.dir}"/> |
626 |
+ |
</jar> |
627 |
|
|
628 |
|
</target> |
629 |
|
|
630 |
|
|
631 |
|
<target name="4jdk7-test-tck" |
632 |
< |
depends="4jdk7compile" |
632 |
> |
depends="4jdk7jar" |
633 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
634 |
+ |
|
635 |
|
<run-tck-tests |
636 |
< |
jvm="${java7}" |
637 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
638 |
< |
product.jar="${4jdk7product.jar}"/> |
636 |
> |
target="7" |
637 |
> |
workdir="${build.4jdk7.dir}" |
638 |
> |
classes="${4jdk7product.jar}"> |
639 |
> |
<javac-elements> |
640 |
> |
<!-- JDK8+ test classes --> |
641 |
> |
<exclude name="*8Test.java"/> |
642 |
> |
<exclude name="*9Test.java"/> |
643 |
> |
<exclude name="DoubleAccumulatorTest.java"/> |
644 |
> |
<exclude name="DoubleAdderTest.java"/> |
645 |
> |
<exclude name="LongAccumulatorTest.java"/> |
646 |
> |
<exclude name="LongAdderTest.java"/> |
647 |
> |
<exclude name="CompletableFutureTest.java"/> |
648 |
> |
<exclude name="SplittableRandomTest.java"/> |
649 |
> |
<exclude name="StampedLockTest.java"/> |
650 |
> |
</javac-elements> |
651 |
> |
</run-tck-tests> |
652 |
|
</target> |
653 |
|
|
654 |
|
|
674 |
|
|
675 |
|
<formatter type="brief"/> |
676 |
|
|
677 |
< |
<test name="JSR166TestCase" haltonfailure="no"> |
677 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
678 |
|
</test> |
679 |
|
|
680 |
|
</junit> |
681 |
|
</target> |
682 |
|
|
683 |
+ |
<target name="4jdk7-test-jtreg" |
684 |
+ |
depends="4jdk7jar" |
685 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
686 |
+ |
<run-jtreg-tests |
687 |
+ |
target="7" |
688 |
+ |
workdir="${build.4jdk7.dir}" |
689 |
+ |
classes="${4jdk7product.jar}"/> |
690 |
+ |
</target> |
691 |
+ |
|
692 |
+ |
|
693 |
+ |
<target name="4jdk7-test" |
694 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
695 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
696 |
+ |
</target> |
697 |
+ |
|
698 |
|
|
699 |
|
<target name="4jdk7docs" |
700 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
701 |
|
|
702 |
< |
<delete dir="${dist.4jdk7.docs.dir}"/> |
703 |
< |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
702 |
> |
<delete dir="${4jdk7docs.dir}"/> |
703 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
704 |
|
|
705 |
< |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
705 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
706 |
|
packagenames="none" |
707 |
< |
link="${jdkapi7docs.url}" |
707 |
> |
link="${java7.api.url}" |
708 |
|
overview="${4jdk7src.dir}/intro.html" |
709 |
+ |
access="${build.javadoc.access}" |
710 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
711 |
|
classpath="" |
712 |
|
executable="${javadoc7}"> |
622 |
– |
<arg value="-XDignore.symbol.file=true"/> |
713 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
714 |
|
<include name="**/*.java"/> |
715 |
|
</fileset> |
716 |
+ |
<arg line="-Xdocrootparent ${java7.docroot.url}"/> |
717 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
718 |
|
</javadoc> |
627 |
– |
|
719 |
|
</target> |
720 |
|
|
721 |
|
|
722 |
|
<target name="4jdk7dist" |
723 |
< |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
723 |
> |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
724 |
|
description="Puts all distributable products in single hierarchy"/> |
725 |
|
|
726 |
|
|
636 |
– |
|
727 |
|
<target name="4jdk7clean" |
728 |
|
description="Removes all 4jdk7 build products"> |
729 |
|
|
732 |
|
</target> |
733 |
|
|
734 |
|
|
645 |
– |
|
646 |
– |
<target name="4jdk7dist-clean" |
647 |
– |
description="Removes all build and distribution products"> |
648 |
– |
|
649 |
– |
</target> |
650 |
– |
|
735 |
|
<target name="4jdk7dist-jar" |
736 |
< |
depends="4jdk7clean, 4jdk7compile"> |
653 |
< |
|
736 |
> |
depends="4jdk7clean, 4jdk7jar"> |
737 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
738 |
+ |
</target> |
739 |
|
|
740 |
+ |
|
741 |
+ |
<target name="4jdk7dist-docs" |
742 |
+ |
depends="4jdk7clean, 4jdk7docs"> |
743 |
+ |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
744 |
|
</target> |
745 |
|
|
746 |
|
|
750 |
|
depends="configure-compiler" |
751 |
|
description="Compiles jsr166x sources to build dir"> |
752 |
|
|
753 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
753 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
754 |
|
|
755 |
|
<javac srcdir="${topsrc.dir}" |
756 |
< |
destdir="${build.jsr166x.dir}" |
756 |
> |
destdir="${build.jsr166x.classes.dir}" |
757 |
|
debug="${build.debug}" |
758 |
|
debuglevel="${build.debuglevel}" |
759 |
|
deprecation="${build.deprecation}" |
760 |
|
classpath="" |
673 |
– |
source="5" |
761 |
|
bootclasspath="${bootclasspath6}" |
762 |
+ |
source="5" |
763 |
|
includeAntRuntime="false" |
764 |
|
includeJavaRuntime="false" |
765 |
|
executable="${javac7}" |
766 |
|
fork="true"> |
767 |
|
|
768 |
|
<include name="jsr166x/**/*.java"/> |
681 |
– |
<compilerarg line="${build.args}"/> |
769 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
770 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
771 |
+ |
<compilerarg value="-Werror"/> |
772 |
+ |
<compilerarg line="${build.args}"/> |
773 |
|
|
774 |
|
</javac> |
686 |
– |
|
775 |
|
</target> |
776 |
|
|
777 |
|
|
690 |
– |
|
778 |
|
<target name="jsr166xjar" |
779 |
|
depends="jsr166xcompile" |
780 |
|
description="Builds library jar from compiled sources"> |
781 |
|
|
782 |
|
<jar destfile="${jsr166x.jar}"> |
783 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
783 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
784 |
|
</jar> |
785 |
|
|
786 |
|
</target> |
787 |
|
|
788 |
|
|
702 |
– |
|
789 |
|
<target name="jsr166xdocs" |
790 |
|
description="Builds javadocs to dist dir"> |
791 |
|
|
792 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
793 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
792 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
793 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
794 |
|
|
795 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
795 |
> |
<javadoc destdir="${jsr166xdocs.dir}" |
796 |
|
packagenames="jsr166x.*" |
797 |
< |
link="${jdkapidocs.url}" |
798 |
< |
source="5" |
713 |
< |
bootclasspath="${bootclasspath6}" |
797 |
> |
link="${java.api.url}" |
798 |
> |
access="${build.javadoc.access}" |
799 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
800 |
< |
executable="${javadoc7}" |
801 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
800 |
> |
bootclasspath="${bootclasspath6}" |
801 |
> |
source="5" |
802 |
> |
executable="${javadoc7}"> |
803 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
804 |
> |
<arg value="-XDignore.symbol.file=true"/> |
805 |
|
|
806 |
+ |
</javadoc> |
807 |
|
</target> |
808 |
|
|
809 |
|
|
810 |
|
<target name="jsr166xdist" |
811 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
811 |
> |
depends="jsr166xdist-jar, jsr166xdist-docs" |
812 |
|
description="Puts all distributable products in single hierarchy"/> |
813 |
|
|
814 |
|
|
726 |
– |
|
815 |
|
<target name="jsr166xclean" |
816 |
|
description="Removes all jsr166x build products"> |
817 |
|
|
820 |
|
</target> |
821 |
|
|
822 |
|
|
735 |
– |
|
736 |
– |
<target name="jsr166xdist-clean" |
737 |
– |
description="Removes all build and distribution products"> |
738 |
– |
|
739 |
– |
</target> |
740 |
– |
|
741 |
– |
|
823 |
|
<target name="jsr166xdist-jar" |
824 |
|
depends="jsr166xclean, jsr166xjar"> |
744 |
– |
|
825 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
826 |
+ |
</target> |
827 |
|
|
828 |
+ |
<target name="jsr166xdist-docs" |
829 |
+ |
depends="jsr166xclean, jsr166xdocs"> |
830 |
+ |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
831 |
|
</target> |
832 |
|
|
833 |
|
<!-- jsr166y --> |
837 |
|
depends="configure-compiler" |
838 |
|
description="Compiles jsr166y sources"> |
839 |
|
|
840 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
840 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
841 |
|
|
842 |
|
<javac srcdir="${topsrc.dir}" |
843 |
< |
destdir="${build.jsr166y.dir}" |
843 |
> |
destdir="${build.jsr166y.classes.dir}" |
844 |
|
debug="${build.debug}" |
845 |
|
debuglevel="${build.debuglevel}" |
846 |
|
deprecation="${build.deprecation}" |
853 |
|
fork="true"> |
854 |
|
|
855 |
|
<include name="jsr166y/**/*.java"/> |
772 |
– |
<compilerarg line="${build.args}"/> |
856 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
857 |
|
<compilerarg value="-Xlint:all"/> |
858 |
+ |
<compilerarg value="-Werror"/> |
859 |
+ |
<compilerarg line="${build.args}"/> |
860 |
+ |
|
861 |
|
</javac> |
862 |
|
</target> |
863 |
|
|
867 |
|
description="Builds library jar from compiled sources"> |
868 |
|
|
869 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
870 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
870 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
871 |
|
</jar> |
872 |
|
|
873 |
|
</target> |
874 |
|
|
875 |
|
|
790 |
– |
|
876 |
|
<target name="jsr166ydocs" |
877 |
|
description="Builds javadocs to dist dir"> |
878 |
|
|
879 |
< |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
880 |
< |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
879 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
880 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
881 |
|
|
882 |
< |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
882 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
883 |
|
packagenames="jsr166y.*" |
884 |
< |
link="${jdkapidocs.url}" |
885 |
< |
source="6" |
801 |
< |
bootclasspath="${bootclasspath6}" |
884 |
> |
link="${java.api.url}" |
885 |
> |
access="${build.javadoc.access}" |
886 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
887 |
< |
executable="${javadoc7}" |
888 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
887 |
> |
bootclasspath="${bootclasspath6}" |
888 |
> |
source="6" |
889 |
> |
executable="${javadoc7}"> |
890 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
891 |
> |
<arg value="-XDignore.symbol.file=true"/> |
892 |
|
|
893 |
+ |
</javadoc> |
894 |
|
</target> |
895 |
|
|
896 |
|
|
897 |
|
<target name="jsr166ydist" |
898 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
898 |
> |
depends="jsr166ydist-jar, jsr166ydist-docs" |
899 |
|
description="Puts all distributable products in single hierarchy"/> |
900 |
|
|
901 |
|
|
814 |
– |
|
902 |
|
<target name="jsr166yclean" |
903 |
|
description="Removes all jsr166y build products"> |
904 |
|
|
907 |
|
</target> |
908 |
|
|
909 |
|
|
823 |
– |
|
824 |
– |
<target name="jsr166ydist-clean" |
825 |
– |
description="Removes all build and distribution products"> |
826 |
– |
|
827 |
– |
</target> |
828 |
– |
|
910 |
|
<target name="jsr166ydist-jar" |
911 |
|
depends="jsr166yclean, jsr166yjar"> |
831 |
– |
|
912 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
913 |
+ |
</target> |
914 |
|
|
915 |
+ |
<target name="jsr166ydist-docs" |
916 |
+ |
depends="jsr166yclean, jsr166ydocs"> |
917 |
+ |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
918 |
|
</target> |
919 |
|
|
920 |
|
|
925 |
|
depends="configure-compiler, jsr166yjar" |
926 |
|
description="Compiles extra166y sources"> |
927 |
|
|
928 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
928 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
929 |
|
|
930 |
|
<javac srcdir="${topsrc.dir}" |
931 |
< |
destdir="${build.extra166y.dir}" |
931 |
> |
destdir="${build.extra166y.classes.dir}" |
932 |
|
debug="${build.debug}" |
933 |
|
debuglevel="${build.debuglevel}" |
934 |
|
deprecation="${build.deprecation}" |
935 |
+ |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
936 |
|
classpath="" |
937 |
|
source="6" |
853 |
– |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
938 |
|
includeAntRuntime="false" |
939 |
|
includeJavaRuntime="false" |
940 |
|
executable="${javac7}" |
941 |
|
fork="true"> |
942 |
|
|
943 |
|
<include name="extra166y/**/*.java"/> |
860 |
– |
<compilerarg line="${build.args}"/> |
944 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
945 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
946 |
+ |
<compilerarg value="-Werror"/> |
947 |
+ |
<compilerarg line="${build.args}"/> |
948 |
|
|
949 |
|
</javac> |
865 |
– |
|
950 |
|
</target> |
951 |
|
|
952 |
|
|
869 |
– |
|
953 |
|
<target name="extra166yjar" |
954 |
|
depends="extra166ycompile" |
955 |
|
description="Builds library jar from compiled sources"> |
956 |
|
|
957 |
|
<jar destfile="${extra166y.jar}" index="true"> |
958 |
< |
<fileset dir="${build.extra166y.dir}"/> |
958 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
959 |
|
</jar> |
960 |
|
|
961 |
|
</target> |
962 |
|
|
963 |
|
|
881 |
– |
|
964 |
|
<target name="extra166ydocs" |
965 |
|
description="Builds javadocs to build dir"> |
966 |
|
|
967 |
< |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
968 |
< |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
967 |
> |
<delete dir="${extra166ydocs.dir}"/> |
968 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
969 |
|
|
970 |
< |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
970 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
971 |
|
packagenames="extra166y.*" |
972 |
< |
link="${jdkapidocs.url}" |
973 |
< |
source="6" |
892 |
< |
bootclasspath="${bootclasspath6}" |
972 |
> |
link="${java.api.url}" |
973 |
> |
access="${build.javadoc.access}" |
974 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
975 |
< |
executable="${javadoc7}" |
976 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
975 |
> |
bootclasspath="${bootclasspath6}" |
976 |
> |
source="6" |
977 |
> |
executable="${javadoc7}"> |
978 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
979 |
> |
<arg value="-XDignore.symbol.file=true"/> |
980 |
|
|
981 |
+ |
</javadoc> |
982 |
|
</target> |
983 |
|
|
984 |
|
|
985 |
|
<target name="extra166ydist" |
986 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
986 |
> |
depends="extra166ydist-jar, extra166ydist-docs" |
987 |
|
description="Puts all distributable products in single hierarchy"/> |
988 |
|
|
989 |
|
|
905 |
– |
|
990 |
|
<target name="extra166yclean" |
991 |
|
description="Removes all extra166y build products"> |
992 |
|
|
995 |
|
</target> |
996 |
|
|
997 |
|
|
914 |
– |
|
915 |
– |
<target name="extra166ydist-clean" |
916 |
– |
description="Removes all build and distribution products"> |
917 |
– |
|
918 |
– |
</target> |
919 |
– |
|
998 |
|
<target name="extra166ydist-jar" |
999 |
|
depends="extra166yclean, extra166yjar"> |
922 |
– |
|
1000 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1001 |
+ |
</target> |
1002 |
|
|
1003 |
+ |
<target name="extra166ydist-docs" |
1004 |
+ |
depends="extra166yclean, extra166ydocs"> |
1005 |
+ |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1006 |
|
</target> |
1007 |
|
|
1008 |
|
<!-- jsr166e --> |
1009 |
|
|
1010 |
+ |
<property name="build.jsr166e.java.version" value="6"/> |
1011 |
+ |
<property name="build.jsr166e.javac" value="${javac6}"/> |
1012 |
+ |
|
1013 |
|
<target name="jsr166ecompile" |
1014 |
|
depends="configure-compiler" |
1015 |
|
description="Compiles jsr166e sources"> |
1016 |
|
|
1017 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
1017 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1018 |
|
|
1019 |
|
<javac srcdir="${topsrc.dir}" |
1020 |
< |
destdir="${build.jsr166e.dir}" |
1020 |
> |
destdir="${build.jsr166e.classes.dir}" |
1021 |
|
debug="${build.debug}" |
1022 |
|
debuglevel="${build.debuglevel}" |
1023 |
|
deprecation="${build.deprecation}" |
1024 |
< |
source="7" |
1024 |
> |
source="${build.jsr166e.java.version}" |
1025 |
|
classpath="" |
1026 |
|
includeAntRuntime="false" |
1027 |
|
includeJavaRuntime="false" |
1028 |
< |
executable="${javac7}" |
1028 |
> |
executable="${build.jsr166e.javac}" |
1029 |
|
fork="true"> |
1030 |
|
|
1031 |
|
<include name="jsr166e/**/*.java"/> |
948 |
– |
<compilerarg line="${build.args}"/> |
1032 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1033 |
|
<compilerarg value="-Xlint:all"/> |
1034 |
+ |
<compilerarg value="-Werror"/> |
1035 |
+ |
<compilerarg line="${build.args}"/> |
1036 |
|
|
1037 |
|
</javac> |
953 |
– |
|
1038 |
|
</target> |
1039 |
|
|
1040 |
+ |
<!-- jsr166e: find doclint errors --> |
1041 |
+ |
<target name="jsr166edoclint"> |
1042 |
+ |
|
1043 |
+ |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1044 |
+ |
|
1045 |
+ |
<javac srcdir="${topsrc.dir}" |
1046 |
+ |
destdir="${build.jsr166e.classes.dir}" |
1047 |
+ |
debug="${build.debug}" |
1048 |
+ |
debuglevel="${build.debuglevel}" |
1049 |
+ |
deprecation="${build.deprecation}" |
1050 |
+ |
source="${build.jsr166e.java.version}" |
1051 |
+ |
classpath="" |
1052 |
+ |
bootclasspath="${bootclasspath7}" |
1053 |
+ |
includeAntRuntime="false" |
1054 |
+ |
includeJavaRuntime="false" |
1055 |
+ |
executable="${javac8}" |
1056 |
+ |
fork="true"> |
1057 |
+ |
|
1058 |
+ |
<include name="jsr166e/**/*.java"/> |
1059 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1060 |
+ |
<compilerarg value="-Xlint:all"/> |
1061 |
+ |
<compilerarg value="-Werror"/> |
1062 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
1063 |
+ |
|
1064 |
+ |
</javac> |
1065 |
+ |
</target> |
1066 |
|
|
1067 |
|
|
1068 |
|
<target name="jsr166ejar" |
1070 |
|
description="Builds library jar from compiled sources"> |
1071 |
|
|
1072 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1073 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
1073 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
1074 |
|
</jar> |
1075 |
|
|
1076 |
|
</target> |
1077 |
|
|
1078 |
|
|
969 |
– |
|
1079 |
|
<target name="jsr166edocs" |
1080 |
|
description="Builds javadocs to build dir"> |
1081 |
|
|
1082 |
< |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1083 |
< |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1082 |
> |
<delete dir="${jsr166edocs.dir}"/> |
1083 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
1084 |
|
|
1085 |
< |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1085 |
> |
<javadoc destdir="${jsr166edocs.dir}" |
1086 |
|
packagenames="jsr166e.*" |
1087 |
< |
link="${jdkapidocs.url}" |
1088 |
< |
source="7" |
1089 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1090 |
< |
executable="${javadoc7}" |
1091 |
< |
additionalparam="-XDignore.symbol.file=true" > |
1087 |
> |
link="${java.api.url}" |
1088 |
> |
access="${build.javadoc.access}" |
1089 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1090 |
> |
source="${build.jsr166e.java.version}" |
1091 |
> |
executable="${javadoc7}"> |
1092 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1093 |
> |
<arg value="-XDignore.symbol.file=true"/> |
1094 |
> |
|
1095 |
|
</javadoc> |
1096 |
+ |
</target> |
1097 |
+ |
|
1098 |
|
|
1099 |
+ |
<target name="jsr166e-test-tck-one-java-version" |
1100 |
+ |
depends="jsr166ejar"> |
1101 |
+ |
|
1102 |
+ |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1103 |
+ |
|
1104 |
+ |
<run-tck-tests |
1105 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1106 |
+ |
target="${build.jsr166e.java.version}" |
1107 |
+ |
workdir="${build.jsr166e.dir}" |
1108 |
+ |
classes="${jsr166e.jar}"/> |
1109 |
+ |
</target> |
1110 |
+ |
|
1111 |
+ |
<target name="jsr166e-test-tck" |
1112 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
1113 |
+ |
|
1114 |
+ |
<!-- <antcall target="clean"/> --> |
1115 |
+ |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
1116 |
+ |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
1117 |
+ |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
1118 |
+ |
<!-- </antcall> --> |
1119 |
+ |
|
1120 |
+ |
<antcall target="clean"/> |
1121 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
1122 |
+ |
<param name="build.jsr166e.java.version" value="7"/> |
1123 |
+ |
<param name="build.jsr166e.javac" value="${javac7}"/> |
1124 |
+ |
</antcall> |
1125 |
+ |
|
1126 |
+ |
<antcall target="clean"/> |
1127 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
1128 |
+ |
<param name="build.jsr166e.java.version" value="6"/> |
1129 |
+ |
<param name="build.jsr166e.javac" value="${javac6}"/> |
1130 |
+ |
</antcall> |
1131 |
|
</target> |
1132 |
|
|
1133 |
|
|
1134 |
+ |
<target name="jsr166e-test" |
1135 |
+ |
depends="jsr166e-test-tck" |
1136 |
+ |
description="Runs all tests for jsr166e"> |
1137 |
+ |
</target> |
1138 |
+ |
|
1139 |
|
<target name="jsr166edist" |
1140 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
1140 |
> |
depends="jsr166edist-jar, jsr166edist-docs" |
1141 |
|
description="Puts all distributable products in single hierarchy"/> |
1142 |
|
|
1143 |
|
|
993 |
– |
|
1144 |
|
<target name="jsr166eclean" |
1145 |
|
description="Removes all jsr166e build products"> |
996 |
– |
|
1146 |
|
<delete dir="${build.jsr166e.dir}"/> |
998 |
– |
|
1147 |
|
</target> |
1148 |
|
|
1149 |
|
|
1150 |
< |
<target name="jsr166edist-clean" |
1151 |
< |
description="Removes all build and distribution products"> |
1150 |
> |
<target name="jsr166edist-jar" |
1151 |
> |
depends="jsr166eclean, jsr166ejar"> |
1152 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1153 |
> |
</target> |
1154 |
|
|
1155 |
+ |
<target name="jsr166edist-docs" |
1156 |
+ |
depends="jsr166eclean, jsr166edocs"> |
1157 |
+ |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1158 |
|
</target> |
1159 |
|
|
1007 |
– |
<target name="jsr166edist-jar" |
1008 |
– |
depends="jsr166eclean, jsr166ejar"> |
1160 |
|
|
1161 |
< |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1161 |
> |
<!-- Find buglets that can be detected by static build tools --> |
1162 |
> |
|
1163 |
> |
<target name="lint"> |
1164 |
> |
<antcall target="dists"> |
1165 |
> |
<param name="build.javadoc.access" value="public"/> |
1166 |
> |
</antcall> |
1167 |
> |
</target> |
1168 |
|
|
1169 |
+ |
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1170 |
+ |
<target name="lint-private"> |
1171 |
+ |
<antcall target="dist"> |
1172 |
+ |
<param name="build.javadoc.access" value="private"/> |
1173 |
+ |
</antcall> |
1174 |
|
</target> |
1175 |
|
|
1176 |
+ |
|
1177 |
|
</project> |