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.179 by jsr166, Sun Sep 13 03:22:29 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines