57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
59 |
|
|
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"/> |
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 binary locations --> |
65 |
> |
<!-- JDK locations --> |
66 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
67 |
|
|
68 |
|
<macrodef name="defjdklocations"> |
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="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
75 |
|
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
76 |
< |
<property name="bootclasspath@{v}" |
77 |
< |
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
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 |
|
|
89 |
< |
<defjdklocations v="6"/> |
90 |
< |
<defjdklocations v="7"/> |
91 |
< |
<defjdklocations v="8"/> |
85 |
< |
|
86 |
< |
<macrodef name="run-tck-tests"> |
87 |
< |
<attribute name="target"/> |
88 |
< |
<attribute name="workdir"/> |
89 |
< |
<attribute name="product.jar" default="${product.jar}"/> |
90 |
< |
<attribute name="jvmflags" default=""/> |
89 |
> |
<macrodef name="mirror-dir"> |
90 |
> |
<attribute name="src"/> |
91 |
> |
<attribute name="dst"/> |
92 |
|
<sequential> |
93 |
< |
|
94 |
< |
<mkdir dir="@{workdir}/tck-classes"/> |
95 |
< |
|
96 |
< |
<javac srcdir="${tck.src.dir}" |
97 |
< |
destdir="@{workdir}/tck-classes" |
97 |
< |
debug="${build.debug}" |
98 |
< |
debuglevel="${build.debuglevel}" |
99 |
< |
deprecation="${build.deprecation}" |
100 |
< |
source="6" |
101 |
< |
classpath="${junit.jar}" |
102 |
< |
bootclasspath="@{product.jar}:${bootclasspath6}" |
103 |
< |
includeAntRuntime="false" |
104 |
< |
includeJavaRuntime="false" |
105 |
< |
executable="${javac@{target}}" |
106 |
< |
fork="true"> |
107 |
< |
|
108 |
< |
<include name="**/*.java"/> |
109 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
110 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
111 |
< |
<compilerarg line="${build.args}"/> |
112 |
< |
</javac> |
113 |
< |
|
114 |
< |
<java classname="JSR166TestCase" jvm="${java@{target}}" fork="true"> |
115 |
< |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
116 |
< |
<jvmarg line="@{jvmflags}"/> |
117 |
< |
<classpath> |
118 |
< |
<pathelement location="${junit.jar}"/> |
119 |
< |
<pathelement location="@{workdir}/tck-classes"/> |
120 |
< |
</classpath> |
121 |
< |
</java> |
122 |
< |
|
93 |
> |
<delete dir="@{dst}"/> |
94 |
> |
<mkdir dir="@{dst}"/> |
95 |
> |
<copy todir="@{dst}" preservelastmodified="true"> |
96 |
> |
<fileset dir="@{src}"/> |
97 |
> |
</copy> |
98 |
|
</sequential> |
99 |
|
</macrodef> |
100 |
|
|
101 |
+ |
<defjdklocations v="6"/> |
102 |
+ |
<defjdklocations v="7"/> |
103 |
+ |
<defjdklocations v="8"/> |
104 |
+ |
|
105 |
|
<!-- Source locations --> |
106 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
107 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
117 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
118 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
119 |
|
|
120 |
< |
<!-- Distribution locations --> |
121 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
122 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
123 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
124 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
125 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
126 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
120 |
> |
<!-- Javadoc locations --> |
121 |
> |
<property name="docs.dir" location="${build.dir}/docs"/> |
122 |
> |
<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/> |
123 |
> |
<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/> |
124 |
> |
<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/> |
125 |
> |
<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/> |
126 |
> |
<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/> |
127 |
> |
|
128 |
> |
<property name="dist.docs.dir" location="${dist.dir}/docs"/> |
129 |
> |
<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
130 |
> |
<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/> |
131 |
> |
<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/> |
132 |
> |
<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/> |
133 |
> |
<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/> |
134 |
|
|
135 |
|
<!-- Jar locations --> |
136 |
|
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
141 |
|
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
142 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
143 |
|
|
158 |
– |
<!-- Bootclasspath argument --> |
159 |
– |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
160 |
– |
|
144 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
145 |
|
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
146 |
|
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
147 |
|
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
148 |
|
|
149 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
150 |
< |
<!-- The below does not yet exist as of 2012-11 --> |
150 |
> |
<!-- The below does not yet exist as of 2013-01 --> |
151 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
152 |
|
|
153 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
164 |
|
<pathelement location="${junit.jar}"/> |
165 |
|
</path> |
166 |
|
|
167 |
+ |
<macrodef name="run-tck-tests"> |
168 |
+ |
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
169 |
+ |
<attribute name="source" default="6"/> |
170 |
+ |
<attribute name="target"/> |
171 |
+ |
<attribute name="workdir"/> |
172 |
+ |
<attribute name="classes"/> |
173 |
+ |
<attribute name="jvmflags" default=""/> |
174 |
+ |
<sequential> |
175 |
+ |
|
176 |
+ |
<mkdir dir="@{workdir}/tck-classes"/> |
177 |
+ |
|
178 |
+ |
<javac srcdir="@{tck.src.dir}" |
179 |
+ |
destdir="@{workdir}/tck-classes" |
180 |
+ |
debug="${build.debug}" |
181 |
+ |
debuglevel="${build.debuglevel}" |
182 |
+ |
deprecation="${build.deprecation}" |
183 |
+ |
source="@{source}" |
184 |
+ |
classpath="${junit.jar}" |
185 |
+ |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
186 |
+ |
includeAntRuntime="false" |
187 |
+ |
includeJavaRuntime="false" |
188 |
+ |
executable="${javac@{target}}" |
189 |
+ |
fork="true"> |
190 |
+ |
|
191 |
+ |
<include name="*.java"/> |
192 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
193 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
194 |
+ |
<compilerarg line="${build.args}"/> |
195 |
+ |
|
196 |
+ |
</javac> |
197 |
+ |
|
198 |
+ |
<java classname="JSR166TestCase" |
199 |
+ |
failonerror="true" |
200 |
+ |
jvm="${java@{target}}" |
201 |
+ |
fork="true"> |
202 |
+ |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
203 |
+ |
<jvmarg line="@{jvmflags}"/> |
204 |
+ |
<classpath> |
205 |
+ |
<pathelement location="${junit.jar}"/> |
206 |
+ |
<pathelement location="@{workdir}/tck-classes"/> |
207 |
+ |
</classpath> |
208 |
+ |
</java> |
209 |
+ |
|
210 |
+ |
</sequential> |
211 |
+ |
</macrodef> |
212 |
+ |
|
213 |
|
<!-- ALoops classpath --> |
214 |
|
<path id="loops.classpath"> |
215 |
|
<pathelement location="${build.loops.dir}"/> |
216 |
|
</path> |
217 |
|
|
218 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
219 |
< |
<!-- TODO: How do we get &trade to work? --> |
191 |
< |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
192 |
< |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
193 |
< |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
219 |
> |
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
220 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
221 |
|
|
222 |
|
<!-- Main targets --> |
243 |
|
fork="true"> |
244 |
|
|
245 |
|
<include name="**/*.java"/> |
220 |
– |
<compilerarg line="${build.args}"/> |
246 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
247 |
|
<compilerarg value="-Xlint:all"/> |
223 |
– |
|
224 |
– |
<!-- |
225 |
– |
<exclude name="java/lang/**"/> |
248 |
|
<compilerarg line="${build.args}"/> |
227 |
– |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
228 |
– |
--> |
249 |
|
|
250 |
|
</javac> |
231 |
– |
|
251 |
|
</target> |
252 |
|
|
253 |
|
|
235 |
– |
|
254 |
|
<target name="jar" |
255 |
|
depends="compile" |
256 |
|
description="Builds library jar from compiled sources"> |
258 |
|
<jar destfile="${product.jar}"> |
259 |
|
<fileset dir="${build.classes.dir}"/> |
260 |
|
</jar> |
243 |
– |
|
261 |
|
</target> |
262 |
|
|
263 |
|
|
247 |
– |
|
264 |
|
<target name="test" |
265 |
|
depends="configure-tests, report-tests" |
266 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
267 |
|
|
268 |
|
|
253 |
– |
|
269 |
|
<target name="docs" |
270 |
|
description="Builds javadocs for src/main to dist dir"> |
271 |
|
|
272 |
< |
<delete dir="${dist.javadocs.dir}"/> |
273 |
< |
<mkdir dir="${dist.javadocs.dir}"/> |
272 |
> |
<delete dir="${docs.dir}"/> |
273 |
> |
<mkdir dir="${docs.dir}"/> |
274 |
|
|
275 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
276 |
|
<!-- sourcepath for packages --> |
277 |
|
|
278 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
278 |
> |
<javadoc destdir="${docs.dir}" |
279 |
|
packagenames="none" |
280 |
|
link="${jdkapi8docs.url}" |
281 |
|
overview="${src.dir}/intro.html" |
282 |
|
sourcepath="${src.dir}:${jdk8src.dir}" |
283 |
|
classpath="" |
284 |
|
executable="${javadoc8}"> |
270 |
– |
<arg value="-XDignore.symbol.file=true"/> |
271 |
– |
<arg value="-tag"/> |
272 |
– |
<arg value="${javadoc.jls.option}"/> |
285 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
286 |
|
<include name="**/*.java"/> |
287 |
|
</fileset> |
288 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
289 |
+ |
<arg value="-tag"/> |
290 |
+ |
<arg value="${javadoc.jls.option}"/> |
291 |
|
</javadoc> |
277 |
– |
|
292 |
|
</target> |
293 |
|
|
294 |
|
|
281 |
– |
|
295 |
|
<target name="dist" |
296 |
< |
depends="dist-clean, dist-jar, docs" |
296 |
> |
depends="dist-clean, dist-jar, dist-docs" |
297 |
|
description="Puts all distributable products in single hierarchy"/> |
298 |
|
|
299 |
|
|
312 |
|
<exclude name="**/SyntaxTest.java"/> |
313 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
314 |
|
</jar> |
302 |
– |
|
315 |
|
</target> |
316 |
|
|
317 |
|
|
306 |
– |
|
318 |
|
<target name="clean" |
319 |
|
description="Removes all build products"> |
320 |
|
|
323 |
|
</target> |
324 |
|
|
325 |
|
|
315 |
– |
|
326 |
|
<target name="dist-clean" |
327 |
|
description="Removes all build and distribution products"> |
328 |
|
|
331 |
|
</target> |
332 |
|
|
333 |
|
|
324 |
– |
|
334 |
|
<!-- Internal targets --> |
335 |
|
|
336 |
|
|
337 |
|
<target name="dist-jar" |
338 |
|
depends="clean, jar"> |
330 |
– |
|
339 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
340 |
+ |
</target> |
341 |
|
|
342 |
+ |
<target name="dist-docs" |
343 |
+ |
depends="clean, docs"> |
344 |
+ |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
345 |
|
</target> |
346 |
|
|
347 |
|
|
357 |
|
deprecation="${build.deprecation}" |
358 |
|
source="6" |
359 |
|
classpath="${junit.jar}" |
360 |
< |
bootclasspath="${product.jar}:${bootclasspath6}" |
360 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
361 |
|
includeAntRuntime="false" |
362 |
|
includeJavaRuntime="false" |
363 |
|
executable="${javac8}" |
364 |
|
fork="true"> |
365 |
|
|
366 |
|
<include name="**/*.java"/> |
355 |
– |
<compilerarg line="${build.args}"/> |
367 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
368 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
369 |
+ |
<compilerarg line="${build.args}"/> |
370 |
|
|
371 |
|
</javac> |
372 |
|
|
377 |
|
deprecation="${build.deprecation}" |
378 |
|
source="6" |
379 |
|
classpath="" |
380 |
< |
bootclasspath="${product.jar}:${bootclasspath6}" |
380 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
381 |
|
includeAntRuntime="false" |
382 |
|
includeJavaRuntime="false" |
383 |
|
executable="${javac8}" |
384 |
|
fork="true"> |
385 |
|
|
386 |
|
<include name="jsr166/test/**/*.java"/> |
375 |
– |
|
376 |
– |
<compilerarg line="${build.args}"/> |
387 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
388 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
389 |
+ |
<compilerarg line="${build.args}"/> |
390 |
|
|
391 |
|
</javac> |
392 |
|
|
399 |
|
source="${build.sourcelevel}" |
400 |
|
fork="true"> |
401 |
|
|
402 |
< |
<compilerarg value="${bootclasspath.args}"/> |
392 |
< |
<compilerarg line="${build.args}"/> |
402 |
> |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
403 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
404 |
+ |
<compilerarg line="${build.args}"/> |
405 |
|
|
406 |
|
</javac> |
407 |
|
--> |
554 |
|
|
555 |
|
<!-- jsr166 4jdk7 --> |
556 |
|
|
546 |
– |
|
557 |
|
<target name="4jdk7compile" |
558 |
|
depends="configure-compiler" |
559 |
|
description="Compiles src/jdk7 sources, targeting jdk7"> |
574 |
|
fork="true"> |
575 |
|
|
576 |
|
<include name="**/*.java"/> |
567 |
– |
<compilerarg line="${build.args}"/> |
577 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
578 |
|
<compilerarg value="-Xlint:all"/> |
579 |
+ |
<compilerarg line="${build.args}"/> |
580 |
|
|
581 |
|
</javac> |
572 |
– |
|
582 |
|
</target> |
583 |
|
|
584 |
< |
<target name="4jdk7-jar" |
584 |
> |
|
585 |
> |
<target name="4jdk7jar" |
586 |
|
depends="4jdk7compile" |
587 |
|
description="Builds library jar from compiled sources"> |
588 |
|
|
594 |
|
|
595 |
|
|
596 |
|
<target name="4jdk7-test-tck" |
597 |
< |
depends="4jdk7-jar" |
597 |
> |
depends="4jdk7jar" |
598 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
599 |
|
|
600 |
|
<run-tck-tests |
601 |
|
target="7" |
602 |
|
workdir="${build.4jdk7.dir}" |
603 |
< |
product.jar="${4jdk7product.jar}"/> |
603 |
> |
classes="${4jdk7product.jar}"/> |
604 |
|
</target> |
605 |
|
|
606 |
|
|
663 |
|
<target name="4jdk7docs" |
664 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
665 |
|
|
666 |
< |
<delete dir="${dist.4jdk7.docs.dir}"/> |
667 |
< |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
666 |
> |
<delete dir="${4jdk7docs.dir}"/> |
667 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
668 |
|
|
669 |
< |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
669 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
670 |
|
packagenames="none" |
671 |
|
link="${jdkapi7docs.url}" |
672 |
|
overview="${4jdk7src.dir}/intro.html" |
673 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
674 |
|
classpath="" |
675 |
|
executable="${javadoc7}"> |
666 |
– |
<arg value="-XDignore.symbol.file=true"/> |
676 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
677 |
|
<include name="**/*.java"/> |
678 |
|
</fileset> |
679 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
680 |
|
</javadoc> |
671 |
– |
|
681 |
|
</target> |
682 |
|
|
683 |
|
|
684 |
|
<target name="4jdk7dist" |
685 |
< |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
685 |
> |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
686 |
|
description="Puts all distributable products in single hierarchy"/> |
687 |
|
|
688 |
|
|
680 |
– |
|
689 |
|
<target name="4jdk7clean" |
690 |
|
description="Removes all 4jdk7 build products"> |
691 |
|
|
694 |
|
</target> |
695 |
|
|
696 |
|
|
689 |
– |
|
697 |
|
<target name="4jdk7dist-clean" |
698 |
|
description="Removes all build and distribution products"> |
699 |
|
|
700 |
|
</target> |
701 |
|
|
702 |
|
<target name="4jdk7dist-jar" |
703 |
< |
depends="4jdk7clean, 4jdk7compile"> |
697 |
< |
|
703 |
> |
depends="4jdk7clean, 4jdk7jar"> |
704 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
705 |
+ |
</target> |
706 |
+ |
|
707 |
|
|
708 |
+ |
<target name="4jdk7dist-docs" |
709 |
+ |
depends="4jdk7clean, 4jdk7docs"> |
710 |
+ |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
711 |
|
</target> |
712 |
|
|
713 |
|
|
725 |
|
debuglevel="${build.debuglevel}" |
726 |
|
deprecation="${build.deprecation}" |
727 |
|
classpath="" |
717 |
– |
source="5" |
728 |
|
bootclasspath="${bootclasspath6}" |
729 |
+ |
source="5" |
730 |
|
includeAntRuntime="false" |
731 |
|
includeJavaRuntime="false" |
732 |
|
executable="${javac7}" |
733 |
|
fork="true"> |
734 |
|
|
735 |
|
<include name="jsr166x/**/*.java"/> |
725 |
– |
<compilerarg line="${build.args}"/> |
736 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
737 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
738 |
+ |
<compilerarg line="${build.args}"/> |
739 |
|
|
740 |
|
</javac> |
730 |
– |
|
741 |
|
</target> |
742 |
|
|
743 |
|
|
734 |
– |
|
744 |
|
<target name="jsr166xjar" |
745 |
|
depends="jsr166xcompile" |
746 |
|
description="Builds library jar from compiled sources"> |
752 |
|
</target> |
753 |
|
|
754 |
|
|
746 |
– |
|
755 |
|
<target name="jsr166xdocs" |
756 |
|
description="Builds javadocs to dist dir"> |
757 |
|
|
758 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
759 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
758 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
759 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
760 |
|
|
761 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
761 |
> |
<javadoc destdir="${jsr166xdocs.dir}" |
762 |
|
packagenames="jsr166x.*" |
763 |
|
link="${jdkapidocs.url}" |
756 |
– |
source="5" |
757 |
– |
bootclasspath="${bootclasspath6}" |
764 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
765 |
< |
executable="${javadoc7}" |
766 |
< |
additionalparam="-XDignore.symbol.file=true"/> |
765 |
> |
bootclasspath="${bootclasspath6}" |
766 |
> |
source="5" |
767 |
> |
executable="${javadoc7}"> |
768 |
> |
<arg value="-XDignore.symbol.file=true"/> |
769 |
|
|
770 |
+ |
</javadoc> |
771 |
|
</target> |
772 |
|
|
773 |
|
|
774 |
|
<target name="jsr166xdist" |
775 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
775 |
> |
depends="jsr166xdist-jar, jsr166xdist-docs" |
776 |
|
description="Puts all distributable products in single hierarchy"/> |
777 |
|
|
778 |
|
|
770 |
– |
|
779 |
|
<target name="jsr166xclean" |
780 |
|
description="Removes all jsr166x build products"> |
781 |
|
|
784 |
|
</target> |
785 |
|
|
786 |
|
|
779 |
– |
|
787 |
|
<target name="jsr166xdist-clean" |
788 |
|
description="Removes all build and distribution products"> |
789 |
|
|
792 |
|
|
793 |
|
<target name="jsr166xdist-jar" |
794 |
|
depends="jsr166xclean, jsr166xjar"> |
788 |
– |
|
795 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
796 |
+ |
</target> |
797 |
|
|
798 |
+ |
<target name="jsr166xdist-docs" |
799 |
+ |
depends="jsr166xclean, jsr166xdocs"> |
800 |
+ |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
801 |
|
</target> |
802 |
|
|
803 |
|
<!-- jsr166y --> |
823 |
|
fork="true"> |
824 |
|
|
825 |
|
<include name="jsr166y/**/*.java"/> |
816 |
– |
<compilerarg line="${build.args}"/> |
826 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
827 |
|
<compilerarg value="-Xlint:all"/> |
828 |
+ |
<compilerarg line="${build.args}"/> |
829 |
+ |
|
830 |
|
</javac> |
831 |
|
</target> |
832 |
|
|
842 |
|
</target> |
843 |
|
|
844 |
|
|
834 |
– |
|
845 |
|
<target name="jsr166ydocs" |
846 |
|
description="Builds javadocs to dist dir"> |
847 |
|
|
848 |
< |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
849 |
< |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
848 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
849 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
850 |
|
|
851 |
< |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
851 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
852 |
|
packagenames="jsr166y.*" |
853 |
|
link="${jdkapidocs.url}" |
844 |
– |
source="6" |
845 |
– |
bootclasspath="${bootclasspath6}" |
854 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
855 |
< |
executable="${javadoc7}" |
856 |
< |
additionalparam="-XDignore.symbol.file=true"/> |
855 |
> |
bootclasspath="${bootclasspath6}" |
856 |
> |
source="6" |
857 |
> |
executable="${javadoc7}"> |
858 |
> |
<arg value="-XDignore.symbol.file=true"/> |
859 |
|
|
860 |
+ |
</javadoc> |
861 |
|
</target> |
862 |
|
|
863 |
|
|
864 |
|
<target name="jsr166ydist" |
865 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
865 |
> |
depends="jsr166ydist-jar, jsr166ydist-docs" |
866 |
|
description="Puts all distributable products in single hierarchy"/> |
867 |
|
|
868 |
|
|
858 |
– |
|
869 |
|
<target name="jsr166yclean" |
870 |
|
description="Removes all jsr166y build products"> |
871 |
|
|
874 |
|
</target> |
875 |
|
|
876 |
|
|
867 |
– |
|
877 |
|
<target name="jsr166ydist-clean" |
878 |
|
description="Removes all build and distribution products"> |
879 |
|
|
881 |
|
|
882 |
|
<target name="jsr166ydist-jar" |
883 |
|
depends="jsr166yclean, jsr166yjar"> |
875 |
– |
|
884 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
885 |
+ |
</target> |
886 |
|
|
887 |
+ |
<target name="jsr166ydist-docs" |
888 |
+ |
depends="jsr166yclean, jsr166ydocs"> |
889 |
+ |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
890 |
|
</target> |
891 |
|
|
892 |
|
|
904 |
|
debug="${build.debug}" |
905 |
|
debuglevel="${build.debuglevel}" |
906 |
|
deprecation="${build.deprecation}" |
907 |
+ |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
908 |
|
classpath="" |
909 |
|
source="6" |
897 |
– |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
910 |
|
includeAntRuntime="false" |
911 |
|
includeJavaRuntime="false" |
912 |
|
executable="${javac7}" |
913 |
|
fork="true"> |
914 |
|
|
915 |
|
<include name="extra166y/**/*.java"/> |
904 |
– |
<compilerarg line="${build.args}"/> |
916 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
917 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
918 |
+ |
<compilerarg line="${build.args}"/> |
919 |
|
|
920 |
|
</javac> |
909 |
– |
|
921 |
|
</target> |
922 |
|
|
923 |
|
|
913 |
– |
|
924 |
|
<target name="extra166yjar" |
925 |
|
depends="extra166ycompile" |
926 |
|
description="Builds library jar from compiled sources"> |
932 |
|
</target> |
933 |
|
|
934 |
|
|
925 |
– |
|
935 |
|
<target name="extra166ydocs" |
936 |
|
description="Builds javadocs to build dir"> |
937 |
|
|
938 |
< |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
939 |
< |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
938 |
> |
<delete dir="${extra166ydocs.dir}"/> |
939 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
940 |
|
|
941 |
< |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
941 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
942 |
|
packagenames="extra166y.*" |
943 |
|
link="${jdkapidocs.url}" |
935 |
– |
source="6" |
936 |
– |
bootclasspath="${bootclasspath6}" |
944 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
945 |
< |
executable="${javadoc7}" |
946 |
< |
additionalparam="-XDignore.symbol.file=true"/> |
945 |
> |
bootclasspath="${bootclasspath6}" |
946 |
> |
source="6" |
947 |
> |
executable="${javadoc7}"> |
948 |
> |
<arg value="-XDignore.symbol.file=true"/> |
949 |
|
|
950 |
+ |
</javadoc> |
951 |
|
</target> |
952 |
|
|
953 |
|
|
954 |
|
<target name="extra166ydist" |
955 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
955 |
> |
depends="extra166ydist-jar, extra166ydist-docs" |
956 |
|
description="Puts all distributable products in single hierarchy"/> |
957 |
|
|
958 |
|
|
949 |
– |
|
959 |
|
<target name="extra166yclean" |
960 |
|
description="Removes all extra166y build products"> |
961 |
|
|
964 |
|
</target> |
965 |
|
|
966 |
|
|
958 |
– |
|
967 |
|
<target name="extra166ydist-clean" |
968 |
|
description="Removes all build and distribution products"> |
969 |
|
|
971 |
|
|
972 |
|
<target name="extra166ydist-jar" |
973 |
|
depends="extra166yclean, extra166yjar"> |
966 |
– |
|
974 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
975 |
+ |
</target> |
976 |
|
|
977 |
+ |
<target name="extra166ydist-docs" |
978 |
+ |
depends="extra166yclean, extra166ydocs"> |
979 |
+ |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
980 |
|
</target> |
981 |
|
|
982 |
|
<!-- jsr166e --> |
1000 |
|
fork="true"> |
1001 |
|
|
1002 |
|
<include name="jsr166e/**/*.java"/> |
992 |
– |
<compilerarg line="${build.args}"/> |
1003 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1004 |
|
<compilerarg value="-Xlint:all"/> |
1005 |
+ |
<compilerarg line="${build.args}"/> |
1006 |
|
|
1007 |
|
</javac> |
997 |
– |
|
1008 |
|
</target> |
1009 |
|
|
1010 |
|
|
1001 |
– |
|
1011 |
|
<target name="jsr166ejar" |
1012 |
|
depends="jsr166ecompile" |
1013 |
|
description="Builds library jar from compiled sources"> |
1019 |
|
</target> |
1020 |
|
|
1021 |
|
|
1013 |
– |
|
1022 |
|
<target name="jsr166edocs" |
1023 |
|
description="Builds javadocs to build dir"> |
1024 |
|
|
1025 |
< |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1026 |
< |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1025 |
> |
<delete dir="${jsr166edocs.dir}"/> |
1026 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
1027 |
|
|
1028 |
< |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1028 |
> |
<javadoc destdir="${jsr166edocs.dir}" |
1029 |
|
packagenames="jsr166e.*" |
1030 |
|
link="${jdkapidocs.url}" |
1023 |
– |
source="7" |
1031 |
|
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1032 |
< |
executable="${javadoc7}" |
1033 |
< |
additionalparam="-XDignore.symbol.file=true" > |
1032 |
> |
source="7" |
1033 |
> |
executable="${javadoc7}"> |
1034 |
> |
<arg value="-XDignore.symbol.file=true"/> |
1035 |
> |
|
1036 |
|
</javadoc> |
1037 |
+ |
</target> |
1038 |
|
|
1039 |
+ |
|
1040 |
+ |
<target name="jsr166e-test-tck" |
1041 |
+ |
depends="jsr166ejar" |
1042 |
+ |
description="Runs tck tests for jsr166e"> |
1043 |
+ |
|
1044 |
+ |
<run-tck-tests |
1045 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1046 |
+ |
source="7" |
1047 |
+ |
target="8" |
1048 |
+ |
workdir="${build.jsr166e.dir}" |
1049 |
+ |
classes="${jsr166e.jar}"/> |
1050 |
|
</target> |
1051 |
|
|
1052 |
|
|
1053 |
|
<target name="jsr166edist" |
1054 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
1054 |
> |
depends="jsr166edist-jar, jsr166edist-docs" |
1055 |
|
description="Puts all distributable products in single hierarchy"/> |
1056 |
|
|
1057 |
|
|
1037 |
– |
|
1058 |
|
<target name="jsr166eclean" |
1059 |
|
description="Removes all jsr166e build products"> |
1040 |
– |
|
1060 |
|
<delete dir="${build.jsr166e.dir}"/> |
1042 |
– |
|
1061 |
|
</target> |
1062 |
|
|
1063 |
|
|
1068 |
|
|
1069 |
|
<target name="jsr166edist-jar" |
1070 |
|
depends="jsr166eclean, jsr166ejar"> |
1053 |
– |
|
1071 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1072 |
+ |
</target> |
1073 |
|
|
1074 |
+ |
<target name="jsr166edist-docs" |
1075 |
+ |
depends="jsr166eclean, jsr166edocs"> |
1076 |
+ |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1077 |
|
</target> |
1078 |
|
|
1079 |
|
</project> |