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 |
+ |
where each of the above is a JDK or a symlink to same, and |
20 |
+ |
$HOME/jdk/src/jdk6 |
21 |
+ |
$HOME/jdk/src/jdk7 |
22 |
+ |
$HOME/jdk/src/jdk8 |
23 |
+ |
where each of the above is a complete JDK source tree |
24 |
+ |
(e.g. mercurial forest) or a symlink to same. |
25 |
+ |
As of 2013-02, the very latest lambda 8 jdk is needed for jdk8. |
26 |
|
------------------------------------------------------------------------------ |
27 |
|
</description> |
28 |
|
|
29 |
< |
<target name="usage" description="Advises user to run with -projecthelp"> |
30 |
< |
<echo>Run "ant -projecthelp" for full usage information.</echo> |
29 |
> |
<!-- Display main targets by running 'ant -projecthelp' --> |
30 |
> |
<target name="usage"> |
31 |
> |
<java classname="org.apache.tools.ant.Main"> |
32 |
> |
<arg value="-projecthelp" /> |
33 |
> |
</java> |
34 |
|
</target> |
35 |
|
|
36 |
|
|
39 |
|
|
40 |
|
|
41 |
|
<!-- Compilation options --> |
42 |
< |
<property name="build.sourcelevel" value="1.5"/> |
25 |
< |
<property name="build.docsourcelevel" value="1.4"/> |
42 |
> |
<property name="build.sourcelevel" value="6"/> |
43 |
|
<property name="build.debug" value="true"/> |
44 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
45 |
|
<property name="build.deprecation" value="false"/> |
46 |
+ |
<property name="build.javadoc.access" value="protected"/> |
47 |
+ |
|
48 |
+ |
<!-- Tck options; see JSR166TestCase.java --> |
49 |
+ |
<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
50 |
+ |
<property name="jsr166.profileTests" value="false"/> |
51 |
+ |
<property name="jsr166.profileThreshold" value="100"/> |
52 |
+ |
<property name="jsr166.runsPerTest" value="1"/> |
53 |
+ |
<!-- Allow running an individual tck test class --> |
54 |
+ |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
55 |
+ |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
56 |
|
|
57 |
|
<!-- Build locations --> |
58 |
< |
<property name="build.dir" location="build"/> |
59 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
60 |
< |
<property name="build.emulation.dir" location="${build.dir}/emulation"/> |
61 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
62 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
63 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
64 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
65 |
< |
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
66 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
67 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
68 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
69 |
< |
<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/> |
58 |
> |
<property name="build.dir" location="build"/> |
59 |
> |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
60 |
> |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
61 |
> |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
62 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
63 |
> |
|
64 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
65 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
66 |
> |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/> |
67 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
68 |
> |
|
69 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
70 |
> |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
71 |
> |
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
72 |
> |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
73 |
> |
|
74 |
> |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
75 |
> |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
76 |
> |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
77 |
> |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
78 |
> |
|
79 |
> |
<!-- JDK locations --> |
80 |
> |
<property name="jdks.home" location="${user.home}/jdk"/> |
81 |
> |
|
82 |
> |
<macrodef name="defjdklocations"> |
83 |
> |
<attribute name="v"/> |
84 |
> |
<sequential> |
85 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
86 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
87 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
88 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
89 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
90 |
> |
<local name="boot.jar.dir"/> |
91 |
> |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib"/> |
92 |
> |
<path id="bootclasspath@{v}"> |
93 |
> |
<pathelement path="${boot.jar.dir}/resources.jar"/> |
94 |
> |
<pathelement path="${boot.jar.dir}/rt.jar"/> |
95 |
> |
<pathelement path="${boot.jar.dir}/jsse.jar"/> |
96 |
> |
<pathelement path="${boot.jar.dir}/jce.jar"/> |
97 |
> |
<pathelement path="${boot.jar.dir}/charsets.jar"/> |
98 |
> |
</path> |
99 |
> |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/> |
100 |
> |
</sequential> |
101 |
> |
</macrodef> |
102 |
> |
|
103 |
> |
<macrodef name="mirror-dir"> |
104 |
> |
<attribute name="src"/> |
105 |
> |
<attribute name="dst"/> |
106 |
> |
<sequential> |
107 |
> |
<delete dir="@{dst}"/> |
108 |
> |
<mkdir dir="@{dst}"/> |
109 |
> |
<copy todir="@{dst}" preservelastmodified="true"> |
110 |
> |
<fileset dir="@{src}"/> |
111 |
> |
</copy> |
112 |
> |
</sequential> |
113 |
> |
</macrodef> |
114 |
> |
|
115 |
> |
<defjdklocations v="6"/> |
116 |
> |
<defjdklocations v="7"/> |
117 |
> |
<defjdklocations v="8"/> |
118 |
|
|
119 |
|
<!-- Source locations --> |
120 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
46 |
– |
<property name="emulation.src.dir" location="${basedir}/src/emulation"/> |
121 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
122 |
< |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
123 |
< |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
122 |
> |
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
123 |
> |
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
124 |
> |
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
125 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
126 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
127 |
< |
|
128 |
< |
<!-- Distribution locations --> |
129 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
127 |
> |
<property name="topsrc.dir" location="${basedir}/src"/> |
128 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
129 |
> |
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
130 |
> |
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
131 |
> |
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
132 |
> |
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
133 |
> |
|
134 |
> |
<!-- Javadoc locations --> |
135 |
> |
<property name="docs.dir" location="${build.dir}/docs"/> |
136 |
> |
<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/> |
137 |
> |
<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/> |
138 |
> |
<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/> |
139 |
> |
<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/> |
140 |
> |
<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/> |
141 |
> |
|
142 |
> |
<property name="dist.docs.dir" location="${dist.dir}/docs"/> |
143 |
> |
<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
144 |
> |
<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/> |
145 |
> |
<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/> |
146 |
> |
<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/> |
147 |
> |
<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/> |
148 |
|
|
149 |
|
<!-- Jar locations --> |
150 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
151 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
152 |
< |
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
153 |
< |
<property name="sinjdoc.jar" location="${lib.dir}/sinjdoc.jar"/> |
154 |
< |
|
155 |
< |
|
156 |
< |
<!-- Files excluded from dist-docs and emulation jar --> |
157 |
< |
<patternset id="unsafe.exclusion"> |
158 |
< |
<exclude name="java/util/Random.*"/> |
159 |
< |
<exclude name="sun/misc/Unsafe.*"/> |
160 |
< |
</patternset> |
161 |
< |
|
162 |
< |
<!-- Files excludes from emulation jar --> |
163 |
< |
<patternset id="atomic.exclusion"> |
164 |
< |
<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/> |
165 |
< |
<exclude name="java/util/concurrent/atomic/AtomicInteger*"/> |
166 |
< |
<exclude name="java/util/concurrent/atomic/AtomicLong*"/> |
167 |
< |
<exclude name="java/util/concurrent/atomic/AtomicReference*"/> |
168 |
< |
</patternset> |
150 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
151 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
152 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
153 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
154 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
155 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
156 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
157 |
> |
|
158 |
> |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
159 |
> |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
160 |
> |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
161 |
> |
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
162 |
> |
|
163 |
> |
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
164 |
> |
<!-- The below does not yet exist as of 2013-01 --> |
165 |
> |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
166 |
> |
|
167 |
> |
<!-- Default jdk api doc location (latest stable release seems best) --> |
168 |
> |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
169 |
> |
|
170 |
> |
<!-- Define the "jtreg" task --> |
171 |
> |
<!-- See the docs in "jtreg -onlineHelp" --> |
172 |
> |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
173 |
> |
classpath="${lib.dir}/jtreg.jar" /> |
174 |
> |
|
175 |
> |
<!-- Test classpath --> |
176 |
> |
<path id="test.classpath"> |
177 |
> |
<pathelement location="${build.testcases.dir}"/> |
178 |
> |
<pathelement location="${junit.jar}"/> |
179 |
> |
</path> |
180 |
> |
|
181 |
> |
<macrodef name="run-tck-tests"> |
182 |
> |
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
183 |
> |
<attribute name="target"/> |
184 |
> |
<attribute name="compile-target" default="@{target}"/> |
185 |
> |
<attribute name="workdir"/> |
186 |
> |
<attribute name="classes"/> |
187 |
> |
<attribute name="jvmflags" default=""/> |
188 |
> |
<element name="javac-elements" optional="true"/> |
189 |
> |
<sequential> |
190 |
> |
|
191 |
> |
<mkdir dir="@{workdir}/tck-classes"/> |
192 |
> |
|
193 |
> |
<javac srcdir="@{tck.src.dir}" |
194 |
> |
destdir="@{workdir}/tck-classes" |
195 |
> |
debug="${build.debug}" |
196 |
> |
debuglevel="${build.debuglevel}" |
197 |
> |
deprecation="${build.deprecation}" |
198 |
> |
source="@{compile-target}" |
199 |
> |
target="@{compile-target}" |
200 |
> |
classpath="${junit.jar}" |
201 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
202 |
> |
includeAntRuntime="false" |
203 |
> |
includeJavaRuntime="false" |
204 |
> |
executable="${javac@{compile-target}}" |
205 |
> |
fork="true"> |
206 |
> |
|
207 |
> |
<include name="*.java"/> |
208 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
209 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
210 |
> |
<compilerarg line="${build.args}"/> |
211 |
> |
<javac-elements/> |
212 |
|
|
213 |
+ |
</javac> |
214 |
+ |
|
215 |
+ |
<java classname="${jsr166.tckTestClass}" |
216 |
+ |
failonerror="true" |
217 |
+ |
jvm="${java@{target}}" |
218 |
+ |
fork="true"> |
219 |
+ |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
220 |
+ |
<jvmarg line="@{jvmflags}"/> |
221 |
+ |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
222 |
+ |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
223 |
+ |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
224 |
+ |
<classpath> |
225 |
+ |
<pathelement location="${junit.jar}"/> |
226 |
+ |
<pathelement location="@{workdir}/tck-classes"/> |
227 |
+ |
</classpath> |
228 |
+ |
</java> |
229 |
+ |
|
230 |
+ |
</sequential> |
231 |
+ |
</macrodef> |
232 |
|
|
233 |
+ |
<macrodef name="run-jtreg-tests"> |
234 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
235 |
+ |
<attribute name="source" default="7"/> |
236 |
+ |
<attribute name="target"/> |
237 |
+ |
<attribute name="workdir"/> |
238 |
+ |
<attribute name="classes"/> |
239 |
+ |
<attribute name="jtregflags" default=""/> |
240 |
+ |
<sequential> |
241 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
242 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
243 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
244 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
245 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
246 |
+ |
jdk="${jdk@{target}.home}" |
247 |
+ |
workDir="@{workdir}/JTwork" |
248 |
+ |
reportDir="@{workdir}/JTreport"> |
249 |
+ |
|
250 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
251 |
+ |
<arg value="-agentvm"/> |
252 |
+ |
<arg value="-v:nopass,fail"/> |
253 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
254 |
+ |
<arg value="-automatic"/> |
255 |
+ |
<arg value="-k:!ignore"/> |
256 |
+ |
<arg line="@{jtregflags}"/> |
257 |
+ |
</jtreg> |
258 |
+ |
</sequential> |
259 |
+ |
</macrodef> |
260 |
+ |
|
261 |
+ |
<!-- ALoops classpath --> |
262 |
+ |
<path id="loops.classpath"> |
263 |
+ |
<pathelement location="${build.loops.dir}"/> |
264 |
+ |
</path> |
265 |
+ |
|
266 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
267 |
+ |
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
268 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
269 |
|
|
270 |
|
<!-- Main targets --> |
271 |
|
|
272 |
< |
<target name="compile" |
273 |
< |
depends="init, configure-compiler, prepare-src" |
274 |
< |
description="Compiles main sources to build folder"> |
272 |
> |
<target name="dists" |
273 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
274 |
> |
description="Builds all public jars and docs"/> |
275 |
|
|
276 |
< |
<property name="prepare.src.dir" value="${src.dir}"/> |
276 |
> |
<target name="compile" |
277 |
> |
depends="configure-compiler" |
278 |
> |
description="Compiles src/main sources to build dir"> |
279 |
|
|
280 |
|
<mkdir dir="${build.classes.dir}"/> |
281 |
|
|
282 |
< |
<!-- |
283 |
< |
<echo>javac ${gjc.args}</echo> |
284 |
< |
<echo>bootclasspath=${compile.bootclasspath}</echo> |
285 |
< |
--> |
282 |
> |
<javac srcdir="${src.dir}" |
283 |
> |
destdir="${build.classes.dir}" |
284 |
> |
debug="${build.debug}" |
285 |
> |
debuglevel="${build.debuglevel}" |
286 |
> |
deprecation="${build.deprecation}" |
287 |
> |
classpath="" |
288 |
> |
includeAntRuntime="false" |
289 |
> |
includeJavaRuntime="false" |
290 |
> |
executable="${javac8}" |
291 |
> |
fork="true"> |
292 |
> |
|
293 |
> |
<include name="**/*.java"/> |
294 |
> |
<compilerarg value="-Xprefer:source"/> |
295 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
296 |
> |
<compilerarg value="-Xlint:all"/> |
297 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
298 |
> |
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
299 |
> |
<compilerarg line="${build.args}"/> |
300 |
|
|
301 |
< |
<javac srcdir="${prepare.src.dir}" |
302 |
< |
destdir="${build.classes.dir}" |
96 |
< |
debug="${build.debug}" |
97 |
< |
debuglevel="${build.debuglevel}" |
98 |
< |
deprecation="${build.deprecation}" |
99 |
< |
source="${build.sourcelevel}" |
100 |
< |
fork="true"> |
301 |
> |
</javac> |
302 |
> |
</target> |
303 |
|
|
102 |
– |
<compilerarg line="${gjc.args}"/> |
103 |
– |
<bootclasspath refid="compile.bootclasspath"/> |
304 |
|
|
305 |
< |
</javac> |
305 |
> |
<target name="jar" |
306 |
> |
depends="compile" |
307 |
> |
description="Builds library jar from compiled sources"> |
308 |
|
|
309 |
+ |
<jar destfile="${product.jar}"> |
310 |
+ |
<fileset dir="${build.classes.dir}"/> |
311 |
+ |
</jar> |
312 |
|
</target> |
313 |
|
|
314 |
|
|
315 |
< |
<target name="jar" |
316 |
< |
depends="configure-emulation, init-jar, native-jar, emulation-jar" |
112 |
< |
description="Builds library jar from compiled sources"/> |
315 |
> |
<target name="docs" |
316 |
> |
description="Builds javadocs for src/main to dist dir"> |
317 |
|
|
318 |
+ |
<delete dir="${docs.dir}"/> |
319 |
+ |
<mkdir dir="${docs.dir}"/> |
320 |
|
|
321 |
< |
<target name="test" |
322 |
< |
depends="init, configure-tests, report-tests" |
323 |
< |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
321 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
322 |
> |
<!-- sourcepath for packages --> |
323 |
> |
|
324 |
> |
<javadoc destdir="${docs.dir}" |
325 |
> |
packagenames="none" |
326 |
> |
link="${jdkapi8docs.url}" |
327 |
> |
overview="${src.dir}/intro.html" |
328 |
> |
access="${build.javadoc.access}" |
329 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
330 |
> |
classpath="" |
331 |
> |
executable="${javadoc8}"> |
332 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
333 |
> |
<include name="**/*.java"/> |
334 |
> |
</fileset> |
335 |
> |
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
336 |
> |
<arg value="-XDignore.symbol.file=true"/> |
337 |
> |
<arg value="-tag"/> |
338 |
> |
<arg value="${javadoc.jls.option}"/> |
339 |
> |
<arg value="-tag"/> |
340 |
> |
<arg value="apiNote:a:<em>API Note:</em>"/> |
341 |
> |
<arg value="-tag"/> |
342 |
> |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
343 |
> |
<arg value="-tag"/> |
344 |
> |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
345 |
> |
</javadoc> |
346 |
> |
</target> |
347 |
|
|
348 |
|
|
349 |
< |
<target name="checkstyle" |
350 |
< |
depends="filter-src" |
351 |
< |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
349 |
> |
<target name="dist" |
350 |
> |
depends="dist-clean, dist-jar, dist-docs" |
351 |
> |
description="Puts all distributable products in single hierarchy"/> |
352 |
|
|
124 |
– |
<taskdef resource="checkstyletask.properties" |
125 |
– |
classpath="${lib.dir}/checkstyle-all-2.4.jar"/> |
353 |
|
|
354 |
< |
<checkstyle> |
355 |
< |
<formatter type="plain"/> <!-- also available: type="xml" --> |
356 |
< |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
357 |
< |
</checkstyle> |
354 |
> |
<target name="release" |
355 |
> |
depends="dist" |
356 |
> |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
357 |
> |
|
358 |
> |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
359 |
|
|
360 |
+ |
<jar basedir="${basedir}" destfile="${release.jar}"> |
361 |
+ |
<!-- <exclude name="build/**"/> --> |
362 |
+ |
<exclude name="${release.jar}"/> |
363 |
+ |
<exclude name="user.properties"/> |
364 |
+ |
<exclude name="etc/notes/**"/> |
365 |
+ |
<exclude name="src/emulation/**"/> |
366 |
+ |
<exclude name="**/SyntaxTest.java"/> |
367 |
+ |
<exclude name="**/SuperfluousAbstract.java"/> |
368 |
+ |
</jar> |
369 |
|
</target> |
370 |
|
|
371 |
|
|
372 |
< |
<target name="doccheck" |
373 |
< |
depends="filter-doccheck" |
137 |
< |
description="Reports on javadoc style errors"> |
372 |
> |
<target name="clean" |
373 |
> |
description="Removes all build products"> |
374 |
|
|
375 |
< |
<delete dir="${build.doccheck.dir}"/> |
140 |
< |
<mkdir dir="${build.doccheck.dir}"/> |
375 |
> |
<delete dir="${build.dir}"/> |
376 |
|
|
377 |
< |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
143 |
< |
docletpath="${lib.dir}/doccheck.jar" |
144 |
< |
destdir="${build.doccheck.dir}"> |
145 |
< |
<packageset dir="${build.filter.doccheck.dir}"/> |
146 |
< |
</javadoc> |
377 |
> |
</target> |
378 |
|
|
379 |
< |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
379 |
> |
|
380 |
> |
<target name="dist-clean" |
381 |
> |
description="Removes all build and distribution products"> |
382 |
> |
|
383 |
> |
<delete dir="${build.dir}"/> |
384 |
> |
<delete dir="${dist.dir}"/> |
385 |
|
|
386 |
|
</target> |
387 |
|
|
388 |
|
|
389 |
< |
<target name="docs" |
390 |
< |
depends="filter-src" |
391 |
< |
description="Builds javadocs with custom tags to build folder"> |
389 |
> |
<target name="dist-jar" |
390 |
> |
depends="clean, jar"> |
391 |
> |
<copy file="${product.jar}" todir="${dist.dir}"/> |
392 |
> |
</target> |
393 |
|
|
394 |
< |
<delete dir="${build.javadocs.dir}"/> |
395 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
394 |
> |
<target name="dist-docs" |
395 |
> |
depends="clean, docs"> |
396 |
> |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
397 |
> |
</target> |
398 |
|
|
160 |
– |
<javadoc destdir="${build.javadocs.dir}" |
161 |
– |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
162 |
– |
overview="${src.dir}/intro.html" |
163 |
– |
source="${build.docsourcelevel}"> |
164 |
– |
|
165 |
– |
<tag name="revised" description="Last revised:"/> |
166 |
– |
<tag name="spec" description="Specified by:"/> |
167 |
– |
<tag name="editor" description="Last edited by:"/> |
168 |
– |
<tag name="fixme" description="FIX ME:"/> |
399 |
|
|
400 |
< |
<packageset dir="${build.filter.src.dir}"/> |
400 |
> |
<target name="test-tck" |
401 |
> |
depends="jar" |
402 |
> |
description="Runs tck tests for main directly"> |
403 |
|
|
404 |
< |
</javadoc> |
404 |
> |
<run-tck-tests |
405 |
> |
target="8" |
406 |
> |
workdir="${build.dir}" |
407 |
> |
classes="${product.jar}"/> |
408 |
> |
</target> |
409 |
|
|
410 |
+ |
<target name="test-jtreg" |
411 |
+ |
depends="jar" |
412 |
+ |
description="Runs jtreg tests for main using the jtreg ant task"> |
413 |
+ |
<run-jtreg-tests |
414 |
+ |
target="8" |
415 |
+ |
workdir="${build.dir}" |
416 |
+ |
classes="${product.jar}"/> |
417 |
|
</target> |
418 |
|
|
419 |
+ |
<target name="test" |
420 |
+ |
depends="test-tck, test-jtreg" |
421 |
+ |
description="Runs tck and jtreg tests for main"> |
422 |
+ |
</target> |
423 |
|
|
177 |
– |
<target name="sinjdocs" |
178 |
– |
depends="configure-tests" |
179 |
– |
description="Builds javadocs with custom tags to build folder"> |
424 |
|
|
181 |
– |
<delete dir="${build.javadocs.dir}"/> |
182 |
– |
<mkdir dir="${build.javadocs.dir}"/> |
425 |
|
|
426 |
< |
<java classname="net.cscott.sinjdoc.Main" fork="true"> |
426 |
> |
<target name="configure-compiler"> |
427 |
|
|
428 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
428 |
> |
<property name="unchecked.option" value="-Xlint:unchecked"/> |
429 |
|
|
430 |
< |
<classpath> |
431 |
< |
<pathelement location="${sinjdoc.jar}"/> |
432 |
< |
<path refid="test.classpath"/> |
191 |
< |
</classpath> |
430 |
> |
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
431 |
> |
<istrue value="${build.warnunchecked}"/> |
432 |
> |
</condition> |
433 |
|
|
434 |
< |
<!-- <arg value="-link"/> <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> --> |
434 |
> |
<property name="warnunchecked.arg" value=""/> |
435 |
|
|
195 |
– |
<arg value="-d"/> <arg value="${build.javadocs.dir}"/> |
196 |
– |
<arg value="-sourcepath"/> <arg value="${src.dir}"/> |
197 |
– |
<arg value="-overview"/> <arg value="${src.dir}/intro.html"/> |
198 |
– |
<arg value="-source"/> <arg value="1.5"/> |
199 |
– |
<arg value="-verbose"/> |
200 |
– |
<arg value="java.util"/> |
201 |
– |
|
202 |
– |
<!-- |
203 |
– |
<arg value="-help"/> |
204 |
– |
--> |
436 |
|
|
437 |
< |
</java> |
437 |
> |
<!-- Common options in javac invocations --> |
438 |
> |
<property name="build.args" value="${warnunchecked.arg}"/> |
439 |
|
|
440 |
|
</target> |
441 |
|
|
442 |
|
|
443 |
< |
<target name="strip" |
444 |
< |
depends="init, configure-compiler" |
445 |
< |
description="Strip generics from java source (not working yet)"> |
446 |
< |
|
447 |
< |
<mkdir dir="${build.stripped.dir}"/> |
448 |
< |
|
449 |
< |
<!-- |
450 |
< |
# javac -s doesn't reliably generate compilable code. It generates |
451 |
< |
# bridge methods (marked as "synthetic") that can have identical |
452 |
< |
# signatures to existing methods except for the return value. |
453 |
< |
--> |
222 |
< |
<javac srcdir="${src.dir}" |
223 |
< |
destdir="${build.stripped.dir}" |
443 |
> |
|
444 |
> |
<!-- Various demos and test programs --> |
445 |
> |
|
446 |
> |
|
447 |
> |
<target name="loops" depends="configure-compiler" |
448 |
> |
description="Benchmark from Doug Lea's AQS paper"> |
449 |
> |
|
450 |
> |
<mkdir dir="${build.loops.dir}"/> |
451 |
> |
|
452 |
> |
<javac srcdir="${loops.src.dir}" |
453 |
> |
destdir="${build.loops.dir}" |
454 |
|
debug="${build.debug}" |
455 |
|
debuglevel="${build.debuglevel}" |
456 |
|
deprecation="${build.deprecation}" |
457 |
|
source="${build.sourcelevel}" |
458 |
|
fork="true"> |
459 |
|
|
460 |
< |
<compilerarg line="${gjc.args} -s"/> |
461 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
460 |
> |
<compilerarg line="${build.args}"/> |
461 |
> |
<classpath refid="loops.classpath"/> |
462 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
463 |
|
|
464 |
|
</javac> |
465 |
|
|
466 |
+ |
<java classname="ALoops" fork="true"> |
467 |
+ |
<classpath refid="loops.classpath"/> |
468 |
+ |
</java> |
469 |
+ |
|
470 |
|
</target> |
471 |
|
|
472 |
|
|
473 |
< |
<target name="dist" |
239 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
240 |
< |
description="Puts all distributable products in single hierarchy"/> |
473 |
> |
<!-- jsr166 4jdk7 --> |
474 |
|
|
475 |
< |
<target name="release" |
476 |
< |
depends="dist" |
477 |
< |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
475 |
> |
<target name="4jdk7compile" |
476 |
> |
depends="configure-compiler" |
477 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
478 |
|
|
479 |
< |
<!-- |
247 |
< |
#keep build dir? - dl |
248 |
< |
<delete dir="${build.dir}"/> |
249 |
< |
--> |
250 |
< |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
479 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
480 |
|
|
481 |
< |
<jar basedir="${basedir}" destfile="${release.jar}"> |
482 |
< |
<exclude name="${release.jar}"/> |
483 |
< |
<exclude name="user.properties"/> |
484 |
< |
<exclude name="etc/notes/**"/> |
485 |
< |
<exclude name="lib/gjc/2.1/**"/> |
486 |
< |
<exclude name="**/SyntaxTest.java"/> |
487 |
< |
</jar> |
481 |
> |
<javac srcdir="${4jdk7src.dir}" |
482 |
> |
destdir="${build.4jdk7.classes.dir}" |
483 |
> |
debug="${build.debug}" |
484 |
> |
debuglevel="${build.debuglevel}" |
485 |
> |
deprecation="${build.deprecation}" |
486 |
> |
source="6" |
487 |
> |
classpath="" |
488 |
> |
bootclasspath="${bootclasspath6}" |
489 |
> |
includeAntRuntime="false" |
490 |
> |
includeJavaRuntime="false" |
491 |
> |
executable="${javac7}" |
492 |
> |
fork="true"> |
493 |
> |
|
494 |
> |
<include name="**/*.java"/> |
495 |
> |
<compilerarg value="-Xprefer:source"/> |
496 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
497 |
> |
<compilerarg value="-Xlint:all"/> |
498 |
> |
<compilerarg line="${build.args}"/> |
499 |
|
|
500 |
+ |
</javac> |
501 |
|
</target> |
502 |
|
|
262 |
– |
<target name="clean" |
263 |
– |
description="Removes all build products"> |
503 |
|
|
504 |
< |
<delete dir="${build.dir}"/> |
505 |
< |
<delete dir="${build.classes.dir}"/> |
506 |
< |
<delete dir="${build.lib.dir}"/> |
268 |
< |
|
269 |
< |
</target> |
504 |
> |
<target name="4jdk7jar" |
505 |
> |
depends="4jdk7compile" |
506 |
> |
description="Builds library jar from compiled sources"> |
507 |
|
|
508 |
+ |
<jar destfile="${4jdk7product.jar}"> |
509 |
+ |
<fileset dir="${build.4jdk7.classes.dir}"/> |
510 |
+ |
</jar> |
511 |
|
|
512 |
< |
<target name="dist-clean" |
273 |
< |
description="Removes all build and distribution products"> |
512 |
> |
</target> |
513 |
|
|
275 |
– |
<delete dir="${dist.dir}"/> |
514 |
|
|
515 |
+ |
<target name="4jdk7-test-tck" |
516 |
+ |
depends="4jdk7jar" |
517 |
+ |
description="Runs tck tests for jsr166-4jdk7 directly"> |
518 |
+ |
|
519 |
+ |
<run-tck-tests |
520 |
+ |
target="7" |
521 |
+ |
workdir="${build.4jdk7.dir}" |
522 |
+ |
classes="${4jdk7product.jar}"> |
523 |
+ |
<javac-elements> |
524 |
+ |
<!-- JDK8+ test classes --> |
525 |
+ |
<exclude name="*8Test.java"/> |
526 |
+ |
<exclude name="DoubleAccumulatorTest.java"/> |
527 |
+ |
<exclude name="DoubleAdderTest.java"/> |
528 |
+ |
<exclude name="LongAccumulatorTest.java"/> |
529 |
+ |
<exclude name="LongAdderTest.java"/> |
530 |
+ |
<exclude name="CompletableFutureTest.java"/> |
531 |
+ |
<exclude name="SplittableRandomTest.java"/> |
532 |
+ |
<exclude name="StampedLockTest.java"/> |
533 |
+ |
</javac-elements> |
534 |
+ |
</run-tck-tests> |
535 |
|
</target> |
536 |
|
|
537 |
|
|
538 |
< |
<target name="dist-docs" |
539 |
< |
depends="filter-src" |
540 |
< |
description="Builds javadocs without custom tags to dist folder"> |
538 |
> |
<target name="4jdk7-test-tck-junit" |
539 |
> |
depends="4jdk7compile" |
540 |
> |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
541 |
|
|
542 |
< |
<delete dir="${dist.javadocs.dir}"/> |
543 |
< |
<mkdir dir="${dist.javadocs.dir}"/> |
542 |
> |
<junit printsummary="true" |
543 |
> |
showoutput="true" |
544 |
> |
errorProperty="junit.failed" |
545 |
> |
failureProperty="junit.failed" |
546 |
> |
includeantruntime="true" |
547 |
> |
jvm="${java7}" |
548 |
> |
fork="true"> |
549 |
|
|
550 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
551 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
289 |
< |
overview="${src.dir}/intro.html" |
290 |
< |
source="${build.docsourcelevel}"> |
550 |
> |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
551 |
> |
<jvmarg value="-server"/> |
552 |
|
|
553 |
< |
<packageset dir="${build.filter.src.dir}"/> |
553 |
> |
<classpath> |
554 |
> |
<pathelement location="${junit.jar}"/> |
555 |
> |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
556 |
> |
</classpath> |
557 |
|
|
558 |
< |
</javadoc> |
558 |
> |
<formatter type="brief"/> |
559 |
> |
|
560 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
561 |
> |
</test> |
562 |
|
|
563 |
+ |
</junit> |
564 |
|
</target> |
565 |
|
|
566 |
+ |
<target name="4jdk7-test-jtreg" |
567 |
+ |
depends="4jdk7jar" |
568 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
569 |
+ |
<run-jtreg-tests |
570 |
+ |
target="7" |
571 |
+ |
workdir="${build.4jdk7.dir}" |
572 |
+ |
classes="${4jdk7product.jar}" |
573 |
+ |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
574 |
+ |
</target> |
575 |
|
|
576 |
|
|
577 |
< |
<!-- Internal targets --> |
577 |
> |
<target name="4jdk7-test" |
578 |
> |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
579 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
580 |
> |
</target> |
581 |
|
|
582 |
|
|
583 |
< |
<target name="init"> |
583 |
> |
<target name="4jdk7docs" |
584 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
585 |
> |
|
586 |
> |
<delete dir="${4jdk7docs.dir}"/> |
587 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
588 |
> |
|
589 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
590 |
> |
packagenames="none" |
591 |
> |
link="${jdkapi7docs.url}" |
592 |
> |
overview="${4jdk7src.dir}/intro.html" |
593 |
> |
access="${build.javadoc.access}" |
594 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
595 |
> |
classpath="" |
596 |
> |
executable="${javadoc7}"> |
597 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
598 |
> |
<include name="**/*.java"/> |
599 |
> |
</fileset> |
600 |
> |
<arg value="-XDignore.symbol.file=true"/> |
601 |
> |
</javadoc> |
602 |
> |
</target> |
603 |
|
|
305 |
– |
<!-- Version is kept in a separate file --> |
306 |
– |
<loadfile property="version" srcFile="version.properties"/> |
307 |
– |
<echo>Building JSR-166 version ${version}</echo> |
604 |
|
|
605 |
< |
</target> |
605 |
> |
<target name="4jdk7dist" |
606 |
> |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
607 |
> |
description="Puts all distributable products in single hierarchy"/> |
608 |
|
|
609 |
|
|
610 |
< |
<target name="init-jar"> |
610 |
> |
<target name="4jdk7clean" |
611 |
> |
description="Removes all 4jdk7 build products"> |
612 |
|
|
613 |
< |
<mkdir dir="${build.lib.dir}"/> |
613 |
> |
<delete dir="${build.4jdk7.dir}"/> |
614 |
|
|
615 |
|
</target> |
616 |
|
|
617 |
|
|
618 |
< |
<target name="native-jar" |
619 |
< |
depends="compile" |
620 |
< |
unless="build.emulation.true"> |
618 |
> |
<target name="4jdk7dist-jar" |
619 |
> |
depends="4jdk7clean, 4jdk7jar"> |
620 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
621 |
> |
</target> |
622 |
|
|
323 |
– |
<jar destfile="${product.jar}"> |
324 |
– |
<fileset dir="${build.classes.dir}"/> |
325 |
– |
</jar> |
623 |
|
|
624 |
+ |
<target name="4jdk7dist-docs" |
625 |
+ |
depends="4jdk7clean, 4jdk7docs"> |
626 |
+ |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
627 |
|
</target> |
628 |
|
|
629 |
|
|
630 |
< |
<target name="compile-emulation" |
331 |
< |
depends="init, configure-compiler" |
332 |
< |
if="build.emulation.true"> |
630 |
> |
<!-- jsr166x --> |
631 |
|
|
632 |
< |
<mkdir dir="${build.emulation.dir}"/> |
632 |
> |
<target name="jsr166xcompile" |
633 |
> |
depends="configure-compiler" |
634 |
> |
description="Compiles jsr166x sources to build dir"> |
635 |
|
|
636 |
< |
<javac srcdir="${emulation.src.dir}" |
337 |
< |
destdir="${build.emulation.dir}" |
338 |
< |
debug="${build.debug}" |
339 |
< |
debuglevel="${build.debuglevel}" |
340 |
< |
deprecation="${build.deprecation}" |
341 |
< |
source="${build.sourcelevel}" |
342 |
< |
fork="true"> |
636 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
637 |
|
|
638 |
< |
<compilerarg line="${gjc.args}"/> |
639 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
638 |
> |
<javac srcdir="${topsrc.dir}" |
639 |
> |
destdir="${build.jsr166x.classes.dir}" |
640 |
> |
debug="${build.debug}" |
641 |
> |
debuglevel="${build.debuglevel}" |
642 |
> |
deprecation="${build.deprecation}" |
643 |
> |
classpath="" |
644 |
> |
bootclasspath="${bootclasspath6}" |
645 |
> |
source="5" |
646 |
> |
includeAntRuntime="false" |
647 |
> |
includeJavaRuntime="false" |
648 |
> |
executable="${javac7}" |
649 |
> |
fork="true"> |
650 |
> |
|
651 |
> |
<include name="jsr166x/**/*.java"/> |
652 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
653 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
654 |
> |
<compilerarg line="${build.args}"/> |
655 |
|
|
656 |
|
</javac> |
348 |
– |
|
657 |
|
</target> |
658 |
|
|
659 |
|
|
660 |
< |
<target name="emulation-jar" |
661 |
< |
depends="compile-emulation" |
662 |
< |
if="build.emulation.true"> |
355 |
< |
|
660 |
> |
<target name="jsr166xjar" |
661 |
> |
depends="jsr166xcompile" |
662 |
> |
description="Builds library jar from compiled sources"> |
663 |
|
|
664 |
< |
<jar destfile="${product.jar}" duplicate="add"> |
665 |
< |
<fileset dir="${build.classes.dir}"> |
359 |
< |
<patternset refid="atomic.exclusion"/> |
360 |
< |
<patternset refid="unsafe.exclusion"/> |
361 |
< |
</fileset> |
362 |
< |
<fileset dir="${build.emulation.dir}"/> |
664 |
> |
<jar destfile="${jsr166x.jar}"> |
665 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
666 |
|
</jar> |
667 |
|
|
668 |
|
</target> |
669 |
|
|
670 |
|
|
671 |
< |
<target name="dist-jar" |
672 |
< |
depends="clean, jar"> |
671 |
> |
<target name="jsr166xdocs" |
672 |
> |
description="Builds javadocs to dist dir"> |
673 |
|
|
674 |
< |
<copy file="${product.jar}" todir="${dist.dir}"/> |
674 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
675 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
676 |
|
|
677 |
+ |
<javadoc destdir="${jsr166xdocs.dir}" |
678 |
+ |
packagenames="jsr166x.*" |
679 |
+ |
link="${jdkapidocs.url}" |
680 |
+ |
access="${build.javadoc.access}" |
681 |
+ |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
682 |
+ |
bootclasspath="${bootclasspath6}" |
683 |
+ |
source="5" |
684 |
+ |
executable="${javadoc7}"> |
685 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
686 |
+ |
|
687 |
+ |
</javadoc> |
688 |
|
</target> |
689 |
|
|
690 |
|
|
691 |
< |
<target name="compile-ant-filter" |
692 |
< |
depends="init"> |
691 |
> |
<target name="jsr166xdist" |
692 |
> |
depends="jsr166xdist-jar, jsr166xdist-docs" |
693 |
> |
description="Puts all distributable products in single hierarchy"/> |
694 |
> |
|
695 |
|
|
696 |
< |
<mkdir dir="${build.ant.dir}"/> |
696 |
> |
<target name="jsr166xclean" |
697 |
> |
description="Removes all jsr166x build products"> |
698 |
|
|
699 |
< |
<javac srcdir="${ant.src.dir}" |
382 |
< |
destdir="${build.ant.dir}" |
383 |
< |
source="1.4" |
384 |
< |
/> |
699 |
> |
<delete dir="${build.jsr166x.dir}"/> |
700 |
|
|
701 |
|
</target> |
702 |
|
|
703 |
|
|
704 |
< |
<target name="filter-src" |
705 |
< |
depends="compile-ant-filter"> |
704 |
> |
<target name="jsr166xdist-jar" |
705 |
> |
depends="jsr166xclean, jsr166xjar"> |
706 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
707 |
> |
</target> |
708 |
|
|
709 |
< |
<mkdir dir="${build.filter.src.dir}"/> |
709 |
> |
<target name="jsr166xdist-docs" |
710 |
> |
depends="jsr166xclean, jsr166xdocs"> |
711 |
> |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
712 |
> |
</target> |
713 |
|
|
714 |
< |
<copy todir="${build.filter.src.dir}"> |
395 |
< |
<fileset dir="${src.dir}"> |
396 |
< |
<include name="**/*.html"/> |
397 |
< |
</fileset> |
398 |
< |
</copy> |
714 |
> |
<!-- jsr166y --> |
715 |
|
|
400 |
– |
<copy todir="${build.filter.src.dir}"> |
401 |
– |
<fileset dir="${src.dir}"> |
402 |
– |
<exclude name="**/*.html"/> |
403 |
– |
<patternset refid="unsafe.exclusion"/> |
404 |
– |
</fileset> |
405 |
– |
<filterchain> |
716 |
|
|
717 |
< |
<!-- |
718 |
< |
# This filter gets rid of angle-bracketed type parameters |
719 |
< |
# so that javadoc can run on the result. The following |
720 |
< |
# heuristic seems to work: |
721 |
< |
# |
412 |
< |
# For all lines not starting with space(s)-asterisk-space(s), |
413 |
< |
# replace <something> with a space, where there may be more |
414 |
< |
# than one right angle bracket at the end, and "something" |
415 |
< |
# must not contain parens or pipes. (This may need some |
416 |
< |
# tweaking.) |
417 |
< |
--> |
418 |
< |
|
419 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
420 |
< |
classpath="${build.ant.dir}"> |
421 |
< |
<param name="notmatching" value="^\s+\*\s.*$"/> |
422 |
< |
<param name="pattern" value="<[^|>()]+?>+"/> |
423 |
< |
<param name="replacement" value=" "/> |
424 |
< |
</filterreader> |
425 |
< |
|
426 |
< |
|
427 |
< |
<!-- |
428 |
< |
# This filter uncomments lines beginning with "//@" so that |
429 |
< |
# javadoc can see imports that are needed to resolve links |
430 |
< |
# but that shouldn't be in the compiled code. |
431 |
< |
--> |
432 |
< |
|
433 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
434 |
< |
classpath="${build.ant.dir}"> |
435 |
< |
<param name="matching" value="^//@.*$"/> |
436 |
< |
<param name="pattern" value="^//@"/> |
437 |
< |
<param name="replacement" value=""/> |
438 |
< |
</filterreader> |
439 |
< |
</filterchain> |
440 |
< |
</copy> |
717 |
> |
<target name="jsr166ycompile" |
718 |
> |
depends="configure-compiler" |
719 |
> |
description="Compiles jsr166y sources"> |
720 |
> |
|
721 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
722 |
|
|
723 |
+ |
<javac srcdir="${topsrc.dir}" |
724 |
+ |
destdir="${build.jsr166y.classes.dir}" |
725 |
+ |
debug="${build.debug}" |
726 |
+ |
debuglevel="${build.debuglevel}" |
727 |
+ |
deprecation="${build.deprecation}" |
728 |
+ |
source="6" |
729 |
+ |
classpath="" |
730 |
+ |
bootclasspath="${bootclasspath6}" |
731 |
+ |
includeAntRuntime="false" |
732 |
+ |
includeJavaRuntime="false" |
733 |
+ |
executable="${javac7}" |
734 |
+ |
fork="true"> |
735 |
+ |
|
736 |
+ |
<include name="jsr166y/**/*.java"/> |
737 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
738 |
+ |
<compilerarg value="-Xlint:all"/> |
739 |
+ |
<compilerarg line="${build.args}"/> |
740 |
+ |
|
741 |
+ |
</javac> |
742 |
|
</target> |
743 |
|
|
744 |
|
|
745 |
+ |
<target name="jsr166yjar" |
746 |
+ |
depends="jsr166ycompile" |
747 |
+ |
description="Builds library jar from compiled sources"> |
748 |
|
|
749 |
+ |
<jar destfile="${jsr166y.jar}" index="true"> |
750 |
+ |
<fileset dir="${build.jsr166y.classes.dir}"/> |
751 |
+ |
</jar> |
752 |
|
|
753 |
< |
<target name="filter-doccheck" |
448 |
< |
depends="filter-src"> |
753 |
> |
</target> |
754 |
|
|
450 |
– |
<mkdir dir="${build.filter.doccheck.dir}"/> |
755 |
|
|
756 |
< |
<copy todir="${build.filter.doccheck.dir}"> |
757 |
< |
<fileset dir="${build.filter.src.dir}"> |
454 |
< |
<include name="**/*.html"/> |
455 |
< |
</fileset> |
456 |
< |
</copy> |
756 |
> |
<target name="jsr166ydocs" |
757 |
> |
description="Builds javadocs to dist dir"> |
758 |
|
|
759 |
< |
<property name="generic.declarations" |
760 |
< |
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 {}" |
460 |
< |
/> |
461 |
< |
|
462 |
< |
<copy todir="${build.filter.doccheck.dir}"> |
463 |
< |
<fileset dir="${build.filter.src.dir}"> |
464 |
< |
<exclude name="**/*.html"/> |
465 |
< |
</fileset> |
466 |
< |
<filterchain> |
467 |
< |
<!-- |
468 |
< |
# These two filters try to make the source look like |
469 |
< |
# something that doccheck can process. The first removes |
470 |
< |
# -source 1.4 assertions and the second adds in a bunch |
471 |
< |
# of single letter public nested marker interfaces so that |
472 |
< |
# the generic type parameters are recognized. |
473 |
< |
--> |
474 |
< |
|
475 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
476 |
< |
classpath="${build.ant.dir}"> |
477 |
< |
<param name="matching" value="^\s*assert[\s ].*$"/> |
478 |
< |
<param name="pattern" value="assert"/> |
479 |
< |
<param name="replacement" value="//assert"/> |
480 |
< |
</filterreader> |
481 |
< |
|
482 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
483 |
< |
classpath="${build.ant.dir}"> |
484 |
< |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
485 |
< |
<param name="pattern" value="$"/> |
486 |
< |
<param name="replacement" value=" ${generic.declarations}"/> |
487 |
< |
</filterreader> |
759 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
760 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
761 |
|
|
762 |
< |
</filterchain> |
763 |
< |
</copy> |
762 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
763 |
> |
packagenames="jsr166y.*" |
764 |
> |
link="${jdkapidocs.url}" |
765 |
> |
access="${build.javadoc.access}" |
766 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
767 |
> |
bootclasspath="${bootclasspath6}" |
768 |
> |
source="6" |
769 |
> |
executable="${javadoc7}"> |
770 |
> |
<arg value="-XDignore.symbol.file=true"/> |
771 |
|
|
772 |
+ |
</javadoc> |
773 |
|
</target> |
774 |
|
|
775 |
|
|
776 |
< |
<target name="compile-tests" |
777 |
< |
depends="jar"> |
776 |
> |
<target name="jsr166ydist" |
777 |
> |
depends="jsr166ydist-jar, jsr166ydist-docs" |
778 |
> |
description="Puts all distributable products in single hierarchy"/> |
779 |
|
|
498 |
– |
<mkdir dir="${build.testcases.dir}"/> |
780 |
|
|
781 |
< |
<!-- |
782 |
< |
<echo>javac ${gjc.args}</echo> |
502 |
< |
<echo>bootclasspath=${test.compile.bootclasspath}</echo> |
503 |
< |
<echo>classpath="${test.classpath}"</echo> |
504 |
< |
--> |
781 |
> |
<target name="jsr166yclean" |
782 |
> |
description="Removes all jsr166y build products"> |
783 |
|
|
784 |
< |
<javac srcdir="${test.src.dir}" |
507 |
< |
destdir="${build.testcases.dir}" |
508 |
< |
debug="${build.debug}" |
509 |
< |
debuglevel="${build.debuglevel}" |
510 |
< |
deprecation="${build.deprecation}" |
511 |
< |
source="${build.sourcelevel}" |
512 |
< |
fork="true"> |
784 |
> |
<delete dir="${build.jsr166y.dir}"/> |
785 |
|
|
786 |
< |
<compilerarg line="${gjc.args}"/> |
515 |
< |
<bootclasspath refid="test.compile.bootclasspath"/> |
516 |
< |
<classpath refid="test.classpath"/> |
786 |
> |
</target> |
787 |
|
|
518 |
– |
</javac> |
788 |
|
|
789 |
+ |
<target name="jsr166ydist-jar" |
790 |
+ |
depends="jsr166yclean, jsr166yjar"> |
791 |
+ |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
792 |
|
</target> |
793 |
|
|
794 |
+ |
<target name="jsr166ydist-docs" |
795 |
+ |
depends="jsr166yclean, jsr166ydocs"> |
796 |
+ |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
797 |
+ |
</target> |
798 |
|
|
523 |
– |
<target name="run-tests" |
524 |
– |
depends="compile-tests"> |
799 |
|
|
800 |
< |
<!-- May be overridden by user.properties --> |
527 |
< |
<property name="testcase" value="*"/> |
800 |
> |
<!-- extra166y --> |
801 |
|
|
529 |
– |
<mkdir dir="${build.reports.dir}"/> |
802 |
|
|
803 |
< |
<junit printsummary="true" |
804 |
< |
showoutput="true" |
805 |
< |
errorProperty="junit.failed" |
534 |
< |
failureProperty="junit.failed" |
535 |
< |
dir="${build.reports.dir}" |
536 |
< |
fork="true"> |
537 |
< |
|
538 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
539 |
< |
|
540 |
< |
<formatter type="xml"/> |
541 |
< |
|
542 |
< |
<batchtest todir="${build.reports.dir}"> |
543 |
< |
<fileset dir="${test.src.dir}"> |
544 |
< |
<include name="**/${testcase}Test.java"/> |
545 |
< |
</fileset> |
546 |
< |
</batchtest> |
803 |
> |
<target name="extra166ycompile" |
804 |
> |
depends="configure-compiler, jsr166yjar" |
805 |
> |
description="Compiles extra166y sources"> |
806 |
|
|
807 |
< |
</junit> |
807 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
808 |
|
|
809 |
< |
</target> |
809 |
> |
<javac srcdir="${topsrc.dir}" |
810 |
> |
destdir="${build.extra166y.classes.dir}" |
811 |
> |
debug="${build.debug}" |
812 |
> |
debuglevel="${build.debuglevel}" |
813 |
> |
deprecation="${build.deprecation}" |
814 |
> |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
815 |
> |
classpath="" |
816 |
> |
source="6" |
817 |
> |
includeAntRuntime="false" |
818 |
> |
includeJavaRuntime="false" |
819 |
> |
executable="${javac7}" |
820 |
> |
fork="true"> |
821 |
|
|
822 |
+ |
<include name="extra166y/**/*.java"/> |
823 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
824 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
825 |
+ |
<compilerarg line="${build.args}"/> |
826 |
|
|
827 |
< |
<target name="report-tests" |
828 |
< |
depends="run-tests"> |
827 |
> |
</javac> |
828 |
> |
</target> |
829 |
|
|
556 |
– |
<!-- Sets junit.report.format to frames if Xalan is present, |
557 |
– |
otherwise sets it to noframes. --> |
558 |
– |
<available property="junit.report.format" |
559 |
– |
value="frames" |
560 |
– |
classname="org.apache.xalan.lib.Redirect" |
561 |
– |
/> |
562 |
– |
<property name="junit.report.format" value="noframes"/> |
563 |
– |
|
564 |
– |
<junitreport todir="${build.reports.dir}"> |
565 |
– |
<fileset dir="${build.reports.dir}"> |
566 |
– |
<include name="TEST-*.xml"/> |
567 |
– |
</fileset> |
568 |
– |
<report styledir="${stylesheet.dir}" |
569 |
– |
format="${junit.report.format}" |
570 |
– |
todir="${build.reports.dir}" |
571 |
– |
/> |
572 |
– |
</junitreport> |
830 |
|
|
831 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
831 |
> |
<target name="extra166yjar" |
832 |
> |
depends="extra166ycompile" |
833 |
> |
description="Builds library jar from compiled sources"> |
834 |
> |
|
835 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
836 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
837 |
> |
</jar> |
838 |
|
|
839 |
|
</target> |
840 |
|
|
841 |
|
|
842 |
< |
<target name="configure-compiler"> |
842 |
> |
<target name="extra166ydocs" |
843 |
> |
description="Builds javadocs to build dir"> |
844 |
|
|
845 |
< |
<property name="gjc.version" |
846 |
< |
value="2.2"/> |
845 |
> |
<delete dir="${extra166ydocs.dir}"/> |
846 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
847 |
|
|
848 |
< |
<condition property="novariance.arg" value="-novariance"> |
849 |
< |
<and> |
850 |
< |
<equals arg1="${gjc.version}" arg2="2.0"/> |
851 |
< |
<or> |
852 |
< |
<not><isset property="gjc.novariance"/></not> |
853 |
< |
<istrue value="${gjc.novariance}"/> |
854 |
< |
</or> |
855 |
< |
</and> |
856 |
< |
</condition> |
848 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
849 |
> |
packagenames="extra166y.*" |
850 |
> |
link="${jdkapidocs.url}" |
851 |
> |
access="${build.javadoc.access}" |
852 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
853 |
> |
bootclasspath="${bootclasspath6}" |
854 |
> |
source="6" |
855 |
> |
executable="${javadoc7}"> |
856 |
> |
<arg value="-XDignore.symbol.file=true"/> |
857 |
|
|
858 |
< |
<property name="novariance.arg" |
859 |
< |
value=""/> |
858 |
> |
</javadoc> |
859 |
> |
</target> |
860 |
|
|
597 |
– |
<property name="gjc.dir" |
598 |
– |
value="${lib.dir}/gjc"/> |
861 |
|
|
862 |
< |
<property name="javac.jar" |
863 |
< |
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
862 |
> |
<target name="extra166ydist" |
863 |
> |
depends="extra166ydist-jar, extra166ydist-docs" |
864 |
> |
description="Puts all distributable products in single hierarchy"/> |
865 |
|
|
603 |
– |
<property name="collect.jar" |
604 |
– |
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
866 |
|
|
867 |
+ |
<target name="extra166yclean" |
868 |
+ |
description="Removes all extra166y build products"> |
869 |
|
|
870 |
< |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
608 |
< |
<istrue value="${gjc.warnunchecked}"/> |
609 |
< |
</condition> |
870 |
> |
<delete dir="${build.extra166y.dir}"/> |
871 |
|
|
872 |
< |
<property name="warnunchecked.arg" value=""/> |
872 |
> |
</target> |
873 |
|
|
613 |
– |
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
614 |
– |
<istrue value="${build.nothreads}"/> |
615 |
– |
</condition> |
874 |
|
|
875 |
+ |
<target name="extra166ydist-jar" |
876 |
+ |
depends="extra166yclean, extra166yjar"> |
877 |
+ |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
878 |
+ |
</target> |
879 |
|
|
880 |
< |
<!-- |
881 |
< |
! Bootclasspath munging for source compilation. |
882 |
< |
--> |
880 |
> |
<target name="extra166ydist-docs" |
881 |
> |
depends="extra166yclean, extra166ydocs"> |
882 |
> |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
883 |
> |
</target> |
884 |
|
|
885 |
< |
<path id="pre.bootclasspath"> |
623 |
< |
<pathelement location="${javac.jar}"/> |
624 |
< |
</path> |
885 |
> |
<!-- jsr166e --> |
886 |
|
|
887 |
< |
<path id="compile.bootclasspath"> |
888 |
< |
<pathelement location="${build.classes.dir}"/> |
628 |
< |
<pathelement location="${collect.jar}"/> |
629 |
< |
<pathelement location="${rt.jar}"/> |
630 |
< |
</path> |
887 |
> |
<property name="build.jsr166e.java.version" value="6"/> |
888 |
> |
<property name="build.jsr166e.javac" value="${javac6}"/> |
889 |
|
|
890 |
< |
<!-- Flatten paths into platform-appropriate strings --> |
891 |
< |
<property name="pre.bootclasspath" refid="pre.bootclasspath"/> |
892 |
< |
<property name="compile.bootclasspath" refid="compile.bootclasspath"/> |
890 |
> |
<target name="jsr166ecompile" |
891 |
> |
depends="configure-compiler" |
892 |
> |
description="Compiles jsr166e sources"> |
893 |
|
|
894 |
+ |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
895 |
|
|
896 |
< |
<!-- Common options in javac invocations --> |
897 |
< |
<property name="gjc.args" |
898 |
< |
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
899 |
< |
/> |
896 |
> |
<javac srcdir="${topsrc.dir}" |
897 |
> |
destdir="${build.jsr166e.classes.dir}" |
898 |
> |
debug="${build.debug}" |
899 |
> |
debuglevel="${build.debuglevel}" |
900 |
> |
deprecation="${build.deprecation}" |
901 |
> |
source="${build.jsr166e.java.version}" |
902 |
> |
classpath="" |
903 |
> |
includeAntRuntime="false" |
904 |
> |
includeJavaRuntime="false" |
905 |
> |
executable="${build.jsr166e.javac}" |
906 |
> |
fork="true"> |
907 |
> |
|
908 |
> |
<include name="jsr166e/**/*.java"/> |
909 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
910 |
> |
<compilerarg value="-Xlint:all"/> |
911 |
> |
<compilerarg line="${build.args}"/> |
912 |
|
|
913 |
+ |
</javac> |
914 |
|
</target> |
915 |
|
|
916 |
|
|
917 |
< |
<target name="prepare-src" |
918 |
< |
depends="configure-compiler" |
919 |
< |
if="prepare.src.dir"> |
917 |
> |
<target name="jsr166ejar" |
918 |
> |
depends="jsr166ecompile" |
919 |
> |
description="Builds library jar from compiled sources"> |
920 |
|
|
921 |
< |
<mkdir dir="${prepare.src.dir}"/> |
922 |
< |
<copy todir="${prepare.src.dir}"> |
923 |
< |
<fileset dir="${src.dir}"> |
652 |
< |
<exclude name="java/lang/**"/> |
653 |
< |
</fileset> |
654 |
< |
</copy> |
921 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
922 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
923 |
> |
</jar> |
924 |
|
|
925 |
|
</target> |
926 |
|
|
927 |
|
|
928 |
< |
<target name="configure-emulation"> |
929 |
< |
|
661 |
< |
<condition property="build.emulation.true"> |
662 |
< |
<or> |
663 |
< |
<and> |
664 |
< |
<os family="windows"/> |
665 |
< |
<not> |
666 |
< |
<isset property="build.emulation"/> |
667 |
< |
</not> |
668 |
< |
</and> |
669 |
< |
<istrue value="${build.emulation}"/> |
670 |
< |
</or> |
671 |
< |
</condition> |
928 |
> |
<target name="jsr166edocs" |
929 |
> |
description="Builds javadocs to build dir"> |
930 |
|
|
931 |
< |
</target> |
931 |
> |
<delete dir="${jsr166edocs.dir}"/> |
932 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
933 |
|
|
934 |
+ |
<javadoc destdir="${jsr166edocs.dir}" |
935 |
+ |
packagenames="jsr166e.*" |
936 |
+ |
link="${jdkapidocs.url}" |
937 |
+ |
access="${build.javadoc.access}" |
938 |
+ |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
939 |
+ |
source="${build.jsr166e.java.version}" |
940 |
+ |
executable="${javadoc7}"> |
941 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
942 |
|
|
943 |
< |
<target name="configure-tests" |
944 |
< |
depends="configure-compiler"> |
678 |
< |
|
679 |
< |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
680 |
< |
<available property="junit.available" |
681 |
< |
classname="junit.framework.Protectable"/> |
682 |
< |
|
683 |
< |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
684 |
< |
unless="junit.available"/> |
685 |
< |
|
686 |
< |
|
687 |
< |
<!-- |
688 |
< |
! Bootclasspath munging for testing, so JUnit can test our local |
689 |
< |
! modifications to java.*. |
690 |
< |
--> |
691 |
< |
|
692 |
< |
<path id="test.classpath"> |
693 |
< |
<pathelement location="${product.jar}"/> |
694 |
< |
<pathelement location="${build.testcases.dir}"/> |
695 |
< |
<pathelement location="${junit.jar}"/> |
696 |
< |
</path> |
943 |
> |
</javadoc> |
944 |
> |
</target> |
945 |
|
|
698 |
– |
<path id="test.compile.bootclasspath"> |
699 |
– |
<pathelement location="${javac.jar}"/> |
700 |
– |
<pathelement location="${collect.jar}"/> |
701 |
– |
<pathelement location="${rt.jar}"/> |
702 |
– |
</path> |
946 |
|
|
947 |
< |
<path id="test.run.bootclasspath"> |
948 |
< |
<pathelement location="${javac.jar}"/> |
706 |
< |
<path refid="test.classpath"/> |
707 |
< |
</path> |
947 |
> |
<target name="jsr166e-test-tck-one-java-version" |
948 |
> |
depends="jsr166ejar"> |
949 |
|
|
950 |
< |
<!-- Flatten test classpaths into platform-appropriate strings --> |
710 |
< |
<property name="test.classpath" refid="test.classpath"/> |
711 |
< |
<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/> |
712 |
< |
<property name="test.run.bootclasspath" refid="test.run.bootclasspath"/> |
950 |
> |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
951 |
|
|
952 |
+ |
<run-tck-tests |
953 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
954 |
+ |
target="${build.jsr166e.java.version}" |
955 |
+ |
workdir="${build.jsr166e.dir}" |
956 |
+ |
classes="${jsr166e.jar}"/> |
957 |
|
</target> |
958 |
|
|
959 |
+ |
<target name="jsr166e-test-tck" |
960 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
961 |
|
|
962 |
+ |
<!-- <antcall target="clean"/> --> |
963 |
+ |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
964 |
+ |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
965 |
+ |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
966 |
+ |
<!-- </antcall> --> |
967 |
|
|
968 |
< |
<!-- Anthill targets --> |
968 |
> |
<antcall target="clean"/> |
969 |
> |
<antcall target="jsr166e-test-tck-one-java-version"> |
970 |
> |
<param name="build.jsr166e.java.version" value="7"/> |
971 |
> |
<param name="build.jsr166e.javac" value="${javac7}"/> |
972 |
> |
</antcall> |
973 |
|
|
974 |
< |
<target name="anthill-build" |
975 |
< |
depends="jar, test, docs, dist-docs"/> |
974 |
> |
<antcall target="clean"/> |
975 |
> |
<antcall target="jsr166e-test-tck-one-java-version"> |
976 |
> |
<param name="build.jsr166e.java.version" value="6"/> |
977 |
> |
<param name="build.jsr166e.javac" value="${javac6}"/> |
978 |
> |
</antcall> |
979 |
> |
</target> |
980 |
|
|
723 |
– |
<target name="anthill-publish"> |
981 |
|
|
982 |
< |
<copy todir="${deployDir}/docs/private"> |
983 |
< |
<fileset dir="${build.javadocs.dir}"/> |
984 |
< |
</copy> |
982 |
> |
<target name="jsr166e-test" |
983 |
> |
depends="jsr166e-test-tck" |
984 |
> |
description="Runs all tests for jsr166e"> |
985 |
> |
</target> |
986 |
|
|
987 |
< |
<copy todir="${deployDir}/docs/public"> |
988 |
< |
<fileset dir="${dist.javadocs.dir}"/> |
989 |
< |
</copy> |
987 |
> |
<target name="jsr166edist" |
988 |
> |
depends="jsr166edist-jar, jsr166edist-docs" |
989 |
> |
description="Puts all distributable products in single hierarchy"/> |
990 |
|
|
733 |
– |
<copy tofile="${deployDir}/index.html" |
734 |
– |
file="${basedir}/etc/anthill-index.html"/> |
991 |
|
|
992 |
< |
<copy todir="${deployDir}/notes"> |
993 |
< |
<fileset dir="${basedir}/etc/notes"/> |
994 |
< |
</copy> |
992 |
> |
<target name="jsr166eclean" |
993 |
> |
description="Removes all jsr166e build products"> |
994 |
> |
<delete dir="${build.jsr166e.dir}"/> |
995 |
> |
</target> |
996 |
|
|
997 |
+ |
|
998 |
+ |
<target name="jsr166edist-jar" |
999 |
+ |
depends="jsr166eclean, jsr166ejar"> |
1000 |
+ |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1001 |
|
</target> |
1002 |
|
|
1003 |
+ |
<target name="jsr166edist-docs" |
1004 |
+ |
depends="jsr166eclean, jsr166edocs"> |
1005 |
+ |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1006 |
+ |
</target> |
1007 |
|
|
743 |
– |
<target name="ng" depends="test"> |
744 |
– |
<java classname="SuperfluousAbstract" fork="true"> |
1008 |
|
|
1009 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
1009 |
> |
<!-- Find buglets that can be detected by static build tools --> |
1010 |
|
|
1011 |
< |
</java> |
1011 |
> |
<target name="lint"> |
1012 |
> |
<antcall target="dists"> |
1013 |
> |
<param name="build.javadoc.access" value="private"/> |
1014 |
> |
</antcall> |
1015 |
|
</target> |
1016 |
|
|
1017 |
|
|