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 |
|
|
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 --> |
61 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
63 |
|
<macrodef name="defjdklocations"> |
64 |
|
<attribute name="v"/> |
65 |
|
<sequential> |
66 |
< |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
67 |
< |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
68 |
< |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
69 |
< |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
70 |
< |
<property name="bootclasspath@{v}" |
66 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
67 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
68 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
69 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
70 |
> |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
71 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
72 |
> |
<property name="bootclasspath@{v}" |
73 |
|
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
74 |
|
</sequential> |
75 |
|
</macrodef> |
78 |
|
<defjdklocations v="7"/> |
79 |
|
<defjdklocations v="8"/> |
80 |
|
|
81 |
+ |
<macrodef name="run-tck-tests"> |
82 |
+ |
<attribute name="jvm"/> |
83 |
+ |
<attribute name="tck.classes"/> |
84 |
+ |
<attribute name="product.jar" default="${product.jar}"/> |
85 |
+ |
<attribute name="jvmflags" default=""/> |
86 |
+ |
<sequential> |
87 |
+ |
<java classname="JSR166TestCase" |
88 |
+ |
jvm="@{jvm}" fork="true"> |
89 |
+ |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
90 |
+ |
<jvmarg line="@{jvmflags}"/> |
91 |
+ |
<classpath> |
92 |
+ |
<pathelement location="${junit.jar}"/> |
93 |
+ |
<pathelement location="@{tck.classes}"/> |
94 |
+ |
</classpath> |
95 |
+ |
</java> |
96 |
+ |
</sequential> |
97 |
+ |
</macrodef> |
98 |
+ |
|
99 |
|
<!-- Source locations --> |
100 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
101 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
105 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
106 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
107 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
108 |
< |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
108 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
109 |
|
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
110 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
111 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
113 |
|
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
114 |
|
|
115 |
|
<!-- Distribution locations --> |
116 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
117 |
< |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
118 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
119 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
120 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
121 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
116 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
117 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
118 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
119 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
120 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
121 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
122 |
|
|
123 |
|
<!-- Jar locations --> |
124 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
125 |
< |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
126 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
127 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
128 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
129 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
130 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
124 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
125 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
126 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
127 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
128 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
129 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
130 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
131 |
|
|
132 |
|
<!-- Bootclasspath argument --> |
133 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
140 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
141 |
|
<!-- The below does not yet exist as of 2012-11 --> |
142 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
143 |
+ |
|
144 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
145 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
146 |
|
|
147 |
|
<!-- Test classpath --> |
155 |
|
<pathelement location="${build.loops.dir}"/> |
156 |
|
</path> |
157 |
|
|
158 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
159 |
+ |
<!-- TODO: How do we get &trade to work? --> |
160 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
161 |
+ |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
162 |
+ |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
163 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
164 |
|
|
165 |
|
<!-- Main targets --> |
166 |
|
|
167 |
|
<target name="dists" |
168 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
168 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
169 |
|
description="Builds all public jars and docs"/> |
170 |
|
|
171 |
|
<target name="compile" |
172 |
< |
depends="init, configure-compiler" |
173 |
< |
description="Compiles main sources to build folder"> |
172 |
> |
depends="configure-compiler" |
173 |
> |
description="Compiles src/main sources to build dir"> |
174 |
|
|
175 |
|
<mkdir dir="${build.classes.dir}"/> |
176 |
|
|
177 |
|
<javac srcdir="${src.dir}" |
178 |
< |
destdir="${build.classes.dir}" |
179 |
< |
debug="${build.debug}" |
180 |
< |
debuglevel="${build.debuglevel}" |
181 |
< |
deprecation="${build.deprecation}" |
182 |
< |
source="${build.sourcelevel}" |
183 |
< |
fork="true"> |
178 |
> |
destdir="${build.classes.dir}" |
179 |
> |
debug="${build.debug}" |
180 |
> |
debuglevel="${build.debuglevel}" |
181 |
> |
deprecation="${build.deprecation}" |
182 |
> |
classpath="" |
183 |
> |
includeAntRuntime="false" |
184 |
> |
includeJavaRuntime="false" |
185 |
> |
executable="${javac8}" |
186 |
> |
fork="true"> |
187 |
|
|
188 |
|
<include name="**/*.java"/> |
189 |
+ |
<compilerarg line="${build.args}"/> |
190 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
191 |
+ |
<compilerarg value="-Xlint:all"/> |
192 |
|
|
193 |
|
<!-- |
194 |
|
<exclude name="java/lang/**"/> |
206 |
|
depends="compile" |
207 |
|
description="Builds library jar from compiled sources"> |
208 |
|
|
175 |
– |
<mkdir dir="${build.lib.dir}"/> |
176 |
– |
|
209 |
|
<jar destfile="${product.jar}"> |
210 |
|
<fileset dir="${build.classes.dir}"/> |
211 |
|
</jar> |
215 |
|
|
216 |
|
|
217 |
|
<target name="test" |
218 |
< |
depends="init, configure-tests, report-tests" |
218 |
> |
depends="configure-tests, report-tests" |
219 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
220 |
|
|
221 |
|
|
222 |
|
|
223 |
|
<target name="docs" |
224 |
< |
description="Builds javadocs with custom tags to build folder"> |
224 |
> |
description="Builds javadocs for src/main to dist dir"> |
225 |
|
|
226 |
< |
<delete dir="${build.javadocs.dir}"/> |
227 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
226 |
> |
<delete dir="${dist.javadocs.dir}"/> |
227 |
> |
<mkdir dir="${dist.javadocs.dir}"/> |
228 |
|
|
229 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
230 |
|
<!-- sourcepath for packages --> |
231 |
|
|
232 |
< |
<javadoc destdir="${build.javadocs.dir}" |
232 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
233 |
|
packagenames="none" |
234 |
< |
link="${jdkapidocs.url}" |
234 |
> |
link="${jdkapi8docs.url}" |
235 |
|
overview="${src.dir}/intro.html" |
236 |
< |
sourcepath="${src.dir}:${jdksrc.dir}" |
237 |
< |
additionalparam="-XDignore.symbol.file=true" > |
236 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
237 |
> |
classpath="" |
238 |
> |
executable="${javadoc8}"> |
239 |
> |
<arg value="-XDignore.symbol.file=true"/> |
240 |
> |
<arg value="-tag"/> |
241 |
> |
<arg value="${javadoc.jls.option}"/> |
242 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
243 |
|
<include name="**/*.java"/> |
244 |
|
</fileset> |
249 |
|
|
250 |
|
|
251 |
|
<target name="dist" |
252 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
252 |
> |
depends="dist-clean, dist-jar, docs" |
253 |
|
description="Puts all distributable products in single hierarchy"/> |
254 |
|
|
255 |
|
|
277 |
|
description="Removes all build products"> |
278 |
|
|
279 |
|
<delete dir="${build.dir}"/> |
244 |
– |
<delete dir="${build.classes.dir}"/> |
245 |
– |
<delete dir="${build.lib.dir}"/> |
280 |
|
|
281 |
|
</target> |
282 |
|
|
291 |
|
|
292 |
|
|
293 |
|
|
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 |
– |
|
294 |
|
<!-- Internal targets --> |
295 |
|
|
296 |
|
|
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 |
– |
|
297 |
|
<target name="dist-jar" |
298 |
|
depends="clean, jar"> |
299 |
|
|
478 |
|
<!-- Various demos and test programs --> |
479 |
|
|
480 |
|
|
481 |
< |
<target name="loops" depends="init, configure-compiler" |
481 |
> |
<target name="loops" depends="configure-compiler" |
482 |
|
description="Benchmark from Doug Lea's AQS paper"> |
483 |
|
|
484 |
|
<mkdir dir="${build.loops.dir}"/> |
504 |
|
</target> |
505 |
|
|
506 |
|
|
507 |
< |
<!-- jdk7 --> |
507 |
> |
<!-- jsr166 4jdk7 --> |
508 |
|
|
509 |
|
|
510 |
< |
<target name="jdk7compile" |
510 |
> |
<target name="4jdk7compile" |
511 |
|
depends="configure-compiler" |
512 |
< |
description="Compiles src/jdk7 sources"> |
512 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
513 |
|
|
514 |
< |
<mkdir dir="${build.jdk7.classes.dir}"/> |
514 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
515 |
|
|
516 |
< |
<javac srcdir="${jdk7src.dir}" |
517 |
< |
destdir="${build.jdk7.classes.dir}" |
516 |
> |
<javac srcdir="${4jdk7src.dir}" |
517 |
> |
destdir="${build.4jdk7.classes.dir}" |
518 |
|
debug="${build.debug}" |
519 |
|
debuglevel="${build.debuglevel}" |
520 |
|
deprecation="${build.deprecation}" |
521 |
< |
source="1.6" |
521 |
> |
source="6" |
522 |
|
classpath="" |
523 |
|
bootclasspath="${bootclasspath6}" |
524 |
|
includeAntRuntime="false" |
525 |
|
includeJavaRuntime="false" |
526 |
< |
executable="${javac6}" |
526 |
> |
executable="${javac7}" |
527 |
|
fork="true"> |
528 |
|
|
529 |
|
<include name="**/*.java"/> |
533 |
|
|
534 |
|
</javac> |
535 |
|
|
536 |
< |
</target> |
536 |
> |
<jar destfile="${4jdk7product.jar}" index="true"> |
537 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
538 |
> |
</jar> |
539 |
|
|
540 |
+ |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
541 |
|
|
542 |
+ |
<javac srcdir="${tck.src.dir}" |
543 |
+ |
destdir="${build.4jdk7.tck.classes.dir}" |
544 |
+ |
debug="${build.debug}" |
545 |
+ |
debuglevel="${build.debuglevel}" |
546 |
+ |
deprecation="${build.deprecation}" |
547 |
+ |
source="6" |
548 |
+ |
classpath="${junit.jar}" |
549 |
+ |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
550 |
+ |
includeAntRuntime="false" |
551 |
+ |
includeJavaRuntime="false" |
552 |
+ |
executable="${javac7}" |
553 |
+ |
fork="true"> |
554 |
|
|
555 |
< |
<target name="jdk7jar" |
556 |
< |
depends="jdk7compile" |
557 |
< |
description="Builds library jar from compiled sources"> |
555 |
> |
<include name="**/*.java"/> |
556 |
> |
<compilerarg line="${build.args}"/> |
557 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
558 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
559 |
> |
|
560 |
> |
</javac> |
561 |
|
|
562 |
< |
<mkdir dir="${build.jdk7.lib.dir}"/> |
562 |
> |
</target> |
563 |
|
|
546 |
– |
<jar destfile="${jdk7product.jar}" index="true"> |
547 |
– |
<fileset dir="${build.jdk7.classes.dir}"/> |
548 |
– |
</jar> |
564 |
|
|
565 |
+ |
<target name="4jdk7-test-tck" |
566 |
+ |
depends="4jdk7compile" |
567 |
+ |
description="Runs tck tests for jsr166-4jdk7 directly"> |
568 |
+ |
<run-tck-tests |
569 |
+ |
jvm="${java7}" |
570 |
+ |
tck.classes="${build.4jdk7.tck.classes.dir}" |
571 |
+ |
product.jar="${4jdk7product.jar}"/> |
572 |
|
</target> |
573 |
|
|
574 |
|
|
575 |
+ |
<target name="4jdk7-test-tck-junit" |
576 |
+ |
depends="4jdk7compile" |
577 |
+ |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
578 |
+ |
|
579 |
+ |
<junit printsummary="true" |
580 |
+ |
showoutput="true" |
581 |
+ |
errorProperty="junit.failed" |
582 |
+ |
failureProperty="junit.failed" |
583 |
+ |
includeantruntime="true" |
584 |
+ |
jvm="${java7}" |
585 |
+ |
fork="true"> |
586 |
+ |
|
587 |
+ |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
588 |
+ |
<jvmarg value="-server"/> |
589 |
+ |
|
590 |
+ |
<classpath> |
591 |
+ |
<pathelement location="${junit.jar}"/> |
592 |
+ |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
593 |
+ |
</classpath> |
594 |
+ |
|
595 |
+ |
<formatter type="brief"/> |
596 |
+ |
|
597 |
+ |
<test name="JSR166TestCase" haltonfailure="no"> |
598 |
+ |
</test> |
599 |
+ |
|
600 |
+ |
</junit> |
601 |
+ |
</target> |
602 |
+ |
|
603 |
|
|
604 |
< |
<target name="jdk7docs" |
605 |
< |
description="Builds javadocs with custom tags to build folder"> |
604 |
> |
<target name="4jdk7docs" |
605 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
606 |
|
|
607 |
< |
<delete dir="${build.jdk7.docs.dir}"/> |
608 |
< |
<mkdir dir="${build.jdk7.docs.dir}"/> |
607 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
608 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
609 |
|
|
610 |
< |
<javadoc destdir="${build.jdk7.docs.dir}" |
610 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
611 |
|
packagenames="none" |
612 |
|
link="${jdkapi7docs.url}" |
613 |
< |
overview="${jdk7src.dir}/intro.html" |
614 |
< |
sourcepath="${jdk7src.dir}" |
565 |
< |
bootclasspath="${bootclasspath6}" |
613 |
> |
overview="${4jdk7src.dir}/intro.html" |
614 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
615 |
|
classpath="" |
616 |
< |
source="1.6" |
617 |
< |
executable="${javadoc7}" |
618 |
< |
additionalparam="-XDignore.symbol.file=true" > |
570 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
616 |
> |
executable="${javadoc7}"> |
617 |
> |
<arg value="-XDignore.symbol.file=true"/> |
618 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
619 |
|
<include name="**/*.java"/> |
620 |
|
</fileset> |
621 |
|
</javadoc> |
623 |
|
</target> |
624 |
|
|
625 |
|
|
626 |
< |
<target name="jdk7dist" |
627 |
< |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
626 |
> |
<target name="4jdk7dist" |
627 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
628 |
|
description="Puts all distributable products in single hierarchy"/> |
629 |
|
|
630 |
|
|
631 |
|
|
632 |
< |
<target name="jdk7clean" |
633 |
< |
description="Removes all build products"> |
632 |
> |
<target name="4jdk7clean" |
633 |
> |
description="Removes all 4jdk7 build products"> |
634 |
|
|
635 |
< |
<delete dir="${build.jdk7.dir}"/> |
635 |
> |
<delete dir="${build.4jdk7.dir}"/> |
636 |
|
|
637 |
|
</target> |
638 |
|
|
639 |
|
|
640 |
|
|
641 |
< |
<target name="jdk7dist-clean" |
641 |
> |
<target name="4jdk7dist-clean" |
642 |
|
description="Removes all build and distribution products"> |
643 |
|
|
644 |
|
</target> |
645 |
|
|
646 |
< |
<target name="jdk7dist-docs" |
647 |
< |
description="Builds javadocs without custom tags to dist folder"> |
600 |
< |
|
601 |
< |
<delete dir="${dist.jdk7.docs.dir}"/> |
602 |
< |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
646 |
> |
<target name="4jdk7dist-jar" |
647 |
> |
depends="4jdk7clean, 4jdk7compile"> |
648 |
|
|
649 |
< |
<javadoc destdir="${dist.jdk7.docs.dir}" |
605 |
< |
packagenames="none" |
606 |
< |
link="${jdkapi7docs.url}" |
607 |
< |
overview="${jdk7src.dir}/intro.html" |
608 |
< |
sourcepath="${jdk7src.dir}" |
609 |
< |
classpath="" |
610 |
< |
executable="${javadoc7}" |
611 |
< |
bootclasspath="${bootclasspath6}" |
612 |
< |
source="1.6"> |
613 |
< |
<arg value="-XDignore.symbol.file=true"/> |
614 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
615 |
< |
<include name="**/*.java"/> |
616 |
< |
</fileset> |
617 |
< |
</javadoc> |
649 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
650 |
|
|
651 |
|
</target> |
652 |
|
|
621 |
– |
<target name="jdk7dist-jar" |
622 |
– |
depends="jdk7clean, jdk7jar"> |
623 |
– |
|
624 |
– |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
625 |
– |
|
626 |
– |
</target> |
653 |
|
|
654 |
|
<!-- jsr166x --> |
655 |
|
|
630 |
– |
|
656 |
|
<target name="jsr166xcompile" |
657 |
< |
depends="init, configure-compiler" |
658 |
< |
description="Compiles jsr166x sources"> |
657 |
> |
depends="configure-compiler" |
658 |
> |
description="Compiles jsr166x sources to build dir"> |
659 |
|
|
660 |
|
<mkdir dir="${build.jsr166x.dir}"/> |
661 |
|
|
662 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
663 |
< |
destdir="${build.jsr166x.dir}" |
664 |
< |
debug="${build.debug}" |
665 |
< |
debuglevel="${build.debuglevel}" |
666 |
< |
deprecation="${build.deprecation}" |
667 |
< |
source="${build.sourcelevel}" |
668 |
< |
fork="true"> |
662 |
> |
<javac srcdir="${topsrc.dir}" |
663 |
> |
destdir="${build.jsr166x.dir}" |
664 |
> |
debug="${build.debug}" |
665 |
> |
debuglevel="${build.debuglevel}" |
666 |
> |
deprecation="${build.deprecation}" |
667 |
> |
classpath="" |
668 |
> |
source="5" |
669 |
> |
bootclasspath="${bootclasspath6}" |
670 |
> |
includeAntRuntime="false" |
671 |
> |
includeJavaRuntime="false" |
672 |
> |
executable="${javac7}" |
673 |
> |
fork="true"> |
674 |
|
|
675 |
< |
<include name="**/*.java"/> |
675 |
> |
<include name="jsr166x/**/*.java"/> |
676 |
|
<compilerarg line="${build.args}"/> |
677 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
678 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
679 |
|
|
680 |
|
</javac> |
681 |
|
|
687 |
|
depends="jsr166xcompile" |
688 |
|
description="Builds library jar from compiled sources"> |
689 |
|
|
690 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
660 |
< |
|
661 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
690 |
> |
<jar destfile="${jsr166x.jar}"> |
691 |
|
<fileset dir="${build.jsr166x.dir}"/> |
692 |
|
</jar> |
693 |
|
|
696 |
|
|
697 |
|
|
698 |
|
<target name="jsr166xdocs" |
699 |
< |
description="Builds javadocs with custom tags to build folder"> |
699 |
> |
description="Builds javadocs to dist dir"> |
700 |
|
|
701 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
702 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
701 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
702 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
703 |
|
|
704 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
705 |
< |
packagenames="jsr166x" |
704 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
705 |
> |
packagenames="jsr166x.*" |
706 |
|
link="${jdkapidocs.url}" |
707 |
< |
source="${build.sourcelevel}" |
708 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
707 |
> |
source="5" |
708 |
> |
bootclasspath="${bootclasspath6}" |
709 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
710 |
> |
executable="${javadoc7}" |
711 |
|
additionalparam="-XDignore.symbol.file=true" /> |
712 |
|
|
713 |
|
</target> |
714 |
|
|
715 |
|
|
716 |
|
<target name="jsr166xdist" |
717 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
717 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
718 |
|
description="Puts all distributable products in single hierarchy"/> |
719 |
|
|
720 |
|
|
721 |
|
|
722 |
|
<target name="jsr166xclean" |
723 |
< |
description="Removes all build products"> |
723 |
> |
description="Removes all jsr166x build products"> |
724 |
|
|
725 |
|
<delete dir="${build.jsr166x.dir}"/> |
695 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
726 |
|
|
727 |
|
</target> |
728 |
|
|
734 |
|
</target> |
735 |
|
|
736 |
|
|
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 |
– |
|
737 |
|
<target name="jsr166xdist-jar" |
738 |
|
depends="jsr166xclean, jsr166xjar"> |
739 |
|
|
740 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
740 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
741 |
|
|
742 |
|
</target> |
743 |
|
|
745 |
|
|
746 |
|
|
747 |
|
<target name="jsr166ycompile" |
748 |
< |
depends="init, configure-compiler" |
748 |
> |
depends="configure-compiler" |
749 |
|
description="Compiles jsr166y sources"> |
750 |
|
|
751 |
|
<mkdir dir="${build.jsr166y.dir}"/> |
752 |
|
|
753 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
754 |
< |
destdir="${build.jsr166y.dir}" |
755 |
< |
debug="${build.debug}" |
756 |
< |
debuglevel="${build.debuglevel}" |
757 |
< |
deprecation="${build.deprecation}" |
758 |
< |
source="${build.sourcelevel}" |
759 |
< |
fork="true"> |
753 |
> |
<javac srcdir="${topsrc.dir}" |
754 |
> |
destdir="${build.jsr166y.dir}" |
755 |
> |
debug="${build.debug}" |
756 |
> |
debuglevel="${build.debuglevel}" |
757 |
> |
deprecation="${build.deprecation}" |
758 |
> |
source="6" |
759 |
> |
classpath="" |
760 |
> |
bootclasspath="${bootclasspath6}" |
761 |
> |
includeAntRuntime="false" |
762 |
> |
includeJavaRuntime="false" |
763 |
> |
executable="${javac7}" |
764 |
> |
fork="true"> |
765 |
|
|
766 |
< |
<include name="**/*.java"/> |
766 |
> |
<include name="jsr166y/**/*.java"/> |
767 |
|
<compilerarg line="${build.args}"/> |
768 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
769 |
< |
<compilerarg value="${bootclasspath.args}"/> |
751 |
< |
|
752 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
753 |
< |
|
769 |
> |
<compilerarg value="-Xlint:all"/> |
770 |
|
</javac> |
755 |
– |
|
771 |
|
</target> |
772 |
|
|
773 |
|
|
759 |
– |
|
774 |
|
<target name="jsr166yjar" |
775 |
|
depends="jsr166ycompile" |
776 |
|
description="Builds library jar from compiled sources"> |
777 |
|
|
778 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
765 |
< |
|
766 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
778 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
779 |
|
<fileset dir="${build.jsr166y.dir}"/> |
780 |
|
</jar> |
781 |
|
|
784 |
|
|
785 |
|
|
786 |
|
<target name="jsr166ydocs" |
787 |
< |
description="Builds javadocs with custom tags to build folder"> |
787 |
> |
description="Builds javadocs to dist dir"> |
788 |
|
|
789 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
790 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
789 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
790 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
791 |
|
|
792 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
793 |
< |
packagenames="jsr166y" |
792 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
793 |
> |
packagenames="jsr166y.*" |
794 |
|
link="${jdkapidocs.url}" |
795 |
< |
source="${build.sourcelevel}" |
796 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
795 |
> |
source="6" |
796 |
> |
bootclasspath="${bootclasspath6}" |
797 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
798 |
> |
executable="${javadoc7}" |
799 |
|
additionalparam="-XDignore.symbol.file=true" /> |
800 |
|
|
801 |
|
</target> |
802 |
|
|
803 |
|
|
804 |
|
<target name="jsr166ydist" |
805 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
805 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
806 |
|
description="Puts all distributable products in single hierarchy"/> |
807 |
|
|
808 |
|
|
809 |
|
|
810 |
|
<target name="jsr166yclean" |
811 |
< |
description="Removes all build products"> |
811 |
> |
description="Removes all jsr166y build products"> |
812 |
|
|
813 |
|
<delete dir="${build.jsr166y.dir}"/> |
800 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
814 |
|
|
815 |
|
</target> |
816 |
|
|
821 |
|
|
822 |
|
</target> |
823 |
|
|
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 |
– |
|
824 |
|
<target name="jsr166ydist-jar" |
825 |
|
depends="jsr166yclean, jsr166yjar"> |
826 |
|
|
827 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
827 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
828 |
|
|
829 |
|
</target> |
830 |
|
|
833 |
|
|
834 |
|
|
835 |
|
<target name="extra166ycompile" |
836 |
< |
depends="init, configure-compiler, jsr166ycompile" |
836 |
> |
depends="configure-compiler, jsr166yjar" |
837 |
|
description="Compiles extra166y sources"> |
838 |
|
|
839 |
|
<mkdir dir="${build.extra166y.dir}"/> |
840 |
|
|
841 |
< |
<javac srcdir="${extra166ysrc.dir}" |
842 |
< |
destdir="${build.extra166y.dir}" |
843 |
< |
debug="${build.debug}" |
844 |
< |
classpath="${jsr166yproduct.jar}" |
845 |
< |
debuglevel="${build.debuglevel}" |
846 |
< |
deprecation="${build.deprecation}" |
847 |
< |
source="${build.sourcelevel}" |
848 |
< |
fork="true"> |
841 |
> |
<javac srcdir="${topsrc.dir}" |
842 |
> |
destdir="${build.extra166y.dir}" |
843 |
> |
debug="${build.debug}" |
844 |
> |
debuglevel="${build.debuglevel}" |
845 |
> |
deprecation="${build.deprecation}" |
846 |
> |
classpath="" |
847 |
> |
source="6" |
848 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
849 |
> |
includeAntRuntime="false" |
850 |
> |
includeJavaRuntime="false" |
851 |
> |
executable="${javac7}" |
852 |
> |
fork="true"> |
853 |
|
|
854 |
< |
<include name="**/*.java"/> |
854 |
> |
<include name="extra166y/**/*.java"/> |
855 |
|
<compilerarg line="${build.args}"/> |
856 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
857 |
< |
<compilerarg value="${bootclasspath.args}"/> |
856 |
< |
|
857 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
857 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
858 |
|
|
859 |
|
</javac> |
860 |
|
|
866 |
|
depends="extra166ycompile" |
867 |
|
description="Builds library jar from compiled sources"> |
868 |
|
|
869 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
870 |
< |
|
871 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
869 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
870 |
|
<fileset dir="${build.extra166y.dir}"/> |
871 |
|
</jar> |
872 |
|
|
875 |
|
|
876 |
|
|
877 |
|
<target name="extra166ydocs" |
878 |
< |
description="Builds javadocs with custom tags to build folder"> |
878 |
> |
description="Builds javadocs to build dir"> |
879 |
|
|
880 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
881 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
880 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
881 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
882 |
|
|
883 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
884 |
< |
packagenames="extra166y" |
883 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
884 |
> |
packagenames="extra166y.*" |
885 |
|
link="${jdkapidocs.url}" |
886 |
< |
source="${build.sourcelevel}" |
887 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
886 |
> |
source="6" |
887 |
> |
bootclasspath="${bootclasspath6}" |
888 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
889 |
> |
executable="${javadoc7}" |
890 |
|
additionalparam="-XDignore.symbol.file=true" /> |
891 |
|
|
892 |
|
</target> |
893 |
|
|
894 |
|
|
895 |
|
<target name="extra166ydist" |
896 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
896 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
897 |
|
description="Puts all distributable products in single hierarchy"/> |
898 |
|
|
899 |
|
|
900 |
|
|
901 |
|
<target name="extra166yclean" |
902 |
< |
description="Removes all build products"> |
902 |
> |
description="Removes all extra166y build products"> |
903 |
|
|
904 |
|
<delete dir="${build.extra166y.dir}"/> |
905 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
905 |
|
|
906 |
|
</target> |
907 |
|
|
912 |
|
|
913 |
|
</target> |
914 |
|
|
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 |
– |
|
915 |
|
<target name="extra166ydist-jar" |
916 |
|
depends="extra166yclean, extra166yjar"> |
917 |
|
|
918 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
918 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
919 |
|
|
920 |
|
</target> |
921 |
|
|
932 |
|
debug="${build.debug}" |
933 |
|
debuglevel="${build.debuglevel}" |
934 |
|
deprecation="${build.deprecation}" |
935 |
< |
source="1.7" |
935 |
> |
source="7" |
936 |
|
classpath="" |
937 |
|
includeAntRuntime="false" |
938 |
|
includeJavaRuntime="false" |
954 |
|
depends="jsr166ecompile" |
955 |
|
description="Builds library jar from compiled sources"> |
956 |
|
|
957 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
974 |
< |
|
975 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
957 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
958 |
|
<fileset dir="${build.jsr166e.dir}"/> |
959 |
|
</jar> |
960 |
|
|
963 |
|
|
964 |
|
|
965 |
|
<target name="jsr166edocs" |
966 |
< |
description="Builds javadocs with custom tags to build folder"> |
966 |
> |
description="Builds javadocs to build dir"> |
967 |
|
|
968 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
969 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
968 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
969 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
970 |
|
|
971 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
972 |
< |
packagenames="jsr166e,jsr166e.extra" |
973 |
< |
link="${jdkapi7docs.url}" |
974 |
< |
source="1.7" |
975 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" |
971 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
972 |
> |
packagenames="jsr166e.*" |
973 |
> |
link="${jdkapidocs.url}" |
974 |
> |
source="7" |
975 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
976 |
|
executable="${javadoc7}" |
977 |
|
additionalparam="-XDignore.symbol.file=true" > |
996 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
997 |
– |
<include name="jsr166e/**/*.java"/> |
998 |
– |
</fileset> |
978 |
|
</javadoc> |
979 |
|
|
980 |
|
</target> |
981 |
|
|
982 |
|
|
983 |
|
<target name="jsr166edist" |
984 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
984 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
985 |
|
description="Puts all distributable products in single hierarchy"/> |
986 |
|
|
987 |
|
|
988 |
|
|
989 |
|
<target name="jsr166eclean" |
990 |
< |
description="Removes all build products"> |
990 |
> |
description="Removes all jsr166e build products"> |
991 |
|
|
992 |
|
<delete dir="${build.jsr166e.dir}"/> |
1014 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
993 |
|
|
994 |
|
</target> |
995 |
|
|
996 |
|
|
1019 |
– |
|
997 |
|
<target name="jsr166edist-clean" |
998 |
|
description="Removes all build and distribution products"> |
999 |
|
|
1000 |
|
</target> |
1001 |
|
|
1025 |
– |
<target name="jsr166edist-docs" |
1026 |
– |
description="Builds javadocs without custom tags to dist folder"> |
1027 |
– |
|
1028 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1029 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1030 |
– |
|
1031 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1032 |
– |
packagenames="jsr166e,jsr166e.extra" |
1033 |
– |
link="${jdkapidocs.url}" |
1034 |
– |
source="1.7" |
1035 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1036 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1037 |
– |
|
1038 |
– |
</target> |
1039 |
– |
|
1002 |
|
<target name="jsr166edist-jar" |
1003 |
|
depends="jsr166eclean, jsr166ejar"> |
1004 |
|
|
1005 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1005 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1006 |
|
|
1007 |
|
</target> |
1008 |
|
|