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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines