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.149 by jsr166, Sat Jul 20 20:40:24 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"/>
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"/>
47  <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"/>
51  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
52  <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 <
128 <  <!-- Distribution locations -->
129 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
127 >  <property name="topsrc.dir"           location="${basedir}/src"/>
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="junit.jar"            location="${lib.dir}/junit.jar"/>
152 <
153 <  <!-- Bootclasspath argument -->
154 <  <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 69 | 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}"/>
80 <    <pathelement location="${junit.jar}"/>
81 <  </path>
82 <
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">
289 <
283 >           destdir="${build.classes.dir}"
284 >           debug="${build.debug}"
285 >           debuglevel="${build.debuglevel}"
286 >           deprecation="${build.deprecation}"
287 >           classpath=""
288 >           includeAntRuntime="false"
289 >           includeJavaRuntime="false"
290 >           executable="${javac8}"
291 >           fork="true">
292 >
293 >      <include name="**/*.java"/>
294 >      <compilerarg value="-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>
104
302    </target>
303  
304  
108
305    <target name="jar"
306            depends="compile"
307            description="Builds library jar from compiled sources">
308  
113    <mkdir dir="${build.lib.dir}"/>
114
309      <jar destfile="${product.jar}">
310        <fileset dir="${build.classes.dir}"/>
311      </jar>
118
312    </target>
313  
314  
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
315    <target name="docs"
316 <          description="Builds javadocs with custom tags to build folder">
316 >          description="Builds javadocs for src/main to dist dir">
317  
318 <    <delete dir="${build.javadocs.dir}"/>
319 <    <mkdir dir="${build.javadocs.dir}"/>
318 >    <delete dir="${docs.dir}"/>
319 >    <mkdir dir="${docs.dir}"/>
320  
321 <    <javadoc destdir="${build.javadocs.dir}"
322 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
137 <            overview="${src.dir}/intro.html"
138 <              source="${build.sourcelevel}">
321 >    <!-- the packagenames="none" hack below prevents scanning the -->
322 >    <!-- sourcepath for packages -->
323  
324 <      <tag name="revised" description="Last revised:"/>
325 <      <tag name="spec"    description="Specified by:"/>
326 <
327 <      <packageset dir="${src.dir}"/>
328 <
329 <    </javadoc>
330 <
331 <  </target>
332 <
333 <
334 <
335 <  <target name="doccheck"
336 <          depends="filter-doccheck"
337 <          description="Reports on javadoc style errors">
338 <
339 <    <delete dir="${build.doccheck.dir}"/>
340 <    <mkdir dir="${build.doccheck.dir}"/>
341 <
342 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
343 <         docletpath="${lib.dir}/doccheck.jar"
344 <            destdir="${build.doccheck.dir}">
161 <      <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>
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
346    </target>
347  
348  
192
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  
198
354    <target name="release"
355            depends="dist"
356            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 211 | Line 366
366        <exclude name="**/SyntaxTest.java"/>
367        <exclude name="**/SuperfluousAbstract.java"/>
368      </jar>
214
369    </target>
370  
371  
218
372    <target name="clean"
373            description="Removes all build products">
374  
375      <delete dir="${build.dir}"/>
223    <delete dir="${build.classes.dir}"/>
224    <delete dir="${build.lib.dir}"/>
376  
377    </target>
378  
379  
229
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  
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
389    <target name="dist-jar"
390            depends="clean, jar">
273
391      <copy file="${product.jar}" todir="${dist.dir}"/>
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  
399  
400 <  <target name="compile-ant-filter"
401 <          depends="init">
400 >  <target name="test-tck"
401 >          depends="jar"
402 >          description="Runs tck tests for main directly">
403  
404 <    <mkdir dir="${build.ant.dir}"/>
404 >    <run-tck-tests
405 >      target="8"
406 >      workdir="${build.dir}"
407 >      classes="${product.jar}"/>
408 >  </target>
409  
410 <    <javac srcdir="${ant.src.dir}"
411 <          destdir="${build.ant.dir}"
412 <           source="1.4"/>
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  
424  
291  <target name="filter-src"
292          depends="compile-ant-filter">
425  
426 <    <mkdir dir="${build.filter.src.dir}"/>
426 >  <target name="configure-compiler">
427  
428 <    <copy todir="${build.filter.src.dir}">
297 <      <fileset dir="${src.dir}">
298 <        <include name="**/*.html"/>
299 <      </fileset>
300 <    </copy>
428 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
429  
430 <    <copy todir="${build.filter.src.dir}">
431 <      <fileset dir="${src.dir}">
432 <        <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>
430 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
431 >      <istrue value="${build.warnunchecked}"/>
432 >    </condition>
433  
434 <  </target>
434 >    <property name="warnunchecked.arg" value=""/>
435  
436  
437 <  <target name="filter-doccheck"
438 <          depends="filter-src">
437 >    <!-- Common options in javac invocations -->
438 >    <property name="build.args" value="${warnunchecked.arg}"/>
439  
440 <    <mkdir dir="${build.dc-filter.dir}"/>
440 >  </target>
441  
347    <copy todir="${build.dc-filter.dir}">
348      <fileset dir="${build.filter.src.dir}">
349        <include name="**/*.html"/>
350      </fileset>
351    </copy>
442  
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>
443  
444 <      </filterchain>
385 <    </copy>
386 <
387 <  </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  
403      <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}"
413 <       debuglevel="${build.debuglevel}"
414 <      deprecation="${build.deprecation}"
415 <           source="${build.sourcelevel}"
416 <             fork="true">
466 >    <java classname="ALoops" fork="true">
467 >      <classpath refid="loops.classpath"/>
468 >    </java>
469  
470 <      <include name="jsr166/test/**"/>
470 >  </target>
471  
420      <compilerarg value="${bootclasspath.args}"/>
421      <compilerarg line="${build.args}"/>
472  
473 <      <classpath refid="test.classpath"/>
473 >  <!-- jsr166 4jdk7 -->
474  
475 <    </javac>
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 < <!--
501 <    <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">
500 >    </javac>
501 >  </target>
502  
503 <      <compilerarg value="${bootclasspath.args}"/>
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 >      <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  
439      <classpath refid="test.classpath"/>
440
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  
450    <!-- May be overridden by user.properties -->
451    <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"/>
464      <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}">
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 < -->
589 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
590 >      </test>
591  
592      </junit>
491
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  
495  <target name="report-tests"
496          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"
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>
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  
516    <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  
523    <property name="unchecked.option" value="-Xlint:unchecked"/>
638  
639 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
640 <      <istrue value="${build.warnunchecked}"/>
527 <    </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  
532    <!-- Common options in javac invocations -->
533    <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  
541    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
542    <available property="junit.available"
543               classname="junit.framework.Protectable"/>
658  
659 <    <!-- Xalan -->
546 <    <available property="xalan.available"
547 <               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 -->
551 <    <!--
552 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
553 <          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 <    -->
670 <
671 <  </target>
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  
563  <!-- Anthill targets -->
688  
689 <  <target name="anthill-build">
689 >  <target name="jsr166xjar"
690 >          depends="jsr166xcompile"
691 >          description="Builds library jar from compiled sources">
692  
693 <    <!-- Override this in user.properties -->
694 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
693 >    <jar destfile="${jsr166x.jar}">
694 >      <fileset dir="${build.jsr166x.classes.dir}"/>
695 >    </jar>
696  
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>
697    </target>
698  
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>
699  
700 <    <copy todir="${deployDir}/docs/public">
701 <      <fileset dir="${dist.javadocs.dir}"/>
597 <    </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  
610  <!-- Various demos and test programs -->
611
612
613  <target name="sample" depends="init, configure-compiler"
614          description="Standalone demo program">
724  
725 <    <mkdir dir="${build.testcases.dir}"/>
725 >  <target name="jsr166xclean"
726 >          description="Removes all jsr166x build products">
727  
728 <    <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">
728 >    <delete dir="${build.jsr166x.dir}"/>
729  
730 <      <include name="jsr166/test/Sample.java"/>
627 <
628 <    </javac>
730 >  </target>
731  
630    <copy todir="${build.testcases.dir}">
631      <fileset dir="${test.src.dir}">
632        <include name="**/*.properties"/>
633      </fileset>
634    </copy>
732  
733 +  <target name="jsr166xdist-jar"
734 +          depends="jsr166xclean, jsr166xjar">
735 +    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
736 +  </target>
737  
738 <    <java classname="jsr166.test.Sample" fork="true">
739 <      <classpath refid="test.classpath"/>
740 <      <!-- <jvmarg value="-ea"/> -->
640 <      <!-- <jvmarg value="-server"/> -->
641 <      <!-- <arg value="1000"/> -->
642 <    </java>
738 >  <target name="jsr166xdist-docs"
739 >          depends="jsr166xclean, jsr166xdocs">
740 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
741    </target>
742  
743 +  <!-- jsr166y -->
744  
646  <target name="loops" depends="init, configure-compiler"
647          description="Benchmark from Doug Lea's AQS paper">
745  
746 <    <mkdir dir="${build.loops.dir}"/>
746 >  <target name="jsr166ycompile"
747 >          depends="configure-compiler"
748 >          description="Compiles jsr166y sources">
749  
750 <    <javac srcdir="${loops.src.dir}"
751 <          destdir="${build.loops.dir}"
752 <            debug="${build.debug}"
753 <       debuglevel="${build.debuglevel}"
754 <      deprecation="${build.deprecation}"
755 <           source="${build.sourcelevel}"
756 <             fork="true">
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}"/>
660      <classpath refid="loops.classpath"/>
769  
770      </javac>
771 +  </target>
772  
664    <java classname="ALoops" fork="true">
665      <classpath refid="loops.classpath"/>
666    </java>
773  
774 <  </target>
774 >  <target name="jsr166yjar"
775 >          depends="jsr166ycompile"
776 >          description="Builds library jar from compiled sources">
777  
778 +    <jar destfile="${jsr166y.jar}" index="true">
779 +      <fileset dir="${build.jsr166y.classes.dir}"/>
780 +    </jar>
781  
782 <  <target name="compile-j1" depends="init, configure-compiler">
782 >  </target>
783  
673    <mkdir dir="${build.j1.dir}"/>
784  
785 <    <javac srcdir="${j1.src.dir}"
786 <          destdir="${build.j1.dir}"
677 <            debug="${build.debug}"
678 <       debuglevel="${build.debuglevel}"
679 <      deprecation="${build.deprecation}"
680 <           source="${build.sourcelevel}"
681 <             fork="true">
785 >  <target name="jsr166ydocs"
786 >          description="Builds javadocs to dist dir">
787  
788 <      <compilerarg line="${build.args}"/>
789 <      <classpath refid="j1.classpath"/>
788 >    <delete dir="${jsr166ydocs.dir}"/>
789 >    <mkdir dir="${jsr166ydocs.dir}"/>
790  
791 <    </javac>
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  
804  
805 <  <target name="sw" depends="compile-j1"
806 <          description="Runs the SwingWorker demo">
805 >  <target name="jsr166ydist"
806 >          depends="jsr166ydist-jar, jsr166ydist-docs"
807 >          description="Puts all distributable products in single hierarchy"/>
808  
694    <!--
695    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
696      <classpath refid="j1.classpath"/>
697    </java>
698    -->
809  
810 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
810 >  <target name="jsr166yclean"
811 >          description="Removes all jsr166y build products">
812  
813 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
703 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
704 <    </exec>
813 >    <delete dir="${build.jsr166y.dir}"/>
814  
815    </target>
816  
708  <target name="j1" depends="compile-j1"
709          description="Runs a standalone JavaOne program">
817  
818 <    <java classname="jsr166.misc.SortedEnumSet" fork="true">
819 <      <classpath refid="j1.classpath"/>
820 <    </java>
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 <  <target name="test-j1" depends="compile-j1"
719 <          description="Runs testcases from the JavaOne source directories">
829 >  <!-- extra166y -->
830  
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>
831  
832 <    </junit>
832 >  <target name="extra166ycompile"
833 >          depends="configure-compiler, jsr166yjar"
834 >          description="Compiles extra166y sources">
835  
836 <    <available property="junit.report.format"
837 <                  value="frames"
838 <              classname="org.apache.xalan.lib.Redirect"/>
839 <    <property name="junit.report.format" value="noframes"/>
840 <
841 <    <junitreport todir="${build.j1.dir}">
842 <      <fileset dir="${build.j1.dir}">
843 <        <include name="TEST-*.xml"/>
844 <      </fileset>
845 <      <report styledir="${stylesheet.dir}"
846 <                format="${junit.report.format}"
847 <                 todir="${build.j1.dir}"
848 <      />
849 <    </junitreport>
836 >    <mkdir dir="${build.extra166y.classes.dir}"/>
837 >
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 <    <fail message="Test Cases Failed" if="junit.failed"/>
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="extra166yjar"
861 +          depends="extra166ycompile"
862 +          description="Builds library jar from compiled sources">
863  
864 <  <!-- C++ and JNI definitions and demos -->
864 >    <jar destfile="${extra166y.jar}" index="true">
865 >      <fileset dir="${build.extra166y.classes.dir}"/>
866 >    </jar>
867  
868 <  <target name="configure-cpp">
868 >  </target>
869  
765    <!-- Define tasks and types -->
870  
871 <    <path id="cpptasks.path">
872 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
769 <    </path>
770 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
771 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
871 >  <target name="extra166ydocs"
872 >          description="Builds javadocs to build dir">
873  
874 <    <!-- Set platform property for JNI includes -->
874 >    <delete dir="${extra166ydocs.dir}"/>
875 >    <mkdir dir="${extra166ydocs.dir}"/>
876  
877 <    <condition property="platform" value="linux">
878 <      <os name="Linux"/>
879 <    </condition>
880 <    <condition property="platform" value="win32">
881 <      <os family="windows"/>
882 <    </condition>
883 <    <condition property="platform" value="solaris">
884 <      <os name="SunOS"/>
885 <    </condition>
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="cppdemo" depends="configure-cpp">
891 >  <target name="extra166ydist"
892 >          depends="extra166ydist-jar, extra166ydist-docs"
893 >          description="Puts all distributable products in single hierarchy"/>
894  
790    <mkdir dir="${build.dir}"/>
895  
896 <    <cc multithreaded="true"
897 <                 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>
896 >  <target name="extra166yclean"
897 >          description="Removes all extra166y build products">
898  
899 <    <exec executable="${build.dir}/CppDemo">
801 <      <arg line="count in word frequency of word in command line count"/>
802 <    </exec>
899 >    <delete dir="${build.extra166y.dir}"/>
900  
901    </target>
902  
903  
904 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
904 >  <target name="extra166ydist-jar"
905 >          depends="extra166yclean, extra166yjar">
906 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
907 >  </target>
908  
909 <    <mkdir dir="${build.testcases.dir}"/>
909 >  <target name="extra166ydist-docs"
910 >          depends="extra166yclean, extra166ydocs">
911 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
912 >  </target>
913  
914 <    <javac srcdir="${test.src.dir}"
915 <          destdir="${build.testcases.dir}"
916 <            debug="${build.debug}"
917 <       debuglevel="${build.debuglevel}"
918 <      deprecation="${build.deprecation}"
919 <           source="${build.sourcelevel}"
920 <             fork="true">
921 <      <compilerarg value="${bootclasspath.args}"/>
914 >  <!-- jsr166e -->
915 >
916 >  <property name="build.jsr166e.java.version" value="6"/>
917 >  <property name="build.jsr166e.javac" value="${javac6}"/>
918 >
919 >  <target name="jsr166ecompile"
920 >          depends="configure-compiler"
921 >          description="Compiles jsr166e sources">
922 >
923 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
924 >
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 <      <classpath refid="test.classpath"/>
821 <      <include name="JniDemo.java"/>
941 >
942      </javac>
943 +  </target>
944  
945 <    <javah destdir="${build.testcases.dir}"
946 <      classpathref="test.classpath">
947 <      <class name="JniDemo"/>
948 <    </javah>
949 <
950 <    <cc multithreaded="true"
951 <                 name="g++"
952 <               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>
945 >
946 >  <target name="jsr166ejar"
947 >          depends="jsr166ecompile"
948 >          description="Builds library jar from compiled sources">
949 >
950 >    <jar destfile="${jsr166e.jar}" index="true">
951 >      <fileset dir="${build.jsr166e.classes.dir}"/>
952 >    </jar>
953  
954    </target>
955  
956  
957 +  <target name="jsr166edocs"
958 +          description="Builds javadocs to build dir">
959  
960 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
960 >    <delete dir="${jsr166edocs.dir}"/>
961 >    <mkdir dir="${jsr166edocs.dir}"/>
962  
963 +    <javadoc destdir="${jsr166edocs.dir}"
964 +             packagenames="jsr166e.*"
965 +             link="${jdkapidocs.url}"
966 +             access="${build.javadoc.access}"
967 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
968 +             source="${build.jsr166e.java.version}"
969 +             executable="${javadoc7}">
970 +      <arg value="-XDignore.symbol.file=true"/>
971  
972 +    </javadoc>
973 +  </target>
974  
874  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
875  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
876  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
877  <property name="pretiger.sourcelevel" value="1.4"/>
975  
976 <  <target name="defang"
977 <       depends="init"
881 <   description="Generates pre-Tiger compatible source">
976 >  <target name="jsr166e-test-tck-one-java-version"
977 >          depends="jsr166ejar">
978  
979 <    <delete dir="${pretiger.src.dir}"/>
980 <    <mkdir dir="${pretiger.src.dir}"/>
979 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
980 >
981 >    <run-tck-tests
982 >      tck.src.dir="${test.src.dir}/tck-jsr166e"
983 >      target="${build.jsr166e.java.version}"
984 >      workdir="${build.jsr166e.dir}"
985 >      classes="${jsr166e.jar}"/>
986 >  </target>
987  
988 <    <exec executable="perl">
989 <      <arg file="etc/defang.pl"/>
888 <      <!-- <arg value="-v"/> -->
889 <      <arg value="-s"/> <arg file="${src.dir}"/>
890 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
891 <    </exec>
988 >  <target name="jsr166e-test-tck"
989 >          description="Runs tck tests for jsr166e for multiple java versions">
990  
991 + <!--     <antcall target="clean"/> -->
992 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
993 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
994 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
995 + <!--     </antcall> -->
996 +
997 +    <antcall target="clean"/>
998 +    <antcall target="jsr166e-test-tck-one-java-version">
999 +      <param name="build.jsr166e.java.version" value="7"/>
1000 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1001 +    </antcall>
1002 +
1003 +    <antcall target="clean"/>
1004 +    <antcall target="jsr166e-test-tck-one-java-version">
1005 +      <param name="build.jsr166e.java.version" value="6"/>
1006 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1007 +    </antcall>
1008    </target>
1009  
895  <target name="compile-pretiger"
896          depends="init, configure-compiler, defang"
897          description="Compiles pre-Tiger sources to build folder">
1010  
1011 <    <mkdir dir="${build.pretiger.dir}"/>
1011 >  <target name="jsr166e-test"
1012 >          depends="jsr166e-test-tck"
1013 >          description="Runs all tests for jsr166e">
1014 >  </target>
1015  
1016 <    <javac srcdir="${pretiger.src.dir}"
1017 <          destdir="${build.pretiger.dir}"
1018 <            debug="${build.debug}"
904 <       debuglevel="${build.debuglevel}"
905 <      deprecation="${build.deprecation}"
906 <           source="${pretiger.sourcelevel}"
907 <             fork="true">
1016 >  <target name="jsr166edist"
1017 >          depends="jsr166edist-jar, jsr166edist-docs"
1018 >          description="Puts all distributable products in single hierarchy"/>
1019  
909      <compilerarg line="${build.args}"/>
910      <exclude name="**/Thread.java"/>
1020  
1021 <    </javac>
1021 >  <target name="jsr166eclean"
1022 >          description="Removes all jsr166e build products">
1023 >    <delete dir="${build.jsr166e.dir}"/>
1024 >  </target>
1025 >
1026  
1027 +  <target name="jsr166edist-jar"
1028 +          depends="jsr166eclean, jsr166ejar">
1029 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1030    </target>
1031  
1032 <  <target name="pretiger" depends="compile-pretiger">
1032 >  <target name="jsr166edist-docs"
1033 >          depends="jsr166eclean, jsr166edocs">
1034 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1035 >  </target>
1036  
918    <mkdir dir="${build.lib.dir}"/>
1037  
1038 <    <jar destfile="${pretiger.jar}">
921 <      <fileset dir="${build.pretiger.dir}">
922 <      </fileset>
923 <    </jar>
1038 > <!-- Find buglets that can be detected by static build tools -->
1039  
1040 +  <target name="lint">
1041 +    <antcall target="dists">
1042 +      <param name="build.javadoc.access" value="private"/>
1043 +    </antcall>
1044    </target>
1045  
1046 +
1047   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines