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.67 by jsr166, Sun Apr 11 22:00:40 2004 UTC vs.
Revision 1.143 by dl, Wed Jul 10 17:09:45 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines