8 |
|
|
9 |
|
User-specific settings are read from user.properties. |
10 |
|
See user.properties.sample for an explanation of some useful settings. |
11 |
+ |
|
12 |
+ |
The repository contains all dependencies except for ant and the JDK |
13 |
+ |
itself. Because the JDK version matters and because different |
14 |
+ |
targets require different JDKs, we assume that users have created a |
15 |
+ |
hierarchy containing: |
16 |
+ |
$HOME/jdk/jdk6 |
17 |
+ |
$HOME/jdk/jdk7 |
18 |
+ |
$HOME/jdk/jdk8 |
19 |
+ |
where each of the above is a JDK or a symlink to same, and |
20 |
+ |
$HOME/jdk/src/jdk6 |
21 |
+ |
$HOME/jdk/src/jdk7 |
22 |
+ |
$HOME/jdk/src/jdk8 |
23 |
+ |
where each of the above is a complete JDK source tree |
24 |
+ |
(e.g. mercurial forest) or a symlink to same. |
25 |
|
------------------------------------------------------------------------------ |
26 |
|
</description> |
27 |
|
|
35 |
|
|
36 |
|
|
37 |
|
<!-- Compilation options --> |
38 |
< |
<property name="build.sourcelevel" value="1.5"/> |
38 |
> |
<property name="build.sourcelevel" value="1.6"/> |
39 |
|
<property name="build.debug" value="true"/> |
40 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
41 |
|
<property name="build.deprecation" value="false"/> |
42 |
|
|
43 |
|
<!-- Build locations --> |
44 |
< |
<property name="build.dir" location="build"/> |
45 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
46 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
47 |
< |
<property name="build.j1.dir" location="${build.dir}/j1"/> |
48 |
< |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
49 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
50 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
51 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
52 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
53 |
< |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
54 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
55 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
56 |
< |
<property name="build.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
44 |
> |
<property name="build.dir" location="build"/> |
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"/> |
48 |
> |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
49 |
> |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
50 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
51 |
> |
|
52 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/4jdk7"/> |
53 |
> |
<property name="build.4jdk7.lib.dir" location="${build.4jdk7.dir}"/> |
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 |
> |
|
62 |
> |
<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 |
> |
|
66 |
> |
<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 |
> |
|
70 |
> |
<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"/> |
73 |
> |
|
74 |
> |
<!-- JDK binary locations --> |
75 |
> |
<property name="jdks.home" location="${user.home}/jdk"/> |
76 |
> |
|
77 |
> |
<macrodef name="defjdklocations"> |
78 |
> |
<attribute name="v"/> |
79 |
> |
<sequential> |
80 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
81 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
82 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
83 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
84 |
> |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
85 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
86 |
> |
<property name="bootclasspath@{v}" |
87 |
> |
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
88 |
> |
</sequential> |
89 |
> |
</macrodef> |
90 |
> |
|
91 |
> |
<defjdklocations v="6"/> |
92 |
> |
<defjdklocations v="7"/> |
93 |
> |
<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=""/> |
100 |
> |
<sequential> |
101 |
> |
<java classname="JSR166TestCase" |
102 |
> |
jvm="@{jvm}" fork="true"> |
103 |
> |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
104 |
> |
<jvmarg line="@{jvmflags}"/> |
105 |
> |
<classpath> |
106 |
> |
<pathelement location="${junit.jar}"/> |
107 |
> |
<pathelement location="@{tck.classes}"/> |
108 |
> |
</classpath> |
109 |
> |
</java> |
110 |
> |
</sequential> |
111 |
> |
</macrodef> |
112 |
|
|
113 |
|
<!-- Source locations --> |
114 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
115 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
47 |
– |
<property name="j1.src.dir" location="${basedir}/src/javaone"/> |
116 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
117 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
118 |
|
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
51 |
– |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
52 |
– |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
119 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
120 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
121 |
+ |
<property name="topsrc.dir" location="${basedir}/src"/> |
122 |
+ |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
123 |
+ |
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
124 |
+ |
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
125 |
+ |
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
126 |
+ |
<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"/> |
128 |
|
|
129 |
|
<!-- Distribution locations --> |
130 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
130 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
131 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
132 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
133 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
134 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
135 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
136 |
|
|
137 |
|
<!-- Jar locations --> |
138 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
139 |
+ |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
140 |
+ |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
141 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
142 |
+ |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
143 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
144 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
62 |
– |
<property name="concurrent.jar" location="${lib.dir}/concurrent.jar"/> |
145 |
|
|
146 |
|
<!-- Bootclasspath argument --> |
147 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
148 |
|
|
149 |
+ |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
150 |
+ |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
151 |
+ |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
152 |
+ |
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
153 |
+ |
|
154 |
+ |
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
155 |
+ |
<!-- The below does not yet exist as of 2012-11 --> |
156 |
+ |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
157 |
+ |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
158 |
+ |
|
159 |
|
<!-- Test classpath --> |
160 |
|
<path id="test.classpath"> |
161 |
|
<pathelement location="${build.testcases.dir}"/> |
167 |
|
<pathelement location="${build.loops.dir}"/> |
168 |
|
</path> |
169 |
|
|
170 |
< |
<!-- J1 classpath --> |
171 |
< |
<path id="j1.classpath"> |
172 |
< |
<pathelement location="${build.j1.dir}"/> |
173 |
< |
<pathelement location="${junit.jar}"/> |
174 |
< |
<pathelement location="${concurrent.jar}"/> |
175 |
< |
</path> |
84 |
< |
|
170 |
> |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
171 |
> |
<!-- TODO: How do we get &trade to work? --> |
172 |
> |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
173 |
> |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
174 |
> |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
175 |
> |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
176 |
|
|
177 |
|
<!-- Main targets --> |
178 |
|
|
179 |
+ |
<target name="dists" |
180 |
+ |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
181 |
+ |
description="Builds all public jars and docs"/> |
182 |
|
|
183 |
|
<target name="compile" |
184 |
< |
depends="init, configure-compiler" |
185 |
< |
description="Compiles main sources to build folder"> |
184 |
> |
depends="configure-compiler" |
185 |
> |
description="Compiles src/main sources to build dir"> |
186 |
|
|
187 |
|
<mkdir dir="${build.classes.dir}"/> |
188 |
|
|
189 |
|
<javac srcdir="${src.dir}" |
190 |
< |
destdir="${build.classes.dir}" |
191 |
< |
debug="${build.debug}" |
192 |
< |
debuglevel="${build.debuglevel}" |
193 |
< |
deprecation="${build.deprecation}" |
194 |
< |
source="${build.sourcelevel}" |
195 |
< |
fork="true"> |
190 |
> |
destdir="${build.classes.dir}" |
191 |
> |
debug="${build.debug}" |
192 |
> |
debuglevel="${build.debuglevel}" |
193 |
> |
deprecation="${build.deprecation}" |
194 |
> |
classpath="" |
195 |
> |
includeAntRuntime="false" |
196 |
> |
includeJavaRuntime="false" |
197 |
> |
executable="${javac8}" |
198 |
> |
fork="true"> |
199 |
|
|
200 |
+ |
<include name="**/*.java"/> |
201 |
|
<compilerarg line="${build.args}"/> |
202 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
203 |
+ |
<compilerarg value="-Xlint:all"/> |
204 |
+ |
|
205 |
+ |
<!-- |
206 |
+ |
<exclude name="java/lang/**"/> |
207 |
+ |
<compilerarg line="${build.args}"/> |
208 |
+ |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
209 |
+ |
--> |
210 |
|
|
211 |
|
</javac> |
212 |
|
|
229 |
|
|
230 |
|
|
231 |
|
<target name="test" |
232 |
< |
depends="init, configure-tests, report-tests" |
232 |
> |
depends="configure-tests, report-tests" |
233 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
234 |
|
|
235 |
|
|
236 |
|
|
237 |
|
<target name="docs" |
238 |
< |
description="Builds javadocs with custom tags to build folder"> |
133 |
< |
|
134 |
< |
<delete dir="${build.javadocs.dir}"/> |
135 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
136 |
< |
|
137 |
< |
<javadoc destdir="${build.javadocs.dir}" |
138 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
139 |
< |
overview="${src.dir}/intro.html" |
140 |
< |
source="${build.sourcelevel}"> |
141 |
< |
|
142 |
< |
<tag name="revised" description="Last revised:"/> |
143 |
< |
<tag name="spec" description="Specified by:"/> |
144 |
< |
|
145 |
< |
<packageset dir="${src.dir}"/> |
146 |
< |
|
147 |
< |
</javadoc> |
148 |
< |
|
149 |
< |
</target> |
238 |
> |
description="Builds javadocs for src/main to dist dir"> |
239 |
|
|
240 |
+ |
<delete dir="${dist.javadocs.dir}"/> |
241 |
+ |
<mkdir dir="${dist.javadocs.dir}"/> |
242 |
|
|
243 |
+ |
<!-- the packagenames="none" hack below prevents scanning the --> |
244 |
+ |
<!-- sourcepath for packages --> |
245 |
|
|
246 |
< |
<target name="doccheck" |
247 |
< |
depends="filter-doccheck" |
248 |
< |
description="Reports on javadoc style errors"> |
249 |
< |
|
250 |
< |
<delete dir="${build.doccheck.dir}"/> |
251 |
< |
<mkdir dir="${build.doccheck.dir}"/> |
252 |
< |
|
253 |
< |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
254 |
< |
docletpath="${lib.dir}/doccheck.jar" |
255 |
< |
destdir="${build.doccheck.dir}"> |
256 |
< |
<packageset dir="${build.dc-filter.dir}"/> |
246 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
247 |
> |
packagenames="none" |
248 |
> |
link="${jdkapi8docs.url}" |
249 |
> |
overview="${src.dir}/intro.html" |
250 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
251 |
> |
classpath="" |
252 |
> |
executable="${javadoc8}"> |
253 |
> |
<arg value="-XDignore.symbol.file=true"/> |
254 |
> |
<arg value="-tag"/> |
255 |
> |
<arg value="${javadoc.jls.option}"/> |
256 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
257 |
> |
<include name="**/*.java"/> |
258 |
> |
</fileset> |
259 |
|
</javadoc> |
260 |
|
|
166 |
– |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
167 |
– |
|
168 |
– |
</target> |
169 |
– |
|
170 |
– |
|
171 |
– |
|
172 |
– |
<target name="checkstyle" |
173 |
– |
depends="filter-src" |
174 |
– |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
175 |
– |
|
176 |
– |
<taskdef resource="checkstyletask.properties" |
177 |
– |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
178 |
– |
|
179 |
– |
<mkdir dir="${build.checkstyle.dir}"/> |
180 |
– |
|
181 |
– |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
182 |
– |
failOnViolation="false"> |
183 |
– |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
184 |
– |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
185 |
– |
</checkstyle> |
186 |
– |
|
187 |
– |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
188 |
– |
out="${build.checkstyle.dir}/checkstyle-report.html" |
189 |
– |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
190 |
– |
|
261 |
|
</target> |
262 |
|
|
263 |
|
|
264 |
|
|
265 |
|
<target name="dist" |
266 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
266 |
> |
depends="dist-clean, dist-jar, docs" |
267 |
|
description="Puts all distributable products in single hierarchy"/> |
268 |
|
|
269 |
|
|
200 |
– |
|
270 |
|
<target name="release" |
271 |
|
depends="dist" |
272 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
307 |
|
|
308 |
|
|
309 |
|
|
241 |
– |
<target name="dist-docs" |
242 |
– |
description="Builds javadocs without custom tags to dist folder"> |
243 |
– |
|
244 |
– |
<delete dir="${dist.javadocs.dir}"/> |
245 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
246 |
– |
|
247 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
248 |
– |
link="http://java.sun.com/j2se/1.4.2/docs/api" |
249 |
– |
overview="${src.dir}/intro.html" |
250 |
– |
source="${build.sourcelevel}"> |
251 |
– |
|
252 |
– |
<packageset dir="${src.dir}"/> |
253 |
– |
|
254 |
– |
</javadoc> |
255 |
– |
|
256 |
– |
</target> |
257 |
– |
|
258 |
– |
|
259 |
– |
|
310 |
|
<!-- Internal targets --> |
311 |
|
|
312 |
|
|
263 |
– |
<target name="init"> |
264 |
– |
|
265 |
– |
<!-- Version is kept in a separate file --> |
266 |
– |
<loadfile property="version" srcFile="version.properties"/> |
267 |
– |
<echo>Building JSR-166 version ${version}</echo> |
268 |
– |
<echo>java.home is ${java.home}</echo> |
269 |
– |
|
270 |
– |
</target> |
271 |
– |
|
272 |
– |
|
313 |
|
<target name="dist-jar" |
314 |
|
depends="clean, jar"> |
315 |
|
|
318 |
|
</target> |
319 |
|
|
320 |
|
|
281 |
– |
<target name="compile-ant-filter" |
282 |
– |
depends="init"> |
283 |
– |
|
284 |
– |
<mkdir dir="${build.ant.dir}"/> |
285 |
– |
|
286 |
– |
<javac srcdir="${ant.src.dir}" |
287 |
– |
destdir="${build.ant.dir}" |
288 |
– |
source="1.4"/> |
289 |
– |
|
290 |
– |
</target> |
291 |
– |
|
292 |
– |
|
293 |
– |
<target name="filter-src" |
294 |
– |
depends="compile-ant-filter"> |
295 |
– |
|
296 |
– |
<mkdir dir="${build.filter.src.dir}"/> |
297 |
– |
|
298 |
– |
<copy todir="${build.filter.src.dir}"> |
299 |
– |
<fileset dir="${src.dir}"> |
300 |
– |
<include name="**/*.html"/> |
301 |
– |
</fileset> |
302 |
– |
</copy> |
303 |
– |
|
304 |
– |
<copy todir="${build.filter.src.dir}"> |
305 |
– |
<fileset dir="${src.dir}"> |
306 |
– |
<exclude name="**/*.html"/> |
307 |
– |
<!-- Files excluded from dist-docs --> |
308 |
– |
<exclude name="java/util/Random.*"/> |
309 |
– |
<exclude name="sun/misc/Unsafe.*"/> |
310 |
– |
</fileset> |
311 |
– |
<!-- |
312 |
– |
<filterchain> |
313 |
– |
--> |
314 |
– |
|
315 |
– |
<!-- |
316 |
– |
# This filter gets rid of angle-bracketed type parameters |
317 |
– |
# so that javadoc can run on the result. The following |
318 |
– |
# heuristic seems to work: |
319 |
– |
# |
320 |
– |
# For all lines not starting with space(s)-asterisk-space(s), |
321 |
– |
# replace <something> with a space, where there may be more |
322 |
– |
# than one right angle bracket at the end, and "something" |
323 |
– |
# must not contain parens or pipes. (This may need some |
324 |
– |
# tweaking.) |
325 |
– |
--> |
326 |
– |
|
327 |
– |
<!-- |
328 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
329 |
– |
classpath="${build.ant.dir}"> |
330 |
– |
<param name="notmatching" value="^\s+\*\s.*$"/> |
331 |
– |
<param name="pattern" value="<[^|>()]+?>+"/> |
332 |
– |
<param name="replacement" value=" "/> |
333 |
– |
</filterreader> |
334 |
– |
--> |
335 |
– |
|
336 |
– |
<!-- |
337 |
– |
</filterchain> |
338 |
– |
--> |
339 |
– |
</copy> |
340 |
– |
|
341 |
– |
</target> |
342 |
– |
|
343 |
– |
|
344 |
– |
<target name="filter-doccheck" |
345 |
– |
depends="filter-src"> |
346 |
– |
|
347 |
– |
<mkdir dir="${build.dc-filter.dir}"/> |
348 |
– |
|
349 |
– |
<copy todir="${build.dc-filter.dir}"> |
350 |
– |
<fileset dir="${build.filter.src.dir}"> |
351 |
– |
<include name="**/*.html"/> |
352 |
– |
</fileset> |
353 |
– |
</copy> |
354 |
– |
|
355 |
– |
<property name="generic.declarations" |
356 |
– |
value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}" |
357 |
– |
/> |
358 |
– |
|
359 |
– |
<copy todir="${build.dc-filter.dir}"> |
360 |
– |
<fileset dir="${build.filter.src.dir}"> |
361 |
– |
<exclude name="**/*.html"/> |
362 |
– |
</fileset> |
363 |
– |
<filterchain> |
364 |
– |
<!-- |
365 |
– |
# These two filters try to make the source look like |
366 |
– |
# something that doccheck can process. The first removes |
367 |
– |
# -source 1.4 assertions and the second adds in a bunch |
368 |
– |
# of single letter public nested marker interfaces so that |
369 |
– |
# the generic type parameters are recognized. |
370 |
– |
--> |
371 |
– |
|
372 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
373 |
– |
classpath="${build.ant.dir}"> |
374 |
– |
<param name="matching" value="^\s*assert[\s ].*$"/> |
375 |
– |
<param name="pattern" value="assert"/> |
376 |
– |
<param name="replacement" value="//assert"/> |
377 |
– |
</filterreader> |
378 |
– |
|
379 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
380 |
– |
classpath="${build.ant.dir}"> |
381 |
– |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
382 |
– |
<param name="pattern" value="$"/> |
383 |
– |
<param name="replacement" value=" ${generic.declarations}"/> |
384 |
– |
</filterreader> |
385 |
– |
|
386 |
– |
</filterchain> |
387 |
– |
</copy> |
388 |
– |
|
389 |
– |
</target> |
390 |
– |
|
391 |
– |
|
321 |
|
<target name="compile-tests" |
322 |
|
depends="jar"> |
323 |
|
|
333 |
|
|
334 |
|
<compilerarg value="${bootclasspath.args}"/> |
335 |
|
<compilerarg line="${build.args}"/> |
336 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
337 |
|
|
338 |
|
<classpath refid="test.classpath"/> |
339 |
|
|
351 |
|
|
352 |
|
<compilerarg value="${bootclasspath.args}"/> |
353 |
|
<compilerarg line="${build.args}"/> |
354 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
355 |
|
|
356 |
|
<classpath refid="test.classpath"/> |
357 |
|
|
368 |
|
|
369 |
|
<compilerarg value="${bootclasspath.args}"/> |
370 |
|
<compilerarg line="${build.args}"/> |
371 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
372 |
|
|
373 |
|
<classpath refid="test.classpath"/> |
374 |
|
|
441 |
|
<fileset dir="${build.reports.dir}"> |
442 |
|
<include name="TEST-*.xml"/> |
443 |
|
</fileset> |
444 |
< |
<report styledir="${stylesheet.dir}" |
513 |
< |
format="${junit.report.format}" |
514 |
< |
todir="${build.reports.dir}" |
444 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
445 |
|
/> |
446 |
|
</junitreport> |
447 |
|
|
491 |
|
</target> |
492 |
|
|
493 |
|
|
494 |
+ |
<!-- Various demos and test programs --> |
495 |
|
|
565 |
– |
<!-- Anthill targets --> |
496 |
|
|
497 |
< |
<target name="anthill-build"> |
497 |
> |
<target name="loops" depends="configure-compiler" |
498 |
> |
description="Benchmark from Doug Lea's AQS paper"> |
499 |
|
|
500 |
< |
<!-- Override this in user.properties --> |
570 |
< |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
500 |
> |
<mkdir dir="${build.loops.dir}"/> |
501 |
|
|
502 |
< |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
503 |
< |
<arg value="-Xmx256000000"/> |
504 |
< |
<!-- classpath of new JVM --> |
505 |
< |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
506 |
< |
<!-- location of Ant home directory --> |
507 |
< |
<arg value="-Dant.home=${ant.home}"/> |
508 |
< |
<!-- the Ant main class --> |
509 |
< |
<arg value="org.apache.tools.ant.Main"/> |
510 |
< |
<!-- The build file --> |
511 |
< |
<arg value="-buildfile"/> <arg value="build.xml"/> |
512 |
< |
<!-- the target to build on the new Ant instance --> |
513 |
< |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
514 |
< |
<arg value="do-anthill-build"/> |
515 |
< |
</exec> |
516 |
< |
</target> |
517 |
< |
|
518 |
< |
<target name="do-anthill-build" |
589 |
< |
depends="jar, test, docs, dist-docs"/> |
590 |
< |
|
591 |
< |
<target name="anthill-publish"> |
592 |
< |
|
593 |
< |
<copy todir="${deployDir}/docs/private"> |
594 |
< |
<fileset dir="${build.javadocs.dir}"/> |
595 |
< |
</copy> |
596 |
< |
|
597 |
< |
<copy todir="${deployDir}/docs/public"> |
598 |
< |
<fileset dir="${dist.javadocs.dir}"/> |
599 |
< |
</copy> |
600 |
< |
|
601 |
< |
<copy tofile="${deployDir}/index.html" |
602 |
< |
file="${basedir}/etc/anthill-index.html"/> |
603 |
< |
|
604 |
< |
<copy todir="${deployDir}/notes"> |
605 |
< |
<fileset dir="${basedir}/etc/notes"/> |
606 |
< |
</copy> |
502 |
> |
<javac srcdir="${loops.src.dir}" |
503 |
> |
destdir="${build.loops.dir}" |
504 |
> |
debug="${build.debug}" |
505 |
> |
debuglevel="${build.debuglevel}" |
506 |
> |
deprecation="${build.deprecation}" |
507 |
> |
source="${build.sourcelevel}" |
508 |
> |
fork="true"> |
509 |
> |
|
510 |
> |
<compilerarg line="${build.args}"/> |
511 |
> |
<classpath refid="loops.classpath"/> |
512 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
513 |
> |
|
514 |
> |
</javac> |
515 |
> |
|
516 |
> |
<java classname="ALoops" fork="true"> |
517 |
> |
<classpath refid="loops.classpath"/> |
518 |
> |
</java> |
519 |
|
|
520 |
|
</target> |
521 |
|
|
522 |
|
|
523 |
+ |
<!-- jsr166 4jdk7 --> |
524 |
|
|
612 |
– |
<!-- Various demos and test programs --> |
525 |
|
|
526 |
+ |
<target name="4jdk7compile" |
527 |
+ |
depends="configure-compiler" |
528 |
+ |
description="Compiles src/jdk7 sources, targeting jdk7"> |
529 |
+ |
|
530 |
+ |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
531 |
+ |
|
532 |
+ |
<javac srcdir="${4jdk7src.dir}" |
533 |
+ |
destdir="${build.4jdk7.classes.dir}" |
534 |
+ |
debug="${build.debug}" |
535 |
+ |
debuglevel="${build.debuglevel}" |
536 |
+ |
deprecation="${build.deprecation}" |
537 |
+ |
source="1.6" |
538 |
+ |
classpath="" |
539 |
+ |
bootclasspath="${bootclasspath6}" |
540 |
+ |
includeAntRuntime="false" |
541 |
+ |
includeJavaRuntime="false" |
542 |
+ |
executable="${javac7}" |
543 |
+ |
fork="true"> |
544 |
|
|
545 |
< |
<target name="sample" depends="init, configure-compiler" |
546 |
< |
description="Standalone demo program"> |
545 |
> |
<include name="**/*.java"/> |
546 |
> |
<compilerarg line="${build.args}"/> |
547 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
548 |
> |
<compilerarg value="-Xlint:all"/> |
549 |
|
|
550 |
< |
<mkdir dir="${build.testcases.dir}"/> |
550 |
> |
</javac> |
551 |
|
|
552 |
< |
<javac srcdir="${test.src.dir}" |
621 |
< |
destdir="${build.testcases.dir}" |
622 |
< |
debug="${build.debug}" |
623 |
< |
debuglevel="${build.debuglevel}" |
624 |
< |
deprecation="${build.deprecation}" |
625 |
< |
source="${build.sourcelevel}" |
626 |
< |
fork="true"> |
552 |
> |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
553 |
|
|
554 |
< |
<include name="jsr166/test/Sample.java"/> |
554 |
> |
<jar destfile="${4jdk7product.jar}" index="true"> |
555 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
556 |
> |
</jar> |
557 |
> |
|
558 |
> |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
559 |
> |
|
560 |
> |
<javac srcdir="${tck.src.dir}" |
561 |
> |
destdir="${build.4jdk7.tck.classes.dir}" |
562 |
> |
debug="${build.debug}" |
563 |
> |
debuglevel="${build.debuglevel}" |
564 |
> |
deprecation="${build.deprecation}" |
565 |
> |
source="1.6" |
566 |
> |
classpath="${junit.jar}" |
567 |
> |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
568 |
> |
includeAntRuntime="false" |
569 |
> |
includeJavaRuntime="false" |
570 |
> |
executable="${javac7}" |
571 |
> |
fork="true"> |
572 |
> |
|
573 |
> |
<include name="**/*.java"/> |
574 |
> |
<compilerarg line="${build.args}"/> |
575 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
576 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
577 |
|
|
578 |
|
</javac> |
579 |
|
|
580 |
< |
<copy todir="${build.testcases.dir}"> |
581 |
< |
<fileset dir="${test.src.dir}"> |
582 |
< |
<include name="**/*.properties"/> |
580 |
> |
</target> |
581 |
> |
|
582 |
> |
|
583 |
> |
<target name="4jdk7-test-tck" |
584 |
> |
depends="4jdk7compile" |
585 |
> |
description="Runs tck tests for jsr166-4jdk7 directly"> |
586 |
> |
<run-tck-tests |
587 |
> |
jvm="${java7}" |
588 |
> |
tck.classes="${build.4jdk7.tck.classes.dir}" |
589 |
> |
product.jar="${4jdk7product.jar}"/> |
590 |
> |
</target> |
591 |
> |
|
592 |
> |
|
593 |
> |
<target name="4jdk7-test-tck-junit" |
594 |
> |
depends="4jdk7compile" |
595 |
> |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
596 |
> |
|
597 |
> |
<junit printsummary="true" |
598 |
> |
showoutput="true" |
599 |
> |
errorProperty="junit.failed" |
600 |
> |
failureProperty="junit.failed" |
601 |
> |
includeantruntime="true" |
602 |
> |
jvm="${java7}" |
603 |
> |
fork="true"> |
604 |
> |
|
605 |
> |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
606 |
> |
<jvmarg value="-server"/> |
607 |
> |
|
608 |
> |
<classpath> |
609 |
> |
<pathelement location="${junit.jar}"/> |
610 |
> |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
611 |
> |
</classpath> |
612 |
> |
|
613 |
> |
<formatter type="brief"/> |
614 |
> |
|
615 |
> |
<test name="JSR166TestCase" haltonfailure="no"> |
616 |
> |
</test> |
617 |
> |
|
618 |
> |
</junit> |
619 |
> |
</target> |
620 |
> |
|
621 |
> |
|
622 |
> |
<target name="4jdk7docs" |
623 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
624 |
> |
|
625 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
626 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
627 |
> |
|
628 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
629 |
> |
packagenames="none" |
630 |
> |
link="${jdkapi7docs.url}" |
631 |
> |
overview="${4jdk7src.dir}/intro.html" |
632 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
633 |
> |
classpath="" |
634 |
> |
executable="${javadoc7}"> |
635 |
> |
<arg value="-XDignore.symbol.file=true"/> |
636 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
637 |
> |
<include name="**/*.java"/> |
638 |
|
</fileset> |
639 |
< |
</copy> |
639 |
> |
</javadoc> |
640 |
|
|
641 |
+ |
</target> |
642 |
+ |
|
643 |
+ |
|
644 |
+ |
<target name="4jdk7dist" |
645 |
+ |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
646 |
+ |
description="Puts all distributable products in single hierarchy"/> |
647 |
+ |
|
648 |
+ |
|
649 |
+ |
|
650 |
+ |
<target name="4jdk7clean" |
651 |
+ |
description="Removes all build products"> |
652 |
+ |
|
653 |
+ |
<delete dir="${build.4jdk7.dir}"/> |
654 |
|
|
639 |
– |
<java classname="jsr166.test.Sample" fork="true"> |
640 |
– |
<classpath refid="test.classpath"/> |
641 |
– |
<!-- <jvmarg value="-ea"/> --> |
642 |
– |
<!-- <jvmarg value="-server"/> --> |
643 |
– |
<!-- <arg value="1000"/> --> |
644 |
– |
</java> |
655 |
|
</target> |
656 |
|
|
657 |
|
|
648 |
– |
<target name="loops" depends="init, configure-compiler" |
649 |
– |
description="Benchmark from Doug Lea's AQS paper"> |
658 |
|
|
659 |
< |
<mkdir dir="${build.loops.dir}"/> |
659 |
> |
<target name="4jdk7dist-clean" |
660 |
> |
description="Removes all build and distribution products"> |
661 |
|
|
662 |
< |
<javac srcdir="${loops.src.dir}" |
663 |
< |
destdir="${build.loops.dir}" |
662 |
> |
</target> |
663 |
> |
|
664 |
> |
<target name="4jdk7dist-jar" |
665 |
> |
depends="4jdk7clean, 4jdk7compile"> |
666 |
> |
|
667 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
668 |
> |
|
669 |
> |
</target> |
670 |
> |
|
671 |
> |
<!-- jsr166x --> |
672 |
> |
|
673 |
> |
|
674 |
> |
<target name="jsr166xcompile" |
675 |
> |
depends="configure-compiler" |
676 |
> |
description="Compiles jsr166x sources"> |
677 |
> |
|
678 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
679 |
> |
|
680 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
681 |
> |
destdir="${build.jsr166x.dir}" |
682 |
|
debug="${build.debug}" |
683 |
|
debuglevel="${build.debuglevel}" |
684 |
|
deprecation="${build.deprecation}" |
685 |
|
source="${build.sourcelevel}" |
686 |
|
fork="true"> |
687 |
|
|
688 |
+ |
<include name="**/*.java"/> |
689 |
|
<compilerarg line="${build.args}"/> |
690 |
< |
<classpath refid="loops.classpath"/> |
690 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
691 |
|
|
692 |
|
</javac> |
693 |
|
|
694 |
< |
<java classname="ALoops" fork="true"> |
695 |
< |
<classpath refid="loops.classpath"/> |
696 |
< |
</java> |
694 |
> |
</target> |
695 |
> |
|
696 |
> |
|
697 |
> |
|
698 |
> |
<target name="jsr166xjar" |
699 |
> |
depends="jsr166xcompile" |
700 |
> |
description="Builds library jar from compiled sources"> |
701 |
> |
|
702 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
703 |
> |
|
704 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
705 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
706 |
> |
</jar> |
707 |
|
|
708 |
|
</target> |
709 |
|
|
710 |
|
|
673 |
– |
<target name="compile-j1" depends="init, configure-compiler"> |
711 |
|
|
712 |
< |
<mkdir dir="${build.j1.dir}"/> |
712 |
> |
<target name="jsr166xdocs" |
713 |
> |
description="Builds javadocs to dist dir"> |
714 |
|
|
715 |
< |
<javac srcdir="${j1.src.dir}" |
716 |
< |
destdir="${build.j1.dir}" |
679 |
< |
debug="${build.debug}" |
680 |
< |
debuglevel="${build.debuglevel}" |
681 |
< |
deprecation="${build.deprecation}" |
682 |
< |
source="${build.sourcelevel}" > |
715 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
716 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
717 |
|
|
718 |
< |
<include name="**/*.java"/> |
719 |
< |
<exclude name="**/dijkstra/**"/> |
718 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
719 |
> |
packagenames="jsr166x" |
720 |
> |
link="${jdkapidocs.url}" |
721 |
> |
source="${build.sourcelevel}" |
722 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
723 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
724 |
|
|
725 |
< |
<compilerarg line="${build.args}"/> |
688 |
< |
<classpath refid="j1.classpath"/> |
725 |
> |
</target> |
726 |
|
|
727 |
< |
</javac> |
727 |
> |
|
728 |
> |
<target name="jsr166xdist" |
729 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
730 |
> |
description="Puts all distributable products in single hierarchy"/> |
731 |
> |
|
732 |
> |
|
733 |
> |
|
734 |
> |
<target name="jsr166xclean" |
735 |
> |
description="Removes all build products"> |
736 |
> |
|
737 |
> |
<delete dir="${build.jsr166x.dir}"/> |
738 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
739 |
|
|
740 |
|
</target> |
741 |
|
|
742 |
|
|
695 |
– |
<target name="sw" depends="compile-j1" |
696 |
– |
description="Runs the SwingWorker demo"> |
743 |
|
|
744 |
< |
<!-- |
745 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
746 |
< |
<classpath refid="j1.classpath"/> |
747 |
< |
</java> |
748 |
< |
--> |
744 |
> |
<target name="jsr166xdist-clean" |
745 |
> |
description="Removes all build and distribution products"> |
746 |
> |
|
747 |
> |
</target> |
748 |
> |
|
749 |
> |
|
750 |
|
|
751 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
751 |
> |
<target name="jsr166xdist-docs" |
752 |
> |
description="Builds javadocs to dist dir"> |
753 |
|
|
754 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
755 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
756 |
< |
</exec> |
754 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
755 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
756 |
> |
|
757 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
758 |
> |
packagenames="jsr166x" |
759 |
> |
link="${jdkapidocs.url}" |
760 |
> |
source="${build.sourcelevel}" |
761 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
762 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
763 |
|
|
764 |
|
</target> |
765 |
|
|
766 |
< |
<target name="j1" depends="compile-j1" |
767 |
< |
description="Runs a standalone JavaOne program"> |
766 |
> |
<target name="jsr166xdist-jar" |
767 |
> |
depends="jsr166xclean, jsr166xjar"> |
768 |
|
|
769 |
< |
<java classname="jsr166.random.TestRandom" fork="true"> |
716 |
< |
<classpath refid="j1.classpath"/> |
717 |
< |
<jvmarg value="-client"/> |
718 |
< |
</java> |
769 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
770 |
|
|
771 |
|
</target> |
772 |
|
|
773 |
+ |
<!-- jsr166y --> |
774 |
|
|
723 |
– |
<target name="test-j1" depends="compile-j1" |
724 |
– |
description="Runs testcases from the JavaOne source directories"> |
775 |
|
|
776 |
< |
<junit printsummary="true" |
777 |
< |
showoutput="true" |
778 |
< |
errorProperty="junit.failed" |
729 |
< |
failureProperty="junit.failed" |
730 |
< |
dir="${build.j1.dir}" |
731 |
< |
fork="true"> |
776 |
> |
<target name="jsr166ycompile" |
777 |
> |
depends="configure-compiler" |
778 |
> |
description="Compiles jsr166y sources"> |
779 |
|
|
780 |
< |
<!-- <jvmarg value="-server"/> --> |
734 |
< |
<classpath refid="j1.classpath"/> |
735 |
< |
<formatter type="xml"/> |
780 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
781 |
|
|
782 |
< |
<batchtest todir="${build.j1.dir}"> |
783 |
< |
<fileset dir="${j1.src.dir}"> |
784 |
< |
<include name="**/*Test.java"/> |
785 |
< |
</fileset> |
786 |
< |
</batchtest> |
782 |
> |
<javac srcdir="${topsrc.dir}" |
783 |
> |
destdir="${build.jsr166y.dir}" |
784 |
> |
debug="${build.debug}" |
785 |
> |
debuglevel="${build.debuglevel}" |
786 |
> |
deprecation="${build.deprecation}" |
787 |
> |
source="1.6" |
788 |
> |
classpath="" |
789 |
> |
bootclasspath="${bootclasspath6}" |
790 |
> |
includeAntRuntime="false" |
791 |
> |
includeJavaRuntime="false" |
792 |
> |
executable="${javac7}" |
793 |
> |
fork="true"> |
794 |
|
|
795 |
< |
</junit> |
795 |
> |
<include name="jsr166y/**/*.java"/> |
796 |
> |
<compilerarg line="${build.args}"/> |
797 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
798 |
> |
<compilerarg value="-Xlint:all"/> |
799 |
> |
</javac> |
800 |
> |
</target> |
801 |
|
|
745 |
– |
<available property="junit.report.format" |
746 |
– |
value="frames" |
747 |
– |
classname="org.apache.xalan.lib.Redirect"/> |
748 |
– |
<property name="junit.report.format" value="noframes"/> |
802 |
|
|
803 |
< |
<junitreport todir="${build.j1.dir}"> |
804 |
< |
<fileset dir="${build.j1.dir}"> |
805 |
< |
<include name="TEST-*.xml"/> |
753 |
< |
</fileset> |
754 |
< |
<report styledir="${stylesheet.dir}" |
755 |
< |
format="${junit.report.format}" |
756 |
< |
todir="${build.j1.dir}" |
757 |
< |
/> |
758 |
< |
</junitreport> |
803 |
> |
<target name="jsr166yjar" |
804 |
> |
depends="jsr166ycompile" |
805 |
> |
description="Builds library jar from compiled sources"> |
806 |
|
|
807 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
807 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
808 |
> |
|
809 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
810 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
811 |
> |
</jar> |
812 |
|
|
813 |
|
</target> |
814 |
|
|
815 |
|
|
816 |
|
|
817 |
< |
<!-- C++ and JNI definitions and demos --> |
817 |
> |
<target name="jsr166ydocs" |
818 |
> |
description="Builds javadocs to dist dir"> |
819 |
|
|
820 |
< |
<target name="configure-cpp"> |
820 |
> |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
821 |
> |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
822 |
|
|
823 |
< |
<!-- Define tasks and types --> |
823 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
824 |
> |
packagenames="jsr166y" |
825 |
> |
link="${jdkapidocs.url}" |
826 |
> |
source="${build.sourcelevel}" |
827 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
828 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
829 |
|
|
830 |
< |
<path id="cpptasks.path"> |
831 |
< |
<pathelement location="${lib.dir}/cpptasks.jar"/> |
832 |
< |
</path> |
833 |
< |
<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/> |
834 |
< |
<typedef resource="cpptasks.types" classpathref="cpptasks.path"/> |
830 |
> |
</target> |
831 |
> |
|
832 |
> |
|
833 |
> |
<target name="jsr166ydist" |
834 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
835 |
> |
description="Puts all distributable products in single hierarchy"/> |
836 |
|
|
778 |
– |
<!-- Set platform property for JNI includes --> |
837 |
|
|
838 |
< |
<condition property="platform" value="linux"> |
839 |
< |
<os name="Linux"/> |
840 |
< |
</condition> |
841 |
< |
<condition property="platform" value="win32"> |
842 |
< |
<os family="windows"/> |
843 |
< |
</condition> |
786 |
< |
<condition property="platform" value="solaris"> |
787 |
< |
<os name="SunOS"/> |
788 |
< |
</condition> |
838 |
> |
|
839 |
> |
<target name="jsr166yclean" |
840 |
> |
description="Removes all build products"> |
841 |
> |
|
842 |
> |
<delete dir="${build.jsr166y.dir}"/> |
843 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
844 |
|
|
845 |
|
</target> |
846 |
|
|
847 |
|
|
793 |
– |
<target name="cppdemo" depends="configure-cpp"> |
848 |
|
|
849 |
< |
<mkdir dir="${build.dir}"/> |
849 |
> |
<target name="jsr166ydist-clean" |
850 |
> |
description="Removes all build and distribution products"> |
851 |
> |
|
852 |
> |
</target> |
853 |
> |
|
854 |
> |
<target name="jsr166ydist-docs" |
855 |
> |
description="Builds javadocs to dist dir"> |
856 |
|
|
857 |
< |
<cc multithreaded="true" |
858 |
< |
name="g++" |
799 |
< |
objdir="${build.dir}" |
800 |
< |
outfile="${build.dir}/CppDemo"> |
801 |
< |
<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/> |
802 |
< |
<libset libs="stdc++"/> |
803 |
< |
</cc> |
857 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
858 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
859 |
|
|
860 |
< |
<exec executable="${build.dir}/CppDemo"> |
861 |
< |
<arg line="count in word frequency of word in command line count"/> |
862 |
< |
</exec> |
860 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
861 |
> |
packagenames="jsr166y" |
862 |
> |
link="${jdkapidocs.url}" |
863 |
> |
source="${build.sourcelevel}" |
864 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
865 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
866 |
|
|
867 |
|
</target> |
868 |
|
|
869 |
+ |
<target name="jsr166ydist-jar" |
870 |
+ |
depends="jsr166yclean, jsr166yjar"> |
871 |
|
|
872 |
< |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
872 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
873 |
|
|
874 |
< |
<mkdir dir="${build.testcases.dir}"/> |
874 |
> |
</target> |
875 |
|
|
876 |
< |
<javac srcdir="${test.src.dir}" |
877 |
< |
destdir="${build.testcases.dir}" |
878 |
< |
debug="${build.debug}" |
879 |
< |
debuglevel="${build.debuglevel}" |
880 |
< |
deprecation="${build.deprecation}" |
881 |
< |
source="${build.sourcelevel}" |
882 |
< |
fork="true"> |
883 |
< |
<compilerarg value="${bootclasspath.args}"/> |
876 |
> |
|
877 |
> |
<!-- extra166y --> |
878 |
> |
|
879 |
> |
|
880 |
> |
<target name="extra166ycompile" |
881 |
> |
depends="configure-compiler, jsr166yjar" |
882 |
> |
description="Compiles extra166y sources"> |
883 |
> |
|
884 |
> |
<mkdir dir="${build.extra166y.dir}"/> |
885 |
> |
|
886 |
> |
<javac srcdir="${topsrc.dir}" |
887 |
> |
destdir="${build.extra166y.dir}" |
888 |
> |
debug="${build.debug}" |
889 |
> |
classpath="" |
890 |
> |
debuglevel="${build.debuglevel}" |
891 |
> |
deprecation="${build.deprecation}" |
892 |
> |
source="1.6" |
893 |
> |
bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}" |
894 |
> |
includeAntRuntime="false" |
895 |
> |
includeJavaRuntime="false" |
896 |
> |
executable="${javac7}" |
897 |
> |
fork="true"> |
898 |
> |
|
899 |
> |
<include name="extra166y/**/*.java"/> |
900 |
|
<compilerarg line="${build.args}"/> |
901 |
< |
<classpath refid="test.classpath"/> |
902 |
< |
<include name="JniDemo.java"/> |
901 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
902 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
903 |
> |
|
904 |
|
</javac> |
905 |
|
|
906 |
< |
<javah destdir="${build.testcases.dir}" |
830 |
< |
classpathref="test.classpath"> |
831 |
< |
<class name="JniDemo"/> |
832 |
< |
</javah> |
906 |
> |
</target> |
907 |
|
|
834 |
– |
<cc multithreaded="true" |
835 |
– |
name="g++" |
836 |
– |
objdir="${build.dir}" |
837 |
– |
outfile="${build.dir}/JniDemo" |
838 |
– |
outtype="shared"> |
908 |
|
|
840 |
– |
<compiler> |
841 |
– |
<defineset> |
842 |
– |
<define name="__int64" value="long long"/> |
843 |
– |
</defineset> |
844 |
– |
<includepath location="${java.home}/../include"/> |
845 |
– |
<includepath location="${java.home}/../include/${platform}"/> |
846 |
– |
<compilerarg value="-mno-cygwin"/> |
847 |
– |
</compiler> |
909 |
|
|
910 |
< |
<linker> |
911 |
< |
<linkerarg value="--add-stdcall-alias"/> |
912 |
< |
</linker> |
910 |
> |
<target name="extra166yjar" |
911 |
> |
depends="extra166ycompile" |
912 |
> |
description="Builds library jar from compiled sources"> |
913 |
|
|
914 |
< |
<includepath location="${build.testcases.dir}"/> |
914 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
915 |
|
|
916 |
< |
<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/> |
916 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
917 |
> |
<fileset dir="${build.extra166y.dir}"/> |
918 |
> |
</jar> |
919 |
|
|
920 |
< |
<libset libs="stdc++"/> |
920 |
> |
</target> |
921 |
|
|
859 |
– |
</cc> |
922 |
|
|
861 |
– |
<!-- Necessary if windows, harmless if not --> |
862 |
– |
<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/> |
923 |
|
|
924 |
< |
<java classname="JniDemo" fork="true"> |
925 |
< |
<!-- Watch out: path separator hardwired to semicolon here! --> |
926 |
< |
<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/> |
927 |
< |
<classpath refid="test.classpath"/> |
928 |
< |
<arg line="count in word frequency of word in command line count"/> |
929 |
< |
</java> |
924 |
> |
<target name="extra166ydocs" |
925 |
> |
description="Builds javadocs with custom tags to build dir"> |
926 |
> |
|
927 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
928 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
929 |
> |
|
930 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
931 |
> |
packagenames="extra166y" |
932 |
> |
link="${jdkapidocs.url}" |
933 |
> |
source="${build.sourcelevel}" |
934 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
935 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
936 |
|
|
937 |
|
</target> |
938 |
|
|
939 |
|
|
940 |
+ |
<target name="extra166ydist" |
941 |
+ |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
942 |
+ |
description="Puts all distributable products in single hierarchy"/> |
943 |
|
|
875 |
– |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
944 |
|
|
945 |
|
|
946 |
+ |
<target name="extra166yclean" |
947 |
+ |
description="Removes all build products"> |
948 |
+ |
|
949 |
+ |
<delete dir="${build.extra166y.dir}"/> |
950 |
+ |
<delete dir="${build.extra166ylib.dir}"/> |
951 |
|
|
952 |
< |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
880 |
< |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
881 |
< |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
882 |
< |
<property name="pretiger.sourcelevel" value="1.4"/> |
952 |
> |
</target> |
953 |
|
|
884 |
– |
<target name="defang" |
885 |
– |
depends="init" |
886 |
– |
description="Generates pre-Tiger compatible source"> |
954 |
|
|
888 |
– |
<delete dir="${pretiger.src.dir}"/> |
889 |
– |
<mkdir dir="${pretiger.src.dir}"/> |
955 |
|
|
956 |
< |
<exec executable="perl"> |
957 |
< |
<arg file="etc/defang.pl"/> |
893 |
< |
<!-- <arg value="-v"/> --> |
894 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
895 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
896 |
< |
</exec> |
956 |
> |
<target name="extra166ydist-clean" |
957 |
> |
description="Removes all build and distribution products"> |
958 |
|
|
959 |
|
</target> |
960 |
|
|
961 |
< |
<target name="compile-pretiger" |
962 |
< |
depends="init, configure-compiler, defang" |
902 |
< |
description="Compiles pre-Tiger sources to build folder"> |
961 |
> |
<target name="extra166ydist-docs" |
962 |
> |
description="Builds javadocs to dist dir"> |
963 |
|
|
964 |
< |
<mkdir dir="${build.pretiger.dir}"/> |
964 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
965 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
966 |
|
|
967 |
< |
<javac srcdir="${pretiger.src.dir}" |
968 |
< |
destdir="${build.pretiger.dir}" |
969 |
< |
debug="${build.debug}" |
970 |
< |
debuglevel="${build.debuglevel}" |
971 |
< |
deprecation="${build.deprecation}" |
972 |
< |
source="${pretiger.sourcelevel}" |
973 |
< |
fork="true"> |
967 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
968 |
> |
packagenames="extra166y" |
969 |
> |
link="${jdkapidocs.url}" |
970 |
> |
source="${build.sourcelevel}" |
971 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
972 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
973 |
> |
|
974 |
> |
</target> |
975 |
> |
|
976 |
> |
<target name="extra166ydist-jar" |
977 |
> |
depends="extra166yclean, extra166yjar"> |
978 |
> |
|
979 |
> |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
980 |
> |
|
981 |
> |
</target> |
982 |
> |
|
983 |
> |
<!-- jsr166e --> |
984 |
> |
|
985 |
> |
<target name="jsr166ecompile" |
986 |
> |
depends="configure-compiler" |
987 |
> |
description="Compiles jsr166e sources"> |
988 |
> |
|
989 |
> |
<mkdir dir="${build.jsr166e.dir}"/> |
990 |
|
|
991 |
+ |
<javac srcdir="${topsrc.dir}" |
992 |
+ |
destdir="${build.jsr166e.dir}" |
993 |
+ |
debug="${build.debug}" |
994 |
+ |
debuglevel="${build.debuglevel}" |
995 |
+ |
deprecation="${build.deprecation}" |
996 |
+ |
source="1.7" |
997 |
+ |
classpath="" |
998 |
+ |
includeAntRuntime="false" |
999 |
+ |
includeJavaRuntime="false" |
1000 |
+ |
executable="${javac7}" |
1001 |
+ |
fork="true"> |
1002 |
+ |
|
1003 |
+ |
<include name="jsr166e/**/*.java"/> |
1004 |
|
<compilerarg line="${build.args}"/> |
1005 |
< |
<exclude name="**/Thread.java"/> |
1005 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
1006 |
> |
<compilerarg value="-Xlint:all"/> |
1007 |
|
|
1008 |
|
</javac> |
1009 |
|
|
1010 |
|
</target> |
1011 |
|
|
921 |
– |
<target name="pretiger" depends="compile-pretiger"> |
1012 |
|
|
923 |
– |
<mkdir dir="${build.lib.dir}"/> |
1013 |
|
|
1014 |
< |
<jar destfile="${pretiger.jar}"> |
1015 |
< |
<fileset dir="${build.pretiger.dir}"> |
1016 |
< |
</fileset> |
1014 |
> |
<target name="jsr166ejar" |
1015 |
> |
depends="jsr166ecompile" |
1016 |
> |
description="Builds library jar from compiled sources"> |
1017 |
> |
|
1018 |
> |
<mkdir dir="${build.jsr166elib.dir}"/> |
1019 |
> |
|
1020 |
> |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
1021 |
> |
<fileset dir="${build.jsr166e.dir}"/> |
1022 |
|
</jar> |
1023 |
|
|
1024 |
|
</target> |
1025 |
|
|
1026 |
+ |
|
1027 |
+ |
|
1028 |
+ |
<target name="jsr166edocs" |
1029 |
+ |
description="Builds javadocs with custom tags to build dir"> |
1030 |
+ |
|
1031 |
+ |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
1032 |
+ |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
1033 |
+ |
|
1034 |
+ |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
1035 |
+ |
packagenames="jsr166e,jsr166e.extra" |
1036 |
+ |
link="${jdkapi7docs.url}" |
1037 |
+ |
source="1.7" |
1038 |
+ |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1039 |
+ |
executable="${javadoc7}" |
1040 |
+ |
additionalparam="-XDignore.symbol.file=true" > |
1041 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1042 |
+ |
<include name="jsr166e/**/*.java"/> |
1043 |
+ |
</fileset> |
1044 |
+ |
</javadoc> |
1045 |
+ |
|
1046 |
+ |
</target> |
1047 |
+ |
|
1048 |
+ |
|
1049 |
+ |
<target name="jsr166edist" |
1050 |
+ |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
1051 |
+ |
description="Puts all distributable products in single hierarchy"/> |
1052 |
+ |
|
1053 |
+ |
|
1054 |
+ |
|
1055 |
+ |
<target name="jsr166eclean" |
1056 |
+ |
description="Removes all build products"> |
1057 |
+ |
|
1058 |
+ |
<delete dir="${build.jsr166e.dir}"/> |
1059 |
+ |
<delete dir="${build.jsr166elib.dir}"/> |
1060 |
+ |
|
1061 |
+ |
</target> |
1062 |
+ |
|
1063 |
+ |
|
1064 |
+ |
|
1065 |
+ |
<target name="jsr166edist-clean" |
1066 |
+ |
description="Removes all build and distribution products"> |
1067 |
+ |
|
1068 |
+ |
</target> |
1069 |
+ |
|
1070 |
+ |
<target name="jsr166edist-docs" |
1071 |
+ |
description="Builds javadocs to dist dir"> |
1072 |
+ |
|
1073 |
+ |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1074 |
+ |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1075 |
+ |
|
1076 |
+ |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1077 |
+ |
packagenames="jsr166e,jsr166e.extra" |
1078 |
+ |
link="${jdkapidocs.url}" |
1079 |
+ |
source="1.7" |
1080 |
+ |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1081 |
+ |
additionalparam="-XDignore.symbol.file=true" /> |
1082 |
+ |
|
1083 |
+ |
</target> |
1084 |
+ |
|
1085 |
+ |
<target name="jsr166edist-jar" |
1086 |
+ |
depends="jsr166eclean, jsr166ejar"> |
1087 |
+ |
|
1088 |
+ |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1089 |
+ |
|
1090 |
+ |
</target> |
1091 |
+ |
|
1092 |
|
</project> |