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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines