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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines