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.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.153 by jsr166, Sat May 3 06:40:14 2014 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 +  $HOME/jdk/jdk9
20 +  where each of the above is a JDK or a symlink to same, and
21 +  $HOME/jdk/src/jdk6
22 +  $HOME/jdk/src/jdk7
23 +  $HOME/jdk/src/jdk8
24 +  $HOME/jdk/src/jdk9
25 +  where each of the above is a complete JDK source tree
26 +  (e.g. mercurial forest) or a symlink to same.
27   ------------------------------------------------------------------------------
28    </description>
29  
30 <  <target name="usage" description="Advises user to run with -projecthelp">
31 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
30 >  <!-- Display main targets by running 'ant -projecthelp' -->
31 >  <target name="usage">
32 >    <java classname="org.apache.tools.ant.Main">
33 >      <arg value="-projecthelp" />
34 >    </java>
35    </target>
36  
37  
# Line 21 | Line 40
40  
41  
42    <!-- Compilation options -->
43 <  <property name="build.sourcelevel"    value="1.5"/>
43 >  <property name="build.sourcelevel"    value="6"/>
44    <property name="build.debug"          value="true"/>
45    <property name="build.debuglevel"     value="source,lines,vars"/>
46    <property name="build.deprecation"    value="false"/>
47 +  <property name="build.javadoc.access" value="protected"/>
48 +
49 +  <!-- Tck options; see JSR166TestCase.java -->
50 +  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51 +  <property name="jsr166.profileTests"     value="false"/>
52 +  <property name="jsr166.profileThreshold" value="100"/>
53 +  <property name="jsr166.runsPerTest"      value="1"/>
54 +  <!-- Allow running an individual tck test class -->
55 +  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57  
58    <!-- Build locations -->
59 <  <property name="build.dir"            location="build"/>
60 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
61 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
62 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
63 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
64 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
65 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
66 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
67 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
68 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
69 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
70 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
71 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
72 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
73 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
74 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
59 >  <property name="build.dir"                   location="build"/>
60 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
61 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
63 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
64 >
65 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69 >
70 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
71 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
72 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
73 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
74 >
75 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
76 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
77 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
78 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
79 >
80 >  <!-- JDK locations -->
81 >  <property name="jdks.home"  location="${user.home}/jdk"/>
82 >
83 >  <macrodef name="defjdklocations">
84 >    <attribute name="v"/>
85 >    <sequential>
86 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
87 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
88 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
89 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
90 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
91 >    <local name="boot.jar.dir"/>
92 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
93 >    <path id="bootclasspath@{v}">
94 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
95 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
96 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
97 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
98 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
99 >    </path>
100 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
101 >    </sequential>
102 >  </macrodef>
103 >
104 >  <macrodef name="mirror-dir">
105 >    <attribute name="src"/>
106 >    <attribute name="dst"/>
107 >    <sequential>
108 >    <delete dir="@{dst}"/>
109 >    <mkdir dir="@{dst}"/>
110 >    <copy todir="@{dst}" preservelastmodified="true">
111 >      <fileset dir="@{src}"/>
112 >    </copy>
113 >    </sequential>
114 >  </macrodef>
115 >
116 >  <defjdklocations v="6"/>
117 >  <defjdklocations v="7"/>
118 >  <defjdklocations v="8"/>
119 >  <defjdklocations v="9"/>
120  
121    <!-- Source locations -->
122    <property name="src.dir"              location="${basedir}/src/main"/>
123    <property name="test.src.dir"         location="${basedir}/src/test"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
124    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
125    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
126    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
127    <property name="lib.dir"              location="${basedir}/lib"/>
128    <property name="dist.dir"             location="${basedir}/dist"/>
129    <property name="topsrc.dir"           location="${basedir}/src"/>
130 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
131 <
132 <  <!-- Distribution locations -->
133 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
134 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
130 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
131 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
132 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
133 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
134 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
135 >
136 >  <!-- Javadoc locations -->
137 >  <property name="docs.dir"          location="${build.dir}/docs"/>
138 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
139 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
140 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
141 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
142 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
143 >
144 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
145 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
146 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
147 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
148 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
149 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
150  
151    <!-- Jar locations -->
152 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
153 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
154 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
155 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
156 <
157 <  <!-- Bootclasspath argument -->
158 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
152 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
153 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
154 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
155 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
156 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
157 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
158 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
159 >
160 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
161 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
162 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
163 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
164 >  <!-- The expected canonical location does not yet exist as of 2014-02 -->
165 >  <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
166 >  <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167 >  <!-- No published jdk9 docs exist as of 2014-02 -->
168 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
169 >  <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
170 >  <!-- Default jdk doc location (latest stable release seems best) -->
171 >  <property name="java.docroot.url"       value="${java7.docroot.url}"/>
172 >
173 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
174 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
175 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
176 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
177 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
178 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
179 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
180 >
181 >  <!-- Define the "jtreg" task -->
182 >  <!-- See the docs in "jtreg -onlineHelp" -->
183 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
184 >           classpath="${lib.dir}/jtreg.jar" />
185  
186    <!-- Test classpath -->
187    <path id="test.classpath">
# Line 77 | Line 189
189      <pathelement location="${junit.jar}"/>
190    </path>
191  
192 +  <macrodef name="run-tck-tests">
193 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
194 +    <attribute name="target"/>
195 +    <attribute name="compile-target" default="@{target}"/>
196 +    <attribute name="workdir"/>
197 +    <attribute name="classes"/>
198 +    <attribute name="jvmflags" default=""/>
199 +    <element name="javac-elements" optional="true"/>
200 +    <sequential>
201 +
202 +    <mkdir dir="@{workdir}/tck-classes"/>
203 +
204 +    <javac srcdir="@{tck.src.dir}"
205 +           destdir="@{workdir}/tck-classes"
206 +           debug="${build.debug}"
207 +           debuglevel="${build.debuglevel}"
208 +           deprecation="${build.deprecation}"
209 +           source="@{compile-target}"
210 +           target="@{compile-target}"
211 +           classpath="${junit.jar}"
212 +           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
213 +           includeAntRuntime="false"
214 +           includeJavaRuntime="false"
215 +           executable="${javac@{compile-target}}"
216 +           fork="true">
217 +
218 +      <include name="*.java"/>
219 +      <compilerarg value="-XDignore.symbol.file=true"/>
220 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
221 +      <compilerarg line="${build.args}"/>
222 +      <javac-elements/>
223 +
224 +    </javac>
225 +
226 +    <java classname="${jsr166.tckTestClass}"
227 +          failonerror="true"
228 +          jvm="${java@{target}}"
229 +          fork="true">
230 +        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
231 +        <jvmarg line="@{jvmflags}"/>
232 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
233 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
234 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
235 +        <classpath>
236 +          <pathelement location="${junit.jar}"/>
237 +          <pathelement location="@{workdir}/tck-classes"/>
238 +        </classpath>
239 +    </java>
240 +
241 +    </sequential>
242 +  </macrodef>
243 +
244 +  <macrodef name="run-jtreg-tests">
245 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
247 +    <attribute name="source" default="7"/>
248 +    <attribute name="target"/>
249 +    <attribute name="workdir"/>
250 +    <attribute name="classes"/>
251 +    <attribute name="jtregflags" default=""/>
252 +    <sequential>
253 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
254 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
255 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
256 +    <mkdir dir="@{workdir}/JTreport"/>
257 +    <jtreg dir="@{jtreg.src.dir}"
258 +           jdk="${jdk@{target}.home}"
259 +           workDir="@{workdir}/JTwork"
260 +           reportDir="@{workdir}/JTreport">
261 +
262 +      <arg value="-Xbootclasspath/p:@{classes}"/>
263 +      <arg value="-agentvm"/>
264 +      <arg value="-v:nopass,fail"/>
265 +      <arg value="-vmoptions:-esa -ea"/>
266 +      <arg value="-automatic"/>
267 +      <arg value="-k:!ignore"/>
268 +      <arg line="@{jtregflags}"/>
269 +    </jtreg>
270 +    </sequential>
271 +  </macrodef>
272 +
273    <!-- ALoops classpath -->
274    <path id="loops.classpath">
275      <pathelement location="${build.loops.dir}"/>
276    </path>
277  
278 <  <!-- J1 classpath -->
279 <  <path id="j1.classpath">
280 <    <pathelement location="${build.j1.dir}"/>
88 <    <pathelement location="${junit.jar}"/>
89 <    <pathelement location="${concurrent.jar}"/>
90 <  </path>
91 <
278 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
279 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
280 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
281  
282    <!-- Main targets -->
283  
284 +  <property name="build.main.java.version" value="9"/>
285 +  <property name="build.main.javac" value="${javac9}"/>
286 +
287 +  <target name="dists"
288 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
289 +          description="Builds all public jars and docs"/>
290  
291    <target name="compile"
292 <          depends="init, configure-compiler"
293 <          description="Compiles main sources to build folder">
292 >          depends="configure-compiler"
293 >          description="Compiles src/main sources to build dir">
294  
295      <mkdir dir="${build.classes.dir}"/>
296  
297      <javac srcdir="${src.dir}"
298 <          destdir="${build.classes.dir}"
299 <            debug="${build.debug}"
300 <       debuglevel="${build.debuglevel}"
301 <      deprecation="${build.deprecation}"
302 <           source="${build.sourcelevel}"
303 <             fork="true">
298 >           destdir="${build.classes.dir}"
299 >           debug="${build.debug}"
300 >           debuglevel="${build.debuglevel}"
301 >           deprecation="${build.deprecation}"
302 >           classpath=""
303 >           includeAntRuntime="false"
304 >           includeJavaRuntime="false"
305 >           executable="${build.main.javac}"
306 >           fork="true">
307  
308        <include name="**/*.java"/>
309 <      <exclude name="java/lang/**"/>
309 >      <compilerarg value="-Xprefer:source"/>
310 >      <compilerarg value="-XDignore.symbol.file=true"/>
311 >      <compilerarg value="-Xlint:all"/>
312 >      <compilerarg value="-Xdoclint:all/protected"/>
313 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
314        <compilerarg line="${build.args}"/>
315  
316      </javac>
115
317    </target>
318  
319  
119
320    <target name="jar"
321            depends="compile"
322            description="Builds library jar from compiled sources">
323  
124    <mkdir dir="${build.lib.dir}"/>
125
324      <jar destfile="${product.jar}">
325        <fileset dir="${build.classes.dir}"/>
326      </jar>
129
327    </target>
328  
329  
133
134  <target name="test"
135          depends="init, configure-tests, report-tests"
136          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
137
138
139
330    <target name="docs"
331 <          description="Builds javadocs with custom tags to build folder">
142 <
143 <    <delete dir="${build.javadocs.dir}"/>
144 <    <mkdir dir="${build.javadocs.dir}"/>
331 >          description="Builds javadocs for src/main to dist dir">
332  
333 <    <javadoc destdir="${build.javadocs.dir}"
334 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
148 <            overview="${src.dir}/intro.html"
149 <              source="${build.sourcelevel}">
333 >    <delete dir="${docs.dir}"/>
334 >    <mkdir dir="${docs.dir}"/>
335  
336 <      <tag name="revised" description="Last revised:"/>
337 <      <tag name="spec"    description="Specified by:"/>
153 <
154 <      <packageset dir="${src.dir}"/>
155 <
156 <    </javadoc>
157 <
158 <  </target>
336 >    <!-- the packagenames="none" hack below prevents scanning the -->
337 >    <!-- sourcepath for packages -->
338  
339 <
340 <
341 <  <target name="doccheck"
342 <          depends="filter-doccheck"
343 <          description="Reports on javadoc style errors">
344 <
345 <    <delete dir="${build.doccheck.dir}"/>
346 <    <mkdir dir="${build.doccheck.dir}"/>
347 <
348 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
349 <         docletpath="${lib.dir}/doccheck.jar"
350 <            destdir="${build.doccheck.dir}">
351 <      <packageset dir="${build.dc-filter.dir}"/>
339 >    <javadoc destdir="${docs.dir}"
340 >             packagenames="none"
341 >             link="${java9.api.url}"
342 >             overview="${src.dir}/intro.html"
343 >             access="${build.javadoc.access}"
344 >             sourcepath="${src.dir}:${jdk9src.dir}"
345 >             classpath=""
346 >             executable="${javadoc9}">
347 >      <fileset dir="${src.dir}" defaultexcludes="yes">
348 >        <include name="**/*.java"/>
349 >      </fileset>
350 >      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
351 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352 >      <arg value="-XDignore.symbol.file=true"/>
353 >      <arg value="-tag"/>
354 >      <arg value="${javadoc.jls.option}"/>
355 >      <arg value="-tag"/>
356 >      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
357 >      <arg value="-tag"/>
358 >      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
359 >      <arg value="-tag"/>
360 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
361      </javadoc>
174
175    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
176
177  </target>
178
179
180
181  <target name="checkstyle"
182          depends="filter-src"
183          description="Reports on style errors in Java source (verbose, mostly chaff)">
184
185    <taskdef resource="checkstyletask.properties"
186            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187
188    <mkdir dir="${build.checkstyle.dir}"/>
189
190    <checkstyle config="etc/checkstyle/sun_checks.xml"
191       failOnViolation="false">
192      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194    </checkstyle>
195
196    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
197          out="${build.checkstyle.dir}/checkstyle-report.html"
198        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199
362    </target>
363  
364  
203
365    <target name="dist"
366 <          depends="init, dist-clean, dist-jar, dist-docs"
366 >          depends="dist-clean, dist-jar, dist-docs"
367            description="Puts all distributable products in single hierarchy"/>
368  
369  
209
370    <target name="release"
371            depends="dist"
372            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 222 | Line 382
382        <exclude name="**/SyntaxTest.java"/>
383        <exclude name="**/SuperfluousAbstract.java"/>
384      </jar>
225
385    </target>
386  
387  
229
388    <target name="clean"
389            description="Removes all build products">
390  
391      <delete dir="${build.dir}"/>
234    <delete dir="${build.classes.dir}"/>
235    <delete dir="${build.lib.dir}"/>
392  
393    </target>
394  
395  
240
396    <target name="dist-clean"
397            description="Removes all build and distribution products">
398  
399 +    <delete dir="${build.dir}"/>
400      <delete dir="${dist.dir}"/>
401  
402    </target>
403  
404  
405 +  <target name="dist-jar"
406 +          depends="clean, jar">
407 +    <copy file="${product.jar}" todir="${dist.dir}"/>
408 +  </target>
409  
410    <target name="dist-docs"
411 <          description="Builds javadocs without custom tags to dist folder">
412 <
253 <    <delete dir="${dist.javadocs.dir}"/>
254 <    <mkdir dir="${dist.javadocs.dir}"/>
255 <
256 <    <javadoc destdir="${dist.javadocs.dir}"
257 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
258 <            overview="${src.dir}/intro.html"
259 <              source="${build.sourcelevel}">
260 <
261 <      <packageset dir="${src.dir}"/>
262 <
263 <    </javadoc>
264 <
411 >          depends="clean, docs">
412 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
413    </target>
414  
415  
416 +  <target name="test-tck"
417 +          depends="jar"
418 +          description="Runs tck tests for main directly">
419  
420 <  <!-- Internal targets -->
421 <
422 <
423 <  <target name="init">
273 <
274 <    <!-- Version is kept in a separate file -->
275 <    <loadfile property="version" srcFile="version.properties"/>
276 <    <echo>Building JSR-166 version ${version}</echo>
277 <    <echo>java.home is ${java.home}</echo>
278 <
420 >    <run-tck-tests
421 >      target="${build.main.java.version}"
422 >      workdir="${build.dir}"
423 >      classes="${product.jar}"/>
424    </target>
425  
426 <
427 <  <target name="dist-jar"
428 <          depends="clean, jar">
429 <
430 <    <copy file="${product.jar}" todir="${dist.dir}"/>
431 <
426 >  <target name="test-jtreg"
427 >          depends="jar"
428 >          description="Runs jtreg tests for main using the jtreg ant task">
429 >    <run-jtreg-tests
430 >       target="${build.main.java.version}"
431 >       workdir="${build.dir}"
432 >       classes="${product.jar}"/>
433    </target>
434  
435 +  <target name="test"
436 +          depends="test-tck, test-jtreg"
437 +          description="Runs tck and jtreg tests for main">
438 +  </target>
439  
440 <  <target name="compile-ant-filter"
441 <          depends="init">
292 <
293 <    <mkdir dir="${build.ant.dir}"/>
440 >  <target name="test89"
441 >          description="Runs tck and jtreg tests for main for multiple java versions">
442  
443 <    <javac srcdir="${ant.src.dir}"
444 <          destdir="${build.ant.dir}"
445 <           source="1.4"/>
443 >    <antcall target="clean"/>
444 >    <antcall target="test">
445 >      <param name="build.main.java.version" value="8"/>
446 >      <param name="build.main.javac" value="${javac8}"/>
447 >    </antcall>
448 >
449 >    <antcall target="clean"/>
450 >    <antcall target="test">
451 >      <param name="build.main.java.version" value="9"/>
452 >      <param name="build.main.javac" value="${javac9}"/>
453 >    </antcall>
454  
455    </target>
456  
457  
302  <target name="filter-src"
303          depends="compile-ant-filter">
304
305    <mkdir dir="${build.filter.src.dir}"/>
458  
459 <    <copy todir="${build.filter.src.dir}">
308 <      <fileset dir="${src.dir}">
309 <        <include name="**/*.html"/>
310 <      </fileset>
311 <    </copy>
459 >  <target name="configure-compiler">
460  
461 <    <copy todir="${build.filter.src.dir}">
314 <      <fileset dir="${src.dir}">
315 <        <exclude name="**/*.html"/>
316 <        <!-- Files excluded from dist-docs -->
317 <        <exclude name="java/util/Random.*"/>
318 <        <exclude name="sun/misc/Unsafe.*"/>
319 <      </fileset>
320 <      <!--
321 <      <filterchain>
322 <      -->
323 <
324 <        <!--
325 <         # This filter gets rid of angle-bracketed type parameters
326 <         # so that javadoc can run on the result. The following
327 <         # heuristic seems to work:
328 <         #
329 <         # For all lines not starting with space(s)-asterisk-space(s),
330 <         #   replace <something> with a space, where there may be more
331 <         #   than one right angle bracket at the end, and "something"
332 <         #   must not contain parens or pipes. (This may need some
333 <         #   tweaking.)
334 <         -->
335 <
336 <        <!--
337 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
338 <                      classpath="${build.ant.dir}">
339 <          <param name="notmatching" value="^\s+\*\s.*$"/>
340 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
341 <          <param name="replacement" value=" "/>
342 <        </filterreader>
343 <        -->
344 <
345 <      <!--
346 <      </filterchain>
347 <      -->
348 <    </copy>
461 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
462  
463 <  </target>
463 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
464 >      <istrue value="${build.warnunchecked}"/>
465 >    </condition>
466  
467 +    <property name="warnunchecked.arg" value=""/>
468  
353  <target name="filter-doccheck"
354          depends="filter-src">
469  
470 <    <mkdir dir="${build.dc-filter.dir}"/>
470 >    <!-- Common options in javac invocations -->
471 >    <property name="build.args" value="${warnunchecked.arg}"/>
472  
473 <    <copy todir="${build.dc-filter.dir}">
359 <      <fileset dir="${build.filter.src.dir}">
360 <        <include name="**/*.html"/>
361 <      </fileset>
362 <    </copy>
473 >  </target>
474  
364    <property name="generic.declarations"
365             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
366    />
367
368    <copy todir="${build.dc-filter.dir}">
369      <fileset dir="${build.filter.src.dir}">
370        <exclude name="**/*.html"/>
371      </fileset>
372      <filterchain>
373        <!--
374         # These two filters try to make the source look like
375         # something that doccheck can process. The first removes
376         # -source 1.4 assertions and the second adds in a bunch
377         # of single letter public nested marker interfaces so that
378         # the generic type parameters are recognized.
379         -->
380
381        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
382                      classpath="${build.ant.dir}">
383          <param name="matching"    value="^\s*assert[\s ].*$"/>
384          <param name="pattern"     value="assert"/>
385          <param name="replacement" value="//assert"/>
386        </filterreader>
387
388        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389                      classpath="${build.ant.dir}">
390          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
391          <param name="pattern"     value="$"/>
392          <param name="replacement" value=" ${generic.declarations}"/>
393        </filterreader>
475  
395      </filterchain>
396    </copy>
476  
477 <  </target>
477 >  <!-- Various demos and test programs -->
478  
479  
480 <  <target name="compile-tests"
481 <          depends="jar">
480 >  <target name="loops" depends="configure-compiler"
481 >          description="Benchmark from Doug Lea's AQS paper">
482  
483 <    <mkdir dir="${build.testcases.dir}"/>
483 >    <mkdir dir="${build.loops.dir}"/>
484  
485 <    <javac srcdir="${tck.src.dir}"
486 <          destdir="${build.testcases.dir}"
485 >    <javac srcdir="${loops.src.dir}"
486 >          destdir="${build.loops.dir}"
487              debug="${build.debug}"
488         debuglevel="${build.debuglevel}"
489        deprecation="${build.deprecation}"
490             source="${build.sourcelevel}"
491               fork="true">
492  
414      <compilerarg value="${bootclasspath.args}"/>
493        <compilerarg line="${build.args}"/>
494 <
495 <      <classpath refid="test.classpath"/>
494 >      <classpath refid="loops.classpath"/>
495 >      <compilerarg value="-XDignore.symbol.file=true"/>
496  
497      </javac>
498  
499 <    <javac srcdir="${test.src.dir}"
500 <          destdir="${build.testcases.dir}"
501 <            debug="${build.debug}"
424 <       debuglevel="${build.debuglevel}"
425 <      deprecation="${build.deprecation}"
426 <           source="${build.sourcelevel}"
427 <             fork="true">
499 >    <java classname="ALoops" fork="true">
500 >      <classpath refid="loops.classpath"/>
501 >    </java>
502  
503 <      <include name="jsr166/test/**"/>
503 >  </target>
504  
431      <compilerarg value="${bootclasspath.args}"/>
432      <compilerarg line="${build.args}"/>
505  
506 <      <classpath refid="test.classpath"/>
506 >  <!-- jsr166 4jdk7 -->
507 >
508 >  <target name="4jdk7compile"
509 >          depends="configure-compiler"
510 >          description="Compiles src/jdk7 sources, targeting jdk7">
511 >
512 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
513 >
514 >    <javac srcdir="${4jdk7src.dir}"
515 >           destdir="${build.4jdk7.classes.dir}"
516 >           debug="${build.debug}"
517 >           debuglevel="${build.debuglevel}"
518 >           deprecation="${build.deprecation}"
519 >           source="6"
520 >           classpath=""
521 >           bootclasspath="${bootclasspath6}"
522 >           includeAntRuntime="false"
523 >           includeJavaRuntime="false"
524 >           executable="${javac7}"
525 >           fork="true">
526 >
527 >      <include name="**/*.java"/>
528 >      <compilerarg value="-Xprefer:source"/>
529 >      <compilerarg value="-XDignore.symbol.file=true"/>
530 >      <compilerarg value="-Xlint:all"/>
531 >      <compilerarg line="${build.args}"/>
532  
533      </javac>
534 +  </target>
535  
536 < <!--
537 <    <javac srcdir="${jtreg.src.dir}"
538 <          destdir="${build.testcases.dir}"
539 <            debug="${build.debug}"
540 <       debuglevel="${build.debuglevel}"
541 <      deprecation="${build.deprecation}"
542 <           source="${build.sourcelevel}"
543 <             fork="true">
536 >  <target name="4jdk7doclint"
537 >          depends="configure-compiler"
538 >          description="Finds doclint warnings">
539 >
540 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
541 >
542 >    <javac srcdir="${4jdk7src.dir}"
543 >           destdir="${build.4jdk7.classes.dir}"
544 >           debug="${build.debug}"
545 >           debuglevel="${build.debuglevel}"
546 >           deprecation="${build.deprecation}"
547 >           source="6"
548 >           classpath=""
549 >           bootclasspath="${bootclasspath7}"
550 >           includeAntRuntime="false"
551 >           includeJavaRuntime="false"
552 >           executable="${javac8}"
553 >           fork="true">
554  
555 <      <compilerarg value="${bootclasspath.args}"/>
555 >      <include name="**/*.java"/>
556 >      <compilerarg value="-Xprefer:source"/>
557 >      <compilerarg value="-XDignore.symbol.file=true"/>
558 >      <compilerarg value="-Xlint:all"/>
559 >      <compilerarg value="-Xdoclint:all/protected"/>
560        <compilerarg line="${build.args}"/>
561  
450      <classpath refid="test.classpath"/>
451
562      </javac>
563 < -->
563 >  </target>
564 >
565 >
566 >  <target name="4jdk7jar"
567 >          depends="4jdk7compile"
568 >          description="Builds library jar from compiled sources">
569 >
570 >    <jar destfile="${4jdk7product.jar}">
571 >      <fileset dir="${build.4jdk7.classes.dir}"/>
572 >    </jar>
573  
574    </target>
575  
576  
577 <  <target name="run-tests"
578 <          depends="compile-tests">
577 >  <target name="4jdk7-test-tck"
578 >          depends="4jdk7jar"
579 >          description="Runs tck tests for jsr166-4jdk7 directly">
580 >
581 >    <run-tck-tests
582 >      target="7"
583 >      workdir="${build.4jdk7.dir}"
584 >      classes="${4jdk7product.jar}">
585 >      <javac-elements>
586 >        <!-- JDK8+ test classes -->
587 >        <exclude name="*8Test.java"/>
588 >        <exclude name="*9Test.java"/>
589 >        <exclude name="DoubleAccumulatorTest.java"/>
590 >        <exclude name="DoubleAdderTest.java"/>
591 >        <exclude name="LongAccumulatorTest.java"/>
592 >        <exclude name="LongAdderTest.java"/>
593 >        <exclude name="CompletableFutureTest.java"/>
594 >        <exclude name="SplittableRandomTest.java"/>
595 >        <exclude name="StampedLockTest.java"/>
596 >      </javac-elements>
597 >    </run-tck-tests>
598 >  </target>
599  
461    <!-- May be overridden by user.properties -->
462    <property name="testcase" value="*"/>
600  
601 <    <mkdir dir="${build.reports.dir}"/>
601 >  <target name="4jdk7-test-tck-junit"
602 >          depends="4jdk7compile"
603 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
604  
605      <junit printsummary="true"
606 <             showoutput="true"
607 <          errorProperty="junit.failed"
608 <        failureProperty="junit.failed"
609 <                    dir="${build.reports.dir}"
610 <                   fork="true">
606 >           showoutput="true"
607 >           errorProperty="junit.failed"
608 >           failureProperty="junit.failed"
609 >           includeantruntime="true"
610 >           jvm="${java7}"
611 >           fork="true">
612  
613 <      <jvmarg value="${bootclasspath.args}"/>
613 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
614        <jvmarg value="-server"/>
475      <jvmarg value="-showversion"/>
615  
616 <      <classpath refid="test.classpath"/>
616 >      <classpath>
617 >        <pathelement location="${junit.jar}"/>
618 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
619 >      </classpath>
620  
621 <      <formatter type="xml"/>
621 >      <formatter type="brief"/>
622  
623 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
624 <        <fileset dir="${tck.src.dir}">
483 <          <include name="**/${testcase}Test.java"/>
484 <        </fileset>
485 <      </batchtest>
486 <
487 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
488 <        <fileset dir="${test.src.dir}">
489 <          <include name="jsr166/test/**/${testcase}Test.java"/>
490 <        </fileset>
491 <      </batchtest>
492 <
493 < <!--
494 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
495 <        <fileset dir="${jtreg.src.dir}">
496 <          <include name="**/${testcase}Test.java"/>
497 <        </fileset>
498 <      </batchtest>
499 < -->
623 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
624 >      </test>
625  
626      </junit>
502
627    </target>
628  
629 +  <target name="4jdk7-test-jtreg"
630 +          depends="4jdk7jar"
631 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
632 +    <run-jtreg-tests
633 +       target="7"
634 +       workdir="${build.4jdk7.dir}"
635 +       classes="${4jdk7product.jar}"
636 +       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
637 +  </target>
638  
506  <target name="report-tests"
507          depends="run-tests">
639  
640 <    <!-- Sets junit.report.format to frames if redirection is present,
641 <         otherwise sets it to noframes. -->
642 <    <available property="junit.report.format"
643 <                  value="frames"
513 <              classname="org.apache.xalan.lib.Redirect"
514 <    />
515 <    <property name="junit.report.format" value="noframes"/>
516 <
517 <    <junitreport todir="${build.reports.dir}">
518 <      <fileset dir="${build.reports.dir}">
519 <        <include name="TEST-*.xml"/>
520 <      </fileset>
521 <      <report styledir="${stylesheet.dir}"
522 <                format="${junit.report.format}"
523 <                 todir="${build.reports.dir}"
524 <      />
525 <    </junitreport>
640 >  <target name="4jdk7-test"
641 >          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
643 >  </target>
644  
527    <fail message="Test Cases Failed" if="junit.failed"/>
645  
646 +  <target name="4jdk7docs"
647 +          description="Builds javadocs for src/jdk7 to dist dir">
648 +
649 +    <delete dir="${4jdk7docs.dir}"/>
650 +    <mkdir dir="${4jdk7docs.dir}"/>
651 +
652 +    <javadoc destdir="${4jdk7docs.dir}"
653 +             packagenames="none"
654 +             link="${java7.api.url}"
655 +             overview="${4jdk7src.dir}/intro.html"
656 +             access="${build.javadoc.access}"
657 +             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
658 +             classpath=""
659 +             executable="${javadoc7}">
660 +      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
661 +        <include name="**/*.java"/>
662 +      </fileset>
663 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
664 +      <arg value="-XDignore.symbol.file=true"/>
665 +    </javadoc>
666    </target>
667  
668  
669 <  <target name="configure-compiler">
669 >  <target name="4jdk7dist"
670 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
671 >          description="Puts all distributable products in single hierarchy"/>
672  
534    <property name="unchecked.option" value="-Xlint:unchecked"/>
673  
674 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
675 <      <istrue value="${build.warnunchecked}"/>
538 <    </condition>
674 >  <target name="4jdk7clean"
675 >          description="Removes all 4jdk7 build products">
676  
677 <    <property name="warnunchecked.arg" value=""/>
677 >    <delete dir="${build.4jdk7.dir}"/>
678  
679 +  </target>
680  
543    <!-- Common options in javac invocations -->
544    <property name="build.args" value="${warnunchecked.arg}"/>
681  
682 +  <target name="4jdk7dist-jar"
683 +          depends="4jdk7clean, 4jdk7jar">
684 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
685    </target>
686  
687  
688 <  <target name="configure-tests"
689 <       depends="configure-compiler">
688 >  <target name="4jdk7dist-docs"
689 >          depends="4jdk7clean, 4jdk7docs">
690 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
691 >  </target>
692  
552    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
553    <available property="junit.available"
554               classname="junit.framework.Protectable"/>
693  
694 <    <!-- Xalan -->
557 <    <available property="xalan.available"
558 <               classname="org.apache.xalan.Version"/>
694 >  <!-- jsr166x -->
695  
696 +  <target name="jsr166xcompile"
697 +          depends="configure-compiler"
698 +          description="Compiles jsr166x sources to build dir">
699  
700 <    <!-- Ant 1.6beta and later don't need or want this check -->
562 <    <!--
563 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
564 <          unless="junit.available"/>
700 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
701  
702 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
703 <          unless="xalan.available"/>
704 <    -->
702 >    <javac srcdir="${topsrc.dir}"
703 >           destdir="${build.jsr166x.classes.dir}"
704 >           debug="${build.debug}"
705 >           debuglevel="${build.debuglevel}"
706 >           deprecation="${build.deprecation}"
707 >           classpath=""
708 >           bootclasspath="${bootclasspath6}"
709 >           source="5"
710 >           includeAntRuntime="false"
711 >           includeJavaRuntime="false"
712 >           executable="${javac7}"
713 >           fork="true">
714 >
715 >      <include name="jsr166x/**/*.java"/>
716 >      <compilerarg value="-XDignore.symbol.file=true"/>
717 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
718 >      <compilerarg line="${build.args}"/>
719  
720 +    </javac>
721    </target>
722  
723  
724 +  <target name="jsr166xjar"
725 +          depends="jsr166xcompile"
726 +          description="Builds library jar from compiled sources">
727  
728 <  <!-- Anthill targets -->
729 <
730 <  <target name="anthill-build">
577 <
578 <    <!-- Override this in user.properties -->
579 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
728 >    <jar destfile="${jsr166x.jar}">
729 >      <fileset dir="${build.jsr166x.classes.dir}"/>
730 >    </jar>
731  
581    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
582      <arg value="-Xmx256000000"/>
583      <!-- classpath of new JVM -->
584      <arg value="-classpath"/> <arg path="${java.class.path}"/>
585      <!-- location of Ant home directory -->
586      <arg value="-Dant.home=${ant.home}"/>
587      <!-- the Ant main class -->
588      <arg value="org.apache.tools.ant.Main"/>
589      <!-- The build file -->
590      <arg value="-buildfile"/>  <arg value="build.xml"/>
591      <!-- the target to build on the new Ant instance -->
592      <arg value="-DJAVA_HOME=${tiger.home}"/>
593      <arg value="do-anthill-build"/>
594    </exec>
732    </target>
733  
597  <target name="do-anthill-build"
598          depends="jar, test, docs, dist-docs"/>
599
600  <target name="anthill-publish">
601
602    <copy todir="${deployDir}/docs/private">
603      <fileset dir="${build.javadocs.dir}"/>
604    </copy>
734  
735 <    <copy todir="${deployDir}/docs/public">
736 <      <fileset dir="${dist.javadocs.dir}"/>
608 <    </copy>
735 >  <target name="jsr166xdocs"
736 >          description="Builds javadocs to dist dir">
737  
738 <    <copy tofile="${deployDir}/index.html"
739 <          file="${basedir}/etc/anthill-index.html"/>
738 >    <delete dir="${jsr166xdocs.dir}"/>
739 >    <mkdir dir="${jsr166xdocs.dir}"/>
740  
741 <    <copy todir="${deployDir}/notes">
742 <      <fileset dir="${basedir}/etc/notes"/>
743 <    </copy>
741 >    <javadoc destdir="${jsr166xdocs.dir}"
742 >             packagenames="jsr166x.*"
743 >             link="${java.api.url}"
744 >             access="${build.javadoc.access}"
745 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
746 >             bootclasspath="${bootclasspath6}"
747 >             source="5"
748 >             executable="${javadoc7}">
749 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
750 >      <arg value="-XDignore.symbol.file=true"/>
751  
752 +    </javadoc>
753    </target>
754  
755  
756 +  <target name="jsr166xdist"
757 +          depends="jsr166xdist-jar, jsr166xdist-docs"
758 +          description="Puts all distributable products in single hierarchy"/>
759  
621  <!-- Various demos and test programs -->
622
623
624  <target name="sample" depends="init, configure-compiler"
625          description="Standalone demo program">
626
627    <mkdir dir="${build.testcases.dir}"/>
628
629    <javac srcdir="${test.src.dir}"
630          destdir="${build.testcases.dir}"
631            debug="${build.debug}"
632       debuglevel="${build.debuglevel}"
633      deprecation="${build.deprecation}"
634           source="${build.sourcelevel}"
635             fork="true">
760  
761 <      <include name="jsr166/test/Sample.java"/>
761 >  <target name="jsr166xclean"
762 >          description="Removes all jsr166x build products">
763  
764 <    </javac>
764 >    <delete dir="${build.jsr166x.dir}"/>
765  
766 <    <copy todir="${build.testcases.dir}">
642 <      <fileset dir="${test.src.dir}">
643 <        <include name="**/*.properties"/>
644 <      </fileset>
645 <    </copy>
766 >  </target>
767  
768  
769 <    <java classname="jsr166.test.Sample" fork="true">
770 <      <classpath refid="test.classpath"/>
771 <      <!-- <jvmarg value="-ea"/> -->
651 <      <!-- <jvmarg value="-server"/> -->
652 <      <!-- <arg value="1000"/> -->
653 <    </java>
769 >  <target name="jsr166xdist-jar"
770 >          depends="jsr166xclean, jsr166xjar">
771 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
772    </target>
773  
774 +  <target name="jsr166xdist-docs"
775 +          depends="jsr166xclean, jsr166xdocs">
776 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
777 +  </target>
778  
779 <  <target name="loops" depends="init, configure-compiler"
658 <          description="Benchmark from Doug Lea's AQS paper">
779 >  <!-- jsr166y -->
780  
660    <mkdir dir="${build.loops.dir}"/>
661
662    <javac srcdir="${loops.src.dir}"
663          destdir="${build.loops.dir}"
664            debug="${build.debug}"
665       debuglevel="${build.debuglevel}"
666      deprecation="${build.deprecation}"
667           source="${build.sourcelevel}"
668             fork="true">
781  
782 +  <target name="jsr166ycompile"
783 +          depends="configure-compiler"
784 +          description="Compiles jsr166y sources">
785 +
786 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
787 +
788 +    <javac srcdir="${topsrc.dir}"
789 +           destdir="${build.jsr166y.classes.dir}"
790 +           debug="${build.debug}"
791 +           debuglevel="${build.debuglevel}"
792 +           deprecation="${build.deprecation}"
793 +           source="6"
794 +           classpath=""
795 +           bootclasspath="${bootclasspath6}"
796 +           includeAntRuntime="false"
797 +           includeJavaRuntime="false"
798 +           executable="${javac7}"
799 +           fork="true">
800 +
801 +      <include name="jsr166y/**/*.java"/>
802 +      <compilerarg value="-XDignore.symbol.file=true"/>
803 +      <compilerarg value="-Xlint:all"/>
804        <compilerarg line="${build.args}"/>
671      <classpath refid="loops.classpath"/>
805  
806      </javac>
674
675    <java classname="ALoops" fork="true">
676      <classpath refid="loops.classpath"/>
677    </java>
678
807    </target>
808  
809  
810 <  <target name="compile-j1" depends="init, configure-compiler">
811 <
812 <    <mkdir dir="${build.j1.dir}"/>
685 <
686 <    <javac srcdir="${j1.src.dir}"
687 <          destdir="${build.j1.dir}"
688 <            debug="${build.debug}"
689 <       debuglevel="${build.debuglevel}"
690 <      deprecation="${build.deprecation}"
691 <           source="${build.sourcelevel}" >
692 <
693 <      <include name="**/*.java"/>
694 <      <exclude name="**/dijkstra/**"/>
695 <
696 <      <compilerarg line="${build.args}"/>
697 <      <classpath refid="j1.classpath"/>
810 >  <target name="jsr166yjar"
811 >          depends="jsr166ycompile"
812 >          description="Builds library jar from compiled sources">
813  
814 <    </javac>
814 >    <jar destfile="${jsr166y.jar}" index="true">
815 >      <fileset dir="${build.jsr166y.classes.dir}"/>
816 >    </jar>
817  
818    </target>
819  
820  
821 <  <target name="sw" depends="compile-j1"
822 <          description="Runs the SwingWorker demo">
706 <
707 <    <!--
708 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
709 <      <classpath refid="j1.classpath"/>
710 <    </java>
711 <    -->
821 >  <target name="jsr166ydocs"
822 >          description="Builds javadocs to dist dir">
823  
824 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
824 >    <delete dir="${jsr166ydocs.dir}"/>
825 >    <mkdir dir="${jsr166ydocs.dir}"/>
826  
827 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
828 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
829 <    </exec>
827 >    <javadoc destdir="${jsr166ydocs.dir}"
828 >             packagenames="jsr166y.*"
829 >             link="${java.api.url}"
830 >             access="${build.javadoc.access}"
831 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
832 >             bootclasspath="${bootclasspath6}"
833 >             source="6"
834 >             executable="${javadoc7}">
835 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
836 >      <arg value="-XDignore.symbol.file=true"/>
837  
838 +    </javadoc>
839    </target>
840  
721  <target name="j1" depends="compile-j1"
722          description="Runs a standalone JavaOne program">
841  
842 <    <java classname="${j1.test}" fork="true">
843 <      <classpath refid="j1.classpath"/>
844 <      <jvmarg value="-client"/>
842 >  <target name="jsr166ydist"
843 >          depends="jsr166ydist-jar, jsr166ydist-docs"
844 >          description="Puts all distributable products in single hierarchy"/>
845  
728      <!-- TestPseudoRandom args -->
729      <arg value="2"/>
730      <arg value="25"/>
731      <arg value="100000"/>
846  
847 <      <!-- WebCrawler args -->
848 <      <!--
735 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
736 <      <arg value="http://www.priorartisans.com"/>
737 <      <arg value="25"/>
738 <      -->
847 >  <target name="jsr166yclean"
848 >          description="Removes all jsr166y build products">
849  
850 <    </java>
850 >    <delete dir="${build.jsr166y.dir}"/>
851  
852    </target>
853  
854  
855 <  <target name="test-j1" depends="compile-j1"
856 <          description="Runs testcases from the JavaOne source directories">
857 <
748 <    <junit printsummary="true"
749 <             showoutput="true"
750 <          errorProperty="junit.failed"
751 <        failureProperty="junit.failed"
752 <                    dir="${build.j1.dir}"
753 <                   fork="true">
754 <
755 <      <!-- <jvmarg value="-server"/> -->
756 <      <classpath refid="j1.classpath"/>
757 <      <formatter type="xml"/>
758 <
759 <      <batchtest todir="${build.j1.dir}">
760 <        <fileset dir="${j1.src.dir}">
761 <          <include name="**/*Test.java"/>
762 <        </fileset>
763 <      </batchtest>
764 <
765 <    </junit>
766 <
767 <    <available property="junit.report.format"
768 <                  value="frames"
769 <              classname="org.apache.xalan.lib.Redirect"/>
770 <    <property name="junit.report.format" value="noframes"/>
771 <
772 <    <junitreport todir="${build.j1.dir}">
773 <      <fileset dir="${build.j1.dir}">
774 <        <include name="TEST-*.xml"/>
775 <      </fileset>
776 <      <report styledir="${stylesheet.dir}"
777 <                format="${junit.report.format}"
778 <                 todir="${build.j1.dir}"
779 <      />
780 <    </junitreport>
781 <
782 <    <fail message="Test Cases Failed" if="junit.failed"/>
783 <
855 >  <target name="jsr166ydist-jar"
856 >          depends="jsr166yclean, jsr166yjar">
857 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
858    </target>
859  
860 +  <target name="jsr166ydist-docs"
861 +          depends="jsr166yclean, jsr166ydocs">
862 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
863 +  </target>
864  
865  
866 <  <!-- C++ and JNI definitions and demos -->
866 >  <!-- extra166y -->
867  
790  <target name="configure-cpp">
868  
869 <    <!-- Define tasks and types -->
869 >  <target name="extra166ycompile"
870 >          depends="configure-compiler, jsr166yjar"
871 >          description="Compiles extra166y sources">
872  
873 <    <path id="cpptasks.path">
795 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
796 <    </path>
797 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
873 >    <mkdir dir="${build.extra166y.classes.dir}"/>
874  
875 <    <!-- Set platform property for JNI includes -->
875 >    <javac srcdir="${topsrc.dir}"
876 >           destdir="${build.extra166y.classes.dir}"
877 >           debug="${build.debug}"
878 >           debuglevel="${build.debuglevel}"
879 >           deprecation="${build.deprecation}"
880 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
881 >           classpath=""
882 >           source="6"
883 >           includeAntRuntime="false"
884 >           includeJavaRuntime="false"
885 >           executable="${javac7}"
886 >           fork="true">
887  
888 <    <condition property="platform" value="linux">
889 <      <os name="Linux"/>
890 <    </condition>
891 <    <condition property="platform" value="win32">
806 <      <os family="windows"/>
807 <    </condition>
808 <    <condition property="platform" value="solaris">
809 <      <os name="SunOS"/>
810 <    </condition>
888 >      <include name="extra166y/**/*.java"/>
889 >      <compilerarg value="-XDignore.symbol.file=true"/>
890 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
891 >      <compilerarg line="${build.args}"/>
892  
893 +    </javac>
894    </target>
895  
896  
897 <  <target name="cppdemo" depends="configure-cpp">
898 <
899 <    <mkdir dir="${build.dir}"/>
818 <
819 <    <cc multithreaded="true"
820 <                 name="g++"
821 <               objdir="${build.dir}"
822 <              outfile="${build.dir}/CppDemo">
823 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
824 <      <libset libs="stdc++"/>
825 <    </cc>
897 >  <target name="extra166yjar"
898 >          depends="extra166ycompile"
899 >          description="Builds library jar from compiled sources">
900  
901 <    <exec executable="${build.dir}/CppDemo">
902 <      <arg line="count in word frequency of word in command line count"/>
903 <    </exec>
901 >    <jar destfile="${extra166y.jar}" index="true">
902 >      <fileset dir="${build.extra166y.classes.dir}"/>
903 >    </jar>
904  
905    </target>
906  
907  
908 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
909 <
836 <    <mkdir dir="${build.testcases.dir}"/>
908 >  <target name="extra166ydocs"
909 >          description="Builds javadocs to build dir">
910  
911 <    <javac srcdir="${test.src.dir}"
912 <          destdir="${build.testcases.dir}"
840 <            debug="${build.debug}"
841 <       debuglevel="${build.debuglevel}"
842 <      deprecation="${build.deprecation}"
843 <           source="${build.sourcelevel}"
844 <             fork="true">
845 <      <compilerarg value="${bootclasspath.args}"/>
846 <      <compilerarg line="${build.args}"/>
847 <      <classpath refid="test.classpath"/>
848 <      <include name="JniDemo.java"/>
849 <    </javac>
911 >    <delete dir="${extra166ydocs.dir}"/>
912 >    <mkdir dir="${extra166ydocs.dir}"/>
913  
914 <    <javah destdir="${build.testcases.dir}"
915 <      classpathref="test.classpath">
916 <      <class name="JniDemo"/>
917 <    </javah>
918 <
919 <    <cc multithreaded="true"
920 <                 name="g++"
921 <               objdir="${build.dir}"
922 <              outfile="${build.dir}/JniDemo"
923 <              outtype="shared">
861 <
862 <      <compiler>
863 <        <defineset>
864 <          <define name="__int64" value="long long"/>
865 <        </defineset>
866 <        <includepath location="${java.home}/../include"/>
867 <        <includepath location="${java.home}/../include/${platform}"/>
868 <        <compilerarg value="-mno-cygwin"/>
869 <      </compiler>
870 <
871 <      <linker>
872 <        <linkerarg value="--add-stdcall-alias"/>
873 <      </linker>
874 <
875 <      <includepath location="${build.testcases.dir}"/>
876 <
877 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878 <
879 <      <libset libs="stdc++"/>
880 <
881 <    </cc>
882 <
883 <    <!-- Necessary if windows, harmless if not -->
884 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885 <
886 <    <java classname="JniDemo" fork="true">
887 <      <!-- Watch out: path separator hardwired to semicolon here! -->
888 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889 <      <classpath refid="test.classpath"/>
890 <      <arg line="count in word frequency of word in command line count"/>
891 <    </java>
914 >    <javadoc destdir="${extra166ydocs.dir}"
915 >             packagenames="extra166y.*"
916 >             link="${java.api.url}"
917 >             access="${build.javadoc.access}"
918 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
919 >             bootclasspath="${bootclasspath6}"
920 >             source="6"
921 >             executable="${javadoc7}">
922 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
923 >      <arg value="-XDignore.symbol.file=true"/>
924  
925 +    </javadoc>
926    </target>
927  
928  
929 +  <target name="extra166ydist"
930 +          depends="extra166ydist-jar, extra166ydist-docs"
931 +          description="Puts all distributable products in single hierarchy"/>
932  
897  <!-- Backward compatibility, work in progress (some files not checked in) -->
898
899
900
901  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
902  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
903  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
904  <property name="pretiger.sourcelevel" value="1.4"/>
905
906  <target name="defang"
907       depends="init"
908   description="Generates pre-Tiger compatible source">
933  
934 <    <delete dir="${pretiger.src.dir}"/>
935 <    <mkdir dir="${pretiger.src.dir}"/>
934 >  <target name="extra166yclean"
935 >          description="Removes all extra166y build products">
936  
937 <    <exec executable="perl">
914 <      <arg file="etc/defang.pl"/>
915 <      <!-- <arg value="-v"/> -->
916 <      <arg value="-s"/> <arg file="${src.dir}"/>
917 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
918 <    </exec>
937 >    <delete dir="${build.extra166y.dir}"/>
938  
939    </target>
940  
922  <target name="compile-pretiger"
923          depends="init, configure-compiler, defang"
924          description="Compiles pre-Tiger sources to build folder">
925
926    <mkdir dir="${build.pretiger.dir}"/>
927
928    <javac srcdir="${pretiger.src.dir}"
929          destdir="${build.pretiger.dir}"
930            debug="${build.debug}"
931       debuglevel="${build.debuglevel}"
932      deprecation="${build.deprecation}"
933           source="${pretiger.sourcelevel}"
934             fork="true">
935
936      <compilerarg line="${build.args}"/>
937      <exclude name="**/Thread.java"/>
941  
942 <    </javac>
942 >  <target name="extra166ydist-jar"
943 >          depends="extra166yclean, extra166yjar">
944 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
945 >  </target>
946  
947 +  <target name="extra166ydist-docs"
948 +          depends="extra166yclean, extra166ydocs">
949 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
950    </target>
951  
952 <  <target name="pretiger" depends="compile-pretiger">
952 >  <!-- jsr166e -->
953  
954 <    <mkdir dir="${build.lib.dir}"/>
954 >  <property name="build.jsr166e.java.version" value="6"/>
955 >  <property name="build.jsr166e.javac" value="${javac6}"/>
956  
957 <    <jar destfile="${pretiger.jar}">
958 <      <fileset dir="${build.pretiger.dir}">
959 <      </fileset>
950 <    </jar>
957 >  <target name="jsr166ecompile"
958 >          depends="configure-compiler"
959 >          description="Compiles jsr166e sources">
960  
961 <  </target>
961 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
962  
963 <  <!-- jsr166x -->
963 >    <javac srcdir="${topsrc.dir}"
964 >           destdir="${build.jsr166e.classes.dir}"
965 >           debug="${build.debug}"
966 >           debuglevel="${build.debuglevel}"
967 >           deprecation="${build.deprecation}"
968 >           source="${build.jsr166e.java.version}"
969 >           classpath=""
970 >           includeAntRuntime="false"
971 >           includeJavaRuntime="false"
972 >           executable="${build.jsr166e.javac}"
973 >           fork="true">
974  
975 +      <include name="jsr166e/**/*.java"/>
976 +      <compilerarg value="-XDignore.symbol.file=true"/>
977 +      <compilerarg value="-Xlint:all"/>
978 +      <compilerarg line="${build.args}"/>
979  
980 <  <target name="jsr166xcompile"
981 <          depends="init, configure-compiler"
959 <          description="Compiles jsr166x sources">
980 >    </javac>
981 >  </target>
982  
983 <    <mkdir dir="${build.jsr166x.dir}"/>
983 >  <!-- jsr166e: find doclint errors -->
984 >  <target name="jsr166edoclint">
985  
986 <    <javac srcdir="${jsr166xsrc.dir}"
964 <          destdir="${build.jsr166x.dir}"
965 <            debug="${build.debug}"
966 <       debuglevel="${build.debuglevel}"
967 <      deprecation="${build.deprecation}"
968 <           source="${build.sourcelevel}"
969 <             fork="true">
986 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
987  
988 <      <include name="**/*.java"/>
989 <      <compilerarg line="${build.args}"/>
988 >    <javac srcdir="${topsrc.dir}"
989 >           destdir="${build.jsr166e.classes.dir}"
990 >           debug="${build.debug}"
991 >           debuglevel="${build.debuglevel}"
992 >           deprecation="${build.deprecation}"
993 >           source="${build.jsr166e.java.version}"
994 >           classpath=""
995 >           bootclasspath="${bootclasspath7}"
996 >           includeAntRuntime="false"
997 >           includeJavaRuntime="false"
998 >           executable="${javac8}"
999 >           fork="true">
1000 >
1001 >      <include name="jsr166e/**/*.java"/>
1002 >      <compilerarg value="-XDignore.symbol.file=true"/>
1003 >      <compilerarg value="-Xlint:all"/>
1004 >      <compilerarg value="-Xdoclint:all/protected"/>
1005  
1006      </javac>
975
1007    </target>
1008  
1009  
1010 <
1011 <  <target name="jsr166xjar"
981 <          depends="jsr166xcompile"
1010 >  <target name="jsr166ejar"
1011 >          depends="jsr166ecompile"
1012            description="Builds library jar from compiled sources">
1013  
1014 <    <mkdir dir="${build.jsr166xlib.dir}"/>
1015 <
986 <    <jar destfile="${jsr166xproduct.jar}">
987 <      <fileset dir="${build.jsr166x.dir}"/>
1014 >    <jar destfile="${jsr166e.jar}" index="true">
1015 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1016      </jar>
1017  
1018    </target>
1019  
1020  
1021 +  <target name="jsr166edocs"
1022 +          description="Builds javadocs to build dir">
1023  
1024 <  <target name="jsr166xdocs"
1025 <          description="Builds javadocs with custom tags to build folder">
996 <
997 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
998 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
999 <
1000 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1001 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1002 <    >
1003 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1004 <      <include name="jsr166x"/>
1005 <      </packageset>
1024 >    <delete dir="${jsr166edocs.dir}"/>
1025 >    <mkdir dir="${jsr166edocs.dir}"/>
1026  
1027 +    <javadoc destdir="${jsr166edocs.dir}"
1028 +             packagenames="jsr166e.*"
1029 +             link="${java.api.url}"
1030 +             access="${build.javadoc.access}"
1031 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1032 +             source="${build.jsr166e.java.version}"
1033 +             executable="${javadoc7}">
1034 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1035 +      <arg value="-XDignore.symbol.file=true"/>
1036  
1037      </javadoc>
1009
1038    </target>
1039  
1040  
1041 <  <target name="jsr166xdist"
1042 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1015 <          description="Puts all distributable products in single hierarchy"/>
1016 <
1017 <
1018 <
1019 <  <target name="jsr166xclean"
1020 <          description="Removes all build products">
1041 >  <target name="jsr166e-test-tck-one-java-version"
1042 >          depends="jsr166ejar">
1043  
1044 <    <delete dir="${build.jsr166x.dir}"/>
1023 <    <delete dir="${build.jsr166xlib.dir}"/>
1044 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1045  
1046 +    <run-tck-tests
1047 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1048 +      target="${build.jsr166e.java.version}"
1049 +      workdir="${build.jsr166e.dir}"
1050 +      classes="${jsr166e.jar}"/>
1051    </target>
1052  
1053 +  <target name="jsr166e-test-tck"
1054 +          description="Runs tck tests for jsr166e for multiple java versions">
1055  
1056 + <!--     <antcall target="clean"/> -->
1057 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1058 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1059 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1060 + <!--     </antcall> -->
1061  
1062 <  <target name="jsr166xdist-clean"
1063 <          description="Removes all build and distribution products">
1062 >    <antcall target="clean"/>
1063 >    <antcall target="jsr166e-test-tck-one-java-version">
1064 >      <param name="build.jsr166e.java.version" value="7"/>
1065 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1066 >    </antcall>
1067  
1068 +    <antcall target="clean"/>
1069 +    <antcall target="jsr166e-test-tck-one-java-version">
1070 +      <param name="build.jsr166e.java.version" value="6"/>
1071 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1072 +    </antcall>
1073    </target>
1074  
1075  
1076 +  <target name="jsr166e-test"
1077 +          depends="jsr166e-test-tck"
1078 +          description="Runs all tests for jsr166e">
1079 +  </target>
1080  
1081 <  <target name="jsr166xdist-docs"
1082 <          description="Builds javadocs without custom tags to dist folder">
1081 >  <target name="jsr166edist"
1082 >          depends="jsr166edist-jar, jsr166edist-docs"
1083 >          description="Puts all distributable products in single hierarchy"/>
1084  
1039    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1040    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1085  
1086 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1087 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1088 <              source="${build.sourcelevel}">
1089 <
1046 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1047 <      <include name="jsr166x"/>
1048 <      </packageset>
1086 >  <target name="jsr166eclean"
1087 >          description="Removes all jsr166e build products">
1088 >    <delete dir="${build.jsr166e.dir}"/>
1089 >  </target>
1090  
1050    </javadoc>
1091  
1092 +  <target name="jsr166edist-jar"
1093 +          depends="jsr166eclean, jsr166ejar">
1094 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1095    </target>
1096  
1097 <  <target name="jsr166xdist-jar"
1098 <          depends="jsr166xclean, jsr166xjar">
1097 >  <target name="jsr166edist-docs"
1098 >          depends="jsr166eclean, jsr166edocs">
1099 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1100 >  </target>
1101  
1057    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1102  
1103 + <!-- Find buglets that can be detected by static build tools -->
1104 +
1105 +  <target name="lint">
1106 +    <antcall target="dists">
1107 +      <param name="build.javadoc.access" value="private"/>
1108 +    </antcall>
1109    </target>
1110  
1111 +
1112   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines