25 |
|
------------------------------------------------------------------------------ |
26 |
|
</description> |
27 |
|
|
28 |
< |
<target name="usage" description="Advises user to run with -projecthelp"> |
29 |
< |
<echo>Run "ant -projecthelp" for full usage information.</echo> |
28 |
> |
<target name="usage" description="Display main targets by running 'ant -projecthelp'"> |
29 |
> |
<java classname="org.apache.tools.ant.Main"> |
30 |
> |
<arg value="-projecthelp" /> |
31 |
> |
</java> |
32 |
|
</target> |
33 |
|
|
34 |
|
|
37 |
|
|
38 |
|
|
39 |
|
<!-- Compilation options --> |
40 |
< |
<property name="build.sourcelevel" value="1.6"/> |
40 |
> |
<property name="build.sourcelevel" value="6"/> |
41 |
|
<property name="build.debug" value="true"/> |
42 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
43 |
|
<property name="build.deprecation" value="false"/> |
44 |
+ |
<property name="build.javadoc.access" value="protected"/> |
45 |
|
|
46 |
|
<!-- Build locations --> |
47 |
|
<property name="build.dir" location="build"/> |
48 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
49 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
50 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
48 |
– |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
49 |
– |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
51 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
52 |
|
|
53 |
< |
<property name="build.4jdk7.dir" location="${build.dir}/4jdk7"/> |
54 |
< |
<property name="build.4jdk7.lib.dir" location="${build.4jdk7.dir}"/> |
55 |
< |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
56 |
< |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/> |
56 |
< |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
53 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
54 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
55 |
> |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/> |
56 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
57 |
|
|
58 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
59 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
60 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
61 |
– |
|
59 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
63 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
64 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
65 |
– |
|
60 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
67 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
68 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
69 |
– |
|
61 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
71 |
– |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
72 |
– |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
62 |
|
|
63 |
< |
<!-- JDK binary locations --> |
63 |
> |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
64 |
> |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
65 |
> |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
66 |
> |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
67 |
> |
|
68 |
> |
<!-- JDK locations --> |
69 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
70 |
|
|
71 |
|
<macrodef name="defjdklocations"> |
75 |
|
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
76 |
|
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
77 |
|
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
84 |
– |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
78 |
|
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
79 |
< |
<property name="bootclasspath@{v}" |
80 |
< |
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
79 |
> |
<local name="boot.jar.dir"/> |
80 |
> |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib"/> |
81 |
> |
<path id="bootclasspath@{v}"> |
82 |
> |
<pathelement path="${boot.jar.dir}/resources.jar"/> |
83 |
> |
<pathelement path="${boot.jar.dir}/rt.jar"/> |
84 |
> |
<pathelement path="${boot.jar.dir}/jsse.jar"/> |
85 |
> |
<pathelement path="${boot.jar.dir}/jce.jar"/> |
86 |
> |
<pathelement path="${boot.jar.dir}/charsets.jar"/> |
87 |
> |
</path> |
88 |
> |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/> |
89 |
|
</sequential> |
90 |
|
</macrodef> |
91 |
|
|
92 |
< |
<defjdklocations v="6"/> |
93 |
< |
<defjdklocations v="7"/> |
94 |
< |
<defjdklocations v="8"/> |
94 |
< |
|
95 |
< |
<macrodef name="run-tck-tests"> |
96 |
< |
<attribute name="jvm"/> |
97 |
< |
<attribute name="tck.classes"/> |
98 |
< |
<attribute name="product.jar" default="${product.jar}"/> |
99 |
< |
<attribute name="jvmflags" default=""/> |
92 |
> |
<macrodef name="mirror-dir"> |
93 |
> |
<attribute name="src"/> |
94 |
> |
<attribute name="dst"/> |
95 |
|
<sequential> |
96 |
< |
<java classname="JSR166TestCase" |
97 |
< |
jvm="@{jvm}" fork="true"> |
98 |
< |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
99 |
< |
<jvmarg line="@{jvmflags}"/> |
100 |
< |
<classpath> |
106 |
< |
<pathelement location="${junit.jar}"/> |
107 |
< |
<pathelement location="@{tck.classes}"/> |
108 |
< |
</classpath> |
109 |
< |
</java> |
96 |
> |
<delete dir="@{dst}"/> |
97 |
> |
<mkdir dir="@{dst}"/> |
98 |
> |
<copy todir="@{dst}" preservelastmodified="true"> |
99 |
> |
<fileset dir="@{src}"/> |
100 |
> |
</copy> |
101 |
|
</sequential> |
102 |
|
</macrodef> |
103 |
|
|
104 |
+ |
<defjdklocations v="6"/> |
105 |
+ |
<defjdklocations v="7"/> |
106 |
+ |
<defjdklocations v="8"/> |
107 |
+ |
|
108 |
|
<!-- Source locations --> |
109 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
110 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
119 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
120 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
121 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
127 |
– |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
122 |
|
|
123 |
< |
<!-- Distribution locations --> |
124 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
125 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
126 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
127 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
128 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
129 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
123 |
> |
<!-- Javadoc locations --> |
124 |
> |
<property name="docs.dir" location="${build.dir}/docs"/> |
125 |
> |
<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/> |
126 |
> |
<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/> |
127 |
> |
<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/> |
128 |
> |
<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/> |
129 |
> |
<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/> |
130 |
> |
|
131 |
> |
<property name="dist.docs.dir" location="${dist.dir}/docs"/> |
132 |
> |
<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
133 |
> |
<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/> |
134 |
> |
<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/> |
135 |
> |
<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/> |
136 |
> |
<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/> |
137 |
|
|
138 |
|
<!-- Jar locations --> |
139 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
140 |
< |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
141 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
142 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
143 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
144 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
145 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
145 |
< |
|
146 |
< |
<!-- Bootclasspath argument --> |
147 |
< |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
139 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
140 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
141 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
142 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
143 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
144 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
145 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
146 |
|
|
147 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
148 |
|
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
150 |
|
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
151 |
|
|
152 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
153 |
< |
<!-- The below does not yet exist as of 2012-11 --> |
153 |
> |
<!-- The below does not yet exist as of 2013-01 --> |
154 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
155 |
+ |
|
156 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
157 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
158 |
|
|
159 |
+ |
<!-- Define the "jtreg" task --> |
160 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
161 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
162 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
163 |
+ |
|
164 |
|
<!-- Test classpath --> |
165 |
|
<path id="test.classpath"> |
166 |
|
<pathelement location="${build.testcases.dir}"/> |
167 |
|
<pathelement location="${junit.jar}"/> |
168 |
|
</path> |
169 |
|
|
170 |
+ |
<macrodef name="run-tck-tests"> |
171 |
+ |
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
172 |
+ |
<attribute name="source" default="6"/> |
173 |
+ |
<attribute name="target"/> |
174 |
+ |
<attribute name="workdir"/> |
175 |
+ |
<attribute name="classes"/> |
176 |
+ |
<attribute name="jvmflags" default=""/> |
177 |
+ |
<sequential> |
178 |
+ |
|
179 |
+ |
<mkdir dir="@{workdir}/tck-classes"/> |
180 |
+ |
|
181 |
+ |
<javac srcdir="@{tck.src.dir}" |
182 |
+ |
destdir="@{workdir}/tck-classes" |
183 |
+ |
debug="${build.debug}" |
184 |
+ |
debuglevel="${build.debuglevel}" |
185 |
+ |
deprecation="${build.deprecation}" |
186 |
+ |
source="@{source}" |
187 |
+ |
classpath="${junit.jar}" |
188 |
+ |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
189 |
+ |
includeAntRuntime="false" |
190 |
+ |
includeJavaRuntime="false" |
191 |
+ |
executable="${javac@{target}}" |
192 |
+ |
fork="true"> |
193 |
+ |
|
194 |
+ |
<include name="*.java"/> |
195 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
196 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
197 |
+ |
<compilerarg line="${build.args}"/> |
198 |
+ |
|
199 |
+ |
</javac> |
200 |
+ |
|
201 |
+ |
<java classname="JSR166TestCase" |
202 |
+ |
failonerror="true" |
203 |
+ |
jvm="${java@{target}}" |
204 |
+ |
fork="true"> |
205 |
+ |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
206 |
+ |
<jvmarg line="@{jvmflags}"/> |
207 |
+ |
<classpath> |
208 |
+ |
<pathelement location="${junit.jar}"/> |
209 |
+ |
<pathelement location="@{workdir}/tck-classes"/> |
210 |
+ |
</classpath> |
211 |
+ |
</java> |
212 |
+ |
|
213 |
+ |
</sequential> |
214 |
+ |
</macrodef> |
215 |
+ |
|
216 |
|
<!-- ALoops classpath --> |
217 |
|
<path id="loops.classpath"> |
218 |
|
<pathelement location="${build.loops.dir}"/> |
219 |
|
</path> |
220 |
|
|
221 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
222 |
< |
<!-- TODO: How do we get &trade to work? --> |
172 |
< |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
173 |
< |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
222 |
> |
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
223 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
224 |
|
|
225 |
|
<!-- Main targets --> |
226 |
|
|
227 |
|
<target name="dists" |
228 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
228 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
229 |
|
description="Builds all public jars and docs"/> |
230 |
|
|
231 |
|
<target name="compile" |
232 |
|
depends="configure-compiler" |
233 |
< |
description="Compiles src/main sources to build folder"> |
233 |
> |
description="Compiles src/main sources to build dir"> |
234 |
|
|
235 |
|
<mkdir dir="${build.classes.dir}"/> |
236 |
|
|
246 |
|
fork="true"> |
247 |
|
|
248 |
|
<include name="**/*.java"/> |
200 |
– |
<compilerarg line="${build.args}"/> |
249 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
250 |
|
<compilerarg value="-Xlint:all"/> |
203 |
– |
|
204 |
– |
<!-- |
205 |
– |
<exclude name="java/lang/**"/> |
251 |
|
<compilerarg line="${build.args}"/> |
207 |
– |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
208 |
– |
--> |
252 |
|
|
253 |
|
</javac> |
211 |
– |
|
254 |
|
</target> |
255 |
|
|
256 |
|
|
215 |
– |
|
257 |
|
<target name="jar" |
258 |
|
depends="compile" |
259 |
|
description="Builds library jar from compiled sources"> |
260 |
|
|
220 |
– |
<mkdir dir="${build.lib.dir}"/> |
221 |
– |
|
261 |
|
<jar destfile="${product.jar}"> |
262 |
|
<fileset dir="${build.classes.dir}"/> |
263 |
|
</jar> |
225 |
– |
|
264 |
|
</target> |
265 |
|
|
266 |
|
|
229 |
– |
|
267 |
|
<target name="test" |
268 |
< |
depends="init, configure-tests, report-tests" |
268 |
> |
depends="configure-tests, report-tests" |
269 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
270 |
|
|
271 |
|
|
235 |
– |
|
272 |
|
<target name="docs" |
273 |
< |
description="Builds javadocs for src/main"> |
273 |
> |
description="Builds javadocs for src/main to dist dir"> |
274 |
|
|
275 |
< |
<delete dir="${dist.javadocs.dir}"/> |
276 |
< |
<mkdir dir="${dist.javadocs.dir}"/> |
275 |
> |
<delete dir="${docs.dir}"/> |
276 |
> |
<mkdir dir="${docs.dir}"/> |
277 |
|
|
278 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
279 |
|
<!-- sourcepath for packages --> |
280 |
|
|
281 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
281 |
> |
<javadoc destdir="${docs.dir}" |
282 |
|
packagenames="none" |
283 |
|
link="${jdkapi8docs.url}" |
284 |
|
overview="${src.dir}/intro.html" |
285 |
+ |
access="${build.javadoc.access}" |
286 |
|
sourcepath="${src.dir}:${jdk8src.dir}" |
287 |
|
classpath="" |
288 |
|
executable="${javadoc8}"> |
252 |
– |
<arg value="-XDignore.symbol.file=true"/> |
253 |
– |
<arg value="-tag"/> |
254 |
– |
<arg value="${javadoc.jls.option}"/> |
289 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
290 |
|
<include name="**/*.java"/> |
291 |
|
</fileset> |
292 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
293 |
+ |
<arg value="-tag"/> |
294 |
+ |
<arg value="${javadoc.jls.option}"/> |
295 |
|
</javadoc> |
259 |
– |
|
296 |
|
</target> |
297 |
|
|
298 |
|
|
263 |
– |
|
299 |
|
<target name="dist" |
300 |
< |
depends="init, dist-clean, dist-jar, docs" |
300 |
> |
depends="dist-clean, dist-jar, dist-docs" |
301 |
|
description="Puts all distributable products in single hierarchy"/> |
302 |
|
|
303 |
|
|
316 |
|
<exclude name="**/SyntaxTest.java"/> |
317 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
318 |
|
</jar> |
284 |
– |
|
319 |
|
</target> |
320 |
|
|
321 |
|
|
288 |
– |
|
322 |
|
<target name="clean" |
323 |
|
description="Removes all build products"> |
324 |
|
|
325 |
|
<delete dir="${build.dir}"/> |
293 |
– |
<delete dir="${build.classes.dir}"/> |
294 |
– |
<delete dir="${build.lib.dir}"/> |
326 |
|
|
327 |
|
</target> |
328 |
|
|
329 |
|
|
299 |
– |
|
330 |
|
<target name="dist-clean" |
331 |
|
description="Removes all build and distribution products"> |
332 |
|
|
335 |
|
</target> |
336 |
|
|
337 |
|
|
308 |
– |
|
338 |
|
<!-- Internal targets --> |
339 |
|
|
340 |
|
|
312 |
– |
<target name="init"> |
313 |
– |
|
314 |
– |
<!-- Version is kept in a separate file --> |
315 |
– |
<loadfile property="version" srcFile="version.properties"/> |
316 |
– |
<echo>Building JSR-166 version ${version}</echo> |
317 |
– |
<echo>java.home is ${java.home}</echo> |
318 |
– |
|
319 |
– |
</target> |
320 |
– |
|
321 |
– |
|
341 |
|
<target name="dist-jar" |
342 |
|
depends="clean, jar"> |
324 |
– |
|
343 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
344 |
+ |
</target> |
345 |
|
|
346 |
+ |
<target name="dist-docs" |
347 |
+ |
depends="clean, docs"> |
348 |
+ |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
349 |
|
</target> |
350 |
|
|
351 |
|
|
355 |
|
<mkdir dir="${build.testcases.dir}"/> |
356 |
|
|
357 |
|
<javac srcdir="${tck.src.dir}" |
358 |
< |
destdir="${build.testcases.dir}" |
359 |
< |
debug="${build.debug}" |
360 |
< |
debuglevel="${build.debuglevel}" |
361 |
< |
deprecation="${build.deprecation}" |
362 |
< |
source="${build.sourcelevel}" |
363 |
< |
fork="true"> |
358 |
> |
destdir="${build.testcases.dir}" |
359 |
> |
debug="${build.debug}" |
360 |
> |
debuglevel="${build.debuglevel}" |
361 |
> |
deprecation="${build.deprecation}" |
362 |
> |
source="6" |
363 |
> |
classpath="${junit.jar}" |
364 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
365 |
> |
includeAntRuntime="false" |
366 |
> |
includeJavaRuntime="false" |
367 |
> |
executable="${javac8}" |
368 |
> |
fork="true"> |
369 |
|
|
370 |
< |
<compilerarg value="${bootclasspath.args}"/> |
344 |
< |
<compilerarg line="${build.args}"/> |
370 |
> |
<include name="**/*.java"/> |
371 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
372 |
< |
|
373 |
< |
<classpath refid="test.classpath"/> |
372 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
373 |
> |
<compilerarg line="${build.args}"/> |
374 |
|
|
375 |
|
</javac> |
376 |
|
|
377 |
|
<javac srcdir="${test.src.dir}" |
378 |
< |
destdir="${build.testcases.dir}" |
379 |
< |
debug="${build.debug}" |
380 |
< |
debuglevel="${build.debuglevel}" |
381 |
< |
deprecation="${build.deprecation}" |
382 |
< |
source="${build.sourcelevel}" |
383 |
< |
fork="true"> |
384 |
< |
|
385 |
< |
<include name="jsr166/test/**"/> |
378 |
> |
destdir="${build.testcases.dir}" |
379 |
> |
debug="${build.debug}" |
380 |
> |
debuglevel="${build.debuglevel}" |
381 |
> |
deprecation="${build.deprecation}" |
382 |
> |
source="6" |
383 |
> |
classpath="" |
384 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
385 |
> |
includeAntRuntime="false" |
386 |
> |
includeJavaRuntime="false" |
387 |
> |
executable="${javac8}" |
388 |
> |
fork="true"> |
389 |
|
|
390 |
< |
<compilerarg value="${bootclasspath.args}"/> |
362 |
< |
<compilerarg line="${build.args}"/> |
390 |
> |
<include name="jsr166/test/**/*.java"/> |
391 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
392 |
< |
|
393 |
< |
<classpath refid="test.classpath"/> |
392 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
393 |
> |
<compilerarg line="${build.args}"/> |
394 |
|
|
395 |
|
</javac> |
396 |
|
|
403 |
|
source="${build.sourcelevel}" |
404 |
|
fork="true"> |
405 |
|
|
406 |
< |
<compilerarg value="${bootclasspath.args}"/> |
379 |
< |
<compilerarg line="${build.args}"/> |
406 |
> |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
407 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
408 |
< |
|
382 |
< |
<classpath refid="test.classpath"/> |
408 |
> |
<compilerarg line="${build.args}"/> |
409 |
|
|
410 |
|
</javac> |
411 |
|
--> |
426 |
|
errorProperty="junit.failed" |
427 |
|
failureProperty="junit.failed" |
428 |
|
dir="${build.reports.dir}" |
429 |
+ |
jvm="${java8}" |
430 |
|
fork="true"> |
431 |
|
|
432 |
< |
<jvmarg value="${bootclasspath.args}"/> |
432 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
433 |
|
<jvmarg value="-server"/> |
434 |
|
<jvmarg value="-showversion"/> |
435 |
|
|
530 |
|
<!-- Various demos and test programs --> |
531 |
|
|
532 |
|
|
533 |
< |
<target name="loops" depends="init, configure-compiler" |
533 |
> |
<target name="loops" depends="configure-compiler" |
534 |
|
description="Benchmark from Doug Lea's AQS paper"> |
535 |
|
|
536 |
|
<mkdir dir="${build.loops.dir}"/> |
558 |
|
|
559 |
|
<!-- jsr166 4jdk7 --> |
560 |
|
|
534 |
– |
|
561 |
|
<target name="4jdk7compile" |
562 |
|
depends="configure-compiler" |
563 |
|
description="Compiles src/jdk7 sources, targeting jdk7"> |
569 |
|
debug="${build.debug}" |
570 |
|
debuglevel="${build.debuglevel}" |
571 |
|
deprecation="${build.deprecation}" |
572 |
< |
source="1.6" |
572 |
> |
source="6" |
573 |
|
classpath="" |
574 |
|
bootclasspath="${bootclasspath6}" |
575 |
|
includeAntRuntime="false" |
578 |
|
fork="true"> |
579 |
|
|
580 |
|
<include name="**/*.java"/> |
555 |
– |
<compilerarg line="${build.args}"/> |
581 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
582 |
|
<compilerarg value="-Xlint:all"/> |
583 |
+ |
<compilerarg line="${build.args}"/> |
584 |
|
|
585 |
|
</javac> |
586 |
+ |
</target> |
587 |
+ |
|
588 |
|
|
589 |
< |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
589 |
> |
<target name="4jdk7jar" |
590 |
> |
depends="4jdk7compile" |
591 |
> |
description="Builds library jar from compiled sources"> |
592 |
|
|
593 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
593 |
> |
<jar destfile="${4jdk7product.jar}"> |
594 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
595 |
|
</jar> |
596 |
|
|
567 |
– |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
568 |
– |
|
569 |
– |
<javac srcdir="${tck.src.dir}" |
570 |
– |
destdir="${build.4jdk7.tck.classes.dir}" |
571 |
– |
debug="${build.debug}" |
572 |
– |
debuglevel="${build.debuglevel}" |
573 |
– |
deprecation="${build.deprecation}" |
574 |
– |
source="1.6" |
575 |
– |
classpath="${junit.jar}" |
576 |
– |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
577 |
– |
includeAntRuntime="false" |
578 |
– |
includeJavaRuntime="false" |
579 |
– |
executable="${javac7}" |
580 |
– |
fork="true"> |
581 |
– |
|
582 |
– |
<include name="**/*.java"/> |
583 |
– |
<compilerarg line="${build.args}"/> |
584 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
585 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
586 |
– |
|
587 |
– |
</javac> |
588 |
– |
|
597 |
|
</target> |
598 |
|
|
599 |
|
|
600 |
|
<target name="4jdk7-test-tck" |
601 |
< |
depends="4jdk7compile" |
601 |
> |
depends="4jdk7jar" |
602 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
603 |
+ |
|
604 |
|
<run-tck-tests |
605 |
< |
jvm="${java7}" |
606 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
607 |
< |
product.jar="${4jdk7product.jar}"/> |
605 |
> |
target="7" |
606 |
> |
workdir="${build.4jdk7.dir}" |
607 |
> |
classes="${4jdk7product.jar}"/> |
608 |
|
</target> |
609 |
|
|
610 |
|
|
636 |
|
</junit> |
637 |
|
</target> |
638 |
|
|
639 |
+ |
<target name="4jdk7-test-jtreg" |
640 |
+ |
depends="4jdk7compile" |
641 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
642 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
643 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
644 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
645 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
646 |
+ |
<jtreg dir="${jtreg.src.dir}" |
647 |
+ |
jdk="${jdk7.home}" |
648 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
649 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
650 |
+ |
|
651 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
652 |
+ |
<arg value="-agentvm"/> |
653 |
+ |
<arg value="-v:nopass,fail"/> |
654 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
655 |
+ |
<arg value="-automatic"/> |
656 |
+ |
<arg value="-k:!ignore"/> |
657 |
+ |
</jtreg> |
658 |
+ |
</target> |
659 |
+ |
|
660 |
+ |
|
661 |
+ |
<target name="4jdk7-test" |
662 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
663 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
664 |
+ |
</target> |
665 |
+ |
|
666 |
|
|
667 |
|
<target name="4jdk7docs" |
668 |
< |
description="Builds javadocs with custom tags to build folder"> |
668 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
669 |
|
|
670 |
< |
<delete dir="${build.4jdk7.docs.dir}"/> |
671 |
< |
<mkdir dir="${build.4jdk7.docs.dir}"/> |
670 |
> |
<delete dir="${4jdk7docs.dir}"/> |
671 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
672 |
|
|
673 |
< |
<javadoc destdir="${build.4jdk7.docs.dir}" |
673 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
674 |
|
packagenames="none" |
675 |
|
link="${jdkapi7docs.url}" |
676 |
|
overview="${4jdk7src.dir}/intro.html" |
677 |
+ |
access="${build.javadoc.access}" |
678 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
679 |
|
classpath="" |
680 |
|
executable="${javadoc7}"> |
644 |
– |
<arg value="-XDignore.symbol.file=true"/> |
681 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
682 |
|
<include name="**/*.java"/> |
683 |
|
</fileset> |
684 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
685 |
|
</javadoc> |
649 |
– |
|
686 |
|
</target> |
687 |
|
|
688 |
|
|
689 |
|
<target name="4jdk7dist" |
690 |
< |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs" |
690 |
> |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
691 |
|
description="Puts all distributable products in single hierarchy"/> |
692 |
|
|
693 |
|
|
658 |
– |
|
694 |
|
<target name="4jdk7clean" |
695 |
< |
description="Removes all build products"> |
695 |
> |
description="Removes all 4jdk7 build products"> |
696 |
|
|
697 |
|
<delete dir="${build.4jdk7.dir}"/> |
698 |
|
|
699 |
|
</target> |
700 |
|
|
701 |
|
|
667 |
– |
|
702 |
|
<target name="4jdk7dist-clean" |
703 |
|
description="Removes all build and distribution products"> |
704 |
|
|
705 |
|
</target> |
706 |
|
|
673 |
– |
<target name="4jdk7dist-docs" |
674 |
– |
description="Builds javadocs without custom tags to dist folder"> |
675 |
– |
|
676 |
– |
<delete dir="${dist.4jdk7.docs.dir}"/> |
677 |
– |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
678 |
– |
|
679 |
– |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
680 |
– |
packagenames="none" |
681 |
– |
link="${jdkapi7docs.url}" |
682 |
– |
overview="${4jdk7src.dir}/intro.html" |
683 |
– |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
684 |
– |
classpath="" |
685 |
– |
executable="${javadoc7}"> |
686 |
– |
<arg value="-XDignore.symbol.file=true"/> |
687 |
– |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
688 |
– |
<include name="**/*.java"/> |
689 |
– |
</fileset> |
690 |
– |
</javadoc> |
691 |
– |
|
692 |
– |
</target> |
693 |
– |
|
707 |
|
<target name="4jdk7dist-jar" |
708 |
< |
depends="4jdk7clean, 4jdk7compile"> |
696 |
< |
|
708 |
> |
depends="4jdk7clean, 4jdk7jar"> |
709 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
710 |
+ |
</target> |
711 |
|
|
712 |
+ |
|
713 |
+ |
<target name="4jdk7dist-docs" |
714 |
+ |
depends="4jdk7clean, 4jdk7docs"> |
715 |
+ |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
716 |
|
</target> |
717 |
|
|
701 |
– |
<!-- jsr166x --> |
718 |
|
|
719 |
+ |
<!-- jsr166x --> |
720 |
|
|
721 |
|
<target name="jsr166xcompile" |
722 |
< |
depends="init, configure-compiler" |
723 |
< |
description="Compiles jsr166x sources"> |
722 |
> |
depends="configure-compiler" |
723 |
> |
description="Compiles jsr166x sources to build dir"> |
724 |
|
|
725 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
725 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
726 |
|
|
727 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
728 |
< |
destdir="${build.jsr166x.dir}" |
729 |
< |
debug="${build.debug}" |
730 |
< |
debuglevel="${build.debuglevel}" |
731 |
< |
deprecation="${build.deprecation}" |
732 |
< |
source="${build.sourcelevel}" |
733 |
< |
fork="true"> |
727 |
> |
<javac srcdir="${topsrc.dir}" |
728 |
> |
destdir="${build.jsr166x.classes.dir}" |
729 |
> |
debug="${build.debug}" |
730 |
> |
debuglevel="${build.debuglevel}" |
731 |
> |
deprecation="${build.deprecation}" |
732 |
> |
classpath="" |
733 |
> |
bootclasspath="${bootclasspath6}" |
734 |
> |
source="5" |
735 |
> |
includeAntRuntime="false" |
736 |
> |
includeJavaRuntime="false" |
737 |
> |
executable="${javac7}" |
738 |
> |
fork="true"> |
739 |
|
|
740 |
< |
<include name="**/*.java"/> |
719 |
< |
<compilerarg line="${build.args}"/> |
740 |
> |
<include name="jsr166x/**/*.java"/> |
741 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
742 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
743 |
+ |
<compilerarg line="${build.args}"/> |
744 |
|
|
745 |
|
</javac> |
723 |
– |
|
746 |
|
</target> |
747 |
|
|
748 |
|
|
727 |
– |
|
749 |
|
<target name="jsr166xjar" |
750 |
|
depends="jsr166xcompile" |
751 |
|
description="Builds library jar from compiled sources"> |
752 |
|
|
753 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
754 |
< |
|
734 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
735 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
753 |
> |
<jar destfile="${jsr166x.jar}"> |
754 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
755 |
|
</jar> |
756 |
|
|
757 |
|
</target> |
758 |
|
|
759 |
|
|
741 |
– |
|
760 |
|
<target name="jsr166xdocs" |
761 |
< |
description="Builds javadocs with custom tags to build folder"> |
761 |
> |
description="Builds javadocs to dist dir"> |
762 |
|
|
763 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
764 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
763 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
764 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
765 |
|
|
766 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
767 |
< |
packagenames="jsr166x" |
766 |
> |
<javadoc destdir="${jsr166xdocs.dir}" |
767 |
> |
packagenames="jsr166x.*" |
768 |
|
link="${jdkapidocs.url}" |
769 |
< |
source="${build.sourcelevel}" |
770 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
771 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
769 |
> |
access="${build.javadoc.access}" |
770 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
771 |
> |
bootclasspath="${bootclasspath6}" |
772 |
> |
source="5" |
773 |
> |
executable="${javadoc7}"> |
774 |
> |
<arg value="-XDignore.symbol.file=true"/> |
775 |
|
|
776 |
+ |
</javadoc> |
777 |
|
</target> |
778 |
|
|
779 |
|
|
780 |
|
<target name="jsr166xdist" |
781 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
781 |
> |
depends="jsr166xdist-jar, jsr166xdist-docs" |
782 |
|
description="Puts all distributable products in single hierarchy"/> |
783 |
|
|
784 |
|
|
763 |
– |
|
785 |
|
<target name="jsr166xclean" |
786 |
< |
description="Removes all build products"> |
786 |
> |
description="Removes all jsr166x build products"> |
787 |
|
|
788 |
|
<delete dir="${build.jsr166x.dir}"/> |
768 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
789 |
|
|
790 |
|
</target> |
791 |
|
|
792 |
|
|
773 |
– |
|
793 |
|
<target name="jsr166xdist-clean" |
794 |
|
description="Removes all build and distribution products"> |
795 |
|
|
796 |
|
</target> |
797 |
|
|
798 |
|
|
780 |
– |
|
781 |
– |
<target name="jsr166xdist-docs" |
782 |
– |
description="Builds javadocs without custom tags to dist folder"> |
783 |
– |
|
784 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
785 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
786 |
– |
|
787 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
788 |
– |
packagenames="jsr166x" |
789 |
– |
link="${jdkapidocs.url}" |
790 |
– |
source="${build.sourcelevel}" |
791 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
792 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
793 |
– |
|
794 |
– |
</target> |
795 |
– |
|
799 |
|
<target name="jsr166xdist-jar" |
800 |
|
depends="jsr166xclean, jsr166xjar"> |
801 |
+ |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
802 |
+ |
</target> |
803 |
|
|
804 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
805 |
< |
|
804 |
> |
<target name="jsr166xdist-docs" |
805 |
> |
depends="jsr166xclean, jsr166xdocs"> |
806 |
> |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
807 |
|
</target> |
808 |
|
|
809 |
|
<!-- jsr166y --> |
810 |
|
|
811 |
|
|
812 |
|
<target name="jsr166ycompile" |
813 |
< |
depends="init, configure-compiler" |
813 |
> |
depends="configure-compiler" |
814 |
|
description="Compiles jsr166y sources"> |
815 |
|
|
816 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
816 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
817 |
|
|
818 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
819 |
< |
destdir="${build.jsr166y.dir}" |
820 |
< |
debug="${build.debug}" |
821 |
< |
debuglevel="${build.debuglevel}" |
822 |
< |
deprecation="${build.deprecation}" |
823 |
< |
source="${build.sourcelevel}" |
824 |
< |
fork="true"> |
818 |
> |
<javac srcdir="${topsrc.dir}" |
819 |
> |
destdir="${build.jsr166y.classes.dir}" |
820 |
> |
debug="${build.debug}" |
821 |
> |
debuglevel="${build.debuglevel}" |
822 |
> |
deprecation="${build.deprecation}" |
823 |
> |
source="6" |
824 |
> |
classpath="" |
825 |
> |
bootclasspath="${bootclasspath6}" |
826 |
> |
includeAntRuntime="false" |
827 |
> |
includeJavaRuntime="false" |
828 |
> |
executable="${javac7}" |
829 |
> |
fork="true"> |
830 |
|
|
831 |
< |
<include name="**/*.java"/> |
821 |
< |
<compilerarg line="${build.args}"/> |
831 |
> |
<include name="jsr166y/**/*.java"/> |
832 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
833 |
< |
<compilerarg value="${bootclasspath.args}"/> |
834 |
< |
|
825 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
833 |
> |
<compilerarg value="-Xlint:all"/> |
834 |
> |
<compilerarg line="${build.args}"/> |
835 |
|
|
836 |
|
</javac> |
828 |
– |
|
837 |
|
</target> |
838 |
|
|
839 |
|
|
832 |
– |
|
840 |
|
<target name="jsr166yjar" |
841 |
|
depends="jsr166ycompile" |
842 |
|
description="Builds library jar from compiled sources"> |
843 |
|
|
844 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
845 |
< |
|
839 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
840 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
844 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
845 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
846 |
|
</jar> |
847 |
|
|
848 |
|
</target> |
849 |
|
|
850 |
|
|
846 |
– |
|
851 |
|
<target name="jsr166ydocs" |
852 |
< |
description="Builds javadocs with custom tags to build folder"> |
852 |
> |
description="Builds javadocs to dist dir"> |
853 |
|
|
854 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
855 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
854 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
855 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
856 |
|
|
857 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
858 |
< |
packagenames="jsr166y" |
857 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
858 |
> |
packagenames="jsr166y.*" |
859 |
|
link="${jdkapidocs.url}" |
860 |
< |
source="${build.sourcelevel}" |
861 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
862 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
860 |
> |
access="${build.javadoc.access}" |
861 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
862 |
> |
bootclasspath="${bootclasspath6}" |
863 |
> |
source="6" |
864 |
> |
executable="${javadoc7}"> |
865 |
> |
<arg value="-XDignore.symbol.file=true"/> |
866 |
|
|
867 |
+ |
</javadoc> |
868 |
|
</target> |
869 |
|
|
870 |
|
|
871 |
|
<target name="jsr166ydist" |
872 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
872 |
> |
depends="jsr166ydist-jar, jsr166ydist-docs" |
873 |
|
description="Puts all distributable products in single hierarchy"/> |
874 |
|
|
875 |
|
|
868 |
– |
|
876 |
|
<target name="jsr166yclean" |
877 |
< |
description="Removes all build products"> |
877 |
> |
description="Removes all jsr166y build products"> |
878 |
|
|
879 |
|
<delete dir="${build.jsr166y.dir}"/> |
873 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
880 |
|
|
881 |
|
</target> |
882 |
|
|
883 |
|
|
878 |
– |
|
884 |
|
<target name="jsr166ydist-clean" |
885 |
|
description="Removes all build and distribution products"> |
886 |
|
|
887 |
|
</target> |
888 |
|
|
884 |
– |
<target name="jsr166ydist-docs" |
885 |
– |
description="Builds javadocs without custom tags to dist folder"> |
886 |
– |
|
887 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
888 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
889 |
– |
|
890 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
891 |
– |
packagenames="jsr166y" |
892 |
– |
link="${jdkapidocs.url}" |
893 |
– |
source="${build.sourcelevel}" |
894 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
895 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
896 |
– |
|
897 |
– |
</target> |
898 |
– |
|
889 |
|
<target name="jsr166ydist-jar" |
890 |
|
depends="jsr166yclean, jsr166yjar"> |
891 |
+ |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
892 |
+ |
</target> |
893 |
|
|
894 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
895 |
< |
|
894 |
> |
<target name="jsr166ydist-docs" |
895 |
> |
depends="jsr166yclean, jsr166ydocs"> |
896 |
> |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
897 |
|
</target> |
898 |
|
|
899 |
|
|
901 |
|
|
902 |
|
|
903 |
|
<target name="extra166ycompile" |
904 |
< |
depends="init, configure-compiler, jsr166ycompile" |
904 |
> |
depends="configure-compiler, jsr166yjar" |
905 |
|
description="Compiles extra166y sources"> |
906 |
|
|
907 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
907 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
908 |
|
|
909 |
< |
<javac srcdir="${extra166ysrc.dir}" |
910 |
< |
destdir="${build.extra166y.dir}" |
911 |
< |
debug="${build.debug}" |
912 |
< |
classpath="${jsr166yproduct.jar}" |
913 |
< |
debuglevel="${build.debuglevel}" |
914 |
< |
deprecation="${build.deprecation}" |
915 |
< |
source="${build.sourcelevel}" |
916 |
< |
fork="true"> |
909 |
> |
<javac srcdir="${topsrc.dir}" |
910 |
> |
destdir="${build.extra166y.classes.dir}" |
911 |
> |
debug="${build.debug}" |
912 |
> |
debuglevel="${build.debuglevel}" |
913 |
> |
deprecation="${build.deprecation}" |
914 |
> |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
915 |
> |
classpath="" |
916 |
> |
source="6" |
917 |
> |
includeAntRuntime="false" |
918 |
> |
includeJavaRuntime="false" |
919 |
> |
executable="${javac7}" |
920 |
> |
fork="true"> |
921 |
|
|
922 |
< |
<include name="**/*.java"/> |
926 |
< |
<compilerarg line="${build.args}"/> |
922 |
> |
<include name="extra166y/**/*.java"/> |
923 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
924 |
< |
<compilerarg value="${bootclasspath.args}"/> |
925 |
< |
|
930 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
924 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
925 |
> |
<compilerarg line="${build.args}"/> |
926 |
|
|
927 |
|
</javac> |
933 |
– |
|
928 |
|
</target> |
929 |
|
|
930 |
|
|
937 |
– |
|
931 |
|
<target name="extra166yjar" |
932 |
|
depends="extra166ycompile" |
933 |
|
description="Builds library jar from compiled sources"> |
934 |
|
|
935 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
936 |
< |
|
944 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
945 |
< |
<fileset dir="${build.extra166y.dir}"/> |
935 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
936 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
937 |
|
</jar> |
938 |
|
|
939 |
|
</target> |
940 |
|
|
941 |
|
|
951 |
– |
|
942 |
|
<target name="extra166ydocs" |
943 |
< |
description="Builds javadocs with custom tags to build folder"> |
943 |
> |
description="Builds javadocs to build dir"> |
944 |
|
|
945 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
946 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
945 |
> |
<delete dir="${extra166ydocs.dir}"/> |
946 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
947 |
|
|
948 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
949 |
< |
packagenames="extra166y" |
948 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
949 |
> |
packagenames="extra166y.*" |
950 |
|
link="${jdkapidocs.url}" |
951 |
< |
source="${build.sourcelevel}" |
952 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
953 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
951 |
> |
access="${build.javadoc.access}" |
952 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
953 |
> |
bootclasspath="${bootclasspath6}" |
954 |
> |
source="6" |
955 |
> |
executable="${javadoc7}"> |
956 |
> |
<arg value="-XDignore.symbol.file=true"/> |
957 |
|
|
958 |
+ |
</javadoc> |
959 |
|
</target> |
960 |
|
|
961 |
|
|
962 |
|
<target name="extra166ydist" |
963 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
963 |
> |
depends="extra166ydist-jar, extra166ydist-docs" |
964 |
|
description="Puts all distributable products in single hierarchy"/> |
965 |
|
|
966 |
|
|
973 |
– |
|
967 |
|
<target name="extra166yclean" |
968 |
< |
description="Removes all build products"> |
968 |
> |
description="Removes all extra166y build products"> |
969 |
|
|
970 |
|
<delete dir="${build.extra166y.dir}"/> |
978 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
971 |
|
|
972 |
|
</target> |
973 |
|
|
974 |
|
|
983 |
– |
|
975 |
|
<target name="extra166ydist-clean" |
976 |
|
description="Removes all build and distribution products"> |
977 |
|
|
978 |
|
</target> |
979 |
|
|
989 |
– |
<target name="extra166ydist-docs" |
990 |
– |
description="Builds javadocs without custom tags to dist folder"> |
991 |
– |
|
992 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
993 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
994 |
– |
|
995 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
996 |
– |
packagenames="extra166y" |
997 |
– |
link="${jdkapidocs.url}" |
998 |
– |
source="${build.sourcelevel}" |
999 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1000 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1001 |
– |
|
1002 |
– |
</target> |
1003 |
– |
|
980 |
|
<target name="extra166ydist-jar" |
981 |
|
depends="extra166yclean, extra166yjar"> |
982 |
+ |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
983 |
+ |
</target> |
984 |
|
|
985 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
986 |
< |
|
985 |
> |
<target name="extra166ydist-docs" |
986 |
> |
depends="extra166yclean, extra166ydocs"> |
987 |
> |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
988 |
|
</target> |
989 |
|
|
990 |
|
<!-- jsr166e --> |
993 |
|
depends="configure-compiler" |
994 |
|
description="Compiles jsr166e sources"> |
995 |
|
|
996 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
996 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
997 |
|
|
998 |
|
<javac srcdir="${topsrc.dir}" |
999 |
< |
destdir="${build.jsr166e.dir}" |
999 |
> |
destdir="${build.jsr166e.classes.dir}" |
1000 |
|
debug="${build.debug}" |
1001 |
|
debuglevel="${build.debuglevel}" |
1002 |
|
deprecation="${build.deprecation}" |
1003 |
< |
source="1.7" |
1003 |
> |
source="7" |
1004 |
|
classpath="" |
1005 |
|
includeAntRuntime="false" |
1006 |
|
includeJavaRuntime="false" |
1008 |
|
fork="true"> |
1009 |
|
|
1010 |
|
<include name="jsr166e/**/*.java"/> |
1032 |
– |
<compilerarg line="${build.args}"/> |
1011 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1012 |
|
<compilerarg value="-Xlint:all"/> |
1013 |
+ |
<compilerarg line="${build.args}"/> |
1014 |
|
|
1015 |
|
</javac> |
1037 |
– |
|
1016 |
|
</target> |
1017 |
|
|
1018 |
|
|
1041 |
– |
|
1019 |
|
<target name="jsr166ejar" |
1020 |
|
depends="jsr166ecompile" |
1021 |
|
description="Builds library jar from compiled sources"> |
1022 |
|
|
1023 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
1024 |
< |
|
1048 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
1049 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
1023 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
1024 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
1025 |
|
</jar> |
1026 |
|
|
1027 |
|
</target> |
1028 |
|
|
1029 |
|
|
1055 |
– |
|
1030 |
|
<target name="jsr166edocs" |
1031 |
< |
description="Builds javadocs with custom tags to build folder"> |
1031 |
> |
description="Builds javadocs to build dir"> |
1032 |
|
|
1033 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
1034 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
1033 |
> |
<delete dir="${jsr166edocs.dir}"/> |
1034 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
1035 |
|
|
1036 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
1037 |
< |
packagenames="jsr166e,jsr166e.extra" |
1038 |
< |
link="${jdkapi7docs.url}" |
1039 |
< |
source="1.7" |
1036 |
> |
<javadoc destdir="${jsr166edocs.dir}" |
1037 |
> |
packagenames="jsr166e.*" |
1038 |
> |
link="${jdkapidocs.url}" |
1039 |
> |
access="${build.javadoc.access}" |
1040 |
|
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1041 |
< |
executable="${javadoc7}" |
1042 |
< |
additionalparam="-XDignore.symbol.file=true" > |
1043 |
< |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1044 |
< |
<include name="jsr166e/**/*.java"/> |
1071 |
< |
</fileset> |
1041 |
> |
source="7" |
1042 |
> |
executable="${javadoc7}"> |
1043 |
> |
<arg value="-XDignore.symbol.file=true"/> |
1044 |
> |
|
1045 |
|
</javadoc> |
1046 |
+ |
</target> |
1047 |
+ |
|
1048 |
|
|
1049 |
+ |
<target name="jsr166e-test-tck" |
1050 |
+ |
depends="jsr166ejar" |
1051 |
+ |
description="Runs tck tests for jsr166e"> |
1052 |
+ |
|
1053 |
+ |
<run-tck-tests |
1054 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1055 |
+ |
source="7" |
1056 |
+ |
target="8" |
1057 |
+ |
workdir="${build.jsr166e.dir}" |
1058 |
+ |
classes="${jsr166e.jar}"/> |
1059 |
|
</target> |
1060 |
|
|
1061 |
|
|
1062 |
|
<target name="jsr166edist" |
1063 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
1063 |
> |
depends="jsr166edist-jar, jsr166edist-docs" |
1064 |
|
description="Puts all distributable products in single hierarchy"/> |
1065 |
|
|
1066 |
|
|
1082 |
– |
|
1067 |
|
<target name="jsr166eclean" |
1068 |
< |
description="Removes all build products"> |
1085 |
< |
|
1068 |
> |
description="Removes all jsr166e build products"> |
1069 |
|
<delete dir="${build.jsr166e.dir}"/> |
1087 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1088 |
– |
|
1070 |
|
</target> |
1071 |
|
|
1072 |
|
|
1092 |
– |
|
1073 |
|
<target name="jsr166edist-clean" |
1074 |
|
description="Removes all build and distribution products"> |
1075 |
|
|
1076 |
|
</target> |
1077 |
|
|
1078 |
< |
<target name="jsr166edist-docs" |
1079 |
< |
description="Builds javadocs without custom tags to dist folder"> |
1080 |
< |
|
1081 |
< |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1102 |
< |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1103 |
< |
|
1104 |
< |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1105 |
< |
packagenames="jsr166e,jsr166e.extra" |
1106 |
< |
link="${jdkapidocs.url}" |
1107 |
< |
source="1.7" |
1108 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1109 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
1078 |
> |
<target name="jsr166edist-jar" |
1079 |
> |
depends="jsr166eclean, jsr166ejar"> |
1080 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1081 |
> |
</target> |
1082 |
|
|
1083 |
+ |
<target name="jsr166edist-docs" |
1084 |
+ |
depends="jsr166eclean, jsr166edocs"> |
1085 |
+ |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1086 |
|
</target> |
1087 |
|
|
1113 |
– |
<target name="jsr166edist-jar" |
1114 |
– |
depends="jsr166eclean, jsr166ejar"> |
1088 |
|
|
1089 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1089 |
> |
<!-- Find buglets that can be detected by static build tools --> |
1090 |
|
|
1091 |
+ |
<target name="lint"> |
1092 |
+ |
<antcall target="dists"> |
1093 |
+ |
<param name="build.javadoc.access" value="private"/> |
1094 |
+ |
</antcall> |
1095 |
|
</target> |
1096 |
|
|
1097 |
+ |
|
1098 |
|
</project> |