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.74 by dl, Thu Sep 13 11:19:25 2007 UTC vs.
Revision 1.148 by jsr166, Sat Jul 20 18:26:16 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines