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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines