ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.81 by jsr166, Sun Aug 2 00:11:59 2009 UTC vs.
Revision 1.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC

# Line 8 | Line 8
8  
9    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.
11 +
12 +  The repository contains all dependencies except for ant and the JDK
13 +  itself.  Because the JDK version matters and because different
14 +  targets require different JDKs, we assume that users have created a
15 +  hierarchy containing:
16 +  $HOME/jdk/jdk6
17 +  $HOME/jdk/jdk7
18 +  $HOME/jdk/jdk8
19 +  where each of the above is a JDK or a symlink to same, and
20 +  $HOME/jdk/src/jdk6
21 +  $HOME/jdk/src/jdk7
22 +  $HOME/jdk/src/jdk8
23 +  where each of the above is a complete JDK source tree
24 +  (e.g. mercurial forest) or a symlink to same.
25   ------------------------------------------------------------------------------
26    </description>
27  
28 <  <target name="usage" description="Advises user to run with -projecthelp">
29 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
28 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
29 >    <java classname="org.apache.tools.ant.Main">
30 >      <arg value="-projecthelp" />
31 >    </java>
32    </target>
33  
34  
# Line 21 | Line 37
37  
38  
39    <!-- Compilation options -->
40 <  <property name="build.sourcelevel"    value="1.6"/>
40 >  <property name="build.sourcelevel"    value="6"/>
41    <property name="build.debug"          value="true"/>
42    <property name="build.debuglevel"     value="source,lines,vars"/>
43    <property name="build.deprecation"    value="false"/>
44 +  <property name="build.javadoc.access" value="protected"/>
45  
46    <!-- Build locations -->
47    <property name="build.dir"                   location="build"/>
48    <property name="build.classes.dir"           location="${build.dir}/classes"/>
49    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
50    <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"/>
51    <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"/>
52  
53 <  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
54 <  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
55 <  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
53 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
54 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
55 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
56 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
57  
58 +  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59 +  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
60 +  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
61    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
62 <  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
63 <  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
62 >
63 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
64 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
65 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
66 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
67 >
68 >  <!-- JDK locations -->
69 >  <property name="jdks.home"  location="${user.home}/jdk"/>
70 >
71 >  <macrodef name="defjdklocations">
72 >    <attribute name="v"/>
73 >    <sequential>
74 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
75 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
76 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
77 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
78 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
79 >    <local name="boot.jar.dir"/>
80 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
81 >    <path id="bootclasspath@{v}">
82 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
83 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
84 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
85 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
86 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
87 >    </path>
88 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
89 >    </sequential>
90 >  </macrodef>
91 >
92 >  <macrodef name="mirror-dir">
93 >    <attribute name="src"/>
94 >    <attribute name="dst"/>
95 >    <sequential>
96 >    <delete dir="@{dst}"/>
97 >    <mkdir dir="@{dst}"/>
98 >    <copy todir="@{dst}" preservelastmodified="true">
99 >      <fileset dir="@{src}"/>
100 >    </copy>
101 >    </sequential>
102 >  </macrodef>
103 >
104 >  <defjdklocations v="6"/>
105 >  <defjdklocations v="7"/>
106 >  <defjdklocations v="8"/>
107  
108    <!-- Source locations -->
109    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 55 | Line 114
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <property name="topsrc.dir"           location="${basedir}/src"/>
117 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
118 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
119 <  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
120 <  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
121 <  <!-- Distribution locations -->
122 <  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
123 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
124 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
125 <  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
117 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
118 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
119 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
120 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
121 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
122 >
123 >  <!-- Javadoc locations -->
124 >  <property name="docs.dir"          location="${build.dir}/docs"/>
125 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
126 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
127 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
128 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
129 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
130 >
131 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
132 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
133 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
134 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
135 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
136 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
137  
138    <!-- Jar locations -->
139 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
140 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141 <  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142 <  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
143 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
144 <
145 <  <!-- Bootclasspath argument -->
146 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
139 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
140 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
141 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
142 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
143 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
144 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
145 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
146 >
147 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
148 >  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
149 >  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
150 >  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
151 >
152 >  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
153 >  <!-- The below does not yet exist as of 2013-01 -->
154 >  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
155 >
156 >  <!-- Default jdk api doc location (latest stable release seems best) -->
157 >  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158 >
159 >  <!-- Define the "jtreg" task -->
160 >  <!-- See the docs in "jtreg -onlineHelp" -->
161 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
162 >           classpath="${lib.dir}/jtreg.jar" />
163  
164    <!-- Test classpath -->
165    <path id="test.classpath">
# Line 81 | Line 167
167      <pathelement location="${junit.jar}"/>
168    </path>
169  
170 +  <macrodef name="run-tck-tests">
171 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
172 +    <attribute name="source" default="6"/>
173 +    <attribute name="target"/>
174 +    <attribute name="workdir"/>
175 +    <attribute name="classes"/>
176 +    <attribute name="jvmflags" default=""/>
177 +    <sequential>
178 +
179 +    <mkdir dir="@{workdir}/tck-classes"/>
180 +
181 +    <javac srcdir="@{tck.src.dir}"
182 +           destdir="@{workdir}/tck-classes"
183 +           debug="${build.debug}"
184 +           debuglevel="${build.debuglevel}"
185 +           deprecation="${build.deprecation}"
186 +           source="@{source}"
187 +           classpath="${junit.jar}"
188 +           bootclasspath="@{classes}:${bootclasspath@{source}}"
189 +           includeAntRuntime="false"
190 +           includeJavaRuntime="false"
191 +           executable="${javac@{target}}"
192 +           fork="true">
193 +
194 +      <include name="*.java"/>
195 +      <compilerarg value="-XDignore.symbol.file=true"/>
196 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
197 +      <compilerarg line="${build.args}"/>
198 +
199 +    </javac>
200 +
201 +    <java classname="JSR166TestCase"
202 +          failonerror="true"
203 +          jvm="${java@{target}}"
204 +          fork="true">
205 +        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
206 +        <jvmarg line="@{jvmflags}"/>
207 +        <classpath>
208 +          <pathelement location="${junit.jar}"/>
209 +          <pathelement location="@{workdir}/tck-classes"/>
210 +        </classpath>
211 +    </java>
212 +
213 +    </sequential>
214 +  </macrodef>
215 +
216    <!-- ALoops classpath -->
217    <path id="loops.classpath">
218      <pathelement location="${build.loops.dir}"/>
219    </path>
220  
221 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
222 +  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
223 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
224  
225    <!-- Main targets -->
226  
227    <target name="dists"
228 <          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
228 >          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
229            description="Builds all public jars and docs"/>
230  
231    <target name="compile"
232 <          depends="init, configure-compiler"
233 <          description="Compiles main sources to build folder">
232 >          depends="configure-compiler"
233 >          description="Compiles src/main sources to build dir">
234  
235      <mkdir dir="${build.classes.dir}"/>
236  
237      <javac srcdir="${src.dir}"
238 <          destdir="${build.classes.dir}"
239 <            debug="${build.debug}"
240 <       debuglevel="${build.debuglevel}"
241 <      deprecation="${build.deprecation}"
242 <           source="${build.sourcelevel}"
243 <             fork="true">
238 >           destdir="${build.classes.dir}"
239 >           debug="${build.debug}"
240 >           debuglevel="${build.debuglevel}"
241 >           deprecation="${build.deprecation}"
242 >           classpath=""
243 >           includeAntRuntime="false"
244 >           includeJavaRuntime="false"
245 >           executable="${javac8}"
246 >           fork="true">
247  
248        <include name="**/*.java"/>
249 <      <compilerarg value="-XDignore.symbol.file"/>
250 <
113 < <!--
114 <      <exclude name="java/lang/**"/>
249 >      <compilerarg value="-XDignore.symbol.file=true"/>
250 >      <compilerarg value="-Xlint:all"/>
251        <compilerarg line="${build.args}"/>
116      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 -->
252  
253      </javac>
120
254    </target>
255  
256  
124
257    <target name="jar"
258            depends="compile"
259            description="Builds library jar from compiled sources">
260  
129    <mkdir dir="${build.lib.dir}"/>
130
261      <jar destfile="${product.jar}">
262        <fileset dir="${build.classes.dir}"/>
263      </jar>
134
264    </target>
265  
266  
138
267    <target name="test"
268 <          depends="init, configure-tests, report-tests"
268 >          depends="configure-tests, report-tests"
269            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
270  
271  
144
272    <target name="docs"
273 <          description="Builds javadocs with custom tags to build folder">
147 <
148 <    <delete dir="${build.javadocs.dir}"/>
149 <    <mkdir dir="${build.javadocs.dir}"/>
273 >          description="Builds javadocs for src/main to dist dir">
274  
275 <    <javadoc destdir="${build.javadocs.dir}"
276 <                link="http://java.sun.com/javase/6/docs/api/"
153 <            overview="${src.dir}/intro.html"
154 <            sourcepath="${src.dir}:${jdksrc.dir}"
155 <    >          
275 >    <delete dir="${docs.dir}"/>
276 >    <mkdir dir="${docs.dir}"/>
277  
278 <      <packageset dir="${src.dir}"/>
278 >    <!-- the packagenames="none" hack below prevents scanning the -->
279 >    <!-- sourcepath for packages -->
280  
281 +    <javadoc destdir="${docs.dir}"
282 +             packagenames="none"
283 +             link="${jdkapi8docs.url}"
284 +             overview="${src.dir}/intro.html"
285 +             access="${build.javadoc.access}"
286 +             sourcepath="${src.dir}:${jdk8src.dir}"
287 +             classpath=""
288 +             executable="${javadoc8}">
289 +      <fileset dir="${src.dir}" defaultexcludes="yes">
290 +        <include name="**/*.java"/>
291 +      </fileset>
292 +      <arg value="-XDignore.symbol.file=true"/>
293 +      <arg value="-tag"/>
294 +      <arg value="${javadoc.jls.option}"/>
295      </javadoc>
160
296    </target>
297  
298  
164
299    <target name="dist"
300 <          depends="init, dist-clean, dist-jar, dist-docs"
300 >          depends="dist-clean, dist-jar, dist-docs"
301            description="Puts all distributable products in single hierarchy"/>
302  
303  
# Line 182 | Line 316
316        <exclude name="**/SyntaxTest.java"/>
317        <exclude name="**/SuperfluousAbstract.java"/>
318      </jar>
185
319    </target>
320  
321  
189
322    <target name="clean"
323            description="Removes all build products">
324  
325      <delete dir="${build.dir}"/>
194    <delete dir="${build.classes.dir}"/>
195    <delete dir="${build.lib.dir}"/>
326  
327    </target>
328  
329  
200
330    <target name="dist-clean"
331            description="Removes all build and distribution products">
332  
# Line 206 | Line 335
335    </target>
336  
337  
209
210  <target name="dist-docs"
211          description="Builds javadocs without custom tags to dist folder">
212
213    <delete dir="${dist.javadocs.dir}"/>
214    <mkdir dir="${dist.javadocs.dir}"/>
215
216    <javadoc destdir="${dist.javadocs.dir}"
217            link="http://java.sun.com/javase/6/docs/api/"
218            overview="${src.dir}/intro.html"
219
220            sourcepath="${src.dir}:${jdksrc.dir}"
221     >
222 <!--
223      <packageset dir="${src.dir}" defaultexcludes="yes">
224      <include name="java/util/concurrent"/>
225      <include name="java/util/concurrent/atomic"/>
226      <include name="java/util/concurrent/locks"/>
227      </packageset>
228 -->
229      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230      <include name="main/java/util/concurrent/*.java"/>
231      <include name="main/java/util/concurrent/atomic/*.java"/>
232      <include name="main/java/util/concurrent/locks/*.java"/>
233      <include name="main/java/util/*.java"/>
234 <!--
235      <include name="main/java/util/concurrent/*.html"/>
236      <include name="main/java/util/concurrent/atomic/*.html"/>
237      <include name="main/java/util/concurrent/locks/*.html"/>
238      <include name="main/java/util/*.html"/>
239 -->
240 <!--      <include name="jsr166x/*.java"/> -->
241      </fileset>
242    </javadoc>
243
244  </target>
245
246
247
338    <!-- Internal targets -->
339  
340  
251  <target name="init">
252
253    <!-- Version is kept in a separate file -->
254    <loadfile property="version" srcFile="version.properties"/>
255    <echo>Building JSR-166 version ${version}</echo>
256    <echo>java.home is ${java.home}</echo>
257
258  </target>
259
260
341    <target name="dist-jar"
342            depends="clean, jar">
263
343      <copy file="${product.jar}" todir="${dist.dir}"/>
344 +  </target>
345  
346 +  <target name="dist-docs"
347 +          depends="clean, docs">
348 +    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
349    </target>
350  
351  
# Line 272 | Line 355
355      <mkdir dir="${build.testcases.dir}"/>
356  
357      <javac srcdir="${tck.src.dir}"
358 <          destdir="${build.testcases.dir}"
359 <            debug="${build.debug}"
360 <       debuglevel="${build.debuglevel}"
361 <      deprecation="${build.deprecation}"
362 <           source="${build.sourcelevel}"
363 <             fork="true">
358 >           destdir="${build.testcases.dir}"
359 >           debug="${build.debug}"
360 >           debuglevel="${build.debuglevel}"
361 >           deprecation="${build.deprecation}"
362 >           source="6"
363 >           classpath="${junit.jar}"
364 >           bootclasspath="@{product.jar}:${bootclasspath6}"
365 >           includeAntRuntime="false"
366 >           includeJavaRuntime="false"
367 >           executable="${javac8}"
368 >           fork="true">
369  
370 <      <compilerarg value="${bootclasspath.args}"/>
370 >      <include name="**/*.java"/>
371 >      <compilerarg value="-XDignore.symbol.file=true"/>
372 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
373        <compilerarg line="${build.args}"/>
374  
285      <classpath refid="test.classpath"/>
286
375      </javac>
376  
377      <javac srcdir="${test.src.dir}"
378 <          destdir="${build.testcases.dir}"
379 <            debug="${build.debug}"
380 <       debuglevel="${build.debuglevel}"
381 <      deprecation="${build.deprecation}"
382 <           source="${build.sourcelevel}"
383 <             fork="true">
384 <
385 <      <include name="jsr166/test/**"/>
386 <
387 <      <compilerarg value="${bootclasspath.args}"/>
378 >           destdir="${build.testcases.dir}"
379 >           debug="${build.debug}"
380 >           debuglevel="${build.debuglevel}"
381 >           deprecation="${build.deprecation}"
382 >           source="6"
383 >           classpath=""
384 >           bootclasspath="@{product.jar}:${bootclasspath6}"
385 >           includeAntRuntime="false"
386 >           includeJavaRuntime="false"
387 >           executable="${javac8}"
388 >           fork="true">
389 >
390 >      <include name="jsr166/test/**/*.java"/>
391 >      <compilerarg value="-XDignore.symbol.file=true"/>
392 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
393        <compilerarg line="${build.args}"/>
394  
302      <classpath refid="test.classpath"/>
303
395      </javac>
396  
397   <!--
# Line 312 | Line 403
403             source="${build.sourcelevel}"
404               fork="true">
405  
406 <      <compilerarg value="${bootclasspath.args}"/>
406 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
407 >      <compilerarg value="-XDignore.symbol.file=true"/>
408        <compilerarg line="${build.args}"/>
409  
318      <classpath refid="test.classpath"/>
319
410      </javac>
411   -->
412  
# Line 336 | Line 426
426            errorProperty="junit.failed"
427          failureProperty="junit.failed"
428                      dir="${build.reports.dir}"
429 +                    jvm="${java8}"
430                     fork="true">
431  
432 <      <jvmarg value="${bootclasspath.args}"/>
432 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
433        <jvmarg value="-server"/>
434        <jvmarg value="-showversion"/>
435  
# Line 439 | Line 530
530    <!-- Various demos and test programs -->
531  
532  
533 <  <target name="loops" depends="init, configure-compiler"
533 >  <target name="loops" depends="configure-compiler"
534            description="Benchmark from Doug Lea's AQS paper">
535  
536      <mkdir dir="${build.loops.dir}"/>
# Line 454 | Line 545
545  
546        <compilerarg line="${build.args}"/>
547        <classpath refid="loops.classpath"/>
548 +      <compilerarg value="-XDignore.symbol.file=true"/>
549  
550      </javac>
551  
# Line 464 | Line 556
556    </target>
557  
558  
559 <  <!-- jsr166x -->
468 <
469 <
470 <  <target name="jsr166xcompile"
471 <          depends="init, configure-compiler"
472 <          description="Compiles jsr166x sources">
473 <
474 <    <mkdir dir="${build.jsr166x.dir}"/>
559 >  <!-- jsr166 4jdk7 -->
560  
561 <    <javac srcdir="${jsr166xsrc.dir}"
562 <          destdir="${build.jsr166x.dir}"
563 <            debug="${build.debug}"
564 <       debuglevel="${build.debuglevel}"
565 <      deprecation="${build.deprecation}"
566 <           source="${build.sourcelevel}"
567 <             fork="true">
561 >  <target name="4jdk7compile"
562 >          depends="configure-compiler"
563 >          description="Compiles src/jdk7 sources, targeting jdk7">
564 >
565 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
566 >
567 >    <javac srcdir="${4jdk7src.dir}"
568 >           destdir="${build.4jdk7.classes.dir}"
569 >           debug="${build.debug}"
570 >           debuglevel="${build.debuglevel}"
571 >           deprecation="${build.deprecation}"
572 >           source="6"
573 >           classpath=""
574 >           bootclasspath="${bootclasspath6}"
575 >           includeAntRuntime="false"
576 >           includeJavaRuntime="false"
577 >           executable="${javac7}"
578 >           fork="true">
579  
580        <include name="**/*.java"/>
581 +      <compilerarg value="-XDignore.symbol.file=true"/>
582 +      <compilerarg value="-Xlint:all"/>
583        <compilerarg line="${build.args}"/>
584  
585      </javac>
488
586    </target>
587  
588  
589 <
590 <  <target name="jsr166xjar"
494 <          depends="jsr166xcompile"
589 >  <target name="4jdk7jar"
590 >          depends="4jdk7compile"
591            description="Builds library jar from compiled sources">
592  
593 <    <mkdir dir="${build.jsr166xlib.dir}"/>
594 <
499 <    <jar destfile="${jsr166xproduct.jar}">
500 <      <fileset dir="${build.jsr166x.dir}"/>
593 >    <jar destfile="${4jdk7product.jar}">
594 >      <fileset dir="${build.4jdk7.classes.dir}"/>
595      </jar>
596  
597    </target>
598  
599  
600 +  <target name="4jdk7-test-tck"
601 +          depends="4jdk7jar"
602 +          description="Runs tck tests for jsr166-4jdk7 directly">
603  
604 <  <target name="jsr166xdocs"
605 <          description="Builds javadocs with custom tags to build folder">
604 >    <run-tck-tests
605 >      target="7"
606 >      workdir="${build.4jdk7.dir}"
607 >      classes="${4jdk7product.jar}"/>
608 >  </target>
609  
510    <delete dir="${build.jsr166xjavadocs.dir}"/>
511    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
610  
611 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
612 <             link="http://java.sun.com/javase/6/docs/api/"
613 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
516 <    >
517 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
518 <      <include name="jsr166x"/>
519 <      </packageset>
611 >  <target name="4jdk7-test-tck-junit"
612 >          depends="4jdk7compile"
613 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
614  
615 +    <junit printsummary="true"
616 +           showoutput="true"
617 +           errorProperty="junit.failed"
618 +           failureProperty="junit.failed"
619 +           includeantruntime="true"
620 +           jvm="${java7}"
621 +           fork="true">
622  
623 <    </javadoc>
623 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
624 >      <jvmarg value="-server"/>
625 >
626 >      <classpath>
627 >        <pathelement location="${junit.jar}"/>
628 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
629 >      </classpath>
630 >
631 >      <formatter type="brief"/>
632 >
633 >      <test name="JSR166TestCase" haltonfailure="no">
634 >      </test>
635  
636 +    </junit>
637 +  </target>
638 +
639 +  <target name="4jdk7-test-jtreg"
640 +          depends="4jdk7compile"
641 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
642 +    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
643 +    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
644 +    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
645 +    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
646 +    <jtreg dir="${jtreg.src.dir}"
647 +           jdk="${jdk7.home}"
648 +           workDir="${build.4jdk7.dir}/JTwork"
649 +           reportDir="${build.4jdk7.dir}/JTreport">
650 +
651 +      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
652 +      <arg value="-agentvm"/>
653 +      <arg value="-v:nopass,fail"/>
654 +      <arg value="-vmoptions:-esa -ea"/>
655 +      <arg value="-automatic"/>
656 +      <arg value="-k:!ignore"/>
657 +    </jtreg>
658    </target>
659  
660  
661 <  <target name="jsr166xdist"
662 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
661 >  <target name="4jdk7-test"
662 >          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
663 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
664 >  </target>
665 >
666 >
667 >  <target name="4jdk7docs"
668 >          description="Builds javadocs for src/jdk7 to dist dir">
669 >
670 >    <delete dir="${4jdk7docs.dir}"/>
671 >    <mkdir dir="${4jdk7docs.dir}"/>
672 >
673 >    <javadoc destdir="${4jdk7docs.dir}"
674 >             packagenames="none"
675 >             link="${jdkapi7docs.url}"
676 >             overview="${4jdk7src.dir}/intro.html"
677 >             access="${build.javadoc.access}"
678 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
679 >             classpath=""
680 >             executable="${javadoc7}">
681 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
682 >        <include name="**/*.java"/>
683 >      </fileset>
684 >      <arg value="-XDignore.symbol.file=true"/>
685 >    </javadoc>
686 >  </target>
687 >
688 >
689 >  <target name="4jdk7dist"
690 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
691            description="Puts all distributable products in single hierarchy"/>
692  
693  
694 +  <target name="4jdk7clean"
695 +          description="Removes all 4jdk7 build products">
696  
697 <  <target name="jsr166xclean"
534 <          description="Removes all build products">
697 >    <delete dir="${build.4jdk7.dir}"/>
698  
699 <    <delete dir="${build.jsr166x.dir}"/>
700 <    <delete dir="${build.jsr166xlib.dir}"/>
699 >  </target>
700 >
701 >
702 >  <target name="4jdk7dist-clean"
703 >          description="Removes all build and distribution products">
704  
705    </target>
706  
707 +  <target name="4jdk7dist-jar"
708 +          depends="4jdk7clean, 4jdk7jar">
709 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
710 +  </target>
711  
712  
713 <  <target name="jsr166xdist-clean"
714 <          description="Removes all build and distribution products">
713 >  <target name="4jdk7dist-docs"
714 >          depends="4jdk7clean, 4jdk7docs">
715 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
716 >  </target>
717  
718 +
719 +  <!-- jsr166x -->
720 +
721 +  <target name="jsr166xcompile"
722 +          depends="configure-compiler"
723 +          description="Compiles jsr166x sources to build dir">
724 +
725 +    <mkdir dir="${build.jsr166x.classes.dir}"/>
726 +
727 +    <javac srcdir="${topsrc.dir}"
728 +           destdir="${build.jsr166x.classes.dir}"
729 +           debug="${build.debug}"
730 +           debuglevel="${build.debuglevel}"
731 +           deprecation="${build.deprecation}"
732 +           classpath=""
733 +           bootclasspath="${bootclasspath6}"
734 +           source="5"
735 +           includeAntRuntime="false"
736 +           includeJavaRuntime="false"
737 +           executable="${javac7}"
738 +           fork="true">
739 +
740 +      <include name="jsr166x/**/*.java"/>
741 +      <compilerarg value="-XDignore.symbol.file=true"/>
742 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
743 +      <compilerarg line="${build.args}"/>
744 +
745 +    </javac>
746    </target>
747  
748  
749 +  <target name="jsr166xjar"
750 +          depends="jsr166xcompile"
751 +          description="Builds library jar from compiled sources">
752 +
753 +    <jar destfile="${jsr166x.jar}">
754 +      <fileset dir="${build.jsr166x.classes.dir}"/>
755 +    </jar>
756  
757 <  <target name="jsr166xdist-docs"
551 <          description="Builds javadocs without custom tags to dist folder">
757 >  </target>
758  
553    <delete dir="${dist.jsr166xjavadocs.dir}"/>
554    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
759  
760 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
761 <                link="http://java.sun.com/javase/6/docs/api/"
762 <              source="${build.sourcelevel}">
763 <
764 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
765 <      <include name="jsr166x"/>
766 <      </packageset>
760 >  <target name="jsr166xdocs"
761 >          description="Builds javadocs to dist dir">
762 >
763 >    <delete dir="${jsr166xdocs.dir}"/>
764 >    <mkdir dir="${jsr166xdocs.dir}"/>
765 >
766 >    <javadoc destdir="${jsr166xdocs.dir}"
767 >             packagenames="jsr166x.*"
768 >             link="${jdkapidocs.url}"
769 >             access="${build.javadoc.access}"
770 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
771 >             bootclasspath="${bootclasspath6}"
772 >             source="5"
773 >             executable="${javadoc7}">
774 >      <arg value="-XDignore.symbol.file=true"/>
775  
776      </javadoc>
777 +  </target>
778 +
779 +
780 +  <target name="jsr166xdist"
781 +          depends="jsr166xdist-jar, jsr166xdist-docs"
782 +          description="Puts all distributable products in single hierarchy"/>
783 +
784 +
785 +  <target name="jsr166xclean"
786 +          description="Removes all jsr166x build products">
787 +
788 +    <delete dir="${build.jsr166x.dir}"/>
789  
790    </target>
791  
792 +
793 +  <target name="jsr166xdist-clean"
794 +          description="Removes all build and distribution products">
795 +
796 +  </target>
797 +
798 +
799    <target name="jsr166xdist-jar"
800            depends="jsr166xclean, jsr166xjar">
801 +    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
802 +  </target>
803  
804 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
805 <
804 >  <target name="jsr166xdist-docs"
805 >          depends="jsr166xclean, jsr166xdocs">
806 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
807    </target>
808  
809    <!-- jsr166y -->
810  
811  
812    <target name="jsr166ycompile"
813 <          depends="init, configure-compiler"
813 >          depends="configure-compiler"
814            description="Compiles jsr166y sources">
815  
816 <    <mkdir dir="${build.jsr166y.dir}"/>
583 <
584 <    <javac srcdir="${jsr166ysrc.dir}"
585 <          destdir="${build.jsr166y.dir}"
586 <            debug="${build.debug}"
587 <       debuglevel="${build.debuglevel}"
588 <      deprecation="${build.deprecation}"
589 <           source="${build.sourcelevel}"
590 <             fork="true">
816 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
817  
818 <      <include name="**/*.java"/>
818 >    <javac srcdir="${topsrc.dir}"
819 >           destdir="${build.jsr166y.classes.dir}"
820 >           debug="${build.debug}"
821 >           debuglevel="${build.debuglevel}"
822 >           deprecation="${build.deprecation}"
823 >           source="6"
824 >           classpath=""
825 >           bootclasspath="${bootclasspath6}"
826 >           includeAntRuntime="false"
827 >           includeJavaRuntime="false"
828 >           executable="${javac7}"
829 >           fork="true">
830 >
831 >      <include name="jsr166y/**/*.java"/>
832 >      <compilerarg value="-XDignore.symbol.file=true"/>
833 >      <compilerarg value="-Xlint:all"/>
834        <compilerarg line="${build.args}"/>
594      <compilerarg value="${bootclasspath.args}"/>
595
596 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
835  
836      </javac>
599
837    </target>
838  
839  
603
840    <target name="jsr166yjar"
841            depends="jsr166ycompile"
842            description="Builds library jar from compiled sources">
843  
844 <    <mkdir dir="${build.jsr166ylib.dir}"/>
845 <
610 <    <jar destfile="${jsr166yproduct.jar}" index="true">
611 <      <fileset dir="${build.jsr166y.dir}"/>
844 >    <jar destfile="${jsr166y.jar}" index="true">
845 >      <fileset dir="${build.jsr166y.classes.dir}"/>
846      </jar>
847  
848    </target>
849  
850  
617
851    <target name="jsr166ydocs"
852 <          description="Builds javadocs with custom tags to build folder">
620 <
621 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
622 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
852 >          description="Builds javadocs to dist dir">
853  
854 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
855 <                link="http://java.sun.com/javase/6/docs/api/"
626 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
627 <    >
628 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
629 <      <include name="jsr166y"/>
630 <      </packageset>
854 >    <delete dir="${jsr166ydocs.dir}"/>
855 >    <mkdir dir="${jsr166ydocs.dir}"/>
856  
857 +    <javadoc destdir="${jsr166ydocs.dir}"
858 +             packagenames="jsr166y.*"
859 +             link="${jdkapidocs.url}"
860 +             access="${build.javadoc.access}"
861 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
862 +             bootclasspath="${bootclasspath6}"
863 +             source="6"
864 +             executable="${javadoc7}">
865 +      <arg value="-XDignore.symbol.file=true"/>
866  
867      </javadoc>
634
868    </target>
869  
870  
871    <target name="jsr166ydist"
872 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
872 >          depends="jsr166ydist-jar, jsr166ydist-docs"
873            description="Puts all distributable products in single hierarchy"/>
874  
875  
643
876    <target name="jsr166yclean"
877 <          description="Removes all build products">
877 >          description="Removes all jsr166y build products">
878  
879      <delete dir="${build.jsr166y.dir}"/>
648    <delete dir="${build.jsr166ylib.dir}"/>
880  
881    </target>
882  
883  
653
884    <target name="jsr166ydist-clean"
885            description="Removes all build and distribution products">
886  
887    </target>
888  
659  <target name="jsr166ydist-docs"
660          description="Builds javadocs without custom tags to dist folder">
661
662    <delete dir="${dist.jsr166yjavadocs.dir}"/>
663    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
664
665    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
666                link="http://java.sun.com/javase/6/docs/api/"
667              source="${build.sourcelevel}"
668            sourcepath="${topsrc.dir}:${jdksrc.dir}"
669            >          
670      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
671      <include name="jsr166y/*.java"/>
672            </fileset>
673    </javadoc>
674
675  </target>
676
889    <target name="jsr166ydist-jar"
890            depends="jsr166yclean, jsr166yjar">
891 +    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
892 +  </target>
893  
894 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
895 <
894 >  <target name="jsr166ydist-docs"
895 >          depends="jsr166yclean, jsr166ydocs">
896 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
897    </target>
898  
899 +
900    <!-- extra166y -->
901  
902  
903    <target name="extra166ycompile"
904 <          depends="init, configure-compiler, jsr166ycompile"
904 >          depends="configure-compiler, jsr166yjar"
905            description="Compiles extra166y sources">
906  
907 <    <mkdir dir="${build.extra166y.dir}"/>
692 <
693 <    <javac srcdir="${extra166ysrc.dir}"
694 <          destdir="${build.extra166y.dir}"
695 <            debug="${build.debug}"
696 <            classpath="${jsr166yproduct.jar}"
697 <       debuglevel="${build.debuglevel}"
698 <      deprecation="${build.deprecation}"
699 <           source="${build.sourcelevel}"
700 <             fork="true">
907 >    <mkdir dir="${build.extra166y.classes.dir}"/>
908  
909 <      <include name="**/*.java"/>
909 >    <javac srcdir="${topsrc.dir}"
910 >           destdir="${build.extra166y.classes.dir}"
911 >           debug="${build.debug}"
912 >           debuglevel="${build.debuglevel}"
913 >           deprecation="${build.deprecation}"
914 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
915 >           classpath=""
916 >           source="6"
917 >           includeAntRuntime="false"
918 >           includeJavaRuntime="false"
919 >           executable="${javac7}"
920 >           fork="true">
921 >
922 >      <include name="extra166y/**/*.java"/>
923 >      <compilerarg value="-XDignore.symbol.file=true"/>
924 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
925        <compilerarg line="${build.args}"/>
704      <compilerarg value="${bootclasspath.args}"/>
705
706 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
926  
927      </javac>
709
928    </target>
929  
930  
713
931    <target name="extra166yjar"
932            depends="extra166ycompile"
933            description="Builds library jar from compiled sources">
934  
935 <    <mkdir dir="${build.extra166ylib.dir}"/>
936 <
720 <    <jar destfile="${extra166yproduct.jar}" index="true">
721 <      <fileset dir="${build.extra166y.dir}"/>
935 >    <jar destfile="${extra166y.jar}" index="true">
936 >      <fileset dir="${build.extra166y.classes.dir}"/>
937      </jar>
938  
939    </target>
940  
941  
727
942    <target name="extra166ydocs"
943 <          description="Builds javadocs with custom tags to build folder">
943 >          description="Builds javadocs to build dir">
944  
945 <    <delete dir="${build.extra166yjavadocs.dir}"/>
946 <    <mkdir dir="${build.extra166yjavadocs.dir}"/>
733 <
734 <    <javadoc destdir="${build.extra166yjavadocs.dir}"
735 <                link="http://java.sun.com/javase/6/docs/api/"
736 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
737 <    >
738 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
739 <      <include name="extra166y"/>
740 <      </packageset>
945 >    <delete dir="${extra166ydocs.dir}"/>
946 >    <mkdir dir="${extra166ydocs.dir}"/>
947  
948 +    <javadoc destdir="${extra166ydocs.dir}"
949 +             packagenames="extra166y.*"
950 +             link="${jdkapidocs.url}"
951 +             access="${build.javadoc.access}"
952 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
953 +             bootclasspath="${bootclasspath6}"
954 +             source="6"
955 +             executable="${javadoc7}">
956 +      <arg value="-XDignore.symbol.file=true"/>
957  
958      </javadoc>
744
959    </target>
960  
961  
962    <target name="extra166ydist"
963 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
963 >          depends="extra166ydist-jar, extra166ydist-docs"
964            description="Puts all distributable products in single hierarchy"/>
965  
966  
753
967    <target name="extra166yclean"
968 <          description="Removes all build products">
968 >          description="Removes all extra166y build products">
969  
970      <delete dir="${build.extra166y.dir}"/>
758    <delete dir="${build.extra166ylib.dir}"/>
971  
972    </target>
973  
974  
763
975    <target name="extra166ydist-clean"
976            description="Removes all build and distribution products">
977  
978    </target>
979  
980 +  <target name="extra166ydist-jar"
981 +          depends="extra166yclean, extra166yjar">
982 +    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
983 +  </target>
984 +
985    <target name="extra166ydist-docs"
986 <          description="Builds javadocs without custom tags to dist folder">
986 >          depends="extra166yclean, extra166ydocs">
987 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
988 >  </target>
989 >
990 >  <!-- jsr166e -->
991 >
992 >  <target name="jsr166ecompile"
993 >          depends="configure-compiler"
994 >          description="Compiles jsr166e sources">
995 >
996 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
997 >
998 >    <javac srcdir="${topsrc.dir}"
999 >           destdir="${build.jsr166e.classes.dir}"
1000 >           debug="${build.debug}"
1001 >           debuglevel="${build.debuglevel}"
1002 >           deprecation="${build.deprecation}"
1003 >           source="7"
1004 >           classpath=""
1005 >           includeAntRuntime="false"
1006 >           includeJavaRuntime="false"
1007 >           executable="${javac7}"
1008 >           fork="true">
1009 >
1010 >      <include name="jsr166e/**/*.java"/>
1011 >      <compilerarg value="-XDignore.symbol.file=true"/>
1012 >      <compilerarg value="-Xlint:all"/>
1013 >      <compilerarg line="${build.args}"/>
1014 >
1015 >    </javac>
1016 >  </target>
1017  
772    <delete dir="${dist.extra166yjavadocs.dir}"/>
773    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
1018  
1019 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
1020 <                link="http://java.sun.com/javase/6/docs/api/"
1021 <              source="${build.sourcelevel}"
1022 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
1023 <            >
1024 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1025 <      <include name="extra166y/*.java"/>
1026 <            </fileset>
1019 >  <target name="jsr166ejar"
1020 >          depends="jsr166ecompile"
1021 >          description="Builds library jar from compiled sources">
1022 >
1023 >    <jar destfile="${jsr166e.jar}" index="true">
1024 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1025 >    </jar>
1026 >
1027 >  </target>
1028 >
1029 >
1030 >  <target name="jsr166edocs"
1031 >          description="Builds javadocs to build dir">
1032 >
1033 >    <delete dir="${jsr166edocs.dir}"/>
1034 >    <mkdir dir="${jsr166edocs.dir}"/>
1035 >
1036 >    <javadoc destdir="${jsr166edocs.dir}"
1037 >             packagenames="jsr166e.*"
1038 >             link="${jdkapidocs.url}"
1039 >             access="${build.javadoc.access}"
1040 >             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1041 >             source="7"
1042 >             executable="${javadoc7}">
1043 >      <arg value="-XDignore.symbol.file=true"/>
1044 >
1045      </javadoc>
1046 +  </target>
1047 +
1048  
1049 +  <target name="jsr166e-test-tck"
1050 +          depends="jsr166ejar"
1051 +          description="Runs tck tests for jsr166e">
1052 +
1053 +    <run-tck-tests
1054 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1055 +      source="7"
1056 +      target="8"
1057 +      workdir="${build.jsr166e.dir}"
1058 +      classes="${jsr166e.jar}"/>
1059    </target>
1060  
787  <target name="extra166ydist-jar"
788          depends="extra166yclean, extra166yjar">
1061  
1062 <    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1062 >  <target name="jsr166edist"
1063 >          depends="jsr166edist-jar, jsr166edist-docs"
1064 >          description="Puts all distributable products in single hierarchy"/>
1065  
1066 +
1067 +  <target name="jsr166eclean"
1068 +          description="Removes all jsr166e build products">
1069 +    <delete dir="${build.jsr166e.dir}"/>
1070 +  </target>
1071 +
1072 +
1073 +  <target name="jsr166edist-clean"
1074 +          description="Removes all build and distribution products">
1075 +
1076 +  </target>
1077 +
1078 +  <target name="jsr166edist-jar"
1079 +          depends="jsr166eclean, jsr166ejar">
1080 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1081    </target>
1082  
1083 +  <target name="jsr166edist-docs"
1084 +          depends="jsr166eclean, jsr166edocs">
1085 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1086 +  </target>
1087 +
1088 +
1089 + <!-- Find buglets that can be detected by static build tools -->
1090 +
1091 +  <target name="lint">
1092 +    <antcall target="dists">
1093 +      <param name="build.javadoc.access" value="private"/>
1094 +    </antcall>
1095 +  </target>
1096 +
1097 +
1098   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines