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