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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines