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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines