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

Comparing jsr166/build.xml (file contents):
Revision 1.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.150 by jsr166, Mon Jul 22 17:50:12 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"/>
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"/>
50  <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"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <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 <
130 <  <!-- Distribution locations -->
131 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
132 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
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="junit.jar"            location="${lib.dir}/junit.jar"/>
153 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
154 <
155 <  <!-- Bootclasspath argument -->
156 <  <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 77 | 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.j1.dir}"/>
88 <    <pathelement location="${junit.jar}"/>
89 <    <pathelement location="${concurrent.jar}"/>
90 <  </path>
91 <
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 <      <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}"/>
300  
301      </javac>
115
302    </target>
303  
304  
119
305    <target name="jar"
306            depends="compile"
307            description="Builds library jar from compiled sources">
308  
124    <mkdir dir="${build.lib.dir}"/>
125
309      <jar destfile="${product.jar}">
310        <fileset dir="${build.classes.dir}"/>
311      </jar>
129
312    </target>
313  
314  
133
134  <target name="test"
135          depends="init, configure-tests, report-tests"
136          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
137
138
139
315    <target name="docs"
316 <          description="Builds javadocs with custom tags to build folder">
142 <
143 <    <delete dir="${build.javadocs.dir}"/>
144 <    <mkdir dir="${build.javadocs.dir}"/>
145 <
146 <    <javadoc destdir="${build.javadocs.dir}"
147 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
148 <            overview="${src.dir}/intro.html"
149 <              source="${build.sourcelevel}">
150 <
151 <      <tag name="revised" description="Last revised:"/>
152 <      <tag name="spec"    description="Specified by:"/>
153 <
154 <      <packageset dir="${src.dir}"/>
155 <
156 <    </javadoc>
157 <
158 <  </target>
316 >          description="Builds javadocs for src/main to dist dir">
317  
318 +    <delete dir="${docs.dir}"/>
319 +    <mkdir dir="${docs.dir}"/>
320  
321 +    <!-- the packagenames="none" hack below prevents scanning the -->
322 +    <!-- sourcepath for packages -->
323  
324 <  <target name="doccheck"
325 <          depends="filter-doccheck"
326 <          description="Reports on javadoc style errors">
327 <
328 <    <delete dir="${build.doccheck.dir}"/>
329 <    <mkdir dir="${build.doccheck.dir}"/>
330 <
331 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
332 <         docletpath="${lib.dir}/doccheck.jar"
333 <            destdir="${build.doccheck.dir}">
334 <      <packageset dir="${build.dc-filter.dir}"/>
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>
174
175    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
176
177  </target>
178
179
180
181  <target name="checkstyle"
182          depends="filter-src"
183          description="Reports on style errors in Java source (verbose, mostly chaff)">
184
185    <taskdef resource="checkstyletask.properties"
186            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187
188    <mkdir dir="${build.checkstyle.dir}"/>
189
190    <checkstyle config="etc/checkstyle/sun_checks.xml"
191       failOnViolation="false">
192      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194    </checkstyle>
195
196    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
197          out="${build.checkstyle.dir}/checkstyle-report.html"
198        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199
346    </target>
347  
348  
203
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  
209
354    <target name="release"
355            depends="dist"
356            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 222 | Line 366
366        <exclude name="**/SyntaxTest.java"/>
367        <exclude name="**/SuperfluousAbstract.java"/>
368      </jar>
225
369    </target>
370  
371  
229
372    <target name="clean"
373            description="Removes all build products">
374  
375      <delete dir="${build.dir}"/>
234    <delete dir="${build.classes.dir}"/>
235    <delete dir="${build.lib.dir}"/>
376  
377    </target>
378  
379  
240
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  
249
250  <target name="dist-docs"
251          description="Builds javadocs without custom tags to dist folder">
252
253    <delete dir="${dist.javadocs.dir}"/>
254    <mkdir dir="${dist.javadocs.dir}"/>
255
256    <javadoc destdir="${dist.javadocs.dir}"
257                link="http://java.sun.com/j2se/1.4.2/docs/api"
258            overview="${src.dir}/intro.html"
259              source="${build.sourcelevel}">
260
261      <packageset dir="${src.dir}"/>
262
263    </javadoc>
264
265  </target>
266
267
268
269  <!-- Internal targets -->
270
271
272  <target name="init">
273
274    <!-- Version is kept in a separate file -->
275    <loadfile property="version" srcFile="version.properties"/>
276    <echo>Building JSR-166 version ${version}</echo>
277    <echo>java.home is ${java.home}</echo>
278
279  </target>
280
281
389    <target name="dist-jar"
390            depends="clean, jar">
284
391      <copy file="${product.jar}" todir="${dist.dir}"/>
286
392    </target>
393  
394 +  <target name="dist-docs"
395 +          depends="clean, docs">
396 +    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
397 +  </target>
398  
290  <target name="compile-ant-filter"
291          depends="init">
399  
400 <    <mkdir dir="${build.ant.dir}"/>
400 >  <target name="test-tck"
401 >          depends="jar"
402 >          description="Runs tck tests for main directly">
403  
404 <    <javac srcdir="${ant.src.dir}"
405 <          destdir="${build.ant.dir}"
406 <           source="1.4"/>
404 >    <run-tck-tests
405 >      target="8"
406 >      workdir="${build.dir}"
407 >      classes="${product.jar}"/>
408 >  </target>
409  
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 +  <target name="test"
420 +          depends="test-tck, test-jtreg"
421 +          description="Runs tck and jtreg tests for main">
422 +  </target>
423  
302  <target name="filter-src"
303          depends="compile-ant-filter">
424  
305    <mkdir dir="${build.filter.src.dir}"/>
425  
426 <    <copy todir="${build.filter.src.dir}">
308 <      <fileset dir="${src.dir}">
309 <        <include name="**/*.html"/>
310 <      </fileset>
311 <    </copy>
426 >  <target name="configure-compiler">
427  
428 <    <copy todir="${build.filter.src.dir}">
314 <      <fileset dir="${src.dir}">
315 <        <exclude name="**/*.html"/>
316 <        <!-- Files excluded from dist-docs -->
317 <        <exclude name="java/util/Random.*"/>
318 <        <exclude name="sun/misc/Unsafe.*"/>
319 <      </fileset>
320 <      <!--
321 <      <filterchain>
322 <      -->
323 <
324 <        <!--
325 <         # This filter gets rid of angle-bracketed type parameters
326 <         # so that javadoc can run on the result. The following
327 <         # heuristic seems to work:
328 <         #
329 <         # For all lines not starting with space(s)-asterisk-space(s),
330 <         #   replace <something> with a space, where there may be more
331 <         #   than one right angle bracket at the end, and "something"
332 <         #   must not contain parens or pipes. (This may need some
333 <         #   tweaking.)
334 <         -->
335 <
336 <        <!--
337 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
338 <                      classpath="${build.ant.dir}">
339 <          <param name="notmatching" value="^\s+\*\s.*$"/>
340 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
341 <          <param name="replacement" value=" "/>
342 <        </filterreader>
343 <        -->
344 <
345 <      <!--
346 <      </filterchain>
347 <      -->
348 <    </copy>
428 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
429  
430 <  </target>
430 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
431 >      <istrue value="${build.warnunchecked}"/>
432 >    </condition>
433  
434 +    <property name="warnunchecked.arg" value=""/>
435  
353  <target name="filter-doccheck"
354          depends="filter-src">
436  
437 <    <mkdir dir="${build.dc-filter.dir}"/>
437 >    <!-- Common options in javac invocations -->
438 >    <property name="build.args" value="${warnunchecked.arg}"/>
439  
440 <    <copy todir="${build.dc-filter.dir}">
359 <      <fileset dir="${build.filter.src.dir}">
360 <        <include name="**/*.html"/>
361 <      </fileset>
362 <    </copy>
440 >  </target>
441  
364    <property name="generic.declarations"
365             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
366    />
367
368    <copy todir="${build.dc-filter.dir}">
369      <fileset dir="${build.filter.src.dir}">
370        <exclude name="**/*.html"/>
371      </fileset>
372      <filterchain>
373        <!--
374         # These two filters try to make the source look like
375         # something that doccheck can process. The first removes
376         # -source 1.4 assertions and the second adds in a bunch
377         # of single letter public nested marker interfaces so that
378         # the generic type parameters are recognized.
379         -->
380
381        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
382                      classpath="${build.ant.dir}">
383          <param name="matching"    value="^\s*assert[\s ].*$"/>
384          <param name="pattern"     value="assert"/>
385          <param name="replacement" value="//assert"/>
386        </filterreader>
387
388        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389                      classpath="${build.ant.dir}">
390          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
391          <param name="pattern"     value="$"/>
392          <param name="replacement" value=" ${generic.declarations}"/>
393        </filterreader>
442  
395      </filterchain>
396    </copy>
443  
444 <  </target>
444 >  <!-- Various demos and test programs -->
445  
446  
447 <  <target name="compile-tests"
448 <          depends="jar">
447 >  <target name="loops" depends="configure-compiler"
448 >          description="Benchmark from Doug Lea's AQS paper">
449  
450 <    <mkdir dir="${build.testcases.dir}"/>
450 >    <mkdir dir="${build.loops.dir}"/>
451  
452 <    <javac srcdir="${tck.src.dir}"
453 <          destdir="${build.testcases.dir}"
452 >    <javac srcdir="${loops.src.dir}"
453 >          destdir="${build.loops.dir}"
454              debug="${build.debug}"
455         debuglevel="${build.debuglevel}"
456        deprecation="${build.deprecation}"
457             source="${build.sourcelevel}"
458               fork="true">
459  
414      <compilerarg value="${bootclasspath.args}"/>
460        <compilerarg line="${build.args}"/>
461 <
462 <      <classpath refid="test.classpath"/>
461 >      <classpath refid="loops.classpath"/>
462 >      <compilerarg value="-XDignore.symbol.file=true"/>
463  
464      </javac>
465  
466 <    <javac srcdir="${test.src.dir}"
467 <          destdir="${build.testcases.dir}"
468 <            debug="${build.debug}"
424 <       debuglevel="${build.debuglevel}"
425 <      deprecation="${build.deprecation}"
426 <           source="${build.sourcelevel}"
427 <             fork="true">
466 >    <java classname="ALoops" fork="true">
467 >      <classpath refid="loops.classpath"/>
468 >    </java>
469  
470 <      <include name="jsr166/test/**"/>
470 >  </target>
471  
431      <compilerarg value="${bootclasspath.args}"/>
432      <compilerarg line="${build.args}"/>
472  
473 <      <classpath refid="test.classpath"/>
473 >  <!-- jsr166 4jdk7 -->
474 >
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 >      <compilerarg value="-Xprefer:source"/>
496 >      <compilerarg value="-XDignore.symbol.file=true"/>
497 >      <compilerarg value="-Xlint:all"/>
498 >      <compilerarg line="${build.args}"/>
499  
500      </javac>
501 +  </target>
502  
503 < <!--
504 <    <javac srcdir="${jtreg.src.dir}"
505 <          destdir="${build.testcases.dir}"
506 <            debug="${build.debug}"
507 <       debuglevel="${build.debuglevel}"
508 <      deprecation="${build.deprecation}"
509 <           source="${build.sourcelevel}"
510 <             fork="true">
503 >  <target name="4jdk7doclint"
504 >          depends="configure-compiler"
505 >          description="Finds doclint warnings">
506 >
507 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
508 >
509 >    <javac srcdir="${4jdk7src.dir}"
510 >           destdir="${build.4jdk7.classes.dir}"
511 >           debug="${build.debug}"
512 >           debuglevel="${build.debuglevel}"
513 >           deprecation="${build.deprecation}"
514 >           source="6"
515 >           classpath=""
516 >           bootclasspath="${bootclasspath7}"
517 >           includeAntRuntime="false"
518 >           includeJavaRuntime="false"
519 >           executable="${javac8}"
520 >           fork="true">
521  
522 <      <compilerarg value="${bootclasspath.args}"/>
522 >      <include name="**/*.java"/>
523 >      <compilerarg value="-Xprefer:source"/>
524 >      <compilerarg value="-XDignore.symbol.file=true"/>
525 >      <compilerarg value="-Xlint:all"/>
526 >      <compilerarg value="-Xdoclint:all/protected"/>
527        <compilerarg line="${build.args}"/>
528  
450      <classpath refid="test.classpath"/>
451
529      </javac>
530 < -->
530 >  </target>
531 >
532 >
533 >  <target name="4jdk7jar"
534 >          depends="4jdk7compile"
535 >          description="Builds library jar from compiled sources">
536 >
537 >    <jar destfile="${4jdk7product.jar}">
538 >      <fileset dir="${build.4jdk7.classes.dir}"/>
539 >    </jar>
540  
541    </target>
542  
543  
544 <  <target name="run-tests"
545 <          depends="compile-tests">
544 >  <target name="4jdk7-test-tck"
545 >          depends="4jdk7jar"
546 >          description="Runs tck tests for jsr166-4jdk7 directly">
547 >
548 >    <run-tck-tests
549 >      target="7"
550 >      workdir="${build.4jdk7.dir}"
551 >      classes="${4jdk7product.jar}">
552 >      <javac-elements>
553 >        <!-- JDK8+ test classes -->
554 >        <exclude name="*8Test.java"/>
555 >        <exclude name="DoubleAccumulatorTest.java"/>
556 >        <exclude name="DoubleAdderTest.java"/>
557 >        <exclude name="LongAccumulatorTest.java"/>
558 >        <exclude name="LongAdderTest.java"/>
559 >        <exclude name="CompletableFutureTest.java"/>
560 >        <exclude name="SplittableRandomTest.java"/>
561 >        <exclude name="StampedLockTest.java"/>
562 >      </javac-elements>
563 >    </run-tck-tests>
564 >  </target>
565  
461    <!-- May be overridden by user.properties -->
462    <property name="testcase" value="*"/>
566  
567 <    <mkdir dir="${build.reports.dir}"/>
567 >  <target name="4jdk7-test-tck-junit"
568 >          depends="4jdk7compile"
569 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
570  
571      <junit printsummary="true"
572 <             showoutput="true"
573 <          errorProperty="junit.failed"
574 <        failureProperty="junit.failed"
575 <                    dir="${build.reports.dir}"
576 <                   fork="true">
572 >           showoutput="true"
573 >           errorProperty="junit.failed"
574 >           failureProperty="junit.failed"
575 >           includeantruntime="true"
576 >           jvm="${java7}"
577 >           fork="true">
578  
579 <      <jvmarg value="${bootclasspath.args}"/>
579 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
580        <jvmarg value="-server"/>
475      <jvmarg value="-showversion"/>
581  
582 <      <classpath refid="test.classpath"/>
582 >      <classpath>
583 >        <pathelement location="${junit.jar}"/>
584 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
585 >      </classpath>
586  
587 <      <formatter type="xml"/>
587 >      <formatter type="brief"/>
588  
589 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
590 <        <fileset dir="${tck.src.dir}">
483 <          <include name="**/${testcase}Test.java"/>
484 <        </fileset>
485 <      </batchtest>
486 <
487 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
488 <        <fileset dir="${test.src.dir}">
489 <          <include name="jsr166/test/**/${testcase}Test.java"/>
490 <        </fileset>
491 <      </batchtest>
492 <
493 < <!--
494 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
495 <        <fileset dir="${jtreg.src.dir}">
496 <          <include name="**/${testcase}Test.java"/>
497 <        </fileset>
498 <      </batchtest>
499 < -->
589 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
590 >      </test>
591  
592      </junit>
502
593    </target>
594  
595 +  <target name="4jdk7-test-jtreg"
596 +          depends="4jdk7jar"
597 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
598 +    <run-jtreg-tests
599 +       target="7"
600 +       workdir="${build.4jdk7.dir}"
601 +       classes="${4jdk7product.jar}"
602 +       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
603 +  </target>
604  
506  <target name="report-tests"
507          depends="run-tests">
605  
606 <    <!-- Sets junit.report.format to frames if redirection is present,
607 <         otherwise sets it to noframes. -->
608 <    <available property="junit.report.format"
609 <                  value="frames"
513 <              classname="org.apache.xalan.lib.Redirect"
514 <    />
515 <    <property name="junit.report.format" value="noframes"/>
516 <
517 <    <junitreport todir="${build.reports.dir}">
518 <      <fileset dir="${build.reports.dir}">
519 <        <include name="TEST-*.xml"/>
520 <      </fileset>
521 <      <report styledir="${stylesheet.dir}"
522 <                format="${junit.report.format}"
523 <                 todir="${build.reports.dir}"
524 <      />
525 <    </junitreport>
606 >  <target name="4jdk7-test"
607 >          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
608 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
609 >  </target>
610  
527    <fail message="Test Cases Failed" if="junit.failed"/>
611  
612 +  <target name="4jdk7docs"
613 +          description="Builds javadocs for src/jdk7 to dist dir">
614 +
615 +    <delete dir="${4jdk7docs.dir}"/>
616 +    <mkdir dir="${4jdk7docs.dir}"/>
617 +
618 +    <javadoc destdir="${4jdk7docs.dir}"
619 +             packagenames="none"
620 +             link="${jdkapi7docs.url}"
621 +             overview="${4jdk7src.dir}/intro.html"
622 +             access="${build.javadoc.access}"
623 +             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
624 +             classpath=""
625 +             executable="${javadoc7}">
626 +      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
627 +        <include name="**/*.java"/>
628 +      </fileset>
629 +      <arg value="-XDignore.symbol.file=true"/>
630 +    </javadoc>
631    </target>
632  
633  
634 <  <target name="configure-compiler">
634 >  <target name="4jdk7dist"
635 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
636 >          description="Puts all distributable products in single hierarchy"/>
637  
534    <property name="unchecked.option" value="-Xlint:unchecked"/>
638  
639 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
640 <      <istrue value="${build.warnunchecked}"/>
538 <    </condition>
639 >  <target name="4jdk7clean"
640 >          description="Removes all 4jdk7 build products">
641  
642 <    <property name="warnunchecked.arg" value=""/>
642 >    <delete dir="${build.4jdk7.dir}"/>
643  
644 +  </target>
645  
543    <!-- Common options in javac invocations -->
544    <property name="build.args" value="${warnunchecked.arg}"/>
646  
647 +  <target name="4jdk7dist-jar"
648 +          depends="4jdk7clean, 4jdk7jar">
649 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
650    </target>
651  
652  
653 <  <target name="configure-tests"
654 <       depends="configure-compiler">
653 >  <target name="4jdk7dist-docs"
654 >          depends="4jdk7clean, 4jdk7docs">
655 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
656 >  </target>
657  
552    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
553    <available property="junit.available"
554               classname="junit.framework.Protectable"/>
658  
659 <    <!-- Xalan -->
557 <    <available property="xalan.available"
558 <               classname="org.apache.xalan.Version"/>
659 >  <!-- jsr166x -->
660  
661 +  <target name="jsr166xcompile"
662 +          depends="configure-compiler"
663 +          description="Compiles jsr166x sources to build dir">
664  
665 <    <!-- Ant 1.6beta and later don't need or want this check -->
562 <    <!--
563 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
564 <          unless="junit.available"/>
665 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
666  
667 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
668 <          unless="xalan.available"/>
669 <    -->
667 >    <javac srcdir="${topsrc.dir}"
668 >           destdir="${build.jsr166x.classes.dir}"
669 >           debug="${build.debug}"
670 >           debuglevel="${build.debuglevel}"
671 >           deprecation="${build.deprecation}"
672 >           classpath=""
673 >           bootclasspath="${bootclasspath6}"
674 >           source="5"
675 >           includeAntRuntime="false"
676 >           includeJavaRuntime="false"
677 >           executable="${javac7}"
678 >           fork="true">
679 >
680 >      <include name="jsr166x/**/*.java"/>
681 >      <compilerarg value="-XDignore.symbol.file=true"/>
682 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
683 >      <compilerarg line="${build.args}"/>
684  
685 +    </javac>
686    </target>
687  
688  
689 +  <target name="jsr166xjar"
690 +          depends="jsr166xcompile"
691 +          description="Builds library jar from compiled sources">
692  
693 <  <!-- Anthill targets -->
694 <
695 <  <target name="anthill-build">
577 <
578 <    <!-- Override this in user.properties -->
579 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
693 >    <jar destfile="${jsr166x.jar}">
694 >      <fileset dir="${build.jsr166x.classes.dir}"/>
695 >    </jar>
696  
581    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
582      <arg value="-Xmx256000000"/>
583      <!-- classpath of new JVM -->
584      <arg value="-classpath"/> <arg path="${java.class.path}"/>
585      <!-- location of Ant home directory -->
586      <arg value="-Dant.home=${ant.home}"/>
587      <!-- the Ant main class -->
588      <arg value="org.apache.tools.ant.Main"/>
589      <!-- The build file -->
590      <arg value="-buildfile"/>  <arg value="build.xml"/>
591      <!-- the target to build on the new Ant instance -->
592      <arg value="-DJAVA_HOME=${tiger.home}"/>
593      <arg value="do-anthill-build"/>
594    </exec>
697    </target>
698  
597  <target name="do-anthill-build"
598          depends="jar, test, docs, dist-docs"/>
599
600  <target name="anthill-publish">
601
602    <copy todir="${deployDir}/docs/private">
603      <fileset dir="${build.javadocs.dir}"/>
604    </copy>
699  
700 <    <copy todir="${deployDir}/docs/public">
701 <      <fileset dir="${dist.javadocs.dir}"/>
608 <    </copy>
700 >  <target name="jsr166xdocs"
701 >          description="Builds javadocs to dist dir">
702  
703 <    <copy tofile="${deployDir}/index.html"
704 <          file="${basedir}/etc/anthill-index.html"/>
703 >    <delete dir="${jsr166xdocs.dir}"/>
704 >    <mkdir dir="${jsr166xdocs.dir}"/>
705  
706 <    <copy todir="${deployDir}/notes">
707 <      <fileset dir="${basedir}/etc/notes"/>
708 <    </copy>
706 >    <javadoc destdir="${jsr166xdocs.dir}"
707 >             packagenames="jsr166x.*"
708 >             link="${jdkapidocs.url}"
709 >             access="${build.javadoc.access}"
710 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
711 >             bootclasspath="${bootclasspath6}"
712 >             source="5"
713 >             executable="${javadoc7}">
714 >      <arg value="-XDignore.symbol.file=true"/>
715  
716 +    </javadoc>
717    </target>
718  
719  
720 +  <target name="jsr166xdist"
721 +          depends="jsr166xdist-jar, jsr166xdist-docs"
722 +          description="Puts all distributable products in single hierarchy"/>
723  
621  <!-- Various demos and test programs -->
622
623
624  <target name="sample" depends="init, configure-compiler"
625          description="Standalone demo program">
626
627    <mkdir dir="${build.testcases.dir}"/>
628
629    <javac srcdir="${test.src.dir}"
630          destdir="${build.testcases.dir}"
631            debug="${build.debug}"
632       debuglevel="${build.debuglevel}"
633      deprecation="${build.deprecation}"
634           source="${build.sourcelevel}"
635             fork="true">
724  
725 <      <include name="jsr166/test/Sample.java"/>
725 >  <target name="jsr166xclean"
726 >          description="Removes all jsr166x build products">
727  
728 <    </javac>
728 >    <delete dir="${build.jsr166x.dir}"/>
729  
730 <    <copy todir="${build.testcases.dir}">
642 <      <fileset dir="${test.src.dir}">
643 <        <include name="**/*.properties"/>
644 <      </fileset>
645 <    </copy>
730 >  </target>
731  
732  
733 <    <java classname="jsr166.test.Sample" fork="true">
734 <      <classpath refid="test.classpath"/>
735 <      <!-- <jvmarg value="-ea"/> -->
651 <      <!-- <jvmarg value="-server"/> -->
652 <      <!-- <arg value="1000"/> -->
653 <    </java>
733 >  <target name="jsr166xdist-jar"
734 >          depends="jsr166xclean, jsr166xjar">
735 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
736    </target>
737  
738 +  <target name="jsr166xdist-docs"
739 +          depends="jsr166xclean, jsr166xdocs">
740 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
741 +  </target>
742  
743 <  <target name="loops" depends="init, configure-compiler"
658 <          description="Benchmark from Doug Lea's AQS paper">
743 >  <!-- jsr166y -->
744  
660    <mkdir dir="${build.loops.dir}"/>
661
662    <javac srcdir="${loops.src.dir}"
663          destdir="${build.loops.dir}"
664            debug="${build.debug}"
665       debuglevel="${build.debuglevel}"
666      deprecation="${build.deprecation}"
667           source="${build.sourcelevel}"
668             fork="true">
745  
746 +  <target name="jsr166ycompile"
747 +          depends="configure-compiler"
748 +          description="Compiles jsr166y sources">
749 +
750 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
751 +
752 +    <javac srcdir="${topsrc.dir}"
753 +           destdir="${build.jsr166y.classes.dir}"
754 +           debug="${build.debug}"
755 +           debuglevel="${build.debuglevel}"
756 +           deprecation="${build.deprecation}"
757 +           source="6"
758 +           classpath=""
759 +           bootclasspath="${bootclasspath6}"
760 +           includeAntRuntime="false"
761 +           includeJavaRuntime="false"
762 +           executable="${javac7}"
763 +           fork="true">
764 +
765 +      <include name="jsr166y/**/*.java"/>
766 +      <compilerarg value="-XDignore.symbol.file=true"/>
767 +      <compilerarg value="-Xlint:all"/>
768        <compilerarg line="${build.args}"/>
671      <classpath refid="loops.classpath"/>
769  
770      </javac>
674
675    <java classname="ALoops" fork="true">
676      <classpath refid="loops.classpath"/>
677    </java>
678
771    </target>
772  
773  
774 <  <target name="compile-j1" depends="init, configure-compiler">
775 <
776 <    <mkdir dir="${build.j1.dir}"/>
685 <
686 <    <javac srcdir="${j1.src.dir}"
687 <          destdir="${build.j1.dir}"
688 <            debug="${build.debug}"
689 <       debuglevel="${build.debuglevel}"
690 <      deprecation="${build.deprecation}"
691 <           source="${build.sourcelevel}" >
692 <
693 <      <include name="**/*.java"/>
694 <      <exclude name="**/dijkstra/**"/>
695 <
696 <      <compilerarg line="${build.args}"/>
697 <      <classpath refid="j1.classpath"/>
774 >  <target name="jsr166yjar"
775 >          depends="jsr166ycompile"
776 >          description="Builds library jar from compiled sources">
777  
778 <    </javac>
778 >    <jar destfile="${jsr166y.jar}" index="true">
779 >      <fileset dir="${build.jsr166y.classes.dir}"/>
780 >    </jar>
781  
782    </target>
783  
784  
785 <  <target name="sw" depends="compile-j1"
786 <          description="Runs the SwingWorker demo">
706 <
707 <    <!--
708 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
709 <      <classpath refid="j1.classpath"/>
710 <    </java>
711 <    -->
785 >  <target name="jsr166ydocs"
786 >          description="Builds javadocs to dist dir">
787  
788 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
788 >    <delete dir="${jsr166ydocs.dir}"/>
789 >    <mkdir dir="${jsr166ydocs.dir}"/>
790  
791 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
792 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
793 <    </exec>
791 >    <javadoc destdir="${jsr166ydocs.dir}"
792 >             packagenames="jsr166y.*"
793 >             link="${jdkapidocs.url}"
794 >             access="${build.javadoc.access}"
795 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
796 >             bootclasspath="${bootclasspath6}"
797 >             source="6"
798 >             executable="${javadoc7}">
799 >      <arg value="-XDignore.symbol.file=true"/>
800  
801 +    </javadoc>
802    </target>
803  
721  <target name="j1" depends="compile-j1"
722          description="Runs a standalone JavaOne program">
804  
805 <    <java classname="${j1.test}" fork="true">
806 <      <classpath refid="j1.classpath"/>
807 <      <jvmarg value="-client"/>
805 >  <target name="jsr166ydist"
806 >          depends="jsr166ydist-jar, jsr166ydist-docs"
807 >          description="Puts all distributable products in single hierarchy"/>
808  
728      <!-- TestPseudoRandom args -->
729      <arg value="2"/>
730      <arg value="25"/>
731      <arg value="100000"/>
809  
810 <      <!-- WebCrawler args -->
811 <      <!--
735 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
736 <      <arg value="http://www.priorartisans.com"/>
737 <      <arg value="25"/>
738 <      -->
810 >  <target name="jsr166yclean"
811 >          description="Removes all jsr166y build products">
812  
813 <    </java>
813 >    <delete dir="${build.jsr166y.dir}"/>
814  
815    </target>
816  
817  
818 <  <target name="test-j1" depends="compile-j1"
819 <          description="Runs testcases from the JavaOne source directories">
820 <
748 <    <junit printsummary="true"
749 <             showoutput="true"
750 <          errorProperty="junit.failed"
751 <        failureProperty="junit.failed"
752 <                    dir="${build.j1.dir}"
753 <                   fork="true">
754 <
755 <      <!-- <jvmarg value="-server"/> -->
756 <      <classpath refid="j1.classpath"/>
757 <      <formatter type="xml"/>
758 <
759 <      <batchtest todir="${build.j1.dir}">
760 <        <fileset dir="${j1.src.dir}">
761 <          <include name="**/*Test.java"/>
762 <        </fileset>
763 <      </batchtest>
764 <
765 <    </junit>
766 <
767 <    <available property="junit.report.format"
768 <                  value="frames"
769 <              classname="org.apache.xalan.lib.Redirect"/>
770 <    <property name="junit.report.format" value="noframes"/>
771 <
772 <    <junitreport todir="${build.j1.dir}">
773 <      <fileset dir="${build.j1.dir}">
774 <        <include name="TEST-*.xml"/>
775 <      </fileset>
776 <      <report styledir="${stylesheet.dir}"
777 <                format="${junit.report.format}"
778 <                 todir="${build.j1.dir}"
779 <      />
780 <    </junitreport>
781 <
782 <    <fail message="Test Cases Failed" if="junit.failed"/>
783 <
818 >  <target name="jsr166ydist-jar"
819 >          depends="jsr166yclean, jsr166yjar">
820 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
821    </target>
822  
823 +  <target name="jsr166ydist-docs"
824 +          depends="jsr166yclean, jsr166ydocs">
825 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
826 +  </target>
827  
828  
829 <  <!-- C++ and JNI definitions and demos -->
829 >  <!-- extra166y -->
830  
790  <target name="configure-cpp">
831  
832 <    <!-- Define tasks and types -->
832 >  <target name="extra166ycompile"
833 >          depends="configure-compiler, jsr166yjar"
834 >          description="Compiles extra166y sources">
835  
836 <    <path id="cpptasks.path">
795 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
796 <    </path>
797 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
836 >    <mkdir dir="${build.extra166y.classes.dir}"/>
837  
838 <    <!-- Set platform property for JNI includes -->
838 >    <javac srcdir="${topsrc.dir}"
839 >           destdir="${build.extra166y.classes.dir}"
840 >           debug="${build.debug}"
841 >           debuglevel="${build.debuglevel}"
842 >           deprecation="${build.deprecation}"
843 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
844 >           classpath=""
845 >           source="6"
846 >           includeAntRuntime="false"
847 >           includeJavaRuntime="false"
848 >           executable="${javac7}"
849 >           fork="true">
850  
851 <    <condition property="platform" value="linux">
852 <      <os name="Linux"/>
853 <    </condition>
854 <    <condition property="platform" value="win32">
806 <      <os family="windows"/>
807 <    </condition>
808 <    <condition property="platform" value="solaris">
809 <      <os name="SunOS"/>
810 <    </condition>
851 >      <include name="extra166y/**/*.java"/>
852 >      <compilerarg value="-XDignore.symbol.file=true"/>
853 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
854 >      <compilerarg line="${build.args}"/>
855  
856 +    </javac>
857    </target>
858  
859  
860 <  <target name="cppdemo" depends="configure-cpp">
861 <
862 <    <mkdir dir="${build.dir}"/>
818 <
819 <    <cc multithreaded="true"
820 <                 name="g++"
821 <               objdir="${build.dir}"
822 <              outfile="${build.dir}/CppDemo">
823 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
824 <      <libset libs="stdc++"/>
825 <    </cc>
860 >  <target name="extra166yjar"
861 >          depends="extra166ycompile"
862 >          description="Builds library jar from compiled sources">
863  
864 <    <exec executable="${build.dir}/CppDemo">
865 <      <arg line="count in word frequency of word in command line count"/>
866 <    </exec>
864 >    <jar destfile="${extra166y.jar}" index="true">
865 >      <fileset dir="${build.extra166y.classes.dir}"/>
866 >    </jar>
867  
868    </target>
869  
870  
871 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
872 <
836 <    <mkdir dir="${build.testcases.dir}"/>
871 >  <target name="extra166ydocs"
872 >          description="Builds javadocs to build dir">
873  
874 <    <javac srcdir="${test.src.dir}"
875 <          destdir="${build.testcases.dir}"
840 <            debug="${build.debug}"
841 <       debuglevel="${build.debuglevel}"
842 <      deprecation="${build.deprecation}"
843 <           source="${build.sourcelevel}"
844 <             fork="true">
845 <      <compilerarg value="${bootclasspath.args}"/>
846 <      <compilerarg line="${build.args}"/>
847 <      <classpath refid="test.classpath"/>
848 <      <include name="JniDemo.java"/>
849 <    </javac>
874 >    <delete dir="${extra166ydocs.dir}"/>
875 >    <mkdir dir="${extra166ydocs.dir}"/>
876  
877 <    <javah destdir="${build.testcases.dir}"
878 <      classpathref="test.classpath">
879 <      <class name="JniDemo"/>
880 <    </javah>
881 <
882 <    <cc multithreaded="true"
883 <                 name="g++"
884 <               objdir="${build.dir}"
885 <              outfile="${build.dir}/JniDemo"
860 <              outtype="shared">
861 <
862 <      <compiler>
863 <        <defineset>
864 <          <define name="__int64" value="long long"/>
865 <        </defineset>
866 <        <includepath location="${java.home}/../include"/>
867 <        <includepath location="${java.home}/../include/${platform}"/>
868 <        <compilerarg value="-mno-cygwin"/>
869 <      </compiler>
870 <
871 <      <linker>
872 <        <linkerarg value="--add-stdcall-alias"/>
873 <      </linker>
874 <
875 <      <includepath location="${build.testcases.dir}"/>
876 <
877 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878 <
879 <      <libset libs="stdc++"/>
880 <
881 <    </cc>
882 <
883 <    <!-- Necessary if windows, harmless if not -->
884 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885 <
886 <    <java classname="JniDemo" fork="true">
887 <      <!-- Watch out: path separator hardwired to semicolon here! -->
888 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889 <      <classpath refid="test.classpath"/>
890 <      <arg line="count in word frequency of word in command line count"/>
891 <    </java>
877 >    <javadoc destdir="${extra166ydocs.dir}"
878 >             packagenames="extra166y.*"
879 >             link="${jdkapidocs.url}"
880 >             access="${build.javadoc.access}"
881 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
882 >             bootclasspath="${bootclasspath6}"
883 >             source="6"
884 >             executable="${javadoc7}">
885 >      <arg value="-XDignore.symbol.file=true"/>
886  
887 +    </javadoc>
888    </target>
889  
890  
891 +  <target name="extra166ydist"
892 +          depends="extra166ydist-jar, extra166ydist-docs"
893 +          description="Puts all distributable products in single hierarchy"/>
894  
897  <!-- Backward compatibility, work in progress (some files not checked in) -->
898
899
900
901  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
902  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
903  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
904  <property name="pretiger.sourcelevel" value="1.4"/>
905
906  <target name="defang"
907       depends="init"
908   description="Generates pre-Tiger compatible source">
895  
896 <    <delete dir="${pretiger.src.dir}"/>
897 <    <mkdir dir="${pretiger.src.dir}"/>
896 >  <target name="extra166yclean"
897 >          description="Removes all extra166y build products">
898  
899 <    <exec executable="perl">
914 <      <arg file="etc/defang.pl"/>
915 <      <!-- <arg value="-v"/> -->
916 <      <arg value="-s"/> <arg file="${src.dir}"/>
917 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
918 <    </exec>
899 >    <delete dir="${build.extra166y.dir}"/>
900  
901    </target>
902  
922  <target name="compile-pretiger"
923          depends="init, configure-compiler, defang"
924          description="Compiles pre-Tiger sources to build folder">
925
926    <mkdir dir="${build.pretiger.dir}"/>
927
928    <javac srcdir="${pretiger.src.dir}"
929          destdir="${build.pretiger.dir}"
930            debug="${build.debug}"
931       debuglevel="${build.debuglevel}"
932      deprecation="${build.deprecation}"
933           source="${pretiger.sourcelevel}"
934             fork="true">
935
936      <compilerarg line="${build.args}"/>
937      <exclude name="**/Thread.java"/>
903  
904 <    </javac>
904 >  <target name="extra166ydist-jar"
905 >          depends="extra166yclean, extra166yjar">
906 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
907 >  </target>
908  
909 +  <target name="extra166ydist-docs"
910 +          depends="extra166yclean, extra166ydocs">
911 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
912    </target>
913  
914 <  <target name="pretiger" depends="compile-pretiger">
914 >  <!-- jsr166e -->
915  
916 <    <mkdir dir="${build.lib.dir}"/>
916 >  <property name="build.jsr166e.java.version" value="6"/>
917 >  <property name="build.jsr166e.javac" value="${javac6}"/>
918  
919 <    <jar destfile="${pretiger.jar}">
920 <      <fileset dir="${build.pretiger.dir}">
921 <      </fileset>
950 <    </jar>
919 >  <target name="jsr166ecompile"
920 >          depends="configure-compiler"
921 >          description="Compiles jsr166e sources">
922  
923 <  </target>
923 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
924  
925 <  <!-- jsr166x -->
925 >    <javac srcdir="${topsrc.dir}"
926 >           destdir="${build.jsr166e.classes.dir}"
927 >           debug="${build.debug}"
928 >           debuglevel="${build.debuglevel}"
929 >           deprecation="${build.deprecation}"
930 >           source="${build.jsr166e.java.version}"
931 >           classpath=""
932 >           includeAntRuntime="false"
933 >           includeJavaRuntime="false"
934 >           executable="${build.jsr166e.javac}"
935 >           fork="true">
936  
937 +      <include name="jsr166e/**/*.java"/>
938 +      <compilerarg value="-XDignore.symbol.file=true"/>
939 +      <compilerarg value="-Xlint:all"/>
940 +      <compilerarg line="${build.args}"/>
941  
942 <  <target name="jsr166xcompile"
943 <          depends="init, configure-compiler"
959 <          description="Compiles jsr166x sources">
942 >    </javac>
943 >  </target>
944  
945 <    <mkdir dir="${build.jsr166x.dir}"/>
945 >  <!-- jsr166e: find doclint errors -->
946 >  <target name="jsr166edoclint">
947  
948 <    <javac srcdir="${jsr166xsrc.dir}"
964 <          destdir="${build.jsr166x.dir}"
965 <            debug="${build.debug}"
966 <       debuglevel="${build.debuglevel}"
967 <      deprecation="${build.deprecation}"
968 <           source="${build.sourcelevel}"
969 <             fork="true">
948 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
949  
950 <      <include name="**/*.java"/>
951 <      <compilerarg line="${build.args}"/>
950 >    <javac srcdir="${topsrc.dir}"
951 >           destdir="${build.jsr166e.classes.dir}"
952 >           debug="${build.debug}"
953 >           debuglevel="${build.debuglevel}"
954 >           deprecation="${build.deprecation}"
955 >           source="${build.jsr166e.java.version}"
956 >           classpath=""
957 >           bootclasspath="${bootclasspath7}"
958 >           includeAntRuntime="false"
959 >           includeJavaRuntime="false"
960 >           executable="${javac8}"
961 >           fork="true">
962 >
963 >      <include name="jsr166e/**/*.java"/>
964 >      <compilerarg value="-XDignore.symbol.file=true"/>
965 >      <compilerarg value="-Xlint:all"/>
966 >      <compilerarg value="-Xdoclint:all/protected"/>
967  
968      </javac>
975
969    </target>
970  
971  
972 <
973 <  <target name="jsr166xjar"
981 <          depends="jsr166xcompile"
972 >  <target name="jsr166ejar"
973 >          depends="jsr166ecompile"
974            description="Builds library jar from compiled sources">
975  
976 <    <mkdir dir="${build.jsr166xlib.dir}"/>
977 <
986 <    <jar destfile="${jsr166xproduct.jar}">
987 <      <fileset dir="${build.jsr166x.dir}"/>
976 >    <jar destfile="${jsr166e.jar}" index="true">
977 >      <fileset dir="${build.jsr166e.classes.dir}"/>
978      </jar>
979  
980    </target>
981  
982  
983 +  <target name="jsr166edocs"
984 +          description="Builds javadocs to build dir">
985  
986 <  <target name="jsr166xdocs"
987 <          description="Builds javadocs with custom tags to build folder">
996 <
997 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
998 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
999 <
1000 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1001 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1002 <    >
1003 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1004 <      <include name="jsr166x"/>
1005 <      </packageset>
986 >    <delete dir="${jsr166edocs.dir}"/>
987 >    <mkdir dir="${jsr166edocs.dir}"/>
988  
989 +    <javadoc destdir="${jsr166edocs.dir}"
990 +             packagenames="jsr166e.*"
991 +             link="${jdkapidocs.url}"
992 +             access="${build.javadoc.access}"
993 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
994 +             source="${build.jsr166e.java.version}"
995 +             executable="${javadoc7}">
996 +      <arg value="-XDignore.symbol.file=true"/>
997  
998      </javadoc>
1009
999    </target>
1000  
1001  
1002 <  <target name="jsr166xdist"
1003 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1015 <          description="Puts all distributable products in single hierarchy"/>
1016 <
1017 <
1018 <
1019 <  <target name="jsr166xclean"
1020 <          description="Removes all build products">
1002 >  <target name="jsr166e-test-tck-one-java-version"
1003 >          depends="jsr166ejar">
1004  
1005 <    <delete dir="${build.jsr166x.dir}"/>
1023 <    <delete dir="${build.jsr166xlib.dir}"/>
1005 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1006  
1007 +    <run-tck-tests
1008 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1009 +      target="${build.jsr166e.java.version}"
1010 +      workdir="${build.jsr166e.dir}"
1011 +      classes="${jsr166e.jar}"/>
1012    </target>
1013  
1014 +  <target name="jsr166e-test-tck"
1015 +          description="Runs tck tests for jsr166e for multiple java versions">
1016  
1017 + <!--     <antcall target="clean"/> -->
1018 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1019 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1020 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1021 + <!--     </antcall> -->
1022  
1023 <  <target name="jsr166xdist-clean"
1024 <          description="Removes all build and distribution products">
1023 >    <antcall target="clean"/>
1024 >    <antcall target="jsr166e-test-tck-one-java-version">
1025 >      <param name="build.jsr166e.java.version" value="7"/>
1026 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1027 >    </antcall>
1028  
1029 +    <antcall target="clean"/>
1030 +    <antcall target="jsr166e-test-tck-one-java-version">
1031 +      <param name="build.jsr166e.java.version" value="6"/>
1032 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1033 +    </antcall>
1034    </target>
1035  
1036  
1037 +  <target name="jsr166e-test"
1038 +          depends="jsr166e-test-tck"
1039 +          description="Runs all tests for jsr166e">
1040 +  </target>
1041  
1042 <  <target name="jsr166xdist-docs"
1043 <          description="Builds javadocs without custom tags to dist folder">
1042 >  <target name="jsr166edist"
1043 >          depends="jsr166edist-jar, jsr166edist-docs"
1044 >          description="Puts all distributable products in single hierarchy"/>
1045  
1039    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1040    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1046  
1047 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1048 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1049 <              source="${build.sourcelevel}">
1050 <
1046 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1047 <      <include name="jsr166x"/>
1048 <      </packageset>
1047 >  <target name="jsr166eclean"
1048 >          description="Removes all jsr166e build products">
1049 >    <delete dir="${build.jsr166e.dir}"/>
1050 >  </target>
1051  
1050    </javadoc>
1052  
1053 +  <target name="jsr166edist-jar"
1054 +          depends="jsr166eclean, jsr166ejar">
1055 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1056    </target>
1057  
1058 <  <target name="jsr166xdist-jar"
1059 <          depends="jsr166xclean, jsr166xjar">
1058 >  <target name="jsr166edist-docs"
1059 >          depends="jsr166eclean, jsr166edocs">
1060 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1061 >  </target>
1062  
1057    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1063  
1064 + <!-- Find buglets that can be detected by static build tools -->
1065 +
1066 +  <target name="lint">
1067 +    <antcall target="dists">
1068 +      <param name="build.javadoc.access" value="private"/>
1069 +    </antcall>
1070    </target>
1071  
1072 +
1073   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines