21 |
|
|
22 |
|
|
23 |
|
<!-- Compilation options --> |
24 |
< |
<property name="build.sourcelevel" value="1.5"/> |
25 |
< |
<property name="build.docsourcelevel" value="1.4"/> |
24 |
> |
<property name="build.sourcelevel" value="1.6"/> |
25 |
|
<property name="build.debug" value="true"/> |
26 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
27 |
|
<property name="build.deprecation" value="false"/> |
28 |
|
|
29 |
|
<!-- Build locations --> |
30 |
< |
<property name="build.dir" location="build"/> |
31 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
< |
<property name="build.emulation.dir" location="${build.dir}/emulation"/> |
33 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
34 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
36 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
37 |
< |
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
38 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
39 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
40 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
41 |
< |
<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/> |
30 |
> |
<property name="build.dir" location="build"/> |
31 |
> |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
> |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
> |
<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"/> |
36 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
37 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
38 |
> |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
39 |
> |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
40 |
> |
|
41 |
> |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
42 |
> |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
43 |
> |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
44 |
> |
|
45 |
> |
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
46 |
> |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
47 |
> |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
48 |
> |
|
49 |
> |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
50 |
> |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
51 |
> |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
52 |
|
|
53 |
|
<!-- Source locations --> |
54 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
46 |
– |
<property name="emulation.src.dir" location="${basedir}/src/emulation"/> |
55 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
56 |
< |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
57 |
< |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
56 |
> |
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
57 |
> |
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
58 |
> |
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
59 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
60 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
61 |
+ |
<property name="topsrc.dir" location="${basedir}/src"/> |
62 |
+ |
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
63 |
+ |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
64 |
+ |
<property name="jsr166esrc.dir" location="${basedir}/src/jsr166e"/> |
65 |
+ |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
66 |
+ |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
67 |
|
|
68 |
|
<!-- Distribution locations --> |
69 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
69 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
70 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
71 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
72 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
73 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
74 |
|
|
75 |
|
<!-- Jar locations --> |
76 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
77 |
+ |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
78 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
79 |
+ |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
80 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
81 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
59 |
– |
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
60 |
– |
<property name="sinjdoc.jar" location="${lib.dir}/sinjdoc.jar"/> |
82 |
|
|
83 |
+ |
<!-- Bootclasspath argument --> |
84 |
+ |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
85 |
|
|
86 |
< |
<!-- Files excluded from dist-docs and emulation jar --> |
87 |
< |
<patternset id="unsafe.exclusion"> |
88 |
< |
<exclude name="java/util/Random.*"/> |
89 |
< |
<exclude name="sun/misc/Unsafe.*"/> |
90 |
< |
</patternset> |
91 |
< |
|
92 |
< |
<!-- Files excludes from emulation jar --> |
93 |
< |
<patternset id="atomic.exclusion"> |
94 |
< |
<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/> |
95 |
< |
<exclude name="java/util/concurrent/atomic/AtomicInteger*"/> |
96 |
< |
<exclude name="java/util/concurrent/atomic/AtomicLong*"/> |
97 |
< |
<exclude name="java/util/concurrent/atomic/AtomicReference*"/> |
98 |
< |
<exclude name="java/util/concurrent/locks/LockSupport*"/> |
99 |
< |
<exclude name="java/util/concurrent/locks/ReentrantLock*"/> |
100 |
< |
</patternset> |
101 |
< |
|
86 |
> |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
87 |
> |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
88 |
> |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
89 |
> |
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
90 |
> |
|
91 |
> |
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
92 |
> |
<!-- The below does not yet exist as of 2012-11 --> |
93 |
> |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
94 |
> |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
95 |
> |
|
96 |
> |
<!-- Test classpath --> |
97 |
> |
<path id="test.classpath"> |
98 |
> |
<pathelement location="${build.testcases.dir}"/> |
99 |
> |
<pathelement location="${junit.jar}"/> |
100 |
> |
</path> |
101 |
> |
|
102 |
> |
<!-- ALoops classpath --> |
103 |
> |
<path id="loops.classpath"> |
104 |
> |
<pathelement location="${build.loops.dir}"/> |
105 |
> |
</path> |
106 |
|
|
107 |
|
|
108 |
|
<!-- Main targets --> |
109 |
|
|
110 |
+ |
<target name="dists" |
111 |
+ |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
112 |
+ |
description="Builds all public jars and docs"/> |
113 |
+ |
|
114 |
|
<target name="compile" |
115 |
< |
depends="init, configure-compiler, prepare-src" |
115 |
> |
depends="init, configure-compiler" |
116 |
|
description="Compiles main sources to build folder"> |
117 |
|
|
87 |
– |
<property name="prepare.src.dir" value="${src.dir}"/> |
88 |
– |
|
118 |
|
<mkdir dir="${build.classes.dir}"/> |
119 |
|
|
120 |
< |
<!-- |
92 |
< |
<echo>javac ${gjc.args}</echo> |
93 |
< |
<echo>bootclasspath=${compile.bootclasspath}</echo> |
94 |
< |
--> |
95 |
< |
|
96 |
< |
<javac srcdir="${prepare.src.dir}" |
120 |
> |
<javac srcdir="${src.dir}" |
121 |
|
destdir="${build.classes.dir}" |
122 |
|
debug="${build.debug}" |
123 |
|
debuglevel="${build.debuglevel}" |
125 |
|
source="${build.sourcelevel}" |
126 |
|
fork="true"> |
127 |
|
|
128 |
< |
<compilerarg line="${gjc.args}"/> |
129 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
128 |
> |
<include name="**/*.java"/> |
129 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
130 |
> |
|
131 |
> |
<!-- |
132 |
> |
<exclude name="java/lang/**"/> |
133 |
> |
<compilerarg line="${build.args}"/> |
134 |
> |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
135 |
> |
--> |
136 |
|
|
137 |
|
</javac> |
138 |
|
|
139 |
|
</target> |
140 |
|
|
141 |
|
|
112 |
– |
<target name="jar" |
113 |
– |
depends="configure-emulation, init-jar, native-jar, emulation-jar" |
114 |
– |
description="Builds library jar from compiled sources"/> |
115 |
– |
|
142 |
|
|
143 |
< |
<target name="test" |
144 |
< |
depends="init, configure-tests, report-tests" |
145 |
< |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
120 |
< |
|
121 |
< |
|
122 |
< |
<target name="checkstyle" |
123 |
< |
depends="filter-src" |
124 |
< |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
143 |
> |
<target name="jar" |
144 |
> |
depends="compile" |
145 |
> |
description="Builds library jar from compiled sources"> |
146 |
|
|
147 |
< |
<taskdef resource="checkstyletask.properties" |
127 |
< |
classpath="${lib.dir}/checkstyle-all-2.4.jar"/> |
147 |
> |
<mkdir dir="${build.lib.dir}"/> |
148 |
|
|
149 |
< |
<checkstyle> |
150 |
< |
<formatter type="plain"/> <!-- also available: type="xml" --> |
151 |
< |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
132 |
< |
</checkstyle> |
149 |
> |
<jar destfile="${product.jar}"> |
150 |
> |
<fileset dir="${build.classes.dir}"/> |
151 |
> |
</jar> |
152 |
|
|
153 |
|
</target> |
154 |
|
|
155 |
|
|
137 |
– |
<target name="doccheck" |
138 |
– |
depends="filter-doccheck" |
139 |
– |
description="Reports on javadoc style errors"> |
140 |
– |
|
141 |
– |
<delete dir="${build.doccheck.dir}"/> |
142 |
– |
<mkdir dir="${build.doccheck.dir}"/> |
156 |
|
|
157 |
< |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
158 |
< |
docletpath="${lib.dir}/doccheck.jar" |
159 |
< |
destdir="${build.doccheck.dir}"> |
147 |
< |
<packageset dir="${build.filter.doccheck.dir}"/> |
148 |
< |
</javadoc> |
149 |
< |
|
150 |
< |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
157 |
> |
<target name="test" |
158 |
> |
depends="init, configure-tests, report-tests" |
159 |
> |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
160 |
|
|
152 |
– |
</target> |
161 |
|
|
162 |
|
|
163 |
|
<target name="docs" |
156 |
– |
depends="filter-src" |
164 |
|
description="Builds javadocs with custom tags to build folder"> |
165 |
|
|
166 |
|
<delete dir="${build.javadocs.dir}"/> |
167 |
|
<mkdir dir="${build.javadocs.dir}"/> |
168 |
|
|
169 |
< |
<javadoc destdir="${build.javadocs.dir}" |
170 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
164 |
< |
overview="${src.dir}/intro.html" |
165 |
< |
source="${build.docsourcelevel}"> |
166 |
< |
|
167 |
< |
<tag name="revised" description="Last revised:"/> |
168 |
< |
<tag name="spec" description="Specified by:"/> |
169 |
< |
<tag name="editor" description="Last edited by:"/> |
170 |
< |
<tag name="fixme" description="FIX ME:"/> |
171 |
< |
|
172 |
< |
<packageset dir="${build.filter.src.dir}"/> |
169 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
170 |
> |
<!-- sourcepath for packages --> |
171 |
|
|
172 |
+ |
<javadoc destdir="${build.javadocs.dir}" |
173 |
+ |
packagenames="none" |
174 |
+ |
link="${jdkapidocs.url}" |
175 |
+ |
overview="${src.dir}/intro.html" |
176 |
+ |
sourcepath="${src.dir}:${jdksrc.dir}" |
177 |
+ |
additionalparam="-XDignore.symbol.file=true" > |
178 |
+ |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
179 |
+ |
<include name="**/*.java"/> |
180 |
+ |
</fileset> |
181 |
|
</javadoc> |
182 |
|
|
183 |
|
</target> |
184 |
|
|
185 |
|
|
179 |
– |
<target name="sinjdocs" |
180 |
– |
depends="configure-tests" |
181 |
– |
description="Builds javadocs with custom tags to build folder"> |
182 |
– |
|
183 |
– |
<delete dir="${build.javadocs.dir}"/> |
184 |
– |
<mkdir dir="${build.javadocs.dir}"/> |
185 |
– |
|
186 |
– |
<java classname="net.cscott.sinjdoc.Main" fork="true"> |
187 |
– |
|
188 |
– |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
189 |
– |
|
190 |
– |
<classpath> |
191 |
– |
<pathelement location="${sinjdoc.jar}"/> |
192 |
– |
<path refid="test.classpath"/> |
193 |
– |
</classpath> |
194 |
– |
|
195 |
– |
<!-- <arg value="-link"/> <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> --> |
196 |
– |
|
197 |
– |
<arg value="-d"/> <arg value="${build.javadocs.dir}"/> |
198 |
– |
<arg value="-sourcepath"/> <arg value="${src.dir}"/> |
199 |
– |
<arg value="-overview"/> <arg value="${src.dir}/intro.html"/> |
200 |
– |
<arg value="-source"/> <arg value="1.5"/> |
201 |
– |
<arg value="-verbose"/> |
202 |
– |
<arg value="java.util"/> |
203 |
– |
|
204 |
– |
<!-- |
205 |
– |
<arg value="-help"/> |
206 |
– |
--> |
207 |
– |
|
208 |
– |
</java> |
209 |
– |
|
210 |
– |
</target> |
211 |
– |
|
212 |
– |
|
213 |
– |
<target name="strip" |
214 |
– |
depends="init, configure-compiler" |
215 |
– |
description="Strip generics from java source (not working yet)"> |
216 |
– |
|
217 |
– |
<mkdir dir="${build.stripped.dir}"/> |
218 |
– |
|
219 |
– |
<!-- |
220 |
– |
# javac -s doesn't reliably generate compilable code. It generates |
221 |
– |
# bridge methods (marked as "synthetic") that can have identical |
222 |
– |
# signatures to existing methods except for the return value. |
223 |
– |
--> |
224 |
– |
<javac srcdir="${src.dir}" |
225 |
– |
destdir="${build.stripped.dir}" |
226 |
– |
debug="${build.debug}" |
227 |
– |
debuglevel="${build.debuglevel}" |
228 |
– |
deprecation="${build.deprecation}" |
229 |
– |
source="${build.sourcelevel}" |
230 |
– |
fork="true"> |
231 |
– |
|
232 |
– |
<compilerarg line="${gjc.args} -s"/> |
233 |
– |
<bootclasspath refid="compile.bootclasspath"/> |
234 |
– |
|
235 |
– |
</javac> |
236 |
– |
|
237 |
– |
</target> |
238 |
– |
|
186 |
|
|
187 |
|
<target name="dist" |
188 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
189 |
|
description="Puts all distributable products in single hierarchy"/> |
190 |
|
|
191 |
+ |
|
192 |
|
<target name="release" |
193 |
|
depends="dist" |
194 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
195 |
|
|
248 |
– |
<!-- |
249 |
– |
#keep build dir? - dl |
250 |
– |
<delete dir="${build.dir}"/> |
251 |
– |
--> |
196 |
|
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
197 |
|
|
198 |
|
<jar basedir="${basedir}" destfile="${release.jar}"> |
199 |
+ |
<!-- <exclude name="build/**"/> --> |
200 |
|
<exclude name="${release.jar}"/> |
201 |
|
<exclude name="user.properties"/> |
202 |
|
<exclude name="etc/notes/**"/> |
203 |
< |
<exclude name="lib/gjc/2.1/**"/> |
203 |
> |
<exclude name="src/emulation/**"/> |
204 |
|
<exclude name="**/SyntaxTest.java"/> |
205 |
+ |
<exclude name="**/SuperfluousAbstract.java"/> |
206 |
|
</jar> |
207 |
|
|
208 |
|
</target> |
209 |
|
|
210 |
+ |
|
211 |
+ |
|
212 |
|
<target name="clean" |
213 |
|
description="Removes all build products"> |
214 |
|
|
219 |
|
</target> |
220 |
|
|
221 |
|
|
222 |
+ |
|
223 |
|
<target name="dist-clean" |
224 |
|
description="Removes all build and distribution products"> |
225 |
|
|
228 |
|
</target> |
229 |
|
|
230 |
|
|
231 |
+ |
|
232 |
|
<target name="dist-docs" |
283 |
– |
depends="filter-src" |
233 |
|
description="Builds javadocs without custom tags to dist folder"> |
234 |
|
|
235 |
|
<delete dir="${dist.javadocs.dir}"/> |
236 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
237 |
|
|
238 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
239 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
291 |
< |
overview="${src.dir}/intro.html" |
292 |
< |
source="${build.docsourcelevel}"> |
293 |
< |
|
294 |
< |
<packageset dir="${build.filter.src.dir}"/> |
238 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
239 |
> |
<!-- sourcepath for packages --> |
240 |
|
|
241 |
+ |
<javadoc destdir="${dist.javadocs.dir}" |
242 |
+ |
packagenames="none" |
243 |
+ |
link="${jdkapidocs.url}" |
244 |
+ |
overview="${src.dir}/intro.html" |
245 |
+ |
sourcepath="${src.dir}:${jdksrc.dir}" |
246 |
+ |
additionalparam="-XDignore.symbol.file=true" > |
247 |
+ |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
248 |
+ |
<include name="**/*.java"/> |
249 |
+ |
</fileset> |
250 |
|
</javadoc> |
251 |
|
|
252 |
|
</target> |
261 |
|
<!-- Version is kept in a separate file --> |
262 |
|
<loadfile property="version" srcFile="version.properties"/> |
263 |
|
<echo>Building JSR-166 version ${version}</echo> |
264 |
+ |
<echo>java.home is ${java.home}</echo> |
265 |
|
|
266 |
|
</target> |
267 |
|
|
268 |
|
|
269 |
< |
<target name="init-jar"> |
269 |
> |
<target name="dist-jar" |
270 |
> |
depends="clean, jar"> |
271 |
|
|
272 |
< |
<mkdir dir="${build.lib.dir}"/> |
272 |
> |
<copy file="${product.jar}" todir="${dist.dir}"/> |
273 |
|
|
274 |
|
</target> |
275 |
|
|
276 |
|
|
277 |
< |
<target name="native-jar" |
278 |
< |
depends="compile" |
323 |
< |
unless="build.emulation.true"> |
277 |
> |
<target name="compile-tests" |
278 |
> |
depends="jar"> |
279 |
|
|
280 |
< |
<jar destfile="${product.jar}"> |
326 |
< |
<fileset dir="${build.classes.dir}"/> |
327 |
< |
</jar> |
280 |
> |
<mkdir dir="${build.testcases.dir}"/> |
281 |
|
|
282 |
< |
</target> |
282 |
> |
<javac srcdir="${tck.src.dir}" |
283 |
> |
destdir="${build.testcases.dir}" |
284 |
> |
debug="${build.debug}" |
285 |
> |
debuglevel="${build.debuglevel}" |
286 |
> |
deprecation="${build.deprecation}" |
287 |
> |
source="${build.sourcelevel}" |
288 |
> |
fork="true"> |
289 |
|
|
290 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
291 |
+ |
<compilerarg line="${build.args}"/> |
292 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
293 |
|
|
294 |
< |
<target name="compile-emulation" |
295 |
< |
depends="init, configure-compiler" |
296 |
< |
if="build.emulation.true"> |
294 |
> |
<classpath refid="test.classpath"/> |
295 |
> |
|
296 |
> |
</javac> |
297 |
> |
|
298 |
> |
<javac srcdir="${test.src.dir}" |
299 |
> |
destdir="${build.testcases.dir}" |
300 |
> |
debug="${build.debug}" |
301 |
> |
debuglevel="${build.debuglevel}" |
302 |
> |
deprecation="${build.deprecation}" |
303 |
> |
source="${build.sourcelevel}" |
304 |
> |
fork="true"> |
305 |
> |
|
306 |
> |
<include name="jsr166/test/**"/> |
307 |
|
|
308 |
< |
<mkdir dir="${build.emulation.dir}"/> |
308 |
> |
<compilerarg value="${bootclasspath.args}"/> |
309 |
> |
<compilerarg line="${build.args}"/> |
310 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
311 |
|
|
312 |
< |
<javac srcdir="${emulation.src.dir}" |
313 |
< |
destdir="${build.emulation.dir}" |
312 |
> |
<classpath refid="test.classpath"/> |
313 |
> |
|
314 |
> |
</javac> |
315 |
> |
|
316 |
> |
<!-- |
317 |
> |
<javac srcdir="${jtreg.src.dir}" |
318 |
> |
destdir="${build.testcases.dir}" |
319 |
|
debug="${build.debug}" |
320 |
|
debuglevel="${build.debuglevel}" |
321 |
|
deprecation="${build.deprecation}" |
322 |
|
source="${build.sourcelevel}" |
323 |
|
fork="true"> |
324 |
|
|
325 |
< |
<compilerarg line="${gjc.args}"/> |
326 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
325 |
> |
<compilerarg value="${bootclasspath.args}"/> |
326 |
> |
<compilerarg line="${build.args}"/> |
327 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
328 |
> |
|
329 |
> |
<classpath refid="test.classpath"/> |
330 |
|
|
331 |
|
</javac> |
332 |
+ |
--> |
333 |
|
|
334 |
|
</target> |
335 |
|
|
336 |
|
|
337 |
< |
<target name="emulation-jar" |
338 |
< |
depends="compile-emulation" |
339 |
< |
if="build.emulation.true"> |
337 |
> |
<target name="run-tests" |
338 |
> |
depends="compile-tests"> |
339 |
> |
|
340 |
> |
<!-- May be overridden by user.properties --> |
341 |
> |
<property name="testcase" value="*"/> |
342 |
> |
|
343 |
> |
<mkdir dir="${build.reports.dir}"/> |
344 |
> |
|
345 |
> |
<junit printsummary="true" |
346 |
> |
showoutput="true" |
347 |
> |
errorProperty="junit.failed" |
348 |
> |
failureProperty="junit.failed" |
349 |
> |
dir="${build.reports.dir}" |
350 |
> |
fork="true"> |
351 |
> |
|
352 |
> |
<jvmarg value="${bootclasspath.args}"/> |
353 |
> |
<jvmarg value="-server"/> |
354 |
> |
<jvmarg value="-showversion"/> |
355 |
> |
|
356 |
> |
<classpath refid="test.classpath"/> |
357 |
> |
|
358 |
> |
<formatter type="xml"/> |
359 |
> |
|
360 |
> |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
361 |
> |
<fileset dir="${tck.src.dir}"> |
362 |
> |
<include name="**/${testcase}Test.java"/> |
363 |
> |
</fileset> |
364 |
> |
</batchtest> |
365 |
> |
|
366 |
> |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
367 |
> |
<fileset dir="${test.src.dir}"> |
368 |
> |
<include name="jsr166/test/**/${testcase}Test.java"/> |
369 |
> |
</fileset> |
370 |
> |
</batchtest> |
371 |
> |
|
372 |
> |
<!-- |
373 |
> |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
374 |
> |
<fileset dir="${jtreg.src.dir}"> |
375 |
> |
<include name="**/${testcase}Test.java"/> |
376 |
> |
</fileset> |
377 |
> |
</batchtest> |
378 |
> |
--> |
379 |
> |
|
380 |
> |
</junit> |
381 |
> |
|
382 |
> |
</target> |
383 |
|
|
384 |
|
|
385 |
< |
<jar destfile="${product.jar}" duplicate="add"> |
386 |
< |
<fileset dir="${build.classes.dir}"> |
387 |
< |
<patternset refid="atomic.exclusion"/> |
388 |
< |
<patternset refid="unsafe.exclusion"/> |
385 |
> |
<target name="report-tests" |
386 |
> |
depends="run-tests"> |
387 |
> |
|
388 |
> |
<!-- Sets junit.report.format to frames if redirection is present, |
389 |
> |
otherwise sets it to noframes. --> |
390 |
> |
<available property="junit.report.format" |
391 |
> |
value="frames" |
392 |
> |
classname="org.apache.xalan.lib.Redirect" |
393 |
> |
/> |
394 |
> |
<property name="junit.report.format" value="noframes"/> |
395 |
> |
|
396 |
> |
<junitreport todir="${build.reports.dir}"> |
397 |
> |
<fileset dir="${build.reports.dir}"> |
398 |
> |
<include name="TEST-*.xml"/> |
399 |
|
</fileset> |
400 |
< |
<fileset dir="${build.emulation.dir}"/> |
401 |
< |
</jar> |
400 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
401 |
> |
/> |
402 |
> |
</junitreport> |
403 |
> |
|
404 |
> |
<fail message="Test Cases Failed" if="junit.failed"/> |
405 |
|
|
406 |
|
</target> |
407 |
|
|
408 |
|
|
409 |
< |
<target name="dist-jar" |
371 |
< |
depends="clean, jar"> |
409 |
> |
<target name="configure-compiler"> |
410 |
|
|
411 |
< |
<copy file="${product.jar}" todir="${dist.dir}"/> |
411 |
> |
<property name="unchecked.option" value="-Xlint:unchecked"/> |
412 |
> |
|
413 |
> |
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
414 |
> |
<istrue value="${build.warnunchecked}"/> |
415 |
> |
</condition> |
416 |
> |
|
417 |
> |
<property name="warnunchecked.arg" value=""/> |
418 |
> |
|
419 |
> |
|
420 |
> |
<!-- Common options in javac invocations --> |
421 |
> |
<property name="build.args" value="${warnunchecked.arg}"/> |
422 |
|
|
423 |
|
</target> |
424 |
|
|
425 |
|
|
426 |
< |
<target name="compile-ant-filter" |
427 |
< |
depends="init"> |
426 |
> |
<target name="configure-tests" |
427 |
> |
depends="configure-compiler"> |
428 |
> |
|
429 |
> |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
430 |
> |
<available property="junit.available" |
431 |
> |
classname="junit.framework.Protectable"/> |
432 |
> |
|
433 |
> |
<!-- Xalan --> |
434 |
> |
<available property="xalan.available" |
435 |
> |
classname="org.apache.xalan.Version"/> |
436 |
|
|
381 |
– |
<mkdir dir="${build.ant.dir}"/> |
437 |
|
|
438 |
< |
<javac srcdir="${ant.src.dir}" |
439 |
< |
destdir="${build.ant.dir}" |
440 |
< |
source="1.4" |
441 |
< |
/> |
438 |
> |
<!-- Ant 1.6beta and later don't need or want this check --> |
439 |
> |
<!-- |
440 |
> |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
441 |
> |
unless="junit.available"/> |
442 |
> |
|
443 |
> |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
444 |
> |
unless="xalan.available"/> |
445 |
> |
--> |
446 |
|
|
447 |
|
</target> |
448 |
|
|
449 |
|
|
450 |
< |
<target name="filter-src" |
392 |
< |
depends="compile-ant-filter"> |
450 |
> |
<!-- Various demos and test programs --> |
451 |
|
|
394 |
– |
<mkdir dir="${build.filter.src.dir}"/> |
452 |
|
|
453 |
< |
<copy todir="${build.filter.src.dir}"> |
454 |
< |
<fileset dir="${src.dir}"> |
398 |
< |
<include name="**/*.html"/> |
399 |
< |
</fileset> |
400 |
< |
</copy> |
453 |
> |
<target name="loops" depends="init, configure-compiler" |
454 |
> |
description="Benchmark from Doug Lea's AQS paper"> |
455 |
|
|
456 |
< |
<copy todir="${build.filter.src.dir}"> |
403 |
< |
<fileset dir="${src.dir}"> |
404 |
< |
<exclude name="**/*.html"/> |
405 |
< |
<patternset refid="unsafe.exclusion"/> |
406 |
< |
</fileset> |
407 |
< |
<filterchain> |
456 |
> |
<mkdir dir="${build.loops.dir}"/> |
457 |
|
|
458 |
< |
<!-- |
459 |
< |
# This filter gets rid of angle-bracketed type parameters |
460 |
< |
# so that javadoc can run on the result. The following |
461 |
< |
# heuristic seems to work: |
462 |
< |
# |
463 |
< |
# For all lines not starting with space(s)-asterisk-space(s), |
464 |
< |
# replace <something> with a space, where there may be more |
416 |
< |
# than one right angle bracket at the end, and "something" |
417 |
< |
# must not contain parens or pipes. (This may need some |
418 |
< |
# tweaking.) |
419 |
< |
--> |
458 |
> |
<javac srcdir="${loops.src.dir}" |
459 |
> |
destdir="${build.loops.dir}" |
460 |
> |
debug="${build.debug}" |
461 |
> |
debuglevel="${build.debuglevel}" |
462 |
> |
deprecation="${build.deprecation}" |
463 |
> |
source="${build.sourcelevel}" |
464 |
> |
fork="true"> |
465 |
|
|
466 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
467 |
< |
classpath="${build.ant.dir}"> |
468 |
< |
<param name="notmatching" value="^\s+\*\s.*$"/> |
424 |
< |
<param name="pattern" value="<[^|>()]+?>+"/> |
425 |
< |
<param name="replacement" value=" "/> |
426 |
< |
</filterreader> |
466 |
> |
<compilerarg line="${build.args}"/> |
467 |
> |
<classpath refid="loops.classpath"/> |
468 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
469 |
|
|
470 |
+ |
</javac> |
471 |
+ |
|
472 |
+ |
<java classname="ALoops" fork="true"> |
473 |
+ |
<classpath refid="loops.classpath"/> |
474 |
+ |
</java> |
475 |
+ |
|
476 |
+ |
</target> |
477 |
|
|
429 |
– |
<!-- |
430 |
– |
# This filter uncomments lines beginning with "//@" so that |
431 |
– |
# javadoc can see imports that are needed to resolve links |
432 |
– |
# but that shouldn't be in the compiled code. |
433 |
– |
--> |
478 |
|
|
479 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
480 |
< |
classpath="${build.ant.dir}"> |
481 |
< |
<param name="matching" value="^//@.*$"/> |
482 |
< |
<param name="pattern" value="^//@"/> |
483 |
< |
<param name="replacement" value=""/> |
484 |
< |
</filterreader> |
485 |
< |
</filterchain> |
486 |
< |
</copy> |
479 |
> |
<!-- jsr166x --> |
480 |
> |
|
481 |
> |
|
482 |
> |
<target name="jsr166xcompile" |
483 |
> |
depends="init, configure-compiler" |
484 |
> |
description="Compiles jsr166x sources"> |
485 |
> |
|
486 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
487 |
> |
|
488 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
489 |
> |
destdir="${build.jsr166x.dir}" |
490 |
> |
debug="${build.debug}" |
491 |
> |
debuglevel="${build.debuglevel}" |
492 |
> |
deprecation="${build.deprecation}" |
493 |
> |
source="${build.sourcelevel}" |
494 |
> |
fork="true"> |
495 |
> |
|
496 |
> |
<include name="**/*.java"/> |
497 |
> |
<compilerarg line="${build.args}"/> |
498 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
499 |
> |
|
500 |
> |
</javac> |
501 |
|
|
502 |
|
</target> |
503 |
|
|
504 |
|
|
505 |
|
|
506 |
+ |
<target name="jsr166xjar" |
507 |
+ |
depends="jsr166xcompile" |
508 |
+ |
description="Builds library jar from compiled sources"> |
509 |
|
|
510 |
< |
<target name="filter-doccheck" |
450 |
< |
depends="filter-src"> |
510 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
511 |
|
|
512 |
< |
<mkdir dir="${build.filter.doccheck.dir}"/> |
512 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
513 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
514 |
> |
</jar> |
515 |
|
|
516 |
< |
<copy todir="${build.filter.doccheck.dir}"> |
455 |
< |
<fileset dir="${build.filter.src.dir}"> |
456 |
< |
<include name="**/*.html"/> |
457 |
< |
</fileset> |
458 |
< |
</copy> |
516 |
> |
</target> |
517 |
|
|
460 |
– |
<property name="generic.declarations" |
461 |
– |
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 {}" |
462 |
– |
/> |
518 |
|
|
464 |
– |
<copy todir="${build.filter.doccheck.dir}"> |
465 |
– |
<fileset dir="${build.filter.src.dir}"> |
466 |
– |
<exclude name="**/*.html"/> |
467 |
– |
</fileset> |
468 |
– |
<filterchain> |
469 |
– |
<!-- |
470 |
– |
# These two filters try to make the source look like |
471 |
– |
# something that doccheck can process. The first removes |
472 |
– |
# -source 1.4 assertions and the second adds in a bunch |
473 |
– |
# of single letter public nested marker interfaces so that |
474 |
– |
# the generic type parameters are recognized. |
475 |
– |
--> |
476 |
– |
|
477 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
478 |
– |
classpath="${build.ant.dir}"> |
479 |
– |
<param name="matching" value="^\s*assert[\s ].*$"/> |
480 |
– |
<param name="pattern" value="assert"/> |
481 |
– |
<param name="replacement" value="//assert"/> |
482 |
– |
</filterreader> |
483 |
– |
|
484 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
485 |
– |
classpath="${build.ant.dir}"> |
486 |
– |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
487 |
– |
<param name="pattern" value="$"/> |
488 |
– |
<param name="replacement" value=" ${generic.declarations}"/> |
489 |
– |
</filterreader> |
519 |
|
|
520 |
< |
</filterchain> |
521 |
< |
</copy> |
520 |
> |
<target name="jsr166xdocs" |
521 |
> |
description="Builds javadocs with custom tags to build folder"> |
522 |
> |
|
523 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
524 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
525 |
> |
|
526 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
527 |
> |
packagenames="jsr166x" |
528 |
> |
link="${jdkapidocs.url}" |
529 |
> |
source="${build.sourcelevel}" |
530 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
531 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
532 |
|
|
533 |
|
</target> |
534 |
|
|
535 |
|
|
536 |
< |
<target name="compile-tests" |
537 |
< |
depends="jar"> |
536 |
> |
<target name="jsr166xdist" |
537 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
538 |
> |
description="Puts all distributable products in single hierarchy"/> |
539 |
|
|
500 |
– |
<mkdir dir="${build.testcases.dir}"/> |
540 |
|
|
502 |
– |
<!-- |
503 |
– |
<echo>javac ${gjc.args}</echo> |
504 |
– |
<echo>bootclasspath=${test.compile.bootclasspath}</echo> |
505 |
– |
<echo>classpath="${test.classpath}"</echo> |
506 |
– |
--> |
541 |
|
|
542 |
< |
<javac srcdir="${test.src.dir}" |
543 |
< |
destdir="${build.testcases.dir}" |
542 |
> |
<target name="jsr166xclean" |
543 |
> |
description="Removes all build products"> |
544 |
> |
|
545 |
> |
<delete dir="${build.jsr166x.dir}"/> |
546 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
547 |
> |
|
548 |
> |
</target> |
549 |
> |
|
550 |
> |
|
551 |
> |
|
552 |
> |
<target name="jsr166xdist-clean" |
553 |
> |
description="Removes all build and distribution products"> |
554 |
> |
|
555 |
> |
</target> |
556 |
> |
|
557 |
> |
|
558 |
> |
|
559 |
> |
<target name="jsr166xdist-docs" |
560 |
> |
description="Builds javadocs without custom tags to dist folder"> |
561 |
> |
|
562 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
563 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
564 |
> |
|
565 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
566 |
> |
packagenames="jsr166x" |
567 |
> |
link="${jdkapidocs.url}" |
568 |
> |
source="${build.sourcelevel}" |
569 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
570 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
571 |
> |
|
572 |
> |
</target> |
573 |
> |
|
574 |
> |
<target name="jsr166xdist-jar" |
575 |
> |
depends="jsr166xclean, jsr166xjar"> |
576 |
> |
|
577 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
578 |
> |
|
579 |
> |
</target> |
580 |
> |
|
581 |
> |
<!-- jsr166y --> |
582 |
> |
|
583 |
> |
|
584 |
> |
<target name="jsr166ycompile" |
585 |
> |
depends="init, configure-compiler" |
586 |
> |
description="Compiles jsr166y sources"> |
587 |
> |
|
588 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
589 |
> |
|
590 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
591 |
> |
destdir="${build.jsr166y.dir}" |
592 |
|
debug="${build.debug}" |
593 |
|
debuglevel="${build.debuglevel}" |
594 |
|
deprecation="${build.deprecation}" |
595 |
|
source="${build.sourcelevel}" |
596 |
|
fork="true"> |
597 |
|
|
598 |
< |
<compilerarg line="${gjc.args}"/> |
599 |
< |
<bootclasspath refid="test.compile.bootclasspath"/> |
600 |
< |
<classpath refid="test.classpath"/> |
598 |
> |
<include name="**/*.java"/> |
599 |
> |
<compilerarg line="${build.args}"/> |
600 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
601 |
> |
<compilerarg value="${bootclasspath.args}"/> |
602 |
> |
|
603 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
604 |
|
|
605 |
|
</javac> |
606 |
|
|
607 |
|
</target> |
608 |
|
|
609 |
|
|
525 |
– |
<target name="run-tests" |
526 |
– |
depends="compile-tests"> |
610 |
|
|
611 |
< |
<!-- May be overridden by user.properties --> |
612 |
< |
<property name="testcase" value="*"/> |
611 |
> |
<target name="jsr166yjar" |
612 |
> |
depends="jsr166ycompile" |
613 |
> |
description="Builds library jar from compiled sources"> |
614 |
|
|
615 |
< |
<mkdir dir="${build.reports.dir}"/> |
615 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
616 |
|
|
617 |
< |
<junit printsummary="true" |
618 |
< |
showoutput="true" |
619 |
< |
errorProperty="junit.failed" |
536 |
< |
failureProperty="junit.failed" |
537 |
< |
dir="${build.reports.dir}" |
538 |
< |
fork="true"> |
617 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
618 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
619 |
> |
</jar> |
620 |
|
|
621 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
621 |
> |
</target> |
622 |
|
|
542 |
– |
<formatter type="xml"/> |
623 |
|
|
544 |
– |
<batchtest todir="${build.reports.dir}"> |
545 |
– |
<fileset dir="${test.src.dir}"> |
546 |
– |
<include name="**/${testcase}Test.java"/> |
547 |
– |
</fileset> |
548 |
– |
</batchtest> |
624 |
|
|
625 |
< |
</junit> |
625 |
> |
<target name="jsr166ydocs" |
626 |
> |
description="Builds javadocs with custom tags to build folder"> |
627 |
> |
|
628 |
> |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
629 |
> |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
630 |
> |
|
631 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
632 |
> |
packagenames="jsr166y" |
633 |
> |
link="${jdkapidocs.url}" |
634 |
> |
source="${build.sourcelevel}" |
635 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
636 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
637 |
|
|
638 |
|
</target> |
639 |
|
|
640 |
|
|
641 |
< |
<target name="report-tests" |
642 |
< |
depends="run-tests"> |
641 |
> |
<target name="jsr166ydist" |
642 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
643 |
> |
description="Puts all distributable products in single hierarchy"/> |
644 |
|
|
558 |
– |
<!-- Sets junit.report.format to frames if Xalan is present, |
559 |
– |
otherwise sets it to noframes. --> |
560 |
– |
<available property="junit.report.format" |
561 |
– |
value="frames" |
562 |
– |
classname="org.apache.xalan.lib.Redirect" |
563 |
– |
/> |
564 |
– |
<property name="junit.report.format" value="noframes"/> |
645 |
|
|
566 |
– |
<junitreport todir="${build.reports.dir}"> |
567 |
– |
<fileset dir="${build.reports.dir}"> |
568 |
– |
<include name="TEST-*.xml"/> |
569 |
– |
</fileset> |
570 |
– |
<report styledir="${stylesheet.dir}" |
571 |
– |
format="${junit.report.format}" |
572 |
– |
todir="${build.reports.dir}" |
573 |
– |
/> |
574 |
– |
</junitreport> |
646 |
|
|
647 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
647 |
> |
<target name="jsr166yclean" |
648 |
> |
description="Removes all build products"> |
649 |
> |
|
650 |
> |
<delete dir="${build.jsr166y.dir}"/> |
651 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
652 |
|
|
653 |
|
</target> |
654 |
|
|
655 |
|
|
581 |
– |
<target name="configure-compiler"> |
656 |
|
|
657 |
< |
<property name="gjc.version" |
658 |
< |
value="2.2"/> |
657 |
> |
<target name="jsr166ydist-clean" |
658 |
> |
description="Removes all build and distribution products"> |
659 |
|
|
660 |
< |
<condition property="novariance.arg" value="-novariance"> |
587 |
< |
<and> |
588 |
< |
<equals arg1="${gjc.version}" arg2="2.0"/> |
589 |
< |
<or> |
590 |
< |
<not><isset property="gjc.novariance"/></not> |
591 |
< |
<istrue value="${gjc.novariance}"/> |
592 |
< |
</or> |
593 |
< |
</and> |
594 |
< |
</condition> |
660 |
> |
</target> |
661 |
|
|
662 |
< |
<property name="novariance.arg" |
663 |
< |
value=""/> |
662 |
> |
<target name="jsr166ydist-docs" |
663 |
> |
description="Builds javadocs without custom tags to dist folder"> |
664 |
|
|
665 |
< |
<property name="gjc.dir" |
666 |
< |
value="${lib.dir}/gjc"/> |
665 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
666 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
667 |
|
|
668 |
< |
<property name="javac.jar" |
669 |
< |
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
668 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
669 |
> |
packagenames="jsr166y" |
670 |
> |
link="${jdkapidocs.url}" |
671 |
> |
source="${build.sourcelevel}" |
672 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
673 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
674 |
|
|
675 |
< |
<property name="collect.jar" |
606 |
< |
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
675 |
> |
</target> |
676 |
|
|
677 |
+ |
<target name="jsr166ydist-jar" |
678 |
+ |
depends="jsr166yclean, jsr166yjar"> |
679 |
|
|
680 |
< |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
610 |
< |
<istrue value="${gjc.warnunchecked}"/> |
611 |
< |
</condition> |
680 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
681 |
|
|
682 |
< |
<property name="warnunchecked.arg" value=""/> |
682 |
> |
</target> |
683 |
|
|
615 |
– |
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
616 |
– |
<istrue value="${build.nothreads}"/> |
617 |
– |
</condition> |
684 |
|
|
685 |
+ |
<!-- extra166y --> |
686 |
|
|
620 |
– |
<!-- |
621 |
– |
! Bootclasspath munging for source compilation. |
622 |
– |
--> |
687 |
|
|
688 |
< |
<path id="pre.bootclasspath"> |
689 |
< |
<pathelement location="${javac.jar}"/> |
690 |
< |
</path> |
627 |
< |
|
628 |
< |
<path id="compile.bootclasspath"> |
629 |
< |
<pathelement location="${build.classes.dir}"/> |
630 |
< |
<pathelement location="${collect.jar}"/> |
631 |
< |
<pathelement location="${rt.jar}"/> |
632 |
< |
</path> |
633 |
< |
|
634 |
< |
<!-- Flatten paths into platform-appropriate strings --> |
635 |
< |
<property name="pre.bootclasspath" refid="pre.bootclasspath"/> |
636 |
< |
<property name="compile.bootclasspath" refid="compile.bootclasspath"/> |
688 |
> |
<target name="extra166ycompile" |
689 |
> |
depends="init, configure-compiler, jsr166ycompile" |
690 |
> |
description="Compiles extra166y sources"> |
691 |
|
|
692 |
+ |
<mkdir dir="${build.extra166y.dir}"/> |
693 |
|
|
694 |
< |
<!-- Common options in javac invocations --> |
695 |
< |
<property name="gjc.args" |
696 |
< |
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
697 |
< |
/> |
694 |
> |
<javac srcdir="${extra166ysrc.dir}" |
695 |
> |
destdir="${build.extra166y.dir}" |
696 |
> |
debug="${build.debug}" |
697 |
> |
classpath="${jsr166yproduct.jar}" |
698 |
> |
debuglevel="${build.debuglevel}" |
699 |
> |
deprecation="${build.deprecation}" |
700 |
> |
source="${build.sourcelevel}" |
701 |
> |
fork="true"> |
702 |
> |
|
703 |
> |
<include name="**/*.java"/> |
704 |
> |
<compilerarg line="${build.args}"/> |
705 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
706 |
> |
<compilerarg value="${bootclasspath.args}"/> |
707 |
> |
|
708 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
709 |
> |
|
710 |
> |
</javac> |
711 |
|
|
712 |
|
</target> |
713 |
|
|
714 |
|
|
715 |
< |
<target name="prepare-src" |
716 |
< |
depends="configure-compiler" |
717 |
< |
if="prepare.src.dir"> |
718 |
< |
|
719 |
< |
<mkdir dir="${prepare.src.dir}"/> |
720 |
< |
<copy todir="${prepare.src.dir}"> |
721 |
< |
<fileset dir="${src.dir}"> |
722 |
< |
<exclude name="java/lang/**"/> |
723 |
< |
</fileset> |
724 |
< |
</copy> |
715 |
> |
|
716 |
> |
<target name="extra166yjar" |
717 |
> |
depends="extra166ycompile" |
718 |
> |
description="Builds library jar from compiled sources"> |
719 |
> |
|
720 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
721 |
> |
|
722 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
723 |
> |
<fileset dir="${build.extra166y.dir}"/> |
724 |
> |
</jar> |
725 |
|
|
726 |
|
</target> |
727 |
|
|
728 |
|
|
661 |
– |
<target name="configure-emulation"> |
729 |
|
|
730 |
< |
<condition property="build.emulation.true"> |
731 |
< |
<or> |
732 |
< |
<and> |
733 |
< |
<os family="windows"/> |
734 |
< |
<not> |
735 |
< |
<isset property="build.emulation"/> |
736 |
< |
</not> |
737 |
< |
</and> |
738 |
< |
<istrue value="${build.emulation}"/> |
739 |
< |
</or> |
740 |
< |
</condition> |
730 |
> |
<target name="extra166ydocs" |
731 |
> |
description="Builds javadocs with custom tags to build folder"> |
732 |
> |
|
733 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
734 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
735 |
> |
|
736 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
737 |
> |
packagenames="extra166y" |
738 |
> |
link="${jdkapidocs.url}" |
739 |
> |
source="${build.sourcelevel}" |
740 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
741 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
742 |
|
|
743 |
|
</target> |
744 |
|
|
745 |
|
|
746 |
< |
<target name="configure-tests" |
747 |
< |
depends="configure-compiler"> |
746 |
> |
<target name="extra166ydist" |
747 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
748 |
> |
description="Puts all distributable products in single hierarchy"/> |
749 |
|
|
681 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
682 |
– |
<available property="junit.available" |
683 |
– |
classname="junit.framework.Protectable"/> |
750 |
|
|
685 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
686 |
– |
unless="junit.available"/> |
751 |
|
|
752 |
+ |
<target name="extra166yclean" |
753 |
+ |
description="Removes all build products"> |
754 |
+ |
|
755 |
+ |
<delete dir="${build.extra166y.dir}"/> |
756 |
+ |
<delete dir="${build.extra166ylib.dir}"/> |
757 |
|
|
758 |
< |
<!-- |
759 |
< |
! Bootclasspath munging for testing, so JUnit can test our local |
760 |
< |
! modifications to java.*. |
761 |
< |
--> |
758 |
> |
</target> |
759 |
> |
|
760 |
> |
|
761 |
> |
|
762 |
> |
<target name="extra166ydist-clean" |
763 |
> |
description="Removes all build and distribution products"> |
764 |
|
|
765 |
< |
<path id="test.classpath"> |
695 |
< |
<pathelement location="${product.jar}"/> |
696 |
< |
<pathelement location="${build.testcases.dir}"/> |
697 |
< |
<pathelement location="${junit.jar}"/> |
698 |
< |
</path> |
765 |
> |
</target> |
766 |
|
|
767 |
< |
<path id="test.compile.bootclasspath"> |
768 |
< |
<pathelement location="${javac.jar}"/> |
702 |
< |
<pathelement location="${collect.jar}"/> |
703 |
< |
<pathelement location="${rt.jar}"/> |
704 |
< |
</path> |
767 |
> |
<target name="extra166ydist-docs" |
768 |
> |
description="Builds javadocs without custom tags to dist folder"> |
769 |
|
|
770 |
< |
<path id="test.run.bootclasspath"> |
771 |
< |
<pathelement location="${javac.jar}"/> |
708 |
< |
<path refid="test.classpath"/> |
709 |
< |
</path> |
770 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
771 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
772 |
|
|
773 |
< |
<!-- Flatten test classpaths into platform-appropriate strings --> |
774 |
< |
<property name="test.classpath" refid="test.classpath"/> |
775 |
< |
<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/> |
776 |
< |
<property name="test.run.bootclasspath" refid="test.run.bootclasspath"/> |
773 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
774 |
> |
packagenames="extra166y" |
775 |
> |
link="${jdkapidocs.url}" |
776 |
> |
source="${build.sourcelevel}" |
777 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
778 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
779 |
|
|
780 |
|
</target> |
781 |
|
|
782 |
+ |
<target name="extra166ydist-jar" |
783 |
+ |
depends="extra166yclean, extra166yjar"> |
784 |
|
|
785 |
+ |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
786 |
|
|
787 |
< |
<!-- Anthill targets --> |
787 |
> |
</target> |
788 |
|
|
789 |
< |
<target name="anthill-build" |
723 |
< |
depends="jar, test, docs, dist-docs"/> |
789 |
> |
<!-- jsr166e --> |
790 |
|
|
725 |
– |
<target name="anthill-publish"> |
791 |
|
|
792 |
< |
<copy todir="${deployDir}/docs/private"> |
793 |
< |
<fileset dir="${build.javadocs.dir}"/> |
794 |
< |
</copy> |
792 |
> |
<target name="jsr166ecompile" |
793 |
> |
depends="init, configure-compiler" |
794 |
> |
description="Compiles jsr166e sources"> |
795 |
|
|
796 |
< |
<copy todir="${deployDir}/docs/public"> |
732 |
< |
<fileset dir="${dist.javadocs.dir}"/> |
733 |
< |
</copy> |
796 |
> |
<mkdir dir="${build.jsr166e.dir}"/> |
797 |
|
|
798 |
< |
<copy tofile="${deployDir}/index.html" |
799 |
< |
file="${basedir}/etc/anthill-index.html"/> |
798 |
> |
<javac srcdir="${jsr166esrc.dir}" |
799 |
> |
destdir="${build.jsr166e.dir}" |
800 |
> |
debug="${build.debug}" |
801 |
> |
debuglevel="${build.debuglevel}" |
802 |
> |
deprecation="${build.deprecation}" |
803 |
> |
source="1.7" |
804 |
> |
fork="true"> |
805 |
> |
|
806 |
> |
<include name="**/*.java"/> |
807 |
> |
<compilerarg line="${build.args}"/> |
808 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
809 |
> |
<compilerarg value="${bootclasspath.args}"/> |
810 |
|
|
811 |
< |
<copy todir="${deployDir}/notes"> |
812 |
< |
<fileset dir="${basedir}/etc/notes"/> |
813 |
< |
</copy> |
811 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
812 |
> |
|
813 |
> |
</javac> |
814 |
|
|
815 |
|
</target> |
816 |
|
|
817 |
|
|
745 |
– |
<target name="ng" depends="test"> |
746 |
– |
<java classname="SuperfluousAbstract" fork="true"> |
818 |
|
|
819 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
819 |
> |
<target name="jsr166ejar" |
820 |
> |
depends="jsr166ecompile" |
821 |
> |
description="Builds library jar from compiled sources"> |
822 |
> |
|
823 |
> |
<mkdir dir="${build.jsr166elib.dir}"/> |
824 |
> |
|
825 |
> |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
826 |
> |
<fileset dir="${build.jsr166e.dir}"/> |
827 |
> |
</jar> |
828 |
> |
|
829 |
> |
</target> |
830 |
> |
|
831 |
> |
|
832 |
> |
|
833 |
> |
<target name="jsr166edocs" |
834 |
> |
description="Builds javadocs with custom tags to build folder"> |
835 |
> |
|
836 |
> |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
837 |
> |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
838 |
> |
|
839 |
> |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
840 |
> |
packagenames="jsr166e,jsr166e.extra" |
841 |
> |
link="${jdkapidocs.url}" |
842 |
> |
source="1.7" |
843 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
844 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
845 |
|
|
750 |
– |
</java> |
846 |
|
</target> |
847 |
|
|
848 |
|
|
849 |
+ |
<target name="jsr166edist" |
850 |
+ |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
851 |
+ |
description="Puts all distributable products in single hierarchy"/> |
852 |
+ |
|
853 |
+ |
|
854 |
+ |
|
855 |
+ |
<target name="jsr166eclean" |
856 |
+ |
description="Removes all build products"> |
857 |
+ |
|
858 |
+ |
<delete dir="${build.jsr166e.dir}"/> |
859 |
+ |
<delete dir="${build.jsr166elib.dir}"/> |
860 |
+ |
|
861 |
+ |
</target> |
862 |
+ |
|
863 |
+ |
|
864 |
+ |
|
865 |
+ |
<target name="jsr166edist-clean" |
866 |
+ |
description="Removes all build and distribution products"> |
867 |
+ |
|
868 |
+ |
</target> |
869 |
+ |
|
870 |
+ |
<target name="jsr166edist-docs" |
871 |
+ |
description="Builds javadocs without custom tags to dist folder"> |
872 |
+ |
|
873 |
+ |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
874 |
+ |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
875 |
+ |
|
876 |
+ |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
877 |
+ |
packagenames="jsr166e,jsr166e.extra" |
878 |
+ |
link="${jdkapidocs.url}" |
879 |
+ |
source="1.7" |
880 |
+ |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
881 |
+ |
additionalparam="-XDignore.symbol.file=true" /> |
882 |
+ |
|
883 |
+ |
</target> |
884 |
+ |
|
885 |
+ |
<target name="jsr166edist-jar" |
886 |
+ |
depends="jsr166eclean, jsr166ejar"> |
887 |
+ |
|
888 |
+ |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
889 |
+ |
|
890 |
+ |
</target> |
891 |
+ |
|
892 |
|
</project> |