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.166 by jsr166, Mon Aug 10 06:32:23 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 +  <!-- Define jtreg test sets for different jdk versions -->
255 +  <fileset dir="${jtreg.src.dir}">
256 +    <patternset id="jdk9.jtreg.tests">
257 +      <include name="**/*.java"/>
258 +    </patternset>
259 +  </fileset>
260 +
261 +  <fileset dir="${jtreg.src.dir}">
262 +    <patternset id="jdk8.jtreg.tests">
263 +      <include name="**/*.java"/>
264 +      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265 +    </patternset>
266 +  </fileset>
267 +
268 +  <fileset dir="${jtreg.src.dir}">
269 +    <patternset id="jdk7.jtreg.tests">
270 +      <include name="**/*.java"/>
271 +      <exclude name="util/Collection/CollectionDefaults.java"/>
272 +      <exclude name="util/List/ListDefaults.java"/>
273 +      <exclude name="util/Spliterator/**/*.java"/>
274 +      <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275 +      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276 +      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277 +    </patternset>
278 +  </fileset>
279 +
280 +  <macrodef name="run-jtreg-tests">
281 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
283 +    <attribute name="source" default="7"/>
284 +    <attribute name="target"/>
285 +    <attribute name="workdir"/>
286 +    <attribute name="classes"/>
287 +    <attribute name="jtregflags" default=""/>
288 +    <sequential>
289 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
290 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
291 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
292 +    <mkdir dir="@{workdir}/JTreport"/>
293 +    <jtreg dir="@{jtreg.src.dir}"
294 +           jdk="${jdk@{target}.home}"
295 +           workDir="@{workdir}/JTwork"
296 +           reportDir="@{workdir}/JTreport">
297 +      <patternset refid="jdk@{target}.jtreg.tests"/>
298 +      <arg value="-Xbootclasspath/p:@{classes}"/>
299 +      <arg value="-agentvm"/>
300 +      <arg value="-v:nopass,fail"/>
301 +      <arg value="-vmoptions:-esa -ea"/>
302 +      <arg value="-automatic"/>
303 +      <arg value="-k:!ignore"/>
304 +      <arg line="@{jtregflags}"/>
305 +    </jtreg>
306 +    </sequential>
307 +  </macrodef>
308 +
309    <!-- ALoops classpath -->
310    <path id="loops.classpath">
311      <pathelement location="${build.loops.dir}"/>
312    </path>
313  
314 <  <!-- J1 classpath -->
315 <  <path id="j1.classpath">
316 <    <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 <
314 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
315 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
316 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
317  
318    <!-- Main targets -->
319  
320 +  <property name="build.main.java.version" value="9"/>
321 +  <property name="build.main.javac" value="${javac9}"/>
322 +
323 +  <target name="dists"
324 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
325 +          description="Builds all public jars and docs"/>
326  
327    <target name="compile"
328 <          depends="init, configure-compiler"
329 <          description="Compiles main sources to build folder">
328 >          depends="configure-compiler"
329 >          description="Compiles src/main sources to build dir">
330  
331      <mkdir dir="${build.classes.dir}"/>
332  
333      <javac srcdir="${src.dir}"
334 <          destdir="${build.classes.dir}"
335 <            debug="${build.debug}"
336 <       debuglevel="${build.debuglevel}"
337 <      deprecation="${build.deprecation}"
338 <           source="${build.sourcelevel}"
339 <             fork="true">
334 >           destdir="${build.classes.dir}"
335 >           debug="${build.debug}"
336 >           debuglevel="${build.debuglevel}"
337 >           deprecation="${build.deprecation}"
338 >           classpath=""
339 >           includeAntRuntime="false"
340 >           includeJavaRuntime="false"
341 >           executable="${build.main.javac}"
342 >           fork="true">
343  
344        <include name="**/*.java"/>
345 <      <compilerarg value="-XDignore.symbol.file"/>
346 <
347 < <!--
348 <      <exclude name="java/lang/**"/>
345 >      <compilerarg value="-Xprefer:source"/>
346 >      <compilerarg value="-XDignore.symbol.file=true"/>
347 >      <compilerarg value="-Xlint:all"/>
348 >      <compilerarg value="-Werror"/>
349 >      <compilerarg value="-Xdoclint:all/protected"/>
350 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
126      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
127 -->
352  
353      </javac>
130
354    </target>
355  
356  
134
357    <target name="jar"
358            depends="compile"
359            description="Builds library jar from compiled sources">
360  
139    <mkdir dir="${build.lib.dir}"/>
140
361      <jar destfile="${product.jar}">
362        <fileset dir="${build.classes.dir}"/>
363      </jar>
144
364    </target>
365  
366  
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
367    <target name="docs"
368 <          description="Builds javadocs with custom tags to build folder">
157 <
158 <    <delete dir="${build.javadocs.dir}"/>
159 <    <mkdir dir="${build.javadocs.dir}"/>
368 >          description="Builds javadocs for src/main to dist dir">
369  
370 <    <javadoc destdir="${build.javadocs.dir}"
371 <                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 <    >          
370 >    <delete dir="${docs.dir}"/>
371 >    <mkdir dir="${docs.dir}"/>
372  
373 <      <packageset dir="${src.dir}"/>
373 >    <!-- the packagenames="none" hack below prevents scanning the -->
374 >    <!-- sourcepath for packages -->
375  
376 +    <javadoc destdir="${docs.dir}"
377 +             packagenames="none"
378 +             link="${java9.api.url}"
379 +             overview="${src.dir}/intro.html"
380 +             access="${build.javadoc.access}"
381 +             sourcepath="${src.dir}:${jdk9src.dir}"
382 +             classpath=""
383 +             executable="${javadoc9}">
384 +      <fileset dir="${src.dir}" defaultexcludes="yes">
385 +        <include name="**/*.java"/>
386 +      </fileset>
387 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
388 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
389 +      <arg value="-XDignore.symbol.file=true"/>
390 +      <arg value="-tag"/>
391 +      <arg value="${javadoc.jls.option}"/>
392 +      <arg value="-tag"/>
393 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
394 +      <arg value="-tag"/>
395 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
396 +      <arg value="-tag"/>
397 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
398      </javadoc>
170
399    </target>
400  
401  
174
175  <target name="doccheck"
176          depends="filter-doccheck"
177          description="Reports on javadoc style errors">
178
179    <delete dir="${build.doccheck.dir}"/>
180    <mkdir dir="${build.doccheck.dir}"/>
181
182    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
183         docletpath="${lib.dir}/doccheck.jar"
184            destdir="${build.doccheck.dir}">
185      <packageset dir="${build.dc-filter.dir}"/>
186    </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
213  </target>
214
215
216
402    <target name="dist"
403 <          depends="init, dist-clean, dist-jar, dist-docs"
403 >          depends="dist-clean, dist-jar, dist-docs"
404            description="Puts all distributable products in single hierarchy"/>
405  
406  
222
407    <target name="release"
408            depends="dist"
409            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 235 | Line 419
419        <exclude name="**/SyntaxTest.java"/>
420        <exclude name="**/SuperfluousAbstract.java"/>
421      </jar>
238
422    </target>
423  
424  
242
425    <target name="clean"
426            description="Removes all build products">
427  
428      <delete dir="${build.dir}"/>
247    <delete dir="${build.classes.dir}"/>
248    <delete dir="${build.lib.dir}"/>
429  
430    </target>
431  
432  
253
433    <target name="dist-clean"
434            description="Removes all build and distribution products">
435  
436 +    <delete dir="${build.dir}"/>
437      <delete dir="${dist.dir}"/>
438  
439    </target>
440  
441  
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
442    <target name="dist-jar"
443            depends="clean, jar">
316
444      <copy file="${product.jar}" todir="${dist.dir}"/>
445 +  </target>
446  
447 +  <target name="dist-docs"
448 +          depends="clean, docs">
449 +    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>
451  
452 +  <target name="tck" depends="test-tck" description="alias for test-tck"/>
453 +  <target name="test-tck"
454 +          depends="jar"
455 +          description="Runs tck tests for main directly">
456 +
457 +    <run-tck-tests
458 +      target="${build.main.java.version}"
459 +      workdir="${build.dir}"
460 +      classes="${product.jar}"/>
461 +  </target>
462 +
463 +  <target name="test-tck-parallelism-1"
464 +          description="Runs test-tck with given common pool parallelism">
465 +    <antcall target="test-tck">
466 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
467 +    </antcall>
468 +  </target>
469 +
470 +  <target name="test-tck-parallelism-0"
471 +          description="Runs test-tck with given common pool parallelism">
472 +    <antcall target="test-tck">
473 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
474 +    </antcall>
475 +  </target>
476 +
477 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478 +  <target name="test-jtreg"
479 +          depends="jar"
480 +          description="Runs jtreg tests for main using the jtreg ant task">
481 +    <run-jtreg-tests
482 +       target="${build.main.java.version}"
483 +       workdir="${build.dir}"
484 +       classes="${product.jar}"/>
485 +  </target>
486  
487 <  <target name="compile-ant-filter"
488 <          depends="init">
487 >  <target name="test"
488 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
489 >          description="Runs tck and jtreg tests for main">
490 >  </target>
491  
492 <    <mkdir dir="${build.ant.dir}"/>
492 >  <target name="test89"
493 >          description="Runs tck and jtreg tests for main for multiple java versions">
494  
495 <    <javac srcdir="${ant.src.dir}"
496 <          destdir="${build.ant.dir}"
497 <           source="1.4"/>
495 >    <antcall target="clean"/>
496 >    <antcall target="test">
497 >      <param name="build.main.java.version" value="8"/>
498 >      <param name="build.main.javac" value="${javac8}"/>
499 >      <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500 >    </antcall>
501 >
502 >    <antcall target="clean"/>
503 >    <antcall target="test">
504 >      <param name="build.main.java.version" value="9"/>
505 >      <param name="build.main.javac" value="${javac9}"/>
506 >    </antcall>
507  
508    </target>
509  
510  
334  <target name="filter-src"
335          depends="compile-ant-filter">
336
337    <mkdir dir="${build.filter.src.dir}"/>
511  
512 <    <copy todir="${build.filter.src.dir}">
340 <      <fileset dir="${src.dir}">
341 <        <include name="**/*.html"/>
342 <      </fileset>
343 <    </copy>
512 >  <target name="configure-compiler">
513  
514 <    <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>
514 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
515  
516 <  </target>
516 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
517 >      <istrue value="${build.warnunchecked}"/>
518 >    </condition>
519  
520 +    <property name="warnunchecked.arg" value=""/>
521  
385  <target name="filter-doccheck"
386          depends="filter-src">
522  
523 <    <mkdir dir="${build.dc-filter.dir}"/>
523 >    <!-- Common options in javac invocations -->
524 >    <property name="build.args" value="${warnunchecked.arg}"/>
525  
526 <    <copy todir="${build.dc-filter.dir}">
391 <      <fileset dir="${build.filter.src.dir}">
392 <        <include name="**/*.html"/>
393 <      </fileset>
394 <    </copy>
526 >  </target>
527  
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>
528  
427      </filterchain>
428    </copy>
529  
530 <  </target>
530 >  <!-- Various demos and test programs -->
531  
532  
533 <  <target name="compile-tests"
534 <          depends="jar">
533 >  <target name="loops" depends="configure-compiler"
534 >          description="Benchmark from Doug Lea's AQS paper">
535  
536 <    <mkdir dir="${build.testcases.dir}"/>
536 >    <mkdir dir="${build.loops.dir}"/>
537  
538 <    <javac srcdir="${tck.src.dir}"
539 <          destdir="${build.testcases.dir}"
538 >    <javac srcdir="${loops.src.dir}"
539 >          destdir="${build.loops.dir}"
540              debug="${build.debug}"
541         debuglevel="${build.debuglevel}"
542        deprecation="${build.deprecation}"
543             source="${build.sourcelevel}"
544               fork="true">
545  
446      <compilerarg value="${bootclasspath.args}"/>
546        <compilerarg line="${build.args}"/>
547 <
548 <      <classpath refid="test.classpath"/>
547 >      <classpath refid="loops.classpath"/>
548 >      <compilerarg value="-XDignore.symbol.file=true"/>
549  
550      </javac>
551  
552 <    <javac srcdir="${test.src.dir}"
553 <          destdir="${build.testcases.dir}"
554 <            debug="${build.debug}"
456 <       debuglevel="${build.debuglevel}"
457 <      deprecation="${build.deprecation}"
458 <           source="${build.sourcelevel}"
459 <             fork="true">
460 <
461 <      <include name="jsr166/test/**"/>
552 >    <java classname="ALoops" fork="true">
553 >      <classpath refid="loops.classpath"/>
554 >    </java>
555  
556 <      <compilerarg value="${bootclasspath.args}"/>
464 <      <compilerarg line="${build.args}"/>
556 >  </target>
557  
466      <classpath refid="test.classpath"/>
558  
559 <    </javac>
559 >  <target name="compile-test-loops" depends="jar"
560 >          description="compile all the perf tests in src/test/loops">
561  
562 < <!--
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">
562 >    <mkdir dir="${build.dir}/test/loops"/>
563  
564 <      <compilerarg value="${bootclasspath.args}"/>
564 >    <javac srcdir="${basedir}/src/test/loops"
565 >           destdir="${build.dir}/test/loops"
566 >           debug="${build.debug}"
567 >           debuglevel="${build.debuglevel}"
568 >           deprecation="${build.deprecation}"
569 >           includeAntRuntime="false"
570 >           includeJavaRuntime="false"
571 >           executable="${javac9}"
572 >           fork="true">
573 >
574 >      <include name="*.java"/>
575 >      <compilerarg value="-XDignore.symbol.file=true"/>
576 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
578        <compilerarg line="${build.args}"/>
579  
482      <classpath refid="test.classpath"/>
483
580      </javac>
485 -->
581  
582    </target>
583  
584  
585 <  <target name="run-tests"
491 <          depends="compile-tests">
492 <
493 <    <!-- May be overridden by user.properties -->
494 <    <property name="testcase" value="*"/>
495 <
496 <    <mkdir dir="${build.reports.dir}"/>
497 <
498 <    <junit printsummary="true"
499 <             showoutput="true"
500 <          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"/>
585 >  <!-- jsr166 4jdk7 -->
586  
587 <      <formatter type="xml"/>
587 >  <target name="4jdk7compile"
588 >          depends="configure-compiler"
589 >          description="Compiles src/jdk7 sources, targeting jdk7">
590 >
591 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
592 >
593 >    <javac srcdir="${4jdk7src.dir}"
594 >           destdir="${build.4jdk7.classes.dir}"
595 >           debug="${build.debug}"
596 >           debuglevel="${build.debuglevel}"
597 >           deprecation="${build.deprecation}"
598 >           source="6"
599 >           classpath=""
600 >           bootclasspath="${bootclasspath6}"
601 >           includeAntRuntime="false"
602 >           includeJavaRuntime="false"
603 >           executable="${javac7}"
604 >           fork="true">
605  
606 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
607 <        <fileset dir="${tck.src.dir}">
608 <          <include name="**/${testcase}Test.java"/>
609 <        </fileset>
610 <      </batchtest>
611 <
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>
606 >      <include name="**/*.java"/>
607 >      <compilerarg value="-Xprefer:source"/>
608 >      <compilerarg value="-XDignore.symbol.file=true"/>
609 >      <compilerarg value="-Xlint:all"/>
610 >      <compilerarg value="-Werror"/>
611 >      <compilerarg line="${build.args}"/>
612  
613 +    </javac>
614    </target>
615  
616 +  <target name="4jdk7doclint"
617 +          depends="configure-compiler"
618 +          description="Finds doclint warnings">
619 +
620 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
621 +
622 +    <javac srcdir="${4jdk7src.dir}"
623 +           destdir="${build.4jdk7.classes.dir}"
624 +           debug="${build.debug}"
625 +           debuglevel="${build.debuglevel}"
626 +           deprecation="${build.deprecation}"
627 +           source="6"
628 +           classpath=""
629 +           bootclasspath="${bootclasspath7}"
630 +           includeAntRuntime="false"
631 +           includeJavaRuntime="false"
632 +           executable="${javac8}"
633 +           fork="true">
634  
635 <  <target name="report-tests"
636 <          depends="run-tests">
637 <
638 <    <!-- Sets junit.report.format to frames if redirection is present,
639 <         otherwise sets it to noframes. -->
640 <    <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"/>
635 >      <include name="**/*.java"/>
636 >      <compilerarg value="-Xprefer:source"/>
637 >      <compilerarg value="-XDignore.symbol.file=true"/>
638 >      <compilerarg value="-Xlint:all"/>
639 >      <compilerarg value="-Xdoclint:all/protected"/>
640 >      <compilerarg line="${build.args}"/>
641  
642 +    </javac>
643    </target>
644  
645  
646 <  <target name="configure-compiler">
647 <
648 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
567 <
568 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
569 <      <istrue value="${build.warnunchecked}"/>
570 <    </condition>
646 >  <target name="4jdk7jar"
647 >          depends="4jdk7compile"
648 >          description="Builds library jar from compiled sources">
649  
650 <    <property name="warnunchecked.arg" value=""/>
650 >    <jar destfile="${4jdk7product.jar}">
651 >      <fileset dir="${build.4jdk7.classes.dir}"/>
652 >    </jar>
653  
654 +  </target>
655  
575    <!-- Common options in javac invocations -->
576    <property name="build.args" value="${warnunchecked.arg}"/>
656  
657 +  <target name="4jdk7-test-tck"
658 +          depends="4jdk7jar"
659 +          description="Runs tck tests for jsr166-4jdk7 directly">
660 +
661 +    <run-tck-tests
662 +      target="7"
663 +      workdir="${build.4jdk7.dir}"
664 +      classes="${4jdk7product.jar}">
665 +      <javac-elements>
666 +        <!-- JDK8+ test classes -->
667 +        <exclude name="*8Test.java"/>
668 +        <exclude name="*9Test.java"/>
669 +        <exclude name="DoubleAccumulatorTest.java"/>
670 +        <exclude name="DoubleAdderTest.java"/>
671 +        <exclude name="LongAccumulatorTest.java"/>
672 +        <exclude name="LongAdderTest.java"/>
673 +        <exclude name="CompletableFutureTest.java"/>
674 +        <exclude name="SplittableRandomTest.java"/>
675 +        <exclude name="StampedLockTest.java"/>
676 +      </javac-elements>
677 +    </run-tck-tests>
678    </target>
679  
680  
681 <  <target name="configure-tests"
682 <       depends="configure-compiler">
681 >  <target name="4jdk7-test-tck-junit"
682 >          depends="4jdk7compile"
683 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
684  
685 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
686 <    <available property="junit.available"
687 <               classname="junit.framework.Protectable"/>
685 >    <junit printsummary="true"
686 >           showoutput="true"
687 >           errorProperty="junit.failed"
688 >           failureProperty="junit.failed"
689 >           includeantruntime="true"
690 >           jvm="${java7}"
691 >           fork="true">
692  
693 <    <!-- Xalan -->
694 <    <available property="xalan.available"
590 <               classname="org.apache.xalan.Version"/>
693 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
694 >      <jvmarg value="-server"/>
695  
696 +      <classpath>
697 +        <pathelement location="${junit.jar}"/>
698 +        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
699 +      </classpath>
700  
701 <    <!-- 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"/>
701 >      <formatter type="brief"/>
702  
703 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
704 <          unless="xalan.available"/>
600 <    -->
703 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
704 >      </test>
705  
706 +    </junit>
707    </target>
708  
709 <
710 <
711 <  <!-- Anthill targets -->
712 <
713 <  <target name="anthill-build">
714 <
715 <    <!-- 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>
709 >  <target name="4jdk7-test-jtreg"
710 >          depends="4jdk7jar"
711 >          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
712 >    <run-jtreg-tests
713 >       target="7"
714 >       workdir="${build.4jdk7.dir}"
715 >       classes="${4jdk7product.jar}"/>
716    </target>
717  
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>
718  
719 +  <target name="4jdk7-test"
720 +          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
721 +          description="Runs tck and jtreg tests for jsr166-4jdk7">
722    </target>
723  
724  
725 <
726 <  <!-- Various demos and test programs -->
727 <
728 <
729 <  <target name="sample" depends="init, configure-compiler"
730 <          description="Standalone demo program">
731 <
732 <    <mkdir dir="${build.testcases.dir}"/>
733 <
734 <    <javac srcdir="${test.src.dir}"
735 <          destdir="${build.testcases.dir}"
736 <            debug="${build.debug}"
737 <       debuglevel="${build.debuglevel}"
738 <      deprecation="${build.deprecation}"
739 <           source="${build.sourcelevel}"
740 <             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"/>
725 >  <target name="4jdk7docs"
726 >          description="Builds javadocs for src/jdk7 to dist dir">
727 >
728 >    <delete dir="${4jdk7docs.dir}"/>
729 >    <mkdir dir="${4jdk7docs.dir}"/>
730 >
731 >    <javadoc destdir="${4jdk7docs.dir}"
732 >             packagenames="none"
733 >             link="${java7.api.url}"
734 >             overview="${4jdk7src.dir}/intro.html"
735 >             access="${build.javadoc.access}"
736 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
737 >             classpath=""
738 >             executable="${javadoc7}">
739 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
740 >        <include name="**/*.java"/>
741        </fileset>
742 <    </copy>
743 <
744 <
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>
742 >      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
743 >      <arg value="-XDignore.symbol.file=true"/>
744 >    </javadoc>
745    </target>
746  
747  
748 <  <target name="loops" depends="init, configure-compiler"
749 <          description="Benchmark from Doug Lea's AQS paper">
748 >  <target name="4jdk7dist"
749 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
750 >          description="Puts all distributable products in single hierarchy"/>
751  
692    <mkdir dir="${build.loops.dir}"/>
752  
753 <    <javac srcdir="${loops.src.dir}"
754 <          destdir="${build.loops.dir}"
696 <            debug="${build.debug}"
697 <       debuglevel="${build.debuglevel}"
698 <      deprecation="${build.deprecation}"
699 <           source="${build.sourcelevel}"
700 <             fork="true">
753 >  <target name="4jdk7clean"
754 >          description="Removes all 4jdk7 build products">
755  
756 <      <compilerarg line="${build.args}"/>
703 <      <classpath refid="loops.classpath"/>
756 >    <delete dir="${build.4jdk7.dir}"/>
757  
758 <    </javac>
758 >  </target>
759  
707    <java classname="ALoops" fork="true">
708      <classpath refid="loops.classpath"/>
709    </java>
760  
761 +  <target name="4jdk7dist-jar"
762 +          depends="4jdk7clean, 4jdk7jar">
763 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
764    </target>
765  
766  
767 <  <target name="compile-j1" depends="init, configure-compiler, compile">
767 >  <target name="4jdk7dist-docs"
768 >          depends="4jdk7clean, 4jdk7docs">
769 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
770 >  </target>
771  
716    <mkdir dir="${build.j1.dir}"/>
772  
773 <    <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}" >
773 >  <!-- jsr166x -->
774  
775 <      <include name="**/*.java"/>
776 <      <exclude name="**/dijkstra/**"/>
775 >  <target name="jsr166xcompile"
776 >          depends="configure-compiler"
777 >          description="Compiles jsr166x sources to build dir">
778  
779 +    <mkdir dir="${build.jsr166x.classes.dir}"/>
780 +
781 +    <javac srcdir="${topsrc.dir}"
782 +           destdir="${build.jsr166x.classes.dir}"
783 +           debug="${build.debug}"
784 +           debuglevel="${build.debuglevel}"
785 +           deprecation="${build.deprecation}"
786 +           classpath=""
787 +           bootclasspath="${bootclasspath6}"
788 +           source="5"
789 +           includeAntRuntime="false"
790 +           includeJavaRuntime="false"
791 +           executable="${javac7}"
792 +           fork="true">
793 +
794 +      <include name="jsr166x/**/*.java"/>
795 +      <compilerarg value="-XDignore.symbol.file=true"/>
796 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
797 +      <compilerarg value="-Werror"/>
798        <compilerarg line="${build.args}"/>
729      <classpath refid="j1.classpath"/>
799  
800      </javac>
732
801    </target>
802  
803  
804 <  <target name="sw" depends="compile-j1"
805 <          description="Runs the SwingWorker demo">
806 <
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"/>
804 >  <target name="jsr166xjar"
805 >          depends="jsr166xcompile"
806 >          description="Builds library jar from compiled sources">
807  
808 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
809 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
810 <    </exec>
808 >    <jar destfile="${jsr166x.jar}">
809 >      <fileset dir="${build.jsr166x.classes.dir}"/>
810 >    </jar>
811  
812    </target>
813  
753  <target name="j1" depends="compile-j1"
754          description="Runs a standalone JavaOne program">
814  
815 <    <java classname="${j1.test}" fork="true">
816 <      <classpath refid="j1.classpath"/>
758 <      <jvmarg value="-client"/>
759 <
760 <      <!-- TestPseudoRandom args -->
761 <      <arg value="2"/>
762 <      <arg value="25"/>
763 <      <arg value="100000"/>
815 >  <target name="jsr166xdocs"
816 >          description="Builds javadocs to dist dir">
817  
818 <      <!-- WebCrawler args -->
819 <      <!--
767 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
768 <      <arg value="http://www.priorartisans.com"/>
769 <      <arg value="25"/>
770 <      -->
818 >    <delete dir="${jsr166xdocs.dir}"/>
819 >    <mkdir dir="${jsr166xdocs.dir}"/>
820  
821 <    </java>
821 >    <javadoc destdir="${jsr166xdocs.dir}"
822 >             packagenames="jsr166x.*"
823 >             link="${java.api.url}"
824 >             access="${build.javadoc.access}"
825 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
826 >             bootclasspath="${bootclasspath6}"
827 >             source="5"
828 >             executable="${javadoc7}">
829 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
830 >      <arg value="-XDignore.symbol.file=true"/>
831  
832 +    </javadoc>
833    </target>
834  
835  
836 <  <target name="test-j1" depends="compile-j1"
837 <          description="Runs testcases from the JavaOne source directories">
838 <
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>
836 >  <target name="jsr166xdist"
837 >          depends="jsr166xdist-jar, jsr166xdist-docs"
838 >          description="Puts all distributable products in single hierarchy"/>
839  
797    </junit>
840  
841 <    <available property="junit.report.format"
842 <                  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>
841 >  <target name="jsr166xclean"
842 >          description="Removes all jsr166x build products">
843  
844 <    <fail message="Test Cases Failed" if="junit.failed"/>
844 >    <delete dir="${build.jsr166x.dir}"/>
845  
846    </target>
847  
848  
849 <
850 <  <!-- C++ and JNI definitions and demos -->
851 <
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 <
849 >  <target name="jsr166xdist-jar"
850 >          depends="jsr166xclean, jsr166xjar">
851 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
852    </target>
853  
854 <
855 <  <target name="cppdemo" depends="configure-cpp">
856 <
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 <
854 >  <target name="jsr166xdist-docs"
855 >          depends="jsr166xclean, jsr166xdocs">
856 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
857    </target>
858  
859 +  <!-- jsr166y -->
860  
866  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
861  
862 <    <mkdir dir="${build.testcases.dir}"/>
862 >  <target name="jsr166ycompile"
863 >          depends="configure-compiler"
864 >          description="Compiles jsr166y sources">
865  
866 <    <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>
866 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
867  
868 <    <javah destdir="${build.testcases.dir}"
869 <      classpathref="test.classpath">
870 <      <class name="JniDemo"/>
871 <    </javah>
872 <
873 <    <cc multithreaded="true"
874 <                 name="g++"
875 <               objdir="${build.dir}"
876 <              outfile="${build.dir}/JniDemo"
877 <              outtype="shared">
878 <
879 <      <compiler>
880 <        <defineset>
881 <          <define name="__int64" value="long long"/>
882 <        </defineset>
883 <        <includepath location="${java.home}/../include"/>
884 <        <includepath location="${java.home}/../include/${platform}"/>
885 <        <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>
868 >    <javac srcdir="${topsrc.dir}"
869 >           destdir="${build.jsr166y.classes.dir}"
870 >           debug="${build.debug}"
871 >           debuglevel="${build.debuglevel}"
872 >           deprecation="${build.deprecation}"
873 >           source="6"
874 >           classpath=""
875 >           bootclasspath="${bootclasspath6}"
876 >           includeAntRuntime="false"
877 >           includeJavaRuntime="false"
878 >           executable="${javac7}"
879 >           fork="true">
880 >
881 >      <include name="jsr166y/**/*.java"/>
882 >      <compilerarg value="-XDignore.symbol.file=true"/>
883 >      <compilerarg value="-Xlint:all"/>
884 >      <compilerarg value="-Werror"/>
885 >      <compilerarg line="${build.args}"/>
886  
887 +    </javac>
888    </target>
889  
890  
891 +  <target name="jsr166yjar"
892 +          depends="jsr166ycompile"
893 +          description="Builds library jar from compiled sources">
894  
895 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
896 <
895 >    <jar destfile="${jsr166y.jar}" index="true">
896 >      <fileset dir="${build.jsr166y.classes.dir}"/>
897 >    </jar>
898  
899 +  </target>
900  
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"/>
901  
902 <  <target name="defang"
903 <       depends="init"
940 <   description="Generates pre-Tiger compatible source">
902 >  <target name="jsr166ydocs"
903 >          description="Builds javadocs to dist dir">
904  
905 <    <delete dir="${pretiger.src.dir}"/>
906 <    <mkdir dir="${pretiger.src.dir}"/>
905 >    <delete dir="${jsr166ydocs.dir}"/>
906 >    <mkdir dir="${jsr166ydocs.dir}"/>
907  
908 <    <exec executable="perl">
909 <      <arg file="etc/defang.pl"/>
910 <      <!-- <arg value="-v"/> -->
911 <      <arg value="-s"/> <arg file="${src.dir}"/>
912 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
913 <    </exec>
908 >    <javadoc destdir="${jsr166ydocs.dir}"
909 >             packagenames="jsr166y.*"
910 >             link="${java.api.url}"
911 >             access="${build.javadoc.access}"
912 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
913 >             bootclasspath="${bootclasspath6}"
914 >             source="6"
915 >             executable="${javadoc7}">
916 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
917 >      <arg value="-XDignore.symbol.file=true"/>
918  
919 +    </javadoc>
920    </target>
921  
954  <target name="compile-pretiger"
955          depends="init, configure-compiler, defang"
956          description="Compiles pre-Tiger sources to build folder">
922  
923 <    <mkdir dir="${build.pretiger.dir}"/>
923 >  <target name="jsr166ydist"
924 >          depends="jsr166ydist-jar, jsr166ydist-docs"
925 >          description="Puts all distributable products in single hierarchy"/>
926  
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">
927  
928 <      <compilerarg line="${build.args}"/>
929 <      <exclude name="**/Thread.java"/>
928 >  <target name="jsr166yclean"
929 >          description="Removes all jsr166y build products">
930  
931 <    </javac>
931 >    <delete dir="${build.jsr166y.dir}"/>
932  
933    </target>
934  
975  <target name="pretiger" depends="compile-pretiger">
976
977    <mkdir dir="${build.lib.dir}"/>
935  
936 <    <jar destfile="${pretiger.jar}">
937 <      <fileset dir="${build.pretiger.dir}">
938 <      </fileset>
939 <    </jar>
936 >  <target name="jsr166ydist-jar"
937 >          depends="jsr166yclean, jsr166yjar">
938 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
939 >  </target>
940  
941 +  <target name="jsr166ydist-docs"
942 +          depends="jsr166yclean, jsr166ydocs">
943 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
944    </target>
945  
986  <!-- jsr166x -->
946  
947 +  <!-- extra166y -->
948  
989  <target name="jsr166xcompile"
990          depends="init, configure-compiler"
991          description="Compiles jsr166x sources">
949  
950 <    <mkdir dir="${build.jsr166x.dir}"/>
950 >  <target name="extra166ycompile"
951 >          depends="configure-compiler, jsr166yjar"
952 >          description="Compiles extra166y sources">
953  
954 <    <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">
954 >    <mkdir dir="${build.extra166y.classes.dir}"/>
955  
956 <      <include name="**/*.java"/>
956 >    <javac srcdir="${topsrc.dir}"
957 >           destdir="${build.extra166y.classes.dir}"
958 >           debug="${build.debug}"
959 >           debuglevel="${build.debuglevel}"
960 >           deprecation="${build.deprecation}"
961 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
962 >           classpath=""
963 >           source="6"
964 >           includeAntRuntime="false"
965 >           includeJavaRuntime="false"
966 >           executable="${javac7}"
967 >           fork="true">
968 >
969 >      <include name="extra166y/**/*.java"/>
970 >      <compilerarg value="-XDignore.symbol.file=true"/>
971 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
972 >      <compilerarg value="-Werror"/>
973        <compilerarg line="${build.args}"/>
974  
975      </javac>
1007
976    </target>
977  
978  
979 <
980 <  <target name="jsr166xjar"
1013 <          depends="jsr166xcompile"
979 >  <target name="extra166yjar"
980 >          depends="extra166ycompile"
981            description="Builds library jar from compiled sources">
982  
983 <    <mkdir dir="${build.jsr166xlib.dir}"/>
984 <
1018 <    <jar destfile="${jsr166xproduct.jar}">
1019 <      <fileset dir="${build.jsr166x.dir}"/>
983 >    <jar destfile="${extra166y.jar}" index="true">
984 >      <fileset dir="${build.extra166y.classes.dir}"/>
985      </jar>
986  
987    </target>
988  
989  
990 +  <target name="extra166ydocs"
991 +          description="Builds javadocs to build dir">
992  
993 <  <target name="jsr166xdocs"
994 <          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>
993 >    <delete dir="${extra166ydocs.dir}"/>
994 >    <mkdir dir="${extra166ydocs.dir}"/>
995  
996 +    <javadoc destdir="${extra166ydocs.dir}"
997 +             packagenames="extra166y.*"
998 +             link="${java.api.url}"
999 +             access="${build.javadoc.access}"
1000 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1001 +             bootclasspath="${bootclasspath6}"
1002 +             source="6"
1003 +             executable="${javadoc7}">
1004 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1005 +      <arg value="-XDignore.symbol.file=true"/>
1006  
1007      </javadoc>
1044
1008    </target>
1009  
1010  
1011 <  <target name="jsr166xdist"
1012 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1011 >  <target name="extra166ydist"
1012 >          depends="extra166ydist-jar, extra166ydist-docs"
1013            description="Puts all distributable products in single hierarchy"/>
1014  
1015  
1016 +  <target name="extra166yclean"
1017 +          description="Removes all extra166y build products">
1018  
1019 <  <target name="jsr166xclean"
1055 <          description="Removes all build products">
1056 <
1057 <    <delete dir="${build.jsr166x.dir}"/>
1058 <    <delete dir="${build.jsr166xlib.dir}"/>
1019 >    <delete dir="${build.extra166y.dir}"/>
1020  
1021    </target>
1022  
1023  
1024 <
1025 <  <target name="jsr166xdist-clean"
1026 <          description="Removes all build and distribution products">
1066 <
1024 >  <target name="extra166ydist-jar"
1025 >          depends="extra166yclean, extra166yjar">
1026 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1027    </target>
1028  
1029 <
1030 <
1031 <  <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 <
1029 >  <target name="extra166ydist-docs"
1030 >          depends="extra166yclean, extra166ydocs">
1031 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1032    </target>
1033  
1034 <  <target name="jsr166xdist-jar"
1090 <          depends="jsr166xclean, jsr166xjar">
1034 >  <!-- jsr166e -->
1035  
1036 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1036 >  <property name="build.jsr166e.java.version" value="6"/>
1037 >  <property name="build.jsr166e.javac" value="${javac6}"/>
1038  
1039 <  </target>
1039 >  <target name="jsr166ecompile"
1040 >          depends="configure-compiler"
1041 >          description="Compiles jsr166e sources">
1042  
1043 <  <!-- jsr166y -->
1043 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1044  
1045 +    <javac srcdir="${topsrc.dir}"
1046 +           destdir="${build.jsr166e.classes.dir}"
1047 +           debug="${build.debug}"
1048 +           debuglevel="${build.debuglevel}"
1049 +           deprecation="${build.deprecation}"
1050 +           source="${build.jsr166e.java.version}"
1051 +           classpath=""
1052 +           includeAntRuntime="false"
1053 +           includeJavaRuntime="false"
1054 +           executable="${build.jsr166e.javac}"
1055 +           fork="true">
1056  
1057 <  <target name="jsr166ycompile"
1058 <          depends="init, configure-compiler"
1059 <          description="Compiles jsr166y sources">
1057 >      <include name="jsr166e/**/*.java"/>
1058 >      <compilerarg value="-XDignore.symbol.file=true"/>
1059 >      <compilerarg value="-Xlint:all"/>
1060 >      <compilerarg value="-Werror"/>
1061 >      <compilerarg line="${build.args}"/>
1062  
1063 <    <mkdir dir="${build.jsr166y.dir}"/>
1063 >    </javac>
1064 >  </target>
1065  
1066 <    <javac srcdir="${jsr166ysrc.dir}"
1067 <          destdir="${build.jsr166y.dir}"
1107 <            debug="${build.debug}"
1108 <       debuglevel="${build.debuglevel}"
1109 <      deprecation="${build.deprecation}"
1110 <           source="${build.sourcelevel}"
1111 <             fork="true">
1066 >  <!-- jsr166e: find doclint errors -->
1067 >  <target name="jsr166edoclint">
1068  
1069 <      <include name="**/*.java"/>
1114 <      <compilerarg line="${build.args}"/>
1115 <      <compilerarg value="${bootclasspath.args}"/>
1069 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1070  
1071 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
1071 >    <javac srcdir="${topsrc.dir}"
1072 >           destdir="${build.jsr166e.classes.dir}"
1073 >           debug="${build.debug}"
1074 >           debuglevel="${build.debuglevel}"
1075 >           deprecation="${build.deprecation}"
1076 >           source="${build.jsr166e.java.version}"
1077 >           classpath=""
1078 >           bootclasspath="${bootclasspath7}"
1079 >           includeAntRuntime="false"
1080 >           includeJavaRuntime="false"
1081 >           executable="${javac8}"
1082 >           fork="true">
1083 >
1084 >      <include name="jsr166e/**/*.java"/>
1085 >      <compilerarg value="-XDignore.symbol.file=true"/>
1086 >      <compilerarg value="-Xlint:all"/>
1087 >      <compilerarg value="-Werror"/>
1088 >      <compilerarg value="-Xdoclint:all/protected"/>
1089  
1090      </javac>
1120
1091    </target>
1092  
1093  
1094 <
1095 <  <target name="jsr166yjar"
1126 <          depends="jsr166ycompile"
1094 >  <target name="jsr166ejar"
1095 >          depends="jsr166ecompile"
1096            description="Builds library jar from compiled sources">
1097  
1098 <    <mkdir dir="${build.jsr166ylib.dir}"/>
1099 <
1131 <    <jar destfile="${jsr166yproduct.jar}">
1132 <      <fileset dir="${build.jsr166y.dir}"/>
1098 >    <jar destfile="${jsr166e.jar}" index="true">
1099 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1100      </jar>
1101  
1102    </target>
1103  
1104  
1105 +  <target name="jsr166edocs"
1106 +          description="Builds javadocs to build dir">
1107  
1108 <  <target name="jsr166ydocs"
1109 <          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>
1108 >    <delete dir="${jsr166edocs.dir}"/>
1109 >    <mkdir dir="${jsr166edocs.dir}"/>
1110  
1111 +    <javadoc destdir="${jsr166edocs.dir}"
1112 +             packagenames="jsr166e.*"
1113 +             link="${java.api.url}"
1114 +             access="${build.javadoc.access}"
1115 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1116 +             source="${build.jsr166e.java.version}"
1117 +             executable="${javadoc7}">
1118 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119 +      <arg value="-XDignore.symbol.file=true"/>
1120  
1121      </javadoc>
1156
1122    </target>
1123  
1124  
1125 <  <target name="jsr166ydist"
1126 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
1162 <          description="Puts all distributable products in single hierarchy"/>
1125 >  <target name="jsr166e-test-tck-one-java-version"
1126 >          depends="jsr166ejar">
1127  
1128 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1129  
1130 +    <run-tck-tests
1131 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1132 +      target="${build.jsr166e.java.version}"
1133 +      workdir="${build.jsr166e.dir}"
1134 +      classes="${jsr166e.jar}"/>
1135 +  </target>
1136  
1137 <  <target name="jsr166yclean"
1138 <          description="Removes all build products">
1137 >  <target name="jsr166e-test-tck"
1138 >          description="Runs tck tests for jsr166e for multiple java versions">
1139  
1140 <    <delete dir="${build.jsr166y.dir}"/>
1141 <    <delete dir="${build.jsr166ylib.dir}"/>
1140 > <!--     <antcall target="clean"/> -->
1141 > <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1142 > <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1143 > <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1144 > <!--     </antcall> -->
1145 >
1146 >    <antcall target="clean"/>
1147 >    <antcall target="jsr166e-test-tck-one-java-version">
1148 >      <param name="build.jsr166e.java.version" value="7"/>
1149 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1150 >    </antcall>
1151  
1152 +    <antcall target="clean"/>
1153 +    <antcall target="jsr166e-test-tck-one-java-version">
1154 +      <param name="build.jsr166e.java.version" value="6"/>
1155 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1156 +    </antcall>
1157    </target>
1158  
1159  
1160 +  <target name="jsr166e-test"
1161 +          depends="jsr166e-test-tck"
1162 +          description="Runs all tests for jsr166e">
1163 +  </target>
1164 +
1165 +  <target name="jsr166edist"
1166 +          depends="jsr166edist-jar, jsr166edist-docs"
1167 +          description="Puts all distributable products in single hierarchy"/>
1168  
1176  <target name="jsr166ydist-clean"
1177          description="Removes all build and distribution products">
1169  
1170 +  <target name="jsr166eclean"
1171 +          description="Removes all jsr166e build products">
1172 +    <delete dir="${build.jsr166e.dir}"/>
1173    </target>
1174  
1181  <target name="jsr166ydist-docs"
1182          description="Builds javadocs without custom tags to dist folder">
1183
1184    <delete dir="${dist.jsr166yjavadocs.dir}"/>
1185    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
1175  
1176 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
1177 <                link="http://java.sun.com/javase/6/docs/api/"
1178 <              source="${build.sourcelevel}">
1179 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1191 <      <include name="jsr166y/*.java"/>
1192 <      <include name="jsr166y/forkjoin/*.java"/>
1193 <            </fileset>
1194 <    </javadoc>
1176 >  <target name="jsr166edist-jar"
1177 >          depends="jsr166eclean, jsr166ejar">
1178 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1179 >  </target>
1180  
1181 +  <target name="jsr166edist-docs"
1182 +          depends="jsr166eclean, jsr166edocs">
1183 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1184    </target>
1185  
1198  <target name="jsr166ydist-jar"
1199          depends="jsr166yclean, jsr166yjar">
1186  
1187 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
1187 > <!-- Find buglets that can be detected by static build tools -->
1188  
1189 +  <target name="lint">
1190 +    <antcall target="dists">
1191 +      <param name="build.javadoc.access" value="public"/>
1192 +    </antcall>
1193    </target>
1194  
1195 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1196 +  <target name="lint-private">
1197 +    <antcall target="dist">
1198 +      <param name="build.javadoc.access" value="private"/>
1199 +    </antcall>
1200 +  </target>
1201 +
1202 +
1203   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines