8 |
|
|
9 |
|
User-specific settings are read from user.properties. |
10 |
|
See user.properties.sample for an explanation of some useful settings. |
11 |
+ |
|
12 |
+ |
The repository contains all dependencies except for ant and the JDK |
13 |
+ |
itself. Because the JDK version matters and because different |
14 |
+ |
targets require different JDKs, we assume that users have created a |
15 |
+ |
hierarchy containing: |
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.5"/> |
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.j1.dir" location="${build.dir}/j1"/> |
69 |
< |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
70 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
71 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
72 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
73 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
74 |
< |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
75 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
76 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
77 |
< |
<property name="build.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
78 |
< |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
79 |
< |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
80 |
< |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
81 |
< |
|
82 |
< |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
83 |
< |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
84 |
< |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
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"/> |
69 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
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"/> |
74 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
75 |
> |
|
76 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
77 |
> |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
78 |
> |
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
79 |
> |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
80 |
> |
|
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"> |
90 |
> |
<attribute name="v"/> |
91 |
> |
<sequential> |
92 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
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"/> |
96 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
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 |
> |
<macrodef name="mirror-dir"> |
111 |
> |
<attribute name="src"/> |
112 |
> |
<attribute name="dst"/> |
113 |
> |
<sequential> |
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"/> |
54 |
– |
<property name="j1.src.dir" location="${basedir}/src/javaone"/> |
130 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
131 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
132 |
|
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
58 |
– |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
59 |
– |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
133 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
134 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
135 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
136 |
< |
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
137 |
< |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
138 |
< |
|
139 |
< |
<!-- Distribution locations --> |
140 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
141 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
142 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
136 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
137 |
> |
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
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"/> |
141 |
> |
|
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="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
160 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
161 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
162 |
< |
<property name="concurrent.jar" location="${lib.dir}/concurrent.jar"/> |
163 |
< |
|
164 |
< |
<!-- Bootclasspath argument --> |
165 |
< |
<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="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 |
+ |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
217 |
+ |
includeAntRuntime="false" |
218 |
+ |
includeJavaRuntime="false" |
219 |
+ |
executable="${javac@{compile-target}}" |
220 |
+ |
fork="true"> |
221 |
+ |
|
222 |
+ |
<include name="*.java"/> |
223 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
224 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
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 |
+ |
<macrodef name="run-jtreg-tests"> |
255 |
+ |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
256 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
257 |
+ |
<attribute name="source" default="7"/> |
258 |
+ |
<attribute name="target"/> |
259 |
+ |
<attribute name="workdir"/> |
260 |
+ |
<attribute name="classes"/> |
261 |
+ |
<attribute name="jtregflags" default=""/> |
262 |
+ |
<sequential> |
263 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
264 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
265 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
266 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
267 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
268 |
+ |
jdk="${jdk@{target}.home}" |
269 |
+ |
workDir="@{workdir}/JTwork" |
270 |
+ |
reportDir="@{workdir}/JTreport"> |
271 |
+ |
|
272 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
273 |
+ |
<arg value="-agentvm"/> |
274 |
+ |
<arg value="-v:nopass,fail"/> |
275 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
276 |
+ |
<arg value="-automatic"/> |
277 |
+ |
<arg value="-k:!ignore"/> |
278 |
+ |
<arg line="@{jtregflags}"/> |
279 |
+ |
</jtreg> |
280 |
+ |
</sequential> |
281 |
+ |
</macrodef> |
282 |
+ |
|
283 |
|
<!-- ALoops classpath --> |
284 |
|
<path id="loops.classpath"> |
285 |
|
<pathelement location="${build.loops.dir}"/> |
286 |
|
</path> |
287 |
|
|
288 |
< |
<!-- J1 classpath --> |
289 |
< |
<path id="j1.classpath"> |
290 |
< |
<pathelement location="${build.classes.dir}"/> |
95 |
< |
<pathelement location="${build.j1.dir}"/> |
96 |
< |
<pathelement location="${junit.jar}"/> |
97 |
< |
|
98 |
< |
<!-- Include dl.u.c for BoundedBuffer comparison --> |
99 |
< |
<pathelement location="${concurrent.jar}"/> |
100 |
< |
</path> |
101 |
< |
|
288 |
> |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
289 |
> |
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
290 |
> |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
291 |
|
|
292 |
|
<!-- Main targets --> |
293 |
|
|
294 |
+ |
<property name="build.main.java.version" value="9"/> |
295 |
+ |
<property name="build.main.javac" value="${javac9}"/> |
296 |
+ |
|
297 |
+ |
<target name="dists" |
298 |
+ |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
299 |
+ |
description="Builds all public jars and docs"/> |
300 |
|
|
301 |
|
<target name="compile" |
302 |
< |
depends="init, configure-compiler" |
303 |
< |
description="Compiles main sources to build folder"> |
302 |
> |
depends="configure-compiler" |
303 |
> |
description="Compiles src/main sources to build dir"> |
304 |
|
|
305 |
|
<mkdir dir="${build.classes.dir}"/> |
306 |
|
|
307 |
|
<javac srcdir="${src.dir}" |
308 |
< |
destdir="${build.classes.dir}" |
309 |
< |
debug="${build.debug}" |
310 |
< |
debuglevel="${build.debuglevel}" |
311 |
< |
deprecation="${build.deprecation}" |
312 |
< |
source="${build.sourcelevel}" |
313 |
< |
fork="true"> |
308 |
> |
destdir="${build.classes.dir}" |
309 |
> |
debug="${build.debug}" |
310 |
> |
debuglevel="${build.debuglevel}" |
311 |
> |
deprecation="${build.deprecation}" |
312 |
> |
classpath="" |
313 |
> |
includeAntRuntime="false" |
314 |
> |
includeJavaRuntime="false" |
315 |
> |
executable="${build.main.javac}" |
316 |
> |
fork="true"> |
317 |
|
|
318 |
|
<include name="**/*.java"/> |
319 |
< |
<compilerarg value="-XDignore.symbol.file"/> |
320 |
< |
|
321 |
< |
<!-- |
322 |
< |
<exclude name="java/lang/**"/> |
319 |
> |
<compilerarg value="-Xprefer:source"/> |
320 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
321 |
> |
<compilerarg value="-Xlint:all"/> |
322 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
323 |
> |
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
324 |
|
<compilerarg line="${build.args}"/> |
126 |
– |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
127 |
– |
--> |
325 |
|
|
326 |
|
</javac> |
130 |
– |
|
327 |
|
</target> |
328 |
|
|
329 |
|
|
134 |
– |
|
330 |
|
<target name="jar" |
331 |
|
depends="compile" |
332 |
|
description="Builds library jar from compiled sources"> |
333 |
|
|
139 |
– |
<mkdir dir="${build.lib.dir}"/> |
140 |
– |
|
334 |
|
<jar destfile="${product.jar}"> |
335 |
|
<fileset dir="${build.classes.dir}"/> |
336 |
|
</jar> |
144 |
– |
|
337 |
|
</target> |
338 |
|
|
339 |
|
|
148 |
– |
|
149 |
– |
<target name="test" |
150 |
– |
depends="init, configure-tests, report-tests" |
151 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
152 |
– |
|
153 |
– |
|
154 |
– |
|
340 |
|
<target name="docs" |
341 |
< |
description="Builds javadocs with custom tags to build folder"> |
341 |
> |
description="Builds javadocs for src/main to dist dir"> |
342 |
|
|
343 |
< |
<delete dir="${build.javadocs.dir}"/> |
344 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
343 |
> |
<delete dir="${docs.dir}"/> |
344 |
> |
<mkdir dir="${docs.dir}"/> |
345 |
|
|
346 |
< |
<javadoc destdir="${build.javadocs.dir}" |
347 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
163 |
< |
overview="${src.dir}/intro.html" |
164 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
165 |
< |
> |
346 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
347 |
> |
<!-- sourcepath for packages --> |
348 |
|
|
349 |
< |
<packageset dir="${src.dir}"/> |
350 |
< |
|
351 |
< |
</javadoc> |
352 |
< |
|
353 |
< |
</target> |
354 |
< |
|
355 |
< |
|
356 |
< |
|
357 |
< |
<target name="doccheck" |
358 |
< |
depends="filter-doccheck" |
359 |
< |
description="Reports on javadoc style errors"> |
360 |
< |
|
361 |
< |
<delete dir="${build.doccheck.dir}"/> |
362 |
< |
<mkdir dir="${build.doccheck.dir}"/> |
363 |
< |
|
364 |
< |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
365 |
< |
docletpath="${lib.dir}/doccheck.jar" |
366 |
< |
destdir="${build.doccheck.dir}"> |
367 |
< |
<packageset dir="${build.dc-filter.dir}"/> |
349 |
> |
<javadoc destdir="${docs.dir}" |
350 |
> |
packagenames="none" |
351 |
> |
link="${java9.api.url}" |
352 |
> |
overview="${src.dir}/intro.html" |
353 |
> |
access="${build.javadoc.access}" |
354 |
> |
sourcepath="${src.dir}:${jdk9src.dir}" |
355 |
> |
classpath="" |
356 |
> |
executable="${javadoc9}"> |
357 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
358 |
> |
<include name="**/*.java"/> |
359 |
> |
</fileset> |
360 |
> |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
361 |
> |
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
362 |
> |
<arg value="-XDignore.symbol.file=true"/> |
363 |
> |
<arg value="-tag"/> |
364 |
> |
<arg value="${javadoc.jls.option}"/> |
365 |
> |
<arg value="-tag"/> |
366 |
> |
<arg value="apiNote:a:<em>API Note:</em>"/> |
367 |
> |
<arg value="-tag"/> |
368 |
> |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
369 |
> |
<arg value="-tag"/> |
370 |
> |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
371 |
|
</javadoc> |
187 |
– |
|
188 |
– |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
189 |
– |
|
372 |
|
</target> |
373 |
|
|
374 |
|
|
193 |
– |
|
194 |
– |
<target name="checkstyle" |
195 |
– |
depends="filter-src" |
196 |
– |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
197 |
– |
|
198 |
– |
<taskdef resource="checkstyletask.properties" |
199 |
– |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
200 |
– |
|
201 |
– |
<mkdir dir="${build.checkstyle.dir}"/> |
202 |
– |
|
203 |
– |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
204 |
– |
failOnViolation="false"> |
205 |
– |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
206 |
– |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
207 |
– |
</checkstyle> |
208 |
– |
|
209 |
– |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
210 |
– |
out="${build.checkstyle.dir}/checkstyle-report.html" |
211 |
– |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
212 |
– |
|
213 |
– |
</target> |
214 |
– |
|
215 |
– |
|
216 |
– |
|
375 |
|
<target name="dist" |
376 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
376 |
> |
depends="dist-clean, dist-jar, dist-docs" |
377 |
|
description="Puts all distributable products in single hierarchy"/> |
378 |
|
|
379 |
|
|
222 |
– |
|
380 |
|
<target name="release" |
381 |
|
depends="dist" |
382 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
392 |
|
<exclude name="**/SyntaxTest.java"/> |
393 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
394 |
|
</jar> |
238 |
– |
|
395 |
|
</target> |
396 |
|
|
397 |
|
|
242 |
– |
|
398 |
|
<target name="clean" |
399 |
|
description="Removes all build products"> |
400 |
|
|
401 |
|
<delete dir="${build.dir}"/> |
247 |
– |
<delete dir="${build.classes.dir}"/> |
248 |
– |
<delete dir="${build.lib.dir}"/> |
402 |
|
|
403 |
|
</target> |
404 |
|
|
405 |
|
|
253 |
– |
|
406 |
|
<target name="dist-clean" |
407 |
|
description="Removes all build and distribution products"> |
408 |
|
|
409 |
+ |
<delete dir="${build.dir}"/> |
410 |
|
<delete dir="${dist.dir}"/> |
411 |
|
|
412 |
|
</target> |
413 |
|
|
414 |
|
|
262 |
– |
|
263 |
– |
<target name="dist-docs" |
264 |
– |
description="Builds javadocs without custom tags to dist folder"> |
265 |
– |
|
266 |
– |
<delete dir="${dist.javadocs.dir}"/> |
267 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
268 |
– |
|
269 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
270 |
– |
link="http://java.sun.com/javase/6/docs/api/" |
271 |
– |
overview="${src.dir}/intro.html" |
272 |
– |
|
273 |
– |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
274 |
– |
> |
275 |
– |
<!-- |
276 |
– |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
277 |
– |
<include name="java/util/concurrent"/> |
278 |
– |
<include name="java/util/concurrent/atomic"/> |
279 |
– |
<include name="java/util/concurrent/locks"/> |
280 |
– |
</packageset> |
281 |
– |
--> |
282 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
283 |
– |
<include name="main/java/util/concurrent/*.java"/> |
284 |
– |
<include name="main/java/util/concurrent/atomic/*.java"/> |
285 |
– |
<include name="main/java/util/concurrent/locks/*.java"/> |
286 |
– |
<include name="main/java/util/*.java"/> |
287 |
– |
<!-- |
288 |
– |
<include name="main/java/util/concurrent/*.html"/> |
289 |
– |
<include name="main/java/util/concurrent/atomic/*.html"/> |
290 |
– |
<include name="main/java/util/concurrent/locks/*.html"/> |
291 |
– |
<include name="main/java/util/*.html"/> |
292 |
– |
--> |
293 |
– |
<!-- <include name="jsr166x/*.java"/> --> |
294 |
– |
</fileset> |
295 |
– |
</javadoc> |
296 |
– |
|
297 |
– |
</target> |
298 |
– |
|
299 |
– |
|
300 |
– |
|
301 |
– |
<!-- Internal targets --> |
302 |
– |
|
303 |
– |
|
304 |
– |
<target name="init"> |
305 |
– |
|
306 |
– |
<!-- Version is kept in a separate file --> |
307 |
– |
<loadfile property="version" srcFile="version.properties"/> |
308 |
– |
<echo>Building JSR-166 version ${version}</echo> |
309 |
– |
<echo>java.home is ${java.home}</echo> |
310 |
– |
|
311 |
– |
</target> |
312 |
– |
|
313 |
– |
|
415 |
|
<target name="dist-jar" |
416 |
|
depends="clean, jar"> |
316 |
– |
|
417 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
318 |
– |
|
418 |
|
</target> |
419 |
|
|
420 |
< |
|
421 |
< |
<target name="compile-ant-filter" |
422 |
< |
depends="init"> |
324 |
< |
|
325 |
< |
<mkdir dir="${build.ant.dir}"/> |
326 |
< |
|
327 |
< |
<javac srcdir="${ant.src.dir}" |
328 |
< |
destdir="${build.ant.dir}" |
329 |
< |
source="1.4"/> |
330 |
< |
|
420 |
> |
<target name="dist-docs" |
421 |
> |
depends="clean, docs"> |
422 |
> |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
423 |
|
</target> |
424 |
|
|
425 |
|
|
426 |
< |
<target name="filter-src" |
427 |
< |
depends="compile-ant-filter"> |
428 |
< |
|
337 |
< |
<mkdir dir="${build.filter.src.dir}"/> |
338 |
< |
|
339 |
< |
<copy todir="${build.filter.src.dir}"> |
340 |
< |
<fileset dir="${src.dir}"> |
341 |
< |
<include name="**/*.html"/> |
342 |
< |
</fileset> |
343 |
< |
</copy> |
344 |
< |
|
345 |
< |
<copy todir="${build.filter.src.dir}"> |
346 |
< |
<fileset dir="${src.dir}"> |
347 |
< |
<exclude name="**/*.html"/> |
348 |
< |
<!-- Files excluded from dist-docs --> |
349 |
< |
<exclude name="java/util/Random.*"/> |
350 |
< |
<exclude name="sun/misc/Unsafe.*"/> |
351 |
< |
</fileset> |
352 |
< |
<!-- |
353 |
< |
<filterchain> |
354 |
< |
--> |
355 |
< |
|
356 |
< |
<!-- |
357 |
< |
# This filter gets rid of angle-bracketed type parameters |
358 |
< |
# so that javadoc can run on the result. The following |
359 |
< |
# heuristic seems to work: |
360 |
< |
# |
361 |
< |
# For all lines not starting with space(s)-asterisk-space(s), |
362 |
< |
# replace <something> with a space, where there may be more |
363 |
< |
# than one right angle bracket at the end, and "something" |
364 |
< |
# must not contain parens or pipes. (This may need some |
365 |
< |
# tweaking.) |
366 |
< |
--> |
367 |
< |
|
368 |
< |
<!-- |
369 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
370 |
< |
classpath="${build.ant.dir}"> |
371 |
< |
<param name="notmatching" value="^\s+\*\s.*$"/> |
372 |
< |
<param name="pattern" value="<[^|>()]+?>+"/> |
373 |
< |
<param name="replacement" value=" "/> |
374 |
< |
</filterreader> |
375 |
< |
--> |
376 |
< |
|
377 |
< |
<!-- |
378 |
< |
</filterchain> |
379 |
< |
--> |
380 |
< |
</copy> |
426 |
> |
<target name="test-tck" |
427 |
> |
depends="jar" |
428 |
> |
description="Runs tck tests for main directly"> |
429 |
|
|
430 |
+ |
<run-tck-tests |
431 |
+ |
target="${build.main.java.version}" |
432 |
+ |
workdir="${build.dir}" |
433 |
+ |
classes="${product.jar}"/> |
434 |
|
</target> |
435 |
|
|
436 |
< |
|
437 |
< |
<target name="filter-doccheck" |
438 |
< |
depends="filter-src"> |
439 |
< |
|
440 |
< |
<mkdir dir="${build.dc-filter.dir}"/> |
389 |
< |
|
390 |
< |
<copy todir="${build.dc-filter.dir}"> |
391 |
< |
<fileset dir="${build.filter.src.dir}"> |
392 |
< |
<include name="**/*.html"/> |
393 |
< |
</fileset> |
394 |
< |
</copy> |
395 |
< |
|
396 |
< |
<property name="generic.declarations" |
397 |
< |
value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}" |
398 |
< |
/> |
399 |
< |
|
400 |
< |
<copy todir="${build.dc-filter.dir}"> |
401 |
< |
<fileset dir="${build.filter.src.dir}"> |
402 |
< |
<exclude name="**/*.html"/> |
403 |
< |
</fileset> |
404 |
< |
<filterchain> |
405 |
< |
<!-- |
406 |
< |
# These two filters try to make the source look like |
407 |
< |
# something that doccheck can process. The first removes |
408 |
< |
# -source 1.4 assertions and the second adds in a bunch |
409 |
< |
# of single letter public nested marker interfaces so that |
410 |
< |
# the generic type parameters are recognized. |
411 |
< |
--> |
412 |
< |
|
413 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
414 |
< |
classpath="${build.ant.dir}"> |
415 |
< |
<param name="matching" value="^\s*assert[\s ].*$"/> |
416 |
< |
<param name="pattern" value="assert"/> |
417 |
< |
<param name="replacement" value="//assert"/> |
418 |
< |
</filterreader> |
419 |
< |
|
420 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
421 |
< |
classpath="${build.ant.dir}"> |
422 |
< |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
423 |
< |
<param name="pattern" value="$"/> |
424 |
< |
<param name="replacement" value=" ${generic.declarations}"/> |
425 |
< |
</filterreader> |
426 |
< |
|
427 |
< |
</filterchain> |
428 |
< |
</copy> |
429 |
< |
|
436 |
> |
<target name="test-tck-parallelism-1" |
437 |
> |
description="Runs test-tck with given common pool parallelism"> |
438 |
> |
<antcall target="test-tck"> |
439 |
> |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
440 |
> |
</antcall> |
441 |
|
</target> |
442 |
|
|
443 |
< |
|
444 |
< |
<target name="compile-tests" |
445 |
< |
depends="jar"> |
446 |
< |
|
447 |
< |
<mkdir dir="${build.testcases.dir}"/> |
437 |
< |
|
438 |
< |
<javac srcdir="${tck.src.dir}" |
439 |
< |
destdir="${build.testcases.dir}" |
440 |
< |
debug="${build.debug}" |
441 |
< |
debuglevel="${build.debuglevel}" |
442 |
< |
deprecation="${build.deprecation}" |
443 |
< |
source="${build.sourcelevel}" |
444 |
< |
fork="true"> |
445 |
< |
|
446 |
< |
<compilerarg value="${bootclasspath.args}"/> |
447 |
< |
<compilerarg line="${build.args}"/> |
448 |
< |
|
449 |
< |
<classpath refid="test.classpath"/> |
450 |
< |
|
451 |
< |
</javac> |
452 |
< |
|
453 |
< |
<javac srcdir="${test.src.dir}" |
454 |
< |
destdir="${build.testcases.dir}" |
455 |
< |
debug="${build.debug}" |
456 |
< |
debuglevel="${build.debuglevel}" |
457 |
< |
deprecation="${build.deprecation}" |
458 |
< |
source="${build.sourcelevel}" |
459 |
< |
fork="true"> |
460 |
< |
|
461 |
< |
<include name="jsr166/test/**"/> |
462 |
< |
|
463 |
< |
<compilerarg value="${bootclasspath.args}"/> |
464 |
< |
<compilerarg line="${build.args}"/> |
465 |
< |
|
466 |
< |
<classpath refid="test.classpath"/> |
467 |
< |
|
468 |
< |
</javac> |
469 |
< |
|
470 |
< |
<!-- |
471 |
< |
<javac srcdir="${jtreg.src.dir}" |
472 |
< |
destdir="${build.testcases.dir}" |
473 |
< |
debug="${build.debug}" |
474 |
< |
debuglevel="${build.debuglevel}" |
475 |
< |
deprecation="${build.deprecation}" |
476 |
< |
source="${build.sourcelevel}" |
477 |
< |
fork="true"> |
478 |
< |
|
479 |
< |
<compilerarg value="${bootclasspath.args}"/> |
480 |
< |
<compilerarg line="${build.args}"/> |
481 |
< |
|
482 |
< |
<classpath refid="test.classpath"/> |
483 |
< |
|
484 |
< |
</javac> |
485 |
< |
--> |
486 |
< |
|
443 |
> |
<target name="test-tck-parallelism-0" |
444 |
> |
description="Runs test-tck with given common pool parallelism"> |
445 |
> |
<antcall target="test-tck"> |
446 |
> |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
447 |
> |
</antcall> |
448 |
|
</target> |
449 |
|
|
450 |
< |
|
451 |
< |
<target name="run-tests" |
452 |
< |
depends="compile-tests"> |
453 |
< |
|
454 |
< |
<!-- May be overridden by user.properties --> |
455 |
< |
<property name="testcase" value="*"/> |
456 |
< |
|
496 |
< |
<mkdir dir="${build.reports.dir}"/> |
497 |
< |
|
498 |
< |
<junit printsummary="true" |
499 |
< |
showoutput="true" |
500 |
< |
errorProperty="junit.failed" |
501 |
< |
failureProperty="junit.failed" |
502 |
< |
dir="${build.reports.dir}" |
503 |
< |
fork="true"> |
504 |
< |
|
505 |
< |
<jvmarg value="${bootclasspath.args}"/> |
506 |
< |
<jvmarg value="-server"/> |
507 |
< |
<jvmarg value="-showversion"/> |
508 |
< |
|
509 |
< |
<classpath refid="test.classpath"/> |
510 |
< |
|
511 |
< |
<formatter type="xml"/> |
512 |
< |
|
513 |
< |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
514 |
< |
<fileset dir="${tck.src.dir}"> |
515 |
< |
<include name="**/${testcase}Test.java"/> |
516 |
< |
</fileset> |
517 |
< |
</batchtest> |
518 |
< |
|
519 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
520 |
< |
<fileset dir="${test.src.dir}"> |
521 |
< |
<include name="jsr166/test/**/${testcase}Test.java"/> |
522 |
< |
</fileset> |
523 |
< |
</batchtest> |
524 |
< |
|
525 |
< |
<!-- |
526 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
527 |
< |
<fileset dir="${jtreg.src.dir}"> |
528 |
< |
<include name="**/${testcase}Test.java"/> |
529 |
< |
</fileset> |
530 |
< |
</batchtest> |
531 |
< |
--> |
532 |
< |
|
533 |
< |
</junit> |
534 |
< |
|
450 |
> |
<target name="test-jtreg" |
451 |
> |
depends="jar" |
452 |
> |
description="Runs jtreg tests for main using the jtreg ant task"> |
453 |
> |
<run-jtreg-tests |
454 |
> |
target="${build.main.java.version}" |
455 |
> |
workdir="${build.dir}" |
456 |
> |
classes="${product.jar}"/> |
457 |
|
</target> |
458 |
|
|
459 |
+ |
<target name="test" |
460 |
+ |
depends="test-tck, test-tck-parallelism-1, test-jtreg" |
461 |
+ |
description="Runs tck and jtreg tests for main"> |
462 |
+ |
</target> |
463 |
|
|
464 |
< |
<target name="report-tests" |
465 |
< |
depends="run-tests"> |
540 |
< |
|
541 |
< |
<!-- Sets junit.report.format to frames if redirection is present, |
542 |
< |
otherwise sets it to noframes. --> |
543 |
< |
<available property="junit.report.format" |
544 |
< |
value="frames" |
545 |
< |
classname="org.apache.xalan.lib.Redirect" |
546 |
< |
/> |
547 |
< |
<property name="junit.report.format" value="noframes"/> |
548 |
< |
|
549 |
< |
<junitreport todir="${build.reports.dir}"> |
550 |
< |
<fileset dir="${build.reports.dir}"> |
551 |
< |
<include name="TEST-*.xml"/> |
552 |
< |
</fileset> |
553 |
< |
<report styledir="${stylesheet.dir}" |
554 |
< |
format="${junit.report.format}" |
555 |
< |
todir="${build.reports.dir}" |
556 |
< |
/> |
557 |
< |
</junitreport> |
464 |
> |
<target name="test89" |
465 |
> |
description="Runs tck and jtreg tests for main for multiple java versions"> |
466 |
|
|
467 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
467 |
> |
<antcall target="clean"/> |
468 |
> |
<antcall target="test"> |
469 |
> |
<param name="build.main.java.version" value="8"/> |
470 |
> |
<param name="build.main.javac" value="${javac8}"/> |
471 |
> |
</antcall> |
472 |
> |
|
473 |
> |
<antcall target="clean"/> |
474 |
> |
<antcall target="test"> |
475 |
> |
<param name="build.main.java.version" value="9"/> |
476 |
> |
<param name="build.main.javac" value="${javac9}"/> |
477 |
> |
</antcall> |
478 |
|
|
479 |
|
</target> |
480 |
|
|
481 |
|
|
482 |
+ |
|
483 |
|
<target name="configure-compiler"> |
484 |
|
|
485 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
497 |
|
</target> |
498 |
|
|
499 |
|
|
581 |
– |
<target name="configure-tests" |
582 |
– |
depends="configure-compiler"> |
583 |
– |
|
584 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
585 |
– |
<available property="junit.available" |
586 |
– |
classname="junit.framework.Protectable"/> |
587 |
– |
|
588 |
– |
<!-- Xalan --> |
589 |
– |
<available property="xalan.available" |
590 |
– |
classname="org.apache.xalan.Version"/> |
591 |
– |
|
592 |
– |
|
593 |
– |
<!-- Ant 1.6beta and later don't need or want this check --> |
594 |
– |
<!-- |
595 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
596 |
– |
unless="junit.available"/> |
597 |
– |
|
598 |
– |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
599 |
– |
unless="xalan.available"/> |
600 |
– |
--> |
601 |
– |
|
602 |
– |
</target> |
603 |
– |
|
604 |
– |
|
605 |
– |
|
606 |
– |
<!-- Anthill targets --> |
607 |
– |
|
608 |
– |
<target name="anthill-build"> |
609 |
– |
|
610 |
– |
<!-- Override this in user.properties --> |
611 |
– |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
612 |
– |
|
613 |
– |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
614 |
– |
<arg value="-Xmx256000000"/> |
615 |
– |
<!-- classpath of new JVM --> |
616 |
– |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
617 |
– |
<!-- location of Ant home directory --> |
618 |
– |
<arg value="-Dant.home=${ant.home}"/> |
619 |
– |
<!-- the Ant main class --> |
620 |
– |
<arg value="org.apache.tools.ant.Main"/> |
621 |
– |
<!-- The build file --> |
622 |
– |
<arg value="-buildfile"/> <arg value="build.xml"/> |
623 |
– |
<!-- the target to build on the new Ant instance --> |
624 |
– |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
625 |
– |
<arg value="do-anthill-build"/> |
626 |
– |
</exec> |
627 |
– |
</target> |
628 |
– |
|
629 |
– |
<target name="do-anthill-build" |
630 |
– |
depends="jar, test, docs, dist-docs"/> |
631 |
– |
|
632 |
– |
<target name="anthill-publish"> |
633 |
– |
|
634 |
– |
<copy todir="${deployDir}/docs/private"> |
635 |
– |
<fileset dir="${build.javadocs.dir}"/> |
636 |
– |
</copy> |
637 |
– |
|
638 |
– |
<copy todir="${deployDir}/docs/public"> |
639 |
– |
<fileset dir="${dist.javadocs.dir}"/> |
640 |
– |
</copy> |
641 |
– |
|
642 |
– |
<copy tofile="${deployDir}/index.html" |
643 |
– |
file="${basedir}/etc/anthill-index.html"/> |
644 |
– |
|
645 |
– |
<copy todir="${deployDir}/notes"> |
646 |
– |
<fileset dir="${basedir}/etc/notes"/> |
647 |
– |
</copy> |
648 |
– |
|
649 |
– |
</target> |
650 |
– |
|
651 |
– |
|
500 |
|
|
501 |
|
<!-- Various demos and test programs --> |
502 |
|
|
503 |
|
|
504 |
< |
<target name="sample" depends="init, configure-compiler" |
657 |
< |
description="Standalone demo program"> |
658 |
< |
|
659 |
< |
<mkdir dir="${build.testcases.dir}"/> |
660 |
< |
|
661 |
< |
<javac srcdir="${test.src.dir}" |
662 |
< |
destdir="${build.testcases.dir}" |
663 |
< |
debug="${build.debug}" |
664 |
< |
debuglevel="${build.debuglevel}" |
665 |
< |
deprecation="${build.deprecation}" |
666 |
< |
source="${build.sourcelevel}" |
667 |
< |
fork="true"> |
668 |
< |
|
669 |
< |
<include name="jsr166/test/Sample.java"/> |
670 |
< |
|
671 |
< |
</javac> |
672 |
< |
|
673 |
< |
<copy todir="${build.testcases.dir}"> |
674 |
< |
<fileset dir="${test.src.dir}"> |
675 |
< |
<include name="**/*.properties"/> |
676 |
< |
</fileset> |
677 |
< |
</copy> |
678 |
< |
|
679 |
< |
|
680 |
< |
<java classname="jsr166.test.Sample" fork="true"> |
681 |
< |
<classpath refid="test.classpath"/> |
682 |
< |
<!-- <jvmarg value="-ea"/> --> |
683 |
< |
<!-- <jvmarg value="-server"/> --> |
684 |
< |
<!-- <arg value="1000"/> --> |
685 |
< |
</java> |
686 |
< |
</target> |
687 |
< |
|
688 |
< |
|
689 |
< |
<target name="loops" depends="init, configure-compiler" |
504 |
> |
<target name="loops" depends="configure-compiler" |
505 |
|
description="Benchmark from Doug Lea's AQS paper"> |
506 |
|
|
507 |
|
<mkdir dir="${build.loops.dir}"/> |
516 |
|
|
517 |
|
<compilerarg line="${build.args}"/> |
518 |
|
<classpath refid="loops.classpath"/> |
519 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
520 |
|
|
521 |
|
</javac> |
522 |
|
|
527 |
|
</target> |
528 |
|
|
529 |
|
|
530 |
< |
<target name="compile-j1" depends="init, configure-compiler, compile"> |
715 |
< |
|
716 |
< |
<mkdir dir="${build.j1.dir}"/> |
530 |
> |
<!-- jsr166 4jdk7 --> |
531 |
|
|
532 |
< |
<javac srcdir="${j1.src.dir}" |
533 |
< |
destdir="${build.j1.dir}" |
534 |
< |
debug="${build.debug}" |
535 |
< |
debuglevel="${build.debuglevel}" |
536 |
< |
deprecation="${build.deprecation}" |
537 |
< |
source="${build.sourcelevel}" > |
532 |
> |
<target name="4jdk7compile" |
533 |
> |
depends="configure-compiler" |
534 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
535 |
> |
|
536 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
537 |
> |
|
538 |
> |
<javac srcdir="${4jdk7src.dir}" |
539 |
> |
destdir="${build.4jdk7.classes.dir}" |
540 |
> |
debug="${build.debug}" |
541 |
> |
debuglevel="${build.debuglevel}" |
542 |
> |
deprecation="${build.deprecation}" |
543 |
> |
source="6" |
544 |
> |
classpath="" |
545 |
> |
bootclasspath="${bootclasspath6}" |
546 |
> |
includeAntRuntime="false" |
547 |
> |
includeJavaRuntime="false" |
548 |
> |
executable="${javac7}" |
549 |
> |
fork="true"> |
550 |
|
|
551 |
|
<include name="**/*.java"/> |
552 |
< |
<exclude name="**/dijkstra/**"/> |
553 |
< |
|
552 |
> |
<compilerarg value="-Xprefer:source"/> |
553 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
554 |
> |
<compilerarg value="-Xlint:all"/> |
555 |
|
<compilerarg line="${build.args}"/> |
729 |
– |
<classpath refid="j1.classpath"/> |
556 |
|
|
557 |
|
</javac> |
732 |
– |
|
558 |
|
</target> |
559 |
|
|
560 |
+ |
<target name="4jdk7doclint" |
561 |
+ |
depends="configure-compiler" |
562 |
+ |
description="Finds doclint warnings"> |
563 |
+ |
|
564 |
+ |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
565 |
+ |
|
566 |
+ |
<javac srcdir="${4jdk7src.dir}" |
567 |
+ |
destdir="${build.4jdk7.classes.dir}" |
568 |
+ |
debug="${build.debug}" |
569 |
+ |
debuglevel="${build.debuglevel}" |
570 |
+ |
deprecation="${build.deprecation}" |
571 |
+ |
source="6" |
572 |
+ |
classpath="" |
573 |
+ |
bootclasspath="${bootclasspath7}" |
574 |
+ |
includeAntRuntime="false" |
575 |
+ |
includeJavaRuntime="false" |
576 |
+ |
executable="${javac8}" |
577 |
+ |
fork="true"> |
578 |
|
|
579 |
< |
<target name="sw" depends="compile-j1" |
580 |
< |
description="Runs the SwingWorker demo"> |
581 |
< |
|
582 |
< |
<!-- |
583 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
584 |
< |
<classpath refid="j1.classpath"/> |
742 |
< |
</java> |
743 |
< |
--> |
744 |
< |
|
745 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
746 |
< |
|
747 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
748 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
749 |
< |
</exec> |
579 |
> |
<include name="**/*.java"/> |
580 |
> |
<compilerarg value="-Xprefer:source"/> |
581 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
582 |
> |
<compilerarg value="-Xlint:all"/> |
583 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
584 |
> |
<compilerarg line="${build.args}"/> |
585 |
|
|
586 |
+ |
</javac> |
587 |
|
</target> |
588 |
|
|
753 |
– |
<target name="j1" depends="compile-j1" |
754 |
– |
description="Runs a standalone JavaOne program"> |
589 |
|
|
590 |
< |
<java classname="${j1.test}" fork="true"> |
591 |
< |
<classpath refid="j1.classpath"/> |
592 |
< |
<jvmarg value="-client"/> |
590 |
> |
<target name="4jdk7jar" |
591 |
> |
depends="4jdk7compile" |
592 |
> |
description="Builds library jar from compiled sources"> |
593 |
|
|
594 |
< |
<!-- TestPseudoRandom args --> |
595 |
< |
<arg value="2"/> |
596 |
< |
<arg value="25"/> |
763 |
< |
<arg value="100000"/> |
594 |
> |
<jar destfile="${4jdk7product.jar}"> |
595 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
596 |
> |
</jar> |
597 |
|
|
598 |
< |
<!-- WebCrawler args --> |
766 |
< |
<!-- |
767 |
< |
<arg value="jsr166.webcrawler.WebCrawler3"/> |
768 |
< |
<arg value="http://www.priorartisans.com"/> |
769 |
< |
<arg value="25"/> |
770 |
< |
--> |
598 |
> |
</target> |
599 |
|
|
772 |
– |
</java> |
600 |
|
|
601 |
+ |
<target name="4jdk7-test-tck" |
602 |
+ |
depends="4jdk7jar" |
603 |
+ |
description="Runs tck tests for jsr166-4jdk7 directly"> |
604 |
+ |
|
605 |
+ |
<run-tck-tests |
606 |
+ |
target="7" |
607 |
+ |
workdir="${build.4jdk7.dir}" |
608 |
+ |
classes="${4jdk7product.jar}"> |
609 |
+ |
<javac-elements> |
610 |
+ |
<!-- JDK8+ test classes --> |
611 |
+ |
<exclude name="*8Test.java"/> |
612 |
+ |
<exclude name="*9Test.java"/> |
613 |
+ |
<exclude name="DoubleAccumulatorTest.java"/> |
614 |
+ |
<exclude name="DoubleAdderTest.java"/> |
615 |
+ |
<exclude name="LongAccumulatorTest.java"/> |
616 |
+ |
<exclude name="LongAdderTest.java"/> |
617 |
+ |
<exclude name="CompletableFutureTest.java"/> |
618 |
+ |
<exclude name="SplittableRandomTest.java"/> |
619 |
+ |
<exclude name="StampedLockTest.java"/> |
620 |
+ |
</javac-elements> |
621 |
+ |
</run-tck-tests> |
622 |
|
</target> |
623 |
|
|
624 |
|
|
625 |
< |
<target name="test-j1" depends="compile-j1" |
626 |
< |
description="Runs testcases from the JavaOne source directories"> |
625 |
> |
<target name="4jdk7-test-tck-junit" |
626 |
> |
depends="4jdk7compile" |
627 |
> |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
628 |
|
|
629 |
|
<junit printsummary="true" |
630 |
< |
showoutput="true" |
631 |
< |
errorProperty="junit.failed" |
632 |
< |
failureProperty="junit.failed" |
633 |
< |
dir="${build.j1.dir}" |
634 |
< |
fork="true"> |
635 |
< |
|
787 |
< |
<!-- <jvmarg value="-server"/> --> |
788 |
< |
<classpath refid="j1.classpath"/> |
789 |
< |
<formatter type="xml"/> |
790 |
< |
|
791 |
< |
<batchtest todir="${build.j1.dir}"> |
792 |
< |
<fileset dir="${j1.src.dir}"> |
793 |
< |
<include name="**/*Test.java"/> |
794 |
< |
</fileset> |
795 |
< |
</batchtest> |
630 |
> |
showoutput="true" |
631 |
> |
errorProperty="junit.failed" |
632 |
> |
failureProperty="junit.failed" |
633 |
> |
includeantruntime="true" |
634 |
> |
jvm="${java7}" |
635 |
> |
fork="true"> |
636 |
|
|
637 |
< |
</junit> |
637 |
> |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
638 |
> |
<jvmarg value="-server"/> |
639 |
|
|
640 |
< |
<available property="junit.report.format" |
641 |
< |
value="frames" |
642 |
< |
classname="org.apache.xalan.lib.Redirect"/> |
643 |
< |
<property name="junit.report.format" value="noframes"/> |
644 |
< |
|
645 |
< |
<junitreport todir="${build.j1.dir}"> |
805 |
< |
<fileset dir="${build.j1.dir}"> |
806 |
< |
<include name="TEST-*.xml"/> |
807 |
< |
</fileset> |
808 |
< |
<report styledir="${stylesheet.dir}" |
809 |
< |
format="${junit.report.format}" |
810 |
< |
todir="${build.j1.dir}" |
811 |
< |
/> |
812 |
< |
</junitreport> |
640 |
> |
<classpath> |
641 |
> |
<pathelement location="${junit.jar}"/> |
642 |
> |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
643 |
> |
</classpath> |
644 |
> |
|
645 |
> |
<formatter type="brief"/> |
646 |
|
|
647 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
647 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
648 |
> |
</test> |
649 |
|
|
650 |
+ |
</junit> |
651 |
|
</target> |
652 |
|
|
653 |
+ |
<target name="4jdk7-test-jtreg" |
654 |
+ |
depends="4jdk7jar" |
655 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
656 |
+ |
<run-jtreg-tests |
657 |
+ |
target="7" |
658 |
+ |
workdir="${build.4jdk7.dir}" |
659 |
+ |
classes="${4jdk7product.jar}" |
660 |
+ |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
661 |
+ |
</target> |
662 |
|
|
663 |
|
|
664 |
< |
<!-- C++ and JNI definitions and demos --> |
664 |
> |
<target name="4jdk7-test" |
665 |
> |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
666 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
667 |
> |
</target> |
668 |
|
|
822 |
– |
<target name="configure-cpp"> |
669 |
|
|
670 |
< |
<!-- Define tasks and types --> |
670 |
> |
<target name="4jdk7docs" |
671 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
672 |
> |
|
673 |
> |
<delete dir="${4jdk7docs.dir}"/> |
674 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
675 |
> |
|
676 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
677 |
> |
packagenames="none" |
678 |
> |
link="${java7.api.url}" |
679 |
> |
overview="${4jdk7src.dir}/intro.html" |
680 |
> |
access="${build.javadoc.access}" |
681 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
682 |
> |
classpath="" |
683 |
> |
executable="${javadoc7}"> |
684 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
685 |
> |
<include name="**/*.java"/> |
686 |
> |
</fileset> |
687 |
> |
<arg line="-Xdocrootparent ${java7.docroot.url}"/> |
688 |
> |
<arg value="-XDignore.symbol.file=true"/> |
689 |
> |
</javadoc> |
690 |
> |
</target> |
691 |
|
|
826 |
– |
<path id="cpptasks.path"> |
827 |
– |
<pathelement location="${lib.dir}/cpptasks.jar"/> |
828 |
– |
</path> |
829 |
– |
<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/> |
830 |
– |
<typedef resource="cpptasks.types" classpathref="cpptasks.path"/> |
692 |
|
|
693 |
< |
<!-- Set platform property for JNI includes --> |
693 |
> |
<target name="4jdk7dist" |
694 |
> |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
695 |
> |
description="Puts all distributable products in single hierarchy"/> |
696 |
|
|
834 |
– |
<condition property="platform" value="linux"> |
835 |
– |
<os name="Linux"/> |
836 |
– |
</condition> |
837 |
– |
<condition property="platform" value="win32"> |
838 |
– |
<os family="windows"/> |
839 |
– |
</condition> |
840 |
– |
<condition property="platform" value="solaris"> |
841 |
– |
<os name="SunOS"/> |
842 |
– |
</condition> |
697 |
|
|
698 |
< |
</target> |
698 |
> |
<target name="4jdk7clean" |
699 |
> |
description="Removes all 4jdk7 build products"> |
700 |
|
|
701 |
+ |
<delete dir="${build.4jdk7.dir}"/> |
702 |
|
|
703 |
< |
<target name="cppdemo" depends="configure-cpp"> |
703 |
> |
</target> |
704 |
|
|
849 |
– |
<mkdir dir="${build.dir}"/> |
705 |
|
|
706 |
< |
<cc multithreaded="true" |
707 |
< |
name="g++" |
708 |
< |
objdir="${build.dir}" |
709 |
< |
outfile="${build.dir}/CppDemo"> |
855 |
< |
<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/> |
856 |
< |
<libset libs="stdc++"/> |
857 |
< |
</cc> |
706 |
> |
<target name="4jdk7dist-jar" |
707 |
> |
depends="4jdk7clean, 4jdk7jar"> |
708 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
709 |
> |
</target> |
710 |
|
|
859 |
– |
<exec executable="${build.dir}/CppDemo"> |
860 |
– |
<arg line="count in word frequency of word in command line count"/> |
861 |
– |
</exec> |
711 |
|
|
712 |
+ |
<target name="4jdk7dist-docs" |
713 |
+ |
depends="4jdk7clean, 4jdk7docs"> |
714 |
+ |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
715 |
|
</target> |
716 |
|
|
717 |
|
|
718 |
< |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
718 |
> |
<!-- jsr166x --> |
719 |
|
|
720 |
< |
<mkdir dir="${build.testcases.dir}"/> |
720 |
> |
<target name="jsr166xcompile" |
721 |
> |
depends="configure-compiler" |
722 |
> |
description="Compiles jsr166x sources to build dir"> |
723 |
|
|
724 |
< |
<javac srcdir="${test.src.dir}" |
871 |
< |
destdir="${build.testcases.dir}" |
872 |
< |
debug="${build.debug}" |
873 |
< |
debuglevel="${build.debuglevel}" |
874 |
< |
deprecation="${build.deprecation}" |
875 |
< |
source="${build.sourcelevel}" |
876 |
< |
fork="true"> |
877 |
< |
<compilerarg value="${bootclasspath.args}"/> |
878 |
< |
<compilerarg line="${build.args}"/> |
879 |
< |
<classpath refid="test.classpath"/> |
880 |
< |
<include name="JniDemo.java"/> |
881 |
< |
</javac> |
724 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
725 |
|
|
726 |
< |
<javah destdir="${build.testcases.dir}" |
727 |
< |
classpathref="test.classpath"> |
728 |
< |
<class name="JniDemo"/> |
729 |
< |
</javah> |
730 |
< |
|
731 |
< |
<cc multithreaded="true" |
732 |
< |
name="g++" |
733 |
< |
objdir="${build.dir}" |
734 |
< |
outfile="${build.dir}/JniDemo" |
735 |
< |
outtype="shared"> |
736 |
< |
|
737 |
< |
<compiler> |
738 |
< |
<defineset> |
739 |
< |
<define name="__int64" value="long long"/> |
740 |
< |
</defineset> |
741 |
< |
<includepath location="${java.home}/../include"/> |
742 |
< |
<includepath location="${java.home}/../include/${platform}"/> |
900 |
< |
<compilerarg value="-mno-cygwin"/> |
901 |
< |
</compiler> |
902 |
< |
|
903 |
< |
<linker> |
904 |
< |
<linkerarg value="--add-stdcall-alias"/> |
905 |
< |
</linker> |
906 |
< |
|
907 |
< |
<includepath location="${build.testcases.dir}"/> |
908 |
< |
|
909 |
< |
<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/> |
910 |
< |
|
911 |
< |
<libset libs="stdc++"/> |
912 |
< |
|
913 |
< |
</cc> |
914 |
< |
|
915 |
< |
<!-- Necessary if windows, harmless if not --> |
916 |
< |
<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/> |
917 |
< |
|
918 |
< |
<java classname="JniDemo" fork="true"> |
919 |
< |
<!-- Watch out: path separator hardwired to semicolon here! --> |
920 |
< |
<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/> |
921 |
< |
<classpath refid="test.classpath"/> |
922 |
< |
<arg line="count in word frequency of word in command line count"/> |
923 |
< |
</java> |
726 |
> |
<javac srcdir="${topsrc.dir}" |
727 |
> |
destdir="${build.jsr166x.classes.dir}" |
728 |
> |
debug="${build.debug}" |
729 |
> |
debuglevel="${build.debuglevel}" |
730 |
> |
deprecation="${build.deprecation}" |
731 |
> |
classpath="" |
732 |
> |
bootclasspath="${bootclasspath6}" |
733 |
> |
source="5" |
734 |
> |
includeAntRuntime="false" |
735 |
> |
includeJavaRuntime="false" |
736 |
> |
executable="${javac7}" |
737 |
> |
fork="true"> |
738 |
> |
|
739 |
> |
<include name="jsr166x/**/*.java"/> |
740 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
741 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
742 |
> |
<compilerarg line="${build.args}"/> |
743 |
|
|
744 |
+ |
</javac> |
745 |
|
</target> |
746 |
|
|
747 |
|
|
748 |
+ |
<target name="jsr166xjar" |
749 |
+ |
depends="jsr166xcompile" |
750 |
+ |
description="Builds library jar from compiled sources"> |
751 |
|
|
752 |
< |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
753 |
< |
|
752 |
> |
<jar destfile="${jsr166x.jar}"> |
753 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
754 |
> |
</jar> |
755 |
|
|
756 |
+ |
</target> |
757 |
|
|
933 |
– |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
934 |
– |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
935 |
– |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
936 |
– |
<property name="pretiger.sourcelevel" value="1.4"/> |
758 |
|
|
759 |
< |
<target name="defang" |
760 |
< |
depends="init" |
940 |
< |
description="Generates pre-Tiger compatible source"> |
759 |
> |
<target name="jsr166xdocs" |
760 |
> |
description="Builds javadocs to dist dir"> |
761 |
|
|
762 |
< |
<delete dir="${pretiger.src.dir}"/> |
763 |
< |
<mkdir dir="${pretiger.src.dir}"/> |
762 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
763 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
764 |
|
|
765 |
< |
<exec executable="perl"> |
766 |
< |
<arg file="etc/defang.pl"/> |
767 |
< |
<!-- <arg value="-v"/> --> |
768 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
769 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
770 |
< |
</exec> |
765 |
> |
<javadoc destdir="${jsr166xdocs.dir}" |
766 |
> |
packagenames="jsr166x.*" |
767 |
> |
link="${java.api.url}" |
768 |
> |
access="${build.javadoc.access}" |
769 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
770 |
> |
bootclasspath="${bootclasspath6}" |
771 |
> |
source="5" |
772 |
> |
executable="${javadoc7}"> |
773 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
774 |
> |
<arg value="-XDignore.symbol.file=true"/> |
775 |
|
|
776 |
+ |
</javadoc> |
777 |
|
</target> |
778 |
|
|
954 |
– |
<target name="compile-pretiger" |
955 |
– |
depends="init, configure-compiler, defang" |
956 |
– |
description="Compiles pre-Tiger sources to build folder"> |
779 |
|
|
780 |
< |
<mkdir dir="${build.pretiger.dir}"/> |
780 |
> |
<target name="jsr166xdist" |
781 |
> |
depends="jsr166xdist-jar, jsr166xdist-docs" |
782 |
> |
description="Puts all distributable products in single hierarchy"/> |
783 |
|
|
960 |
– |
<javac srcdir="${pretiger.src.dir}" |
961 |
– |
destdir="${build.pretiger.dir}" |
962 |
– |
debug="${build.debug}" |
963 |
– |
debuglevel="${build.debuglevel}" |
964 |
– |
deprecation="${build.deprecation}" |
965 |
– |
source="${pretiger.sourcelevel}" |
966 |
– |
fork="true"> |
784 |
|
|
785 |
< |
<compilerarg line="${build.args}"/> |
786 |
< |
<exclude name="**/Thread.java"/> |
785 |
> |
<target name="jsr166xclean" |
786 |
> |
description="Removes all jsr166x build products"> |
787 |
|
|
788 |
< |
</javac> |
788 |
> |
<delete dir="${build.jsr166x.dir}"/> |
789 |
|
|
790 |
|
</target> |
791 |
|
|
975 |
– |
<target name="pretiger" depends="compile-pretiger"> |
976 |
– |
|
977 |
– |
<mkdir dir="${build.lib.dir}"/> |
792 |
|
|
793 |
< |
<jar destfile="${pretiger.jar}"> |
794 |
< |
<fileset dir="${build.pretiger.dir}"> |
795 |
< |
</fileset> |
796 |
< |
</jar> |
793 |
> |
<target name="jsr166xdist-jar" |
794 |
> |
depends="jsr166xclean, jsr166xjar"> |
795 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
796 |
> |
</target> |
797 |
|
|
798 |
+ |
<target name="jsr166xdist-docs" |
799 |
+ |
depends="jsr166xclean, jsr166xdocs"> |
800 |
+ |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
801 |
|
</target> |
802 |
|
|
803 |
< |
<!-- jsr166x --> |
803 |
> |
<!-- jsr166y --> |
804 |
|
|
805 |
|
|
806 |
< |
<target name="jsr166xcompile" |
807 |
< |
depends="init, configure-compiler" |
808 |
< |
description="Compiles jsr166x sources"> |
806 |
> |
<target name="jsr166ycompile" |
807 |
> |
depends="configure-compiler" |
808 |
> |
description="Compiles jsr166y sources"> |
809 |
|
|
810 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
810 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
811 |
|
|
812 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
813 |
< |
destdir="${build.jsr166x.dir}" |
814 |
< |
debug="${build.debug}" |
815 |
< |
debuglevel="${build.debuglevel}" |
816 |
< |
deprecation="${build.deprecation}" |
817 |
< |
source="${build.sourcelevel}" |
818 |
< |
fork="true"> |
819 |
< |
|
820 |
< |
<include name="**/*.java"/> |
812 |
> |
<javac srcdir="${topsrc.dir}" |
813 |
> |
destdir="${build.jsr166y.classes.dir}" |
814 |
> |
debug="${build.debug}" |
815 |
> |
debuglevel="${build.debuglevel}" |
816 |
> |
deprecation="${build.deprecation}" |
817 |
> |
source="6" |
818 |
> |
classpath="" |
819 |
> |
bootclasspath="${bootclasspath6}" |
820 |
> |
includeAntRuntime="false" |
821 |
> |
includeJavaRuntime="false" |
822 |
> |
executable="${javac7}" |
823 |
> |
fork="true"> |
824 |
> |
|
825 |
> |
<include name="jsr166y/**/*.java"/> |
826 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
827 |
> |
<compilerarg value="-Xlint:all"/> |
828 |
|
<compilerarg line="${build.args}"/> |
829 |
|
|
830 |
|
</javac> |
1007 |
– |
|
831 |
|
</target> |
832 |
|
|
833 |
|
|
834 |
< |
|
835 |
< |
<target name="jsr166xjar" |
1013 |
< |
depends="jsr166xcompile" |
834 |
> |
<target name="jsr166yjar" |
835 |
> |
depends="jsr166ycompile" |
836 |
|
description="Builds library jar from compiled sources"> |
837 |
|
|
838 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
839 |
< |
|
1018 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
1019 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
838 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
839 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
840 |
|
</jar> |
841 |
|
|
842 |
|
</target> |
843 |
|
|
844 |
|
|
845 |
+ |
<target name="jsr166ydocs" |
846 |
+ |
description="Builds javadocs to dist dir"> |
847 |
|
|
848 |
< |
<target name="jsr166xdocs" |
849 |
< |
description="Builds javadocs with custom tags to build folder"> |
848 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
849 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
850 |
|
|
851 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
852 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
851 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
852 |
> |
packagenames="jsr166y.*" |
853 |
> |
link="${java.api.url}" |
854 |
> |
access="${build.javadoc.access}" |
855 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
856 |
> |
bootclasspath="${bootclasspath6}" |
857 |
> |
source="6" |
858 |
> |
executable="${javadoc7}"> |
859 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
860 |
> |
<arg value="-XDignore.symbol.file=true"/> |
861 |
|
|
862 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
863 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
862 |
> |
</javadoc> |
863 |
> |
</target> |
864 |
|
|
1035 |
– |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
865 |
|
|
866 |
< |
> |
867 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
868 |
< |
<include name="jsr166x"/> |
1040 |
< |
</packageset> |
866 |
> |
<target name="jsr166ydist" |
867 |
> |
depends="jsr166ydist-jar, jsr166ydist-docs" |
868 |
> |
description="Puts all distributable products in single hierarchy"/> |
869 |
|
|
870 |
|
|
871 |
< |
</javadoc> |
871 |
> |
<target name="jsr166yclean" |
872 |
> |
description="Removes all jsr166y build products"> |
873 |
> |
|
874 |
> |
<delete dir="${build.jsr166y.dir}"/> |
875 |
|
|
876 |
|
</target> |
877 |
|
|
878 |
|
|
879 |
< |
<target name="jsr166xdist" |
880 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
881 |
< |
description="Puts all distributable products in single hierarchy"/> |
879 |
> |
<target name="jsr166ydist-jar" |
880 |
> |
depends="jsr166yclean, jsr166yjar"> |
881 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
882 |
> |
</target> |
883 |
|
|
884 |
+ |
<target name="jsr166ydist-docs" |
885 |
+ |
depends="jsr166yclean, jsr166ydocs"> |
886 |
+ |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
887 |
+ |
</target> |
888 |
|
|
889 |
|
|
890 |
< |
<target name="jsr166xclean" |
1055 |
< |
description="Removes all build products"> |
890 |
> |
<!-- extra166y --> |
891 |
|
|
1057 |
– |
<delete dir="${build.jsr166x.dir}"/> |
1058 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
892 |
|
|
893 |
< |
</target> |
893 |
> |
<target name="extra166ycompile" |
894 |
> |
depends="configure-compiler, jsr166yjar" |
895 |
> |
description="Compiles extra166y sources"> |
896 |
|
|
897 |
+ |
<mkdir dir="${build.extra166y.classes.dir}"/> |
898 |
|
|
899 |
+ |
<javac srcdir="${topsrc.dir}" |
900 |
+ |
destdir="${build.extra166y.classes.dir}" |
901 |
+ |
debug="${build.debug}" |
902 |
+ |
debuglevel="${build.debuglevel}" |
903 |
+ |
deprecation="${build.deprecation}" |
904 |
+ |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
905 |
+ |
classpath="" |
906 |
+ |
source="6" |
907 |
+ |
includeAntRuntime="false" |
908 |
+ |
includeJavaRuntime="false" |
909 |
+ |
executable="${javac7}" |
910 |
+ |
fork="true"> |
911 |
|
|
912 |
< |
<target name="jsr166xdist-clean" |
913 |
< |
description="Removes all build and distribution products"> |
912 |
> |
<include name="extra166y/**/*.java"/> |
913 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
914 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
915 |
> |
<compilerarg line="${build.args}"/> |
916 |
|
|
917 |
+ |
</javac> |
918 |
|
</target> |
919 |
|
|
920 |
|
|
921 |
+ |
<target name="extra166yjar" |
922 |
+ |
depends="extra166ycompile" |
923 |
+ |
description="Builds library jar from compiled sources"> |
924 |
|
|
925 |
< |
<target name="jsr166xdist-docs" |
926 |
< |
description="Builds javadocs without custom tags to dist folder"> |
925 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
926 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
927 |
> |
</jar> |
928 |
> |
|
929 |
> |
</target> |
930 |
|
|
1074 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
1075 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
931 |
|
|
932 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
933 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
934 |
< |
source="${build.sourcelevel}"> |
935 |
< |
|
936 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
937 |
< |
<include name="jsr166x"/> |
938 |
< |
</packageset> |
932 |
> |
<target name="extra166ydocs" |
933 |
> |
description="Builds javadocs to build dir"> |
934 |
> |
|
935 |
> |
<delete dir="${extra166ydocs.dir}"/> |
936 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
937 |
> |
|
938 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
939 |
> |
packagenames="extra166y.*" |
940 |
> |
link="${java.api.url}" |
941 |
> |
access="${build.javadoc.access}" |
942 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
943 |
> |
bootclasspath="${bootclasspath6}" |
944 |
> |
source="6" |
945 |
> |
executable="${javadoc7}"> |
946 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
947 |
> |
<arg value="-XDignore.symbol.file=true"/> |
948 |
|
|
949 |
|
</javadoc> |
950 |
+ |
</target> |
951 |
+ |
|
952 |
+ |
|
953 |
+ |
<target name="extra166ydist" |
954 |
+ |
depends="extra166ydist-jar, extra166ydist-docs" |
955 |
+ |
description="Puts all distributable products in single hierarchy"/> |
956 |
+ |
|
957 |
+ |
|
958 |
+ |
<target name="extra166yclean" |
959 |
+ |
description="Removes all extra166y build products"> |
960 |
+ |
|
961 |
+ |
<delete dir="${build.extra166y.dir}"/> |
962 |
|
|
963 |
|
</target> |
964 |
|
|
1089 |
– |
<target name="jsr166xdist-jar" |
1090 |
– |
depends="jsr166xclean, jsr166xjar"> |
965 |
|
|
966 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
966 |
> |
<target name="extra166ydist-jar" |
967 |
> |
depends="extra166yclean, extra166yjar"> |
968 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
969 |
> |
</target> |
970 |
|
|
971 |
+ |
<target name="extra166ydist-docs" |
972 |
+ |
depends="extra166yclean, extra166ydocs"> |
973 |
+ |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
974 |
|
</target> |
975 |
|
|
976 |
< |
<!-- jsr166y --> |
976 |
> |
<!-- jsr166e --> |
977 |
|
|
978 |
+ |
<property name="build.jsr166e.java.version" value="6"/> |
979 |
+ |
<property name="build.jsr166e.javac" value="${javac6}"/> |
980 |
|
|
981 |
< |
<target name="jsr166ycompile" |
982 |
< |
depends="init, configure-compiler" |
983 |
< |
description="Compiles jsr166y sources"> |
981 |
> |
<target name="jsr166ecompile" |
982 |
> |
depends="configure-compiler" |
983 |
> |
description="Compiles jsr166e sources"> |
984 |
|
|
985 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
985 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
986 |
|
|
987 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
988 |
< |
destdir="${build.jsr166y.dir}" |
989 |
< |
debug="${build.debug}" |
990 |
< |
debuglevel="${build.debuglevel}" |
991 |
< |
deprecation="${build.deprecation}" |
992 |
< |
source="${build.sourcelevel}" |
993 |
< |
fork="true"> |
987 |
> |
<javac srcdir="${topsrc.dir}" |
988 |
> |
destdir="${build.jsr166e.classes.dir}" |
989 |
> |
debug="${build.debug}" |
990 |
> |
debuglevel="${build.debuglevel}" |
991 |
> |
deprecation="${build.deprecation}" |
992 |
> |
source="${build.jsr166e.java.version}" |
993 |
> |
classpath="" |
994 |
> |
includeAntRuntime="false" |
995 |
> |
includeJavaRuntime="false" |
996 |
> |
executable="${build.jsr166e.javac}" |
997 |
> |
fork="true"> |
998 |
|
|
999 |
< |
<include name="**/*.java"/> |
999 |
> |
<include name="jsr166e/**/*.java"/> |
1000 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
1001 |
> |
<compilerarg value="-Xlint:all"/> |
1002 |
|
<compilerarg line="${build.args}"/> |
1115 |
– |
<compilerarg value="${bootclasspath.args}"/> |
1116 |
– |
|
1117 |
– |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
1003 |
|
|
1004 |
|
</javac> |
1120 |
– |
|
1005 |
|
</target> |
1006 |
|
|
1007 |
+ |
<!-- jsr166e: find doclint errors --> |
1008 |
+ |
<target name="jsr166edoclint"> |
1009 |
|
|
1010 |
+ |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1011 |
|
|
1012 |
< |
<target name="jsr166yjar" |
1013 |
< |
depends="jsr166ycompile" |
1014 |
< |
description="Builds library jar from compiled sources"> |
1012 |
> |
<javac srcdir="${topsrc.dir}" |
1013 |
> |
destdir="${build.jsr166e.classes.dir}" |
1014 |
> |
debug="${build.debug}" |
1015 |
> |
debuglevel="${build.debuglevel}" |
1016 |
> |
deprecation="${build.deprecation}" |
1017 |
> |
source="${build.jsr166e.java.version}" |
1018 |
> |
classpath="" |
1019 |
> |
bootclasspath="${bootclasspath7}" |
1020 |
> |
includeAntRuntime="false" |
1021 |
> |
includeJavaRuntime="false" |
1022 |
> |
executable="${javac8}" |
1023 |
> |
fork="true"> |
1024 |
> |
|
1025 |
> |
<include name="jsr166e/**/*.java"/> |
1026 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
1027 |
> |
<compilerarg value="-Xlint:all"/> |
1028 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
1029 |
|
|
1030 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
1030 |
> |
</javac> |
1031 |
> |
</target> |
1032 |
|
|
1131 |
– |
<jar destfile="${jsr166yproduct.jar}"> |
1132 |
– |
<fileset dir="${build.jsr166y.dir}"/> |
1133 |
– |
</jar> |
1033 |
|
|
1034 |
< |
</target> |
1034 |
> |
<target name="jsr166ejar" |
1035 |
> |
depends="jsr166ecompile" |
1036 |
> |
description="Builds library jar from compiled sources"> |
1037 |
|
|
1038 |
+ |
<jar destfile="${jsr166e.jar}" index="true"> |
1039 |
+ |
<fileset dir="${build.jsr166e.classes.dir}"/> |
1040 |
+ |
</jar> |
1041 |
|
|
1042 |
+ |
</target> |
1043 |
|
|
1139 |
– |
<target name="jsr166ydocs" |
1140 |
– |
description="Builds javadocs with custom tags to build folder"> |
1044 |
|
|
1045 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
1046 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
1045 |
> |
<target name="jsr166edocs" |
1046 |
> |
description="Builds javadocs to build dir"> |
1047 |
|
|
1048 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
1049 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
1147 |
< |
sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
1148 |
< |
|
1149 |
< |
> |
1150 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
1151 |
< |
<include name="jsr166y"/> |
1152 |
< |
</packageset> |
1048 |
> |
<delete dir="${jsr166edocs.dir}"/> |
1049 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
1050 |
|
|
1051 |
+ |
<javadoc destdir="${jsr166edocs.dir}" |
1052 |
+ |
packagenames="jsr166e.*" |
1053 |
+ |
link="${java.api.url}" |
1054 |
+ |
access="${build.javadoc.access}" |
1055 |
+ |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1056 |
+ |
source="${build.jsr166e.java.version}" |
1057 |
+ |
executable="${javadoc7}"> |
1058 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1059 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
1060 |
|
|
1061 |
|
</javadoc> |
1156 |
– |
|
1062 |
|
</target> |
1063 |
|
|
1064 |
|
|
1065 |
< |
<target name="jsr166ydist" |
1066 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
1067 |
< |
description="Puts all distributable products in single hierarchy"/> |
1065 |
> |
<target name="jsr166e-test-tck-one-java-version" |
1066 |
> |
depends="jsr166ejar"> |
1067 |
> |
|
1068 |
> |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1069 |
|
|
1070 |
+ |
<run-tck-tests |
1071 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1072 |
+ |
target="${build.jsr166e.java.version}" |
1073 |
+ |
workdir="${build.jsr166e.dir}" |
1074 |
+ |
classes="${jsr166e.jar}"/> |
1075 |
+ |
</target> |
1076 |
|
|
1077 |
+ |
<target name="jsr166e-test-tck" |
1078 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
1079 |
|
|
1080 |
< |
<target name="jsr166yclean" |
1081 |
< |
description="Removes all build products"> |
1080 |
> |
<!-- <antcall target="clean"/> --> |
1081 |
> |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
1082 |
> |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
1083 |
> |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
1084 |
> |
<!-- </antcall> --> |
1085 |
|
|
1086 |
< |
<delete dir="${build.jsr166y.dir}"/> |
1087 |
< |
<delete dir="${build.jsr166ylib.dir}"/> |
1086 |
> |
<antcall target="clean"/> |
1087 |
> |
<antcall target="jsr166e-test-tck-one-java-version"> |
1088 |
> |
<param name="build.jsr166e.java.version" value="7"/> |
1089 |
> |
<param name="build.jsr166e.javac" value="${javac7}"/> |
1090 |
> |
</antcall> |
1091 |
|
|
1092 |
+ |
<antcall target="clean"/> |
1093 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
1094 |
+ |
<param name="build.jsr166e.java.version" value="6"/> |
1095 |
+ |
<param name="build.jsr166e.javac" value="${javac6}"/> |
1096 |
+ |
</antcall> |
1097 |
|
</target> |
1098 |
|
|
1099 |
|
|
1100 |
+ |
<target name="jsr166e-test" |
1101 |
+ |
depends="jsr166e-test-tck" |
1102 |
+ |
description="Runs all tests for jsr166e"> |
1103 |
+ |
</target> |
1104 |
|
|
1105 |
< |
<target name="jsr166ydist-clean" |
1106 |
< |
description="Removes all build and distribution products"> |
1105 |
> |
<target name="jsr166edist" |
1106 |
> |
depends="jsr166edist-jar, jsr166edist-docs" |
1107 |
> |
description="Puts all distributable products in single hierarchy"/> |
1108 |
|
|
1179 |
– |
</target> |
1109 |
|
|
1110 |
< |
<target name="jsr166ydist-docs" |
1111 |
< |
description="Builds javadocs without custom tags to dist folder"> |
1110 |
> |
<target name="jsr166eclean" |
1111 |
> |
description="Removes all jsr166e build products"> |
1112 |
> |
<delete dir="${build.jsr166e.dir}"/> |
1113 |
> |
</target> |
1114 |
|
|
1184 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
1185 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
1115 |
|
|
1116 |
< |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
1117 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
1118 |
< |
source="${build.sourcelevel}"> |
1119 |
< |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1191 |
< |
<include name="jsr166y/*.java"/> |
1192 |
< |
<include name="jsr166y/forkjoin/*.java"/> |
1193 |
< |
</fileset> |
1194 |
< |
</javadoc> |
1116 |
> |
<target name="jsr166edist-jar" |
1117 |
> |
depends="jsr166eclean, jsr166ejar"> |
1118 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1119 |
> |
</target> |
1120 |
|
|
1121 |
+ |
<target name="jsr166edist-docs" |
1122 |
+ |
depends="jsr166eclean, jsr166edocs"> |
1123 |
+ |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1124 |
|
</target> |
1125 |
|
|
1198 |
– |
<target name="jsr166ydist-jar" |
1199 |
– |
depends="jsr166yclean, jsr166yjar"> |
1126 |
|
|
1127 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
1127 |
> |
<!-- Find buglets that can be detected by static build tools --> |
1128 |
|
|
1129 |
+ |
<target name="lint"> |
1130 |
+ |
<antcall target="dists"> |
1131 |
+ |
<param name="build.javadoc.access" value="public"/> |
1132 |
+ |
</antcall> |
1133 |
|
</target> |
1134 |
|
|
1135 |
+ |
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1136 |
+ |
<target name="lint-private"> |
1137 |
+ |
<antcall target="dist"> |
1138 |
+ |
<param name="build.javadoc.access" value="private"/> |
1139 |
+ |
</antcall> |
1140 |
+ |
</target> |
1141 |
+ |
|
1142 |
+ |
|
1143 |
|
</project> |