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 |
|
------------------------------------------------------------------------------ |
26 |
|
</description> |
27 |
|
|
35 |
|
|
36 |
|
|
37 |
|
<!-- Compilation options --> |
38 |
< |
<property name="build.sourcelevel" value="1.6"/> |
38 |
> |
<property name="build.sourcelevel" value="6"/> |
39 |
|
<property name="build.debug" value="true"/> |
40 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
41 |
|
<property name="build.deprecation" value="false"/> |
45 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
46 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
47 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
34 |
– |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
– |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
48 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
49 |
|
|
50 |
< |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
51 |
< |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
52 |
< |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
53 |
< |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
50 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
51 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
52 |
> |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/> |
53 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
54 |
|
|
55 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
44 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
45 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
46 |
– |
|
56 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
48 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
49 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
50 |
– |
|
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
52 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
53 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
54 |
– |
|
58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
56 |
– |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
57 |
– |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
59 |
|
|
60 |
< |
<!-- JDK binary locations --> |
60 |
> |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
61 |
> |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
62 |
> |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
63 |
> |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
64 |
> |
|
65 |
> |
<!-- JDK locations --> |
66 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
67 |
|
|
68 |
|
<macrodef name="defjdklocations"> |
69 |
|
<attribute name="v"/> |
70 |
|
<sequential> |
71 |
< |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
72 |
< |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
73 |
< |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
74 |
< |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
75 |
< |
<property name="bootclasspath@{v}" |
76 |
< |
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
71 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
72 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
73 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
74 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
75 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
76 |
> |
<local name="boot.jar.dir"/> |
77 |
> |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib"/> |
78 |
> |
<path id="bootclasspath@{v}"> |
79 |
> |
<pathelement path="${boot.jar.dir}/resources.jar"/> |
80 |
> |
<pathelement path="${boot.jar.dir}/rt.jar"/> |
81 |
> |
<pathelement path="${boot.jar.dir}/jsse.jar"/> |
82 |
> |
<pathelement path="${boot.jar.dir}/jce.jar"/> |
83 |
> |
<pathelement path="${boot.jar.dir}/charsets.jar"/> |
84 |
> |
</path> |
85 |
> |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/> |
86 |
|
</sequential> |
87 |
|
</macrodef> |
88 |
|
|
99 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
100 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
101 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
102 |
< |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
102 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
103 |
|
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
104 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
105 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
106 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
92 |
– |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
107 |
|
|
108 |
|
<!-- Distribution locations --> |
109 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
110 |
< |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
111 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
112 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
113 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
114 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
109 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
110 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
111 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
112 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
113 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
114 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
115 |
|
|
116 |
|
<!-- Jar locations --> |
117 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
118 |
< |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
119 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
120 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
121 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
122 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
123 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
110 |
< |
|
111 |
< |
<!-- Bootclasspath argument --> |
112 |
< |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
117 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
118 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
119 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
120 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
121 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
122 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
123 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
124 |
|
|
125 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
126 |
|
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
130 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
131 |
|
<!-- The below does not yet exist as of 2012-11 --> |
132 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
133 |
+ |
|
134 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
135 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
136 |
|
|
137 |
+ |
<!-- Define the "jtreg" task --> |
138 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
139 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
140 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
141 |
+ |
|
142 |
|
<!-- Test classpath --> |
143 |
|
<path id="test.classpath"> |
144 |
|
<pathelement location="${build.testcases.dir}"/> |
145 |
|
<pathelement location="${junit.jar}"/> |
146 |
|
</path> |
147 |
|
|
148 |
+ |
<macrodef name="run-tck-tests"> |
149 |
+ |
<attribute name="target"/> |
150 |
+ |
<attribute name="workdir"/> |
151 |
+ |
<attribute name="product.jar" default="${product.jar}"/> |
152 |
+ |
<attribute name="jvmflags" default=""/> |
153 |
+ |
<sequential> |
154 |
+ |
|
155 |
+ |
<mkdir dir="@{workdir}/tck-classes"/> |
156 |
+ |
|
157 |
+ |
<javac srcdir="${tck.src.dir}" |
158 |
+ |
destdir="@{workdir}/tck-classes" |
159 |
+ |
debug="${build.debug}" |
160 |
+ |
debuglevel="${build.debuglevel}" |
161 |
+ |
deprecation="${build.deprecation}" |
162 |
+ |
source="6" |
163 |
+ |
classpath="${junit.jar}" |
164 |
+ |
bootclasspath="@{product.jar}:${bootclasspath6}" |
165 |
+ |
includeAntRuntime="false" |
166 |
+ |
includeJavaRuntime="false" |
167 |
+ |
executable="${javac@{target}}" |
168 |
+ |
fork="true"> |
169 |
+ |
|
170 |
+ |
<include name="JSR166TestCase.java"/> |
171 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
172 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
173 |
+ |
<compilerarg line="${build.args}"/> |
174 |
+ |
|
175 |
+ |
</javac> |
176 |
+ |
|
177 |
+ |
<java classname="JSR166TestCase" |
178 |
+ |
failonerror="true" |
179 |
+ |
jvm="${java@{target}}" |
180 |
+ |
fork="true"> |
181 |
+ |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
182 |
+ |
<jvmarg line="@{jvmflags}"/> |
183 |
+ |
<classpath> |
184 |
+ |
<pathelement location="${junit.jar}"/> |
185 |
+ |
<pathelement location="@{workdir}/tck-classes"/> |
186 |
+ |
</classpath> |
187 |
+ |
</java> |
188 |
+ |
|
189 |
+ |
</sequential> |
190 |
+ |
</macrodef> |
191 |
+ |
|
192 |
|
<!-- ALoops classpath --> |
193 |
|
<path id="loops.classpath"> |
194 |
|
<pathelement location="${build.loops.dir}"/> |
195 |
|
</path> |
196 |
|
|
197 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
198 |
+ |
<!-- TODO: How do we get &trade to work? --> |
199 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
200 |
+ |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
201 |
+ |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
202 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
203 |
|
|
204 |
|
<!-- Main targets --> |
205 |
|
|
206 |
|
<target name="dists" |
207 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
207 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
208 |
|
description="Builds all public jars and docs"/> |
209 |
|
|
210 |
|
<target name="compile" |
211 |
< |
depends="init, configure-compiler" |
212 |
< |
description="Compiles main sources to build folder"> |
211 |
> |
depends="configure-compiler" |
212 |
> |
description="Compiles src/main sources to build dir"> |
213 |
|
|
214 |
|
<mkdir dir="${build.classes.dir}"/> |
215 |
|
|
216 |
|
<javac srcdir="${src.dir}" |
217 |
< |
destdir="${build.classes.dir}" |
218 |
< |
debug="${build.debug}" |
219 |
< |
debuglevel="${build.debuglevel}" |
220 |
< |
deprecation="${build.deprecation}" |
221 |
< |
source="${build.sourcelevel}" |
222 |
< |
fork="true"> |
217 |
> |
destdir="${build.classes.dir}" |
218 |
> |
debug="${build.debug}" |
219 |
> |
debuglevel="${build.debuglevel}" |
220 |
> |
deprecation="${build.deprecation}" |
221 |
> |
classpath="" |
222 |
> |
includeAntRuntime="false" |
223 |
> |
includeJavaRuntime="false" |
224 |
> |
executable="${javac8}" |
225 |
> |
fork="true"> |
226 |
|
|
227 |
|
<include name="**/*.java"/> |
228 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
229 |
< |
|
159 |
< |
<!-- |
160 |
< |
<exclude name="java/lang/**"/> |
229 |
> |
<compilerarg value="-Xlint:all"/> |
230 |
|
<compilerarg line="${build.args}"/> |
162 |
– |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
163 |
– |
--> |
231 |
|
|
232 |
|
</javac> |
166 |
– |
|
233 |
|
</target> |
234 |
|
|
235 |
|
|
170 |
– |
|
236 |
|
<target name="jar" |
237 |
|
depends="compile" |
238 |
|
description="Builds library jar from compiled sources"> |
239 |
|
|
175 |
– |
<mkdir dir="${build.lib.dir}"/> |
176 |
– |
|
240 |
|
<jar destfile="${product.jar}"> |
241 |
|
<fileset dir="${build.classes.dir}"/> |
242 |
|
</jar> |
180 |
– |
|
243 |
|
</target> |
244 |
|
|
245 |
|
|
184 |
– |
|
246 |
|
<target name="test" |
247 |
< |
depends="init, configure-tests, report-tests" |
247 |
> |
depends="configure-tests, report-tests" |
248 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
249 |
|
|
250 |
|
|
190 |
– |
|
251 |
|
<target name="docs" |
252 |
< |
description="Builds javadocs with custom tags to build folder"> |
252 |
> |
description="Builds javadocs for src/main to dist dir"> |
253 |
|
|
254 |
< |
<delete dir="${build.javadocs.dir}"/> |
255 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
254 |
> |
<delete dir="${dist.javadocs.dir}"/> |
255 |
> |
<mkdir dir="${dist.javadocs.dir}"/> |
256 |
|
|
257 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
258 |
|
<!-- sourcepath for packages --> |
259 |
|
|
260 |
< |
<javadoc destdir="${build.javadocs.dir}" |
260 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
261 |
|
packagenames="none" |
262 |
< |
link="${jdkapidocs.url}" |
262 |
> |
link="${jdkapi8docs.url}" |
263 |
|
overview="${src.dir}/intro.html" |
264 |
< |
sourcepath="${src.dir}:${jdksrc.dir}" |
265 |
< |
additionalparam="-XDignore.symbol.file=true" > |
264 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
265 |
> |
classpath="" |
266 |
> |
executable="${javadoc8}"> |
267 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
268 |
|
<include name="**/*.java"/> |
269 |
|
</fileset> |
270 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
271 |
+ |
<arg value="-tag"/> |
272 |
+ |
<arg value="${javadoc.jls.option}"/> |
273 |
|
</javadoc> |
210 |
– |
|
274 |
|
</target> |
275 |
|
|
276 |
|
|
214 |
– |
|
277 |
|
<target name="dist" |
278 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
278 |
> |
depends="dist-clean, dist-jar, docs" |
279 |
|
description="Puts all distributable products in single hierarchy"/> |
280 |
|
|
281 |
|
|
294 |
|
<exclude name="**/SyntaxTest.java"/> |
295 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
296 |
|
</jar> |
235 |
– |
|
297 |
|
</target> |
298 |
|
|
299 |
|
|
239 |
– |
|
300 |
|
<target name="clean" |
301 |
|
description="Removes all build products"> |
302 |
|
|
303 |
|
<delete dir="${build.dir}"/> |
244 |
– |
<delete dir="${build.classes.dir}"/> |
245 |
– |
<delete dir="${build.lib.dir}"/> |
304 |
|
|
305 |
|
</target> |
306 |
|
|
307 |
|
|
250 |
– |
|
308 |
|
<target name="dist-clean" |
309 |
|
description="Removes all build and distribution products"> |
310 |
|
|
313 |
|
</target> |
314 |
|
|
315 |
|
|
259 |
– |
|
260 |
– |
<target name="dist-docs" |
261 |
– |
description="Builds javadocs without custom tags to dist folder"> |
262 |
– |
|
263 |
– |
<delete dir="${dist.javadocs.dir}"/> |
264 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
265 |
– |
|
266 |
– |
<!-- the packagenames="none" hack below prevents scanning the --> |
267 |
– |
<!-- sourcepath for packages --> |
268 |
– |
|
269 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
270 |
– |
packagenames="none" |
271 |
– |
link="${jdkapidocs.url}" |
272 |
– |
overview="${src.dir}/intro.html" |
273 |
– |
sourcepath="${src.dir}:${jdksrc.dir}" |
274 |
– |
additionalparam="-XDignore.symbol.file=true" > |
275 |
– |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
276 |
– |
<include name="**/*.java"/> |
277 |
– |
</fileset> |
278 |
– |
</javadoc> |
279 |
– |
|
280 |
– |
</target> |
281 |
– |
|
282 |
– |
|
283 |
– |
|
316 |
|
<!-- Internal targets --> |
317 |
|
|
318 |
|
|
287 |
– |
<target name="init"> |
288 |
– |
|
289 |
– |
<!-- Version is kept in a separate file --> |
290 |
– |
<loadfile property="version" srcFile="version.properties"/> |
291 |
– |
<echo>Building JSR-166 version ${version}</echo> |
292 |
– |
<echo>java.home is ${java.home}</echo> |
293 |
– |
|
294 |
– |
</target> |
295 |
– |
|
296 |
– |
|
319 |
|
<target name="dist-jar" |
320 |
|
depends="clean, jar"> |
321 |
|
|
330 |
|
<mkdir dir="${build.testcases.dir}"/> |
331 |
|
|
332 |
|
<javac srcdir="${tck.src.dir}" |
333 |
< |
destdir="${build.testcases.dir}" |
334 |
< |
debug="${build.debug}" |
335 |
< |
debuglevel="${build.debuglevel}" |
336 |
< |
deprecation="${build.deprecation}" |
337 |
< |
source="${build.sourcelevel}" |
338 |
< |
fork="true"> |
333 |
> |
destdir="${build.testcases.dir}" |
334 |
> |
debug="${build.debug}" |
335 |
> |
debuglevel="${build.debuglevel}" |
336 |
> |
deprecation="${build.deprecation}" |
337 |
> |
source="6" |
338 |
> |
classpath="${junit.jar}" |
339 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
340 |
> |
includeAntRuntime="false" |
341 |
> |
includeJavaRuntime="false" |
342 |
> |
executable="${javac8}" |
343 |
> |
fork="true"> |
344 |
|
|
345 |
< |
<compilerarg value="${bootclasspath.args}"/> |
319 |
< |
<compilerarg line="${build.args}"/> |
345 |
> |
<include name="**/*.java"/> |
346 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
347 |
< |
|
348 |
< |
<classpath refid="test.classpath"/> |
347 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
348 |
> |
<compilerarg line="${build.args}"/> |
349 |
|
|
350 |
|
</javac> |
351 |
|
|
352 |
|
<javac srcdir="${test.src.dir}" |
353 |
< |
destdir="${build.testcases.dir}" |
354 |
< |
debug="${build.debug}" |
355 |
< |
debuglevel="${build.debuglevel}" |
356 |
< |
deprecation="${build.deprecation}" |
357 |
< |
source="${build.sourcelevel}" |
358 |
< |
fork="true"> |
359 |
< |
|
360 |
< |
<include name="jsr166/test/**"/> |
353 |
> |
destdir="${build.testcases.dir}" |
354 |
> |
debug="${build.debug}" |
355 |
> |
debuglevel="${build.debuglevel}" |
356 |
> |
deprecation="${build.deprecation}" |
357 |
> |
source="6" |
358 |
> |
classpath="" |
359 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
360 |
> |
includeAntRuntime="false" |
361 |
> |
includeJavaRuntime="false" |
362 |
> |
executable="${javac8}" |
363 |
> |
fork="true"> |
364 |
|
|
365 |
< |
<compilerarg value="${bootclasspath.args}"/> |
337 |
< |
<compilerarg line="${build.args}"/> |
365 |
> |
<include name="jsr166/test/**/*.java"/> |
366 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
367 |
< |
|
368 |
< |
<classpath refid="test.classpath"/> |
367 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
368 |
> |
<compilerarg line="${build.args}"/> |
369 |
|
|
370 |
|
</javac> |
371 |
|
|
378 |
|
source="${build.sourcelevel}" |
379 |
|
fork="true"> |
380 |
|
|
381 |
< |
<compilerarg value="${bootclasspath.args}"/> |
354 |
< |
<compilerarg line="${build.args}"/> |
381 |
> |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
382 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
383 |
< |
|
357 |
< |
<classpath refid="test.classpath"/> |
383 |
> |
<compilerarg line="${build.args}"/> |
384 |
|
|
385 |
|
</javac> |
386 |
|
--> |
401 |
|
errorProperty="junit.failed" |
402 |
|
failureProperty="junit.failed" |
403 |
|
dir="${build.reports.dir}" |
404 |
+ |
jvm="${java8}" |
405 |
|
fork="true"> |
406 |
|
|
407 |
< |
<jvmarg value="${bootclasspath.args}"/> |
407 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
408 |
|
<jvmarg value="-server"/> |
409 |
|
<jvmarg value="-showversion"/> |
410 |
|
|
505 |
|
<!-- Various demos and test programs --> |
506 |
|
|
507 |
|
|
508 |
< |
<target name="loops" depends="init, configure-compiler" |
508 |
> |
<target name="loops" depends="configure-compiler" |
509 |
|
description="Benchmark from Doug Lea's AQS paper"> |
510 |
|
|
511 |
|
<mkdir dir="${build.loops.dir}"/> |
531 |
|
</target> |
532 |
|
|
533 |
|
|
534 |
< |
<!-- jdk7 --> |
534 |
> |
<!-- jsr166 4jdk7 --> |
535 |
|
|
536 |
< |
|
510 |
< |
<target name="jdk7compile" |
536 |
> |
<target name="4jdk7compile" |
537 |
|
depends="configure-compiler" |
538 |
< |
description="Compiles src/jdk7 sources"> |
538 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
539 |
|
|
540 |
< |
<mkdir dir="${build.jdk7.classes.dir}"/> |
540 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
541 |
|
|
542 |
< |
<javac srcdir="${jdk7src.dir}" |
543 |
< |
destdir="${build.jdk7.classes.dir}" |
542 |
> |
<javac srcdir="${4jdk7src.dir}" |
543 |
> |
destdir="${build.4jdk7.classes.dir}" |
544 |
|
debug="${build.debug}" |
545 |
|
debuglevel="${build.debuglevel}" |
546 |
|
deprecation="${build.deprecation}" |
547 |
< |
source="1.6" |
547 |
> |
source="6" |
548 |
|
classpath="" |
549 |
|
bootclasspath="${bootclasspath6}" |
550 |
|
includeAntRuntime="false" |
551 |
|
includeJavaRuntime="false" |
552 |
< |
executable="${javac6}" |
552 |
> |
executable="${javac7}" |
553 |
|
fork="true"> |
554 |
|
|
555 |
|
<include name="**/*.java"/> |
530 |
– |
<compilerarg line="${build.args}"/> |
556 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
557 |
|
<compilerarg value="-Xlint:all"/> |
558 |
+ |
<compilerarg line="${build.args}"/> |
559 |
|
|
560 |
|
</javac> |
535 |
– |
|
561 |
|
</target> |
562 |
|
|
563 |
|
|
564 |
< |
|
565 |
< |
<target name="jdk7jar" |
541 |
< |
depends="jdk7compile" |
564 |
> |
<target name="4jdk7-jar" |
565 |
> |
depends="4jdk7compile" |
566 |
|
description="Builds library jar from compiled sources"> |
567 |
|
|
568 |
< |
<mkdir dir="${build.jdk7.lib.dir}"/> |
569 |
< |
|
546 |
< |
<jar destfile="${jdk7product.jar}" index="true"> |
547 |
< |
<fileset dir="${build.jdk7.classes.dir}"/> |
568 |
> |
<jar destfile="${4jdk7product.jar}"> |
569 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
570 |
|
</jar> |
571 |
|
|
572 |
|
</target> |
573 |
|
|
574 |
|
|
575 |
+ |
<target name="4jdk7-test-tck" |
576 |
+ |
depends="4jdk7-jar" |
577 |
+ |
description="Runs tck tests for jsr166-4jdk7 directly"> |
578 |
|
|
579 |
< |
<target name="jdk7docs" |
580 |
< |
description="Builds javadocs with custom tags to build folder"> |
581 |
< |
|
582 |
< |
<delete dir="${build.jdk7.docs.dir}"/> |
558 |
< |
<mkdir dir="${build.jdk7.docs.dir}"/> |
559 |
< |
|
560 |
< |
<javadoc destdir="${build.jdk7.docs.dir}" |
561 |
< |
packagenames="none" |
562 |
< |
link="${jdkapi7docs.url}" |
563 |
< |
overview="${jdk7src.dir}/intro.html" |
564 |
< |
sourcepath="${jdk7src.dir}" |
565 |
< |
bootclasspath="${bootclasspath6}" |
566 |
< |
classpath="" |
567 |
< |
source="1.6" |
568 |
< |
executable="${javadoc7}" |
569 |
< |
additionalparam="-XDignore.symbol.file=true" > |
570 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
571 |
< |
<include name="**/*.java"/> |
572 |
< |
</fileset> |
573 |
< |
</javadoc> |
574 |
< |
|
579 |
> |
<run-tck-tests |
580 |
> |
target="7" |
581 |
> |
workdir="${build.4jdk7.dir}" |
582 |
> |
product.jar="${4jdk7product.jar}"/> |
583 |
|
</target> |
584 |
|
|
585 |
|
|
586 |
< |
<target name="jdk7dist" |
587 |
< |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
588 |
< |
description="Puts all distributable products in single hierarchy"/> |
586 |
> |
<target name="4jdk7-test-tck-junit" |
587 |
> |
depends="4jdk7compile" |
588 |
> |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
589 |
|
|
590 |
+ |
<junit printsummary="true" |
591 |
+ |
showoutput="true" |
592 |
+ |
errorProperty="junit.failed" |
593 |
+ |
failureProperty="junit.failed" |
594 |
+ |
includeantruntime="true" |
595 |
+ |
jvm="${java7}" |
596 |
+ |
fork="true"> |
597 |
|
|
598 |
+ |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
599 |
+ |
<jvmarg value="-server"/> |
600 |
|
|
601 |
< |
<target name="jdk7clean" |
602 |
< |
description="Removes all build products"> |
601 |
> |
<classpath> |
602 |
> |
<pathelement location="${junit.jar}"/> |
603 |
> |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
604 |
> |
</classpath> |
605 |
|
|
606 |
< |
<delete dir="${build.jdk7.dir}"/> |
606 |
> |
<formatter type="brief"/> |
607 |
|
|
608 |
+ |
<test name="JSR166TestCase" haltonfailure="no"> |
609 |
+ |
</test> |
610 |
+ |
|
611 |
+ |
</junit> |
612 |
|
</target> |
613 |
|
|
614 |
+ |
<target name="4jdk7-test-jtreg" |
615 |
+ |
depends="4jdk7compile" |
616 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
617 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
618 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
619 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
620 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
621 |
+ |
<jtreg dir="${jtreg.src.dir}" |
622 |
+ |
jdk="${jdk7.home}" |
623 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
624 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
625 |
|
|
626 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
627 |
+ |
<arg value="-agentvm"/> |
628 |
+ |
<arg value="-v:nopass,fail"/> |
629 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
630 |
+ |
<arg value="-automatic"/> |
631 |
+ |
<arg value="-k:!ignore"/> |
632 |
+ |
</jtreg> |
633 |
+ |
</target> |
634 |
|
|
593 |
– |
<target name="jdk7dist-clean" |
594 |
– |
description="Removes all build and distribution products"> |
635 |
|
|
636 |
+ |
<target name="4jdk7-test" |
637 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
638 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
639 |
|
</target> |
640 |
|
|
598 |
– |
<target name="jdk7dist-docs" |
599 |
– |
description="Builds javadocs without custom tags to dist folder"> |
641 |
|
|
642 |
< |
<delete dir="${dist.jdk7.docs.dir}"/> |
643 |
< |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
642 |
> |
<target name="4jdk7docs" |
643 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
644 |
> |
|
645 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
646 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
647 |
|
|
648 |
< |
<javadoc destdir="${dist.jdk7.docs.dir}" |
648 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
649 |
|
packagenames="none" |
650 |
|
link="${jdkapi7docs.url}" |
651 |
< |
overview="${jdk7src.dir}/intro.html" |
652 |
< |
sourcepath="${jdk7src.dir}" |
651 |
> |
overview="${4jdk7src.dir}/intro.html" |
652 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
653 |
|
classpath="" |
654 |
< |
executable="${javadoc7}" |
655 |
< |
bootclasspath="${bootclasspath6}" |
612 |
< |
source="1.6"> |
613 |
< |
<arg value="-XDignore.symbol.file=true"/> |
614 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
654 |
> |
executable="${javadoc7}"> |
655 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
656 |
|
<include name="**/*.java"/> |
657 |
|
</fileset> |
658 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
659 |
|
</javadoc> |
660 |
+ |
</target> |
661 |
+ |
|
662 |
+ |
|
663 |
+ |
<target name="4jdk7dist" |
664 |
+ |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
665 |
+ |
description="Puts all distributable products in single hierarchy"/> |
666 |
+ |
|
667 |
+ |
|
668 |
+ |
<target name="4jdk7clean" |
669 |
+ |
description="Removes all 4jdk7 build products"> |
670 |
+ |
|
671 |
+ |
<delete dir="${build.4jdk7.dir}"/> |
672 |
|
|
673 |
|
</target> |
674 |
|
|
621 |
– |
<target name="jdk7dist-jar" |
622 |
– |
depends="jdk7clean, jdk7jar"> |
675 |
|
|
676 |
< |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
676 |
> |
<target name="4jdk7dist-clean" |
677 |
> |
description="Removes all build and distribution products"> |
678 |
|
|
679 |
|
</target> |
680 |
|
|
681 |
< |
<!-- jsr166x --> |
681 |
> |
<target name="4jdk7dist-jar" |
682 |
> |
depends="4jdk7clean, 4jdk7-jar"> |
683 |
> |
|
684 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
685 |
> |
|
686 |
> |
</target> |
687 |
|
|
688 |
|
|
689 |
+ |
<!-- jsr166x --> |
690 |
+ |
|
691 |
|
<target name="jsr166xcompile" |
692 |
< |
depends="init, configure-compiler" |
693 |
< |
description="Compiles jsr166x sources"> |
692 |
> |
depends="configure-compiler" |
693 |
> |
description="Compiles jsr166x sources to build dir"> |
694 |
|
|
695 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
695 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
696 |
|
|
697 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
698 |
< |
destdir="${build.jsr166x.dir}" |
699 |
< |
debug="${build.debug}" |
700 |
< |
debuglevel="${build.debuglevel}" |
701 |
< |
deprecation="${build.deprecation}" |
702 |
< |
source="${build.sourcelevel}" |
703 |
< |
fork="true"> |
697 |
> |
<javac srcdir="${topsrc.dir}" |
698 |
> |
destdir="${build.jsr166x.classes.dir}" |
699 |
> |
debug="${build.debug}" |
700 |
> |
debuglevel="${build.debuglevel}" |
701 |
> |
deprecation="${build.deprecation}" |
702 |
> |
classpath="" |
703 |
> |
bootclasspath="${bootclasspath6}" |
704 |
> |
source="5" |
705 |
> |
includeAntRuntime="false" |
706 |
> |
includeJavaRuntime="false" |
707 |
> |
executable="${javac7}" |
708 |
> |
fork="true"> |
709 |
|
|
710 |
< |
<include name="**/*.java"/> |
646 |
< |
<compilerarg line="${build.args}"/> |
710 |
> |
<include name="jsr166x/**/*.java"/> |
711 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
712 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
713 |
+ |
<compilerarg line="${build.args}"/> |
714 |
|
|
715 |
|
</javac> |
650 |
– |
|
716 |
|
</target> |
717 |
|
|
718 |
|
|
719 |
< |
|
655 |
< |
<target name="jsr166xjar" |
719 |
> |
<target name="jsr166x-jar" |
720 |
|
depends="jsr166xcompile" |
721 |
|
description="Builds library jar from compiled sources"> |
722 |
|
|
723 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
724 |
< |
|
661 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
662 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
723 |
> |
<jar destfile="${jsr166x.jar}"> |
724 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
725 |
|
</jar> |
726 |
|
|
727 |
|
</target> |
728 |
|
|
729 |
|
|
668 |
– |
|
730 |
|
<target name="jsr166xdocs" |
731 |
< |
description="Builds javadocs with custom tags to build folder"> |
731 |
> |
description="Builds javadocs to dist dir"> |
732 |
|
|
733 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
734 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
733 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
734 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
735 |
|
|
736 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
737 |
< |
packagenames="jsr166x" |
736 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
737 |
> |
packagenames="jsr166x.*" |
738 |
|
link="${jdkapidocs.url}" |
739 |
< |
source="${build.sourcelevel}" |
740 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
741 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
739 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
740 |
> |
bootclasspath="${bootclasspath6}" |
741 |
> |
source="5" |
742 |
> |
executable="${javadoc7}"> |
743 |
> |
<arg value="-XDignore.symbol.file=true"/> |
744 |
|
|
745 |
+ |
</javadoc> |
746 |
|
</target> |
747 |
|
|
748 |
|
|
749 |
|
<target name="jsr166xdist" |
750 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
750 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
751 |
|
description="Puts all distributable products in single hierarchy"/> |
752 |
|
|
753 |
|
|
690 |
– |
|
754 |
|
<target name="jsr166xclean" |
755 |
< |
description="Removes all build products"> |
755 |
> |
description="Removes all jsr166x build products"> |
756 |
|
|
757 |
|
<delete dir="${build.jsr166x.dir}"/> |
695 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
758 |
|
|
759 |
|
</target> |
760 |
|
|
761 |
|
|
700 |
– |
|
762 |
|
<target name="jsr166xdist-clean" |
763 |
|
description="Removes all build and distribution products"> |
764 |
|
|
765 |
|
</target> |
766 |
|
|
767 |
|
|
707 |
– |
|
708 |
– |
<target name="jsr166xdist-docs" |
709 |
– |
description="Builds javadocs without custom tags to dist folder"> |
710 |
– |
|
711 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
712 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
713 |
– |
|
714 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
715 |
– |
packagenames="jsr166x" |
716 |
– |
link="${jdkapidocs.url}" |
717 |
– |
source="${build.sourcelevel}" |
718 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
719 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
720 |
– |
|
721 |
– |
</target> |
722 |
– |
|
768 |
|
<target name="jsr166xdist-jar" |
769 |
< |
depends="jsr166xclean, jsr166xjar"> |
769 |
> |
depends="jsr166xclean, jsr166x-jar"> |
770 |
|
|
771 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
771 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
772 |
|
|
773 |
|
</target> |
774 |
|
|
776 |
|
|
777 |
|
|
778 |
|
<target name="jsr166ycompile" |
779 |
< |
depends="init, configure-compiler" |
779 |
> |
depends="configure-compiler" |
780 |
|
description="Compiles jsr166y sources"> |
781 |
|
|
782 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
782 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
783 |
|
|
784 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
785 |
< |
destdir="${build.jsr166y.dir}" |
786 |
< |
debug="${build.debug}" |
787 |
< |
debuglevel="${build.debuglevel}" |
788 |
< |
deprecation="${build.deprecation}" |
789 |
< |
source="${build.sourcelevel}" |
790 |
< |
fork="true"> |
784 |
> |
<javac srcdir="${topsrc.dir}" |
785 |
> |
destdir="${build.jsr166y.classes.dir}" |
786 |
> |
debug="${build.debug}" |
787 |
> |
debuglevel="${build.debuglevel}" |
788 |
> |
deprecation="${build.deprecation}" |
789 |
> |
source="6" |
790 |
> |
classpath="" |
791 |
> |
bootclasspath="${bootclasspath6}" |
792 |
> |
includeAntRuntime="false" |
793 |
> |
includeJavaRuntime="false" |
794 |
> |
executable="${javac7}" |
795 |
> |
fork="true"> |
796 |
|
|
797 |
< |
<include name="**/*.java"/> |
748 |
< |
<compilerarg line="${build.args}"/> |
797 |
> |
<include name="jsr166y/**/*.java"/> |
798 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
799 |
< |
<compilerarg value="${bootclasspath.args}"/> |
800 |
< |
|
752 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
799 |
> |
<compilerarg value="-Xlint:all"/> |
800 |
> |
<compilerarg line="${build.args}"/> |
801 |
|
|
802 |
|
</javac> |
755 |
– |
|
803 |
|
</target> |
804 |
|
|
805 |
|
|
806 |
< |
|
760 |
< |
<target name="jsr166yjar" |
806 |
> |
<target name="jsr166y-jar" |
807 |
|
depends="jsr166ycompile" |
808 |
|
description="Builds library jar from compiled sources"> |
809 |
|
|
810 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
811 |
< |
|
766 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
767 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
810 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
811 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
812 |
|
</jar> |
813 |
|
|
814 |
|
</target> |
815 |
|
|
816 |
|
|
773 |
– |
|
817 |
|
<target name="jsr166ydocs" |
818 |
< |
description="Builds javadocs with custom tags to build folder"> |
818 |
> |
description="Builds javadocs to dist dir"> |
819 |
|
|
820 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
821 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
820 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
821 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
822 |
|
|
823 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
824 |
< |
packagenames="jsr166y" |
823 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
824 |
> |
packagenames="jsr166y.*" |
825 |
|
link="${jdkapidocs.url}" |
826 |
< |
source="${build.sourcelevel}" |
827 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
828 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
826 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
827 |
> |
bootclasspath="${bootclasspath6}" |
828 |
> |
source="6" |
829 |
> |
executable="${javadoc7}"> |
830 |
> |
<arg value="-XDignore.symbol.file=true"/> |
831 |
|
|
832 |
+ |
</javadoc> |
833 |
|
</target> |
834 |
|
|
835 |
|
|
836 |
|
<target name="jsr166ydist" |
837 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
837 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
838 |
|
description="Puts all distributable products in single hierarchy"/> |
839 |
|
|
840 |
|
|
795 |
– |
|
841 |
|
<target name="jsr166yclean" |
842 |
< |
description="Removes all build products"> |
842 |
> |
description="Removes all jsr166y build products"> |
843 |
|
|
844 |
|
<delete dir="${build.jsr166y.dir}"/> |
800 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
845 |
|
|
846 |
|
</target> |
847 |
|
|
848 |
|
|
805 |
– |
|
849 |
|
<target name="jsr166ydist-clean" |
850 |
|
description="Removes all build and distribution products"> |
851 |
|
|
852 |
|
</target> |
853 |
|
|
811 |
– |
<target name="jsr166ydist-docs" |
812 |
– |
description="Builds javadocs without custom tags to dist folder"> |
813 |
– |
|
814 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
815 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
816 |
– |
|
817 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
818 |
– |
packagenames="jsr166y" |
819 |
– |
link="${jdkapidocs.url}" |
820 |
– |
source="${build.sourcelevel}" |
821 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
822 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
823 |
– |
|
824 |
– |
</target> |
825 |
– |
|
854 |
|
<target name="jsr166ydist-jar" |
855 |
< |
depends="jsr166yclean, jsr166yjar"> |
855 |
> |
depends="jsr166yclean, jsr166y-jar"> |
856 |
|
|
857 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
857 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
858 |
|
|
859 |
|
</target> |
860 |
|
|
863 |
|
|
864 |
|
|
865 |
|
<target name="extra166ycompile" |
866 |
< |
depends="init, configure-compiler, jsr166ycompile" |
866 |
> |
depends="configure-compiler, jsr166y-jar" |
867 |
|
description="Compiles extra166y sources"> |
868 |
|
|
869 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
869 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
870 |
|
|
871 |
< |
<javac srcdir="${extra166ysrc.dir}" |
872 |
< |
destdir="${build.extra166y.dir}" |
873 |
< |
debug="${build.debug}" |
874 |
< |
classpath="${jsr166yproduct.jar}" |
875 |
< |
debuglevel="${build.debuglevel}" |
876 |
< |
deprecation="${build.deprecation}" |
877 |
< |
source="${build.sourcelevel}" |
878 |
< |
fork="true"> |
871 |
> |
<javac srcdir="${topsrc.dir}" |
872 |
> |
destdir="${build.extra166y.classes.dir}" |
873 |
> |
debug="${build.debug}" |
874 |
> |
debuglevel="${build.debuglevel}" |
875 |
> |
deprecation="${build.deprecation}" |
876 |
> |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
877 |
> |
classpath="" |
878 |
> |
source="6" |
879 |
> |
includeAntRuntime="false" |
880 |
> |
includeJavaRuntime="false" |
881 |
> |
executable="${javac7}" |
882 |
> |
fork="true"> |
883 |
|
|
884 |
< |
<include name="**/*.java"/> |
853 |
< |
<compilerarg line="${build.args}"/> |
884 |
> |
<include name="extra166y/**/*.java"/> |
885 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
886 |
< |
<compilerarg value="${bootclasspath.args}"/> |
887 |
< |
|
857 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
886 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
887 |
> |
<compilerarg line="${build.args}"/> |
888 |
|
|
889 |
|
</javac> |
860 |
– |
|
890 |
|
</target> |
891 |
|
|
892 |
|
|
893 |
< |
|
865 |
< |
<target name="extra166yjar" |
893 |
> |
<target name="extra166y-jar" |
894 |
|
depends="extra166ycompile" |
895 |
|
description="Builds library jar from compiled sources"> |
896 |
|
|
897 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
898 |
< |
|
871 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
872 |
< |
<fileset dir="${build.extra166y.dir}"/> |
897 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
898 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
899 |
|
</jar> |
900 |
|
|
901 |
|
</target> |
902 |
|
|
903 |
|
|
878 |
– |
|
904 |
|
<target name="extra166ydocs" |
905 |
< |
description="Builds javadocs with custom tags to build folder"> |
905 |
> |
description="Builds javadocs to build dir"> |
906 |
|
|
907 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
908 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
907 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
908 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
909 |
|
|
910 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
911 |
< |
packagenames="extra166y" |
910 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
911 |
> |
packagenames="extra166y.*" |
912 |
|
link="${jdkapidocs.url}" |
913 |
< |
source="${build.sourcelevel}" |
914 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
915 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
913 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
914 |
> |
bootclasspath="${bootclasspath6}" |
915 |
> |
source="6" |
916 |
> |
executable="${javadoc7}"> |
917 |
> |
<arg value="-XDignore.symbol.file=true"/> |
918 |
|
|
919 |
+ |
</javadoc> |
920 |
|
</target> |
921 |
|
|
922 |
|
|
923 |
|
<target name="extra166ydist" |
924 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
924 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
925 |
|
description="Puts all distributable products in single hierarchy"/> |
926 |
|
|
927 |
|
|
900 |
– |
|
928 |
|
<target name="extra166yclean" |
929 |
< |
description="Removes all build products"> |
929 |
> |
description="Removes all extra166y build products"> |
930 |
|
|
931 |
|
<delete dir="${build.extra166y.dir}"/> |
905 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
932 |
|
|
933 |
|
</target> |
934 |
|
|
935 |
|
|
910 |
– |
|
936 |
|
<target name="extra166ydist-clean" |
937 |
|
description="Removes all build and distribution products"> |
938 |
|
|
939 |
|
</target> |
940 |
|
|
916 |
– |
<target name="extra166ydist-docs" |
917 |
– |
description="Builds javadocs without custom tags to dist folder"> |
918 |
– |
|
919 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
920 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
921 |
– |
|
922 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
923 |
– |
packagenames="extra166y" |
924 |
– |
link="${jdkapidocs.url}" |
925 |
– |
source="${build.sourcelevel}" |
926 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
927 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
928 |
– |
|
929 |
– |
</target> |
930 |
– |
|
941 |
|
<target name="extra166ydist-jar" |
942 |
< |
depends="extra166yclean, extra166yjar"> |
942 |
> |
depends="extra166yclean, extra166y-jar"> |
943 |
|
|
944 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
944 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
945 |
|
|
946 |
|
</target> |
947 |
|
|
951 |
|
depends="configure-compiler" |
952 |
|
description="Compiles jsr166e sources"> |
953 |
|
|
954 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
954 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
955 |
|
|
956 |
|
<javac srcdir="${topsrc.dir}" |
957 |
< |
destdir="${build.jsr166e.dir}" |
957 |
> |
destdir="${build.jsr166e.classes.dir}" |
958 |
|
debug="${build.debug}" |
959 |
|
debuglevel="${build.debuglevel}" |
960 |
|
deprecation="${build.deprecation}" |
961 |
< |
source="1.7" |
961 |
> |
source="7" |
962 |
|
classpath="" |
963 |
|
includeAntRuntime="false" |
964 |
|
includeJavaRuntime="false" |
966 |
|
fork="true"> |
967 |
|
|
968 |
|
<include name="jsr166e/**/*.java"/> |
959 |
– |
<compilerarg line="${build.args}"/> |
969 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
970 |
|
<compilerarg value="-Xlint:all"/> |
971 |
+ |
<compilerarg line="${build.args}"/> |
972 |
|
|
973 |
|
</javac> |
964 |
– |
|
974 |
|
</target> |
975 |
|
|
976 |
|
|
977 |
< |
|
969 |
< |
<target name="jsr166ejar" |
977 |
> |
<target name="jsr166e-jar" |
978 |
|
depends="jsr166ecompile" |
979 |
|
description="Builds library jar from compiled sources"> |
980 |
|
|
981 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
982 |
< |
|
975 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
976 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
981 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
982 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
983 |
|
</jar> |
984 |
|
|
985 |
|
</target> |
986 |
|
|
987 |
|
|
982 |
– |
|
988 |
|
<target name="jsr166edocs" |
989 |
< |
description="Builds javadocs with custom tags to build folder"> |
989 |
> |
description="Builds javadocs to build dir"> |
990 |
|
|
991 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
992 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
991 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
992 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
993 |
|
|
994 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
995 |
< |
packagenames="jsr166e,jsr166e.extra" |
994 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
995 |
> |
packagenames="jsr166e.*" |
996 |
|
link="${jdkapidocs.url}" |
997 |
< |
source="1.7" |
998 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
999 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
997 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
998 |
> |
source="7" |
999 |
> |
executable="${javadoc7}"> |
1000 |
> |
<arg value="-XDignore.symbol.file=true"/> |
1001 |
|
|
1002 |
+ |
</javadoc> |
1003 |
|
</target> |
1004 |
|
|
1005 |
|
|
1006 |
|
<target name="jsr166edist" |
1007 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
1007 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
1008 |
|
description="Puts all distributable products in single hierarchy"/> |
1009 |
|
|
1010 |
|
|
1004 |
– |
|
1011 |
|
<target name="jsr166eclean" |
1012 |
< |
description="Removes all build products"> |
1012 |
> |
description="Removes all jsr166e build products"> |
1013 |
|
|
1014 |
|
<delete dir="${build.jsr166e.dir}"/> |
1009 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1015 |
|
|
1016 |
|
</target> |
1017 |
|
|
1018 |
|
|
1014 |
– |
|
1019 |
|
<target name="jsr166edist-clean" |
1020 |
|
description="Removes all build and distribution products"> |
1021 |
|
|
1022 |
|
</target> |
1023 |
|
|
1020 |
– |
<target name="jsr166edist-docs" |
1021 |
– |
description="Builds javadocs without custom tags to dist folder"> |
1022 |
– |
|
1023 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1024 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1025 |
– |
|
1026 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1027 |
– |
packagenames="jsr166e,jsr166e.extra" |
1028 |
– |
link="${jdkapidocs.url}" |
1029 |
– |
source="1.7" |
1030 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1031 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1032 |
– |
|
1033 |
– |
</target> |
1034 |
– |
|
1024 |
|
<target name="jsr166edist-jar" |
1025 |
< |
depends="jsr166eclean, jsr166ejar"> |
1025 |
> |
depends="jsr166eclean, jsr166e-jar"> |
1026 |
|
|
1027 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1027 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1028 |
|
|
1029 |
|
</target> |
1030 |
|
|