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.66 by jsr166, Sun Apr 11 01:37:41 2004 UTC vs.
Revision 1.222 by jsr166, Mon Oct 10 04:51:19 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 >  <!-- Run 'ant -projecthelp' (default target) -->
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"/>
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"/>
47  <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 <
150 <  <!-- Distribution locations -->
151 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
149 >  <property name="topsrc.dir"           location="${basedir}/src"/>
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="junit.jar"            location="${lib.dir}/junit.jar"/>
177 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
178 <
179 <  <!-- Bootclasspath argument -->
180 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
181 <
182 <  <!-- Test classpath -->
183 <  <path id="test.classpath">
184 <    <pathelement location="${build.testcases.dir}"/>
185 <    <pathelement location="${junit.jar}"/>
186 <  </path>
187 <
188 <  <!-- ALoops classpath -->
189 <  <path id="loops.classpath">
190 <    <pathelement location="${build.loops.dir}"/>
191 <  </path>
192 <
193 <  <!-- J1 classpath -->
194 <  <path id="j1.classpath">
195 <    <pathelement location="${build.j1.dir}"/>
196 <    <pathelement location="${junit.jar}"/>
197 <    <pathelement location="${concurrent.jar}"/>
198 <  </path>
199 <
200 <
201 <  <!-- Main targets -->
202 <
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-04 -->
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/java/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 <  <target name="compile"
90 <          depends="init, configure-compiler"
91 <          description="Compiles main sources to build folder">
229 >    <sequential>
230  
231 <    <mkdir dir="${build.classes.dir}"/>
231 >    <local name="modules"/>
232 >    <condition property="modules">
233 >      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234 >    </condition>
235  
236 <    <javac srcdir="${src.dir}"
96 <          destdir="${build.classes.dir}"
97 <            debug="${build.debug}"
98 <       debuglevel="${build.debuglevel}"
99 <      deprecation="${build.deprecation}"
100 <           source="${build.sourcelevel}"
101 <             fork="true">
236 >    <mkdir dir="@{workdir}/tck-classes"/>
237  
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 +           encoding="ASCII"
249 +           executable="${javac@{compile-target}}"
250 +           fork="true">
251 +
252 +      <include name="*.java"/>
253 +      <compilerarg value="-XDignore.symbol.file=true"/>
254 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255 +      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256 +      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257        <compilerarg line="${build.args}"/>
258 +      <javac-elements/>
259  
260      </javac>
261  
262 <  </target>
263 <
264 <
265 <
266 <  <target name="jar"
267 <          depends="compile"
268 <          description="Builds library jar from compiled sources">
262 >    <java classname="${jsr166.tckTestClass}"
263 >          failonerror="true"
264 >          jvm="${java@{target}}"
265 >          fork="true">
266 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267 >        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268 >        <jvmarg line="@{jvmflags}"/>
269 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
271 >
272 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273 >        <syspropertyset id="system-properties-used-by-tck">
274 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
275 >          <propertyref prefix="jsr166."/>
276 >          <propertyref name="test.timeout.factor"/>
277 >        </syspropertyset>
278 >
279 >        <classpath>
280 >          <pathelement location="${junit.jar}"/>
281 >          <pathelement location="@{workdir}/tck-classes"/>
282 >        </classpath>
283 >    </java>
284  
285 <    <mkdir dir="${build.lib.dir}"/>
285 >    </sequential>
286 >  </macrodef>
287  
288 <    <jar destfile="${product.jar}">
289 <      <fileset dir="${build.classes.dir}"/>
290 <    </jar>
291 <
292 <  </target>
288 >  <!-- Define jtreg test sets for different jdk versions -->
289 >  <fileset dir="${jtreg9.src.dir}">
290 >    <patternset id="jdk9.jtreg.tests">
291 >      <include name="**/*.java"/>
292 >    </patternset>
293 >  </fileset>
294  
295 +  <fileset dir="${jtreg8.src.dir}">
296 +    <patternset id="jdk8.jtreg.tests">
297 +      <include name="**/*.java"/>
298 +      <exclude name="**/SpliteratorCharacteristics.java"/>
299 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
300 +      <exclude name="**/GCDuringIteration.java"/>
301 +    </patternset>
302 +  </fileset>
303  
304 +  <fileset dir="${jtreg7.src.dir}">
305 +    <patternset id="jdk7.jtreg.tests">
306 +      <include name="**/*.java"/>
307 +    </patternset>
308 +  </fileset>
309  
310 <  <target name="test"
311 <          depends="init, configure-tests, report-tests"
127 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
310 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
311 >  <property name="jtreg.flags" value=""/>
312  
313 +  <macrodef name="run-jtreg-tests">
314 +    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315 +    <attribute name="source" default="7"/>
316 +    <attribute name="target"/>
317 +    <attribute name="workdir"/>
318 +    <attribute name="classes"/>
319 +    <attribute name="jtregflags" default=""/>
320 +
321 +    <sequential>
322 +
323 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
324 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
325 +
326 +    <local name="modules"/>
327 +    <condition property="modules">
328 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
329 +    </condition>
330  
331 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
332 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
333 +    <jtreg dir="${jtreg@{target}.src.dir}"
334 +           jdk="${jdk@{target}.home}"
335 +           workDir="@{workdir}/JTwork"
336 +           reportDir="@{workdir}/JTreport">
337 +      <patternset refid="jdk@{target}.jtreg.tests"/>
338 +      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339 +      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340 +      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" 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 <  <target name="docs"
353 <          description="Builds javadocs with custom tags to build folder">
352 >  <!-- ALoops classpath -->
353 >  <path id="loops.classpath">
354 >    <pathelement location="${build.loops.dir}"/>
355 >  </path>
356  
357 <    <delete dir="${build.javadocs.dir}"/>
358 <    <mkdir dir="${build.javadocs.dir}"/>
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 <    <javadoc destdir="${build.javadocs.dir}"
138 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
139 <            overview="${src.dir}/intro.html"
140 <              source="${build.sourcelevel}">
361 >  <!-- Main targets -->
362  
363 <      <tag name="revised" description="Last revised:"/>
364 <      <tag name="spec"    description="Specified by:"/>
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}">
398 <      <packageset dir="${build.dc-filter.dir}"/>
164 <    </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 >           encoding="ASCII"
397 >           executable="${build.main.javac}"
398 >           fork="true">
399  
400 <    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
400 >      <include name="**/*.java"/>
401 >      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
402 >      <compilerarg value="-Xprefer:source"/>
403 >      <compilerarg value="-XDignore.symbol.file=true"/>
404 >      <compilerarg value="-Xlint:all"/>
405 >      <compilerarg value="-Werror"/>
406 >      <compilerarg value="-Xdoclint:all/protected"/>
407 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408 >      <compilerarg line="${build.args}"/>
409  
410 +    </javac>
411    </target>
412  
413  
414 +  <target name="jar"
415 +          depends="compile"
416 +          description="Builds library jar for src/main from compiled sources">
417 +    <local name="subdir"/>
418 +    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419 +    <jar destfile="${product.jar}">
420 +      <fileset dir="${build.classes.dir}${subdir}"/>
421 +      <manifest>
422 +        <attribute name="Built-By" value="${user.name}"/>
423 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
424 +      </manifest>
425 +    </jar>
426 +  </target>
427  
172  <target name="checkstyle"
173          depends="filter-src"
174          description="Reports on style errors in Java source (verbose, mostly chaff)">
175
176    <taskdef resource="checkstyletask.properties"
177            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
428  
429 <    <mkdir dir="${build.checkstyle.dir}"/>
429 >  <target name="docs"
430 >          description="Builds javadocs for src/main to dist dir">
431  
432 <    <checkstyle config="etc/checkstyle/sun_checks.xml"
433 <       failOnViolation="false">
183 <      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
184 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
185 <    </checkstyle>
432 >    <delete dir="${docs.dir}"/>
433 >    <mkdir dir="${docs.dir}"/>
434  
435 <    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
436 <          out="${build.checkstyle.dir}/checkstyle-report.html"
189 <        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
435 >    <!-- the packagenames="none" hack below prevents scanning the -->
436 >    <!-- sourcepath for packages -->
437  
438 + <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439 + <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440 +    <javadoc destdir="${docs.dir}"
441 +             packagenames="none"
442 +             link="${java9.api.url}"
443 +             overview="${src.dir}/intro.html"
444 +             access="${build.javadoc.access}"
445 +             sourcepath="${src.dir}"
446 +             classpath=""
447 +             executable="${javadoc9}">
448 +      <fileset dir="${src.dir}" defaultexcludes="yes">
449 +        <include name="**/*.java"/>
450 +      </fileset>
451 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
452 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
453 +      <arg value="-XDignore.symbol.file=true"/>
454 +      <arg value="-Xmodule:java.base"/>
455 +      <arg value="-tag"/>
456 +      <arg value="${javadoc.jls.option}"/>
457 + <!-- @apiNote currently unused -->
458 + <!--       <arg value="-tag"/> -->
459 + <!--       <arg value="apiNote:a:API Note:"/> -->
460 +      <arg value="-tag"/>
461 +      <arg value="implSpec:a:Implementation Requirements:"/>
462 +      <arg value="-tag"/>
463 +      <arg value="implNote:a:Implementation Note:"/>
464 + <!-- tags added in jdk9: currently unused -->
465 + <!--       <arg value="-tag"/> -->
466 + <!--       <arg value="revised:X"/> -->
467 + <!--       <arg value="-tag"/> -->
468 + <!--       <arg value="spec:X"/> -->
469 +    </javadoc>
470    </target>
471  
472  
194
473    <target name="dist"
474 <          depends="init, dist-clean, dist-jar, dist-docs"
474 >          depends="dist-clean, dist-jar, dist-docs"
475            description="Puts all distributable products in single hierarchy"/>
476  
477  
200
478    <target name="release"
479            depends="dist"
480            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 212 | Line 489
489        <exclude name="src/emulation/**"/>
490        <exclude name="**/SyntaxTest.java"/>
491        <exclude name="**/SuperfluousAbstract.java"/>
492 +      <manifest>
493 +        <attribute name="Built-By" value="${user.name}"/>
494 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
495 +      </manifest>
496      </jar>
216
497    </target>
498  
499  
220
500    <target name="clean"
501            description="Removes all build products">
502  
503      <delete dir="${build.dir}"/>
225    <delete dir="${build.classes.dir}"/>
226    <delete dir="${build.lib.dir}"/>
504  
505    </target>
506  
507  
231
508    <target name="dist-clean"
509            description="Removes all build and distribution products">
510  
511 +    <delete dir="${build.dir}"/>
512      <delete dir="${dist.dir}"/>
513  
514    </target>
515  
516  
517 +  <target name="dist-jar"
518 +          depends="clean, jar">
519 +    <copy file="${product.jar}" todir="${dist.dir}"/>
520 +  </target>
521  
522    <target name="dist-docs"
523 <          description="Builds javadocs without custom tags to dist folder">
523 >          depends="clean, docs">
524 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
525 >  </target>
526  
527 <    <delete dir="${dist.javadocs.dir}"/>
528 <    <mkdir dir="${dist.javadocs.dir}"/>
527 >  <target name="tck"
528 >          depends="jar"
529 >          description="Runs tck tests for src/main directly">
530  
531 <    <javadoc destdir="${dist.javadocs.dir}"
532 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
533 <            overview="${src.dir}/intro.html"
534 <              source="${build.sourcelevel}">
531 >    <run-tck-tests
532 >      target="${build.main.java.version}"
533 >      workdir="${build.dir}"
534 >      classes="${product.jar}"/>
535 >  </target>
536  
537 <      <packageset dir="${src.dir}"/>
537 >  <target name="tck-parallelism-1"
538 >          description="Runs tck with common pool parallelism 1">
539 >    <antcall target="tck">
540 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
541 >    </antcall>
542 >  </target>
543  
544 <    </javadoc>
544 >  <target name="tck-parallelism-0"
545 >          description="Runs tck with common pool parallelism 0">
546 >    <antcall target="tck">
547 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
548 >    </antcall>
549 >  </target>
550  
551 +  <target name="tck-security-manager"
552 +          description="Runs tck with a security manager">
553 +    <antcall target="tck">
554 +      <param name="jsr166.useSecurityManager" value="true"/>
555 +    </antcall>
556    </target>
557  
558 +  <target name="jtreg"
559 +          depends="jar"
560 +          description="Runs jtreg tests for src/main using the jtreg ant task">
561 +    <run-jtreg-tests
562 +       target="${build.main.java.version}"
563 +       workdir="${build.dir}"
564 +       classes="${product.jar}"/>
565 +  </target>
566  
567 +  <target name="test"
568 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
569 +          description="Runs tck and jtreg tests for src/main">
570 +  </target>
571  
572 <  <!-- Internal targets -->
572 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
573  
574 + <!--     <antcall target="jtreg"> -->
575 + <!--       <param name="build.main.java.version" value="8"/> -->
576 + <!--       <param name="build.main.javac" value="${javac8}"/> -->
577 + <!--     </antcall> -->
578  
579 <  <target name="init">
579 > <!--   </target> -->
580  
581 <    <!-- Version is kept in a separate file -->
582 <    <loadfile property="version" srcFile="version.properties"/>
267 <    <echo>Building JSR-166 version ${version}</echo>
268 <    <echo>java.home is ${java.home}</echo>
581 > <!--   <target name="test89" -->
582 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
583  
584 <  </target>
584 > <!--     <antcall target="clean"/> -->
585 > <!--     <antcall target="test"> -->
586 > <!--       <param name="build.main.java.version" value="8"/> -->
587 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
588 > <!--     </antcall> -->
589  
590 + <!--     <antcall target="clean"/> -->
591 + <!--     <antcall target="test"> -->
592 + <!--       <param name="build.main.java.version" value="9"/> -->
593 + <!--       <param name="build.main.javac" value="${javac9}"/> -->
594 + <!--     </antcall> -->
595  
596 <  <target name="dist-jar"
274 <          depends="clean, jar">
596 > <!--   </target> -->
597  
276    <copy file="${product.jar}" todir="${dist.dir}"/>
598  
278  </target>
599  
600 +  <target name="configure-compiler">
601 +    <fail message="ant version too old">
602 +      <condition>
603 +        <not> <antversion atleast="1.9.1"/> </not>
604 +      </condition>
605 +    </fail>
606  
607 <  <target name="compile-ant-filter"
282 <          depends="init">
607 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
608  
609 <    <mkdir dir="${build.ant.dir}"/>
609 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
610 >      <istrue value="${build.warnunchecked}"/>
611 >    </condition>
612  
613 <    <javac srcdir="${ant.src.dir}"
287 <          destdir="${build.ant.dir}"
288 <           source="1.4"/>
613 >    <property name="warnunchecked.arg" value=""/>
614  
290  </target>
615  
616 +    <!-- Common options in javac invocations -->
617 +    <property name="build.args" value="${warnunchecked.arg}"/>
618  
619 <  <target name="filter-src"
294 <          depends="compile-ant-filter">
619 >  </target>
620  
296    <mkdir dir="${build.filter.src.dir}"/>
621  
298    <copy todir="${build.filter.src.dir}">
299      <fileset dir="${src.dir}">
300        <include name="**/*.html"/>
301      </fileset>
302    </copy>
622  
623 <    <copy todir="${build.filter.src.dir}">
305 <      <fileset dir="${src.dir}">
306 <        <exclude name="**/*.html"/>
307 <        <!-- Files excluded from dist-docs -->
308 <        <exclude name="java/util/Random.*"/>
309 <        <exclude name="sun/misc/Unsafe.*"/>
310 <      </fileset>
311 <      <!--
312 <      <filterchain>
313 <      -->
314 <
315 <        <!--
316 <         # This filter gets rid of angle-bracketed type parameters
317 <         # so that javadoc can run on the result. The following
318 <         # heuristic seems to work:
319 <         #
320 <         # For all lines not starting with space(s)-asterisk-space(s),
321 <         #   replace <something> with a space, where there may be more
322 <         #   than one right angle bracket at the end, and "something"
323 <         #   must not contain parens or pipes. (This may need some
324 <         #   tweaking.)
325 <         -->
326 <
327 <        <!--
328 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
329 <                      classpath="${build.ant.dir}">
330 <          <param name="notmatching" value="^\s+\*\s.*$"/>
331 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
332 <          <param name="replacement" value=" "/>
333 <        </filterreader>
334 <        -->
335 <
336 <      <!--
337 <      </filterchain>
338 <      -->
339 <    </copy>
623 >  <!-- Various demos and test programs -->
624  
341  </target>
625  
626 +  <!-- description="Benchmark from Doug Lea's AQS paper" -->
627 +  <target name="loops" depends="configure-compiler">
628  
629 <  <target name="filter-doccheck"
345 <          depends="filter-src">
629 >    <mkdir dir="${build.loops.dir}"/>
630  
631 <    <mkdir dir="${build.dc-filter.dir}"/>
631 >    <javac srcdir="${loops.src.dir}"
632 >          destdir="${build.loops.dir}"
633 >            debug="${build.debug}"
634 >       debuglevel="${build.debuglevel}"
635 >      deprecation="${build.deprecation}"
636 >           source="${build.sourcelevel}"
637 >           target="${build.sourcelevel}"
638 >         encoding="ASCII"
639 >             fork="true">
640  
641 <    <copy todir="${build.dc-filter.dir}">
642 <      <fileset dir="${build.filter.src.dir}">
643 <        <include name="**/*.html"/>
352 <      </fileset>
353 <    </copy>
641 >      <compilerarg line="${build.args}"/>
642 >      <classpath refid="loops.classpath"/>
643 >      <compilerarg value="-XDignore.symbol.file=true"/>
644  
645 <    <property name="generic.declarations"
356 <             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 {}"
357 <    />
358 <
359 <    <copy todir="${build.dc-filter.dir}">
360 <      <fileset dir="${build.filter.src.dir}">
361 <        <exclude name="**/*.html"/>
362 <      </fileset>
363 <      <filterchain>
364 <        <!--
365 <         # These two filters try to make the source look like
366 <         # something that doccheck can process. The first removes
367 <         # -source 1.4 assertions and the second adds in a bunch
368 <         # of single letter public nested marker interfaces so that
369 <         # the generic type parameters are recognized.
370 <         -->
371 <
372 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
373 <                      classpath="${build.ant.dir}">
374 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
375 <          <param name="pattern"     value="assert"/>
376 <          <param name="replacement" value="//assert"/>
377 <        </filterreader>
378 <
379 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
380 <                      classpath="${build.ant.dir}">
381 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
382 <          <param name="pattern"     value="$"/>
383 <          <param name="replacement" value=" ${generic.declarations}"/>
384 <        </filterreader>
645 >    </javac>
646  
647 <      </filterchain>
648 <    </copy>
647 >    <java classname="ALoops" fork="true">
648 >      <classpath refid="loops.classpath"/>
649 >    </java>
650  
651    </target>
652  
653  
654 <  <target name="compile-tests"
655 <          depends="jar">
654 >  <target name="compile-test-loops" depends="jar"
655 >          description="compile all the perf tests in src/test/loops">
656  
657 <    <mkdir dir="${build.testcases.dir}"/>
657 >    <mkdir dir="${build.dir}/test/loops"/>
658  
659 <    <javac srcdir="${tck.src.dir}"
660 <          destdir="${build.testcases.dir}"
661 <            debug="${build.debug}"
662 <       debuglevel="${build.debuglevel}"
663 <      deprecation="${build.deprecation}"
664 <           source="${build.sourcelevel}"
665 <             fork="true">
666 <
667 <      <compilerarg value="${bootclasspath.args}"/>
659 >    <javac srcdir="${basedir}/src/test/loops"
660 >           destdir="${build.dir}/test/loops"
661 >           debug="${build.debug}"
662 >           debuglevel="${build.debuglevel}"
663 >           deprecation="${build.deprecation}"
664 >           includeAntRuntime="false"
665 >           includeJavaRuntime="false"
666 >           encoding="ASCII"
667 >           executable="${javac9}"
668 >           fork="true">
669 >
670 >      <include name="*.java"/>
671 >      <compilerarg value="-XDignore.symbol.file=true"/>
672 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
673 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
674        <compilerarg line="${build.args}"/>
675  
408      <classpath refid="test.classpath"/>
409
676      </javac>
677  
678 <    <javac srcdir="${test.src.dir}"
413 <          destdir="${build.testcases.dir}"
414 <            debug="${build.debug}"
415 <       debuglevel="${build.debuglevel}"
416 <      deprecation="${build.deprecation}"
417 <           source="${build.sourcelevel}"
418 <             fork="true">
678 >  </target>
679  
420      <include name="jsr166/test/**"/>
680  
681 <      <compilerarg value="${bootclasspath.args}"/>
423 <      <compilerarg line="${build.args}"/>
681 >  <!-- jsr166 4jdk8 -->
682  
683 <      <classpath refid="test.classpath"/>
683 >  <target name="4jdk8compile"
684 >          depends="configure-compiler"
685 >          description="Compiles src/jdk8 sources, targeting jdk8">
686 >
687 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
688 >
689 >    <javac srcdir="${4jdk8src.dir}"
690 >           destdir="${build.4jdk8.classes.dir}"
691 >           debug="${build.debug}"
692 >           debuglevel="${build.debuglevel}"
693 >           deprecation="${build.deprecation}"
694 >           source="8"
695 >           target="8"
696 >           classpath=""
697 >           bootclasspath="${bootclasspath8}"
698 >           includeAntRuntime="false"
699 >           includeJavaRuntime="false"
700 >           encoding="ASCII"
701 >           executable="${javac8}"
702 >           fork="true">
703 >
704 >      <include name="**/*.java"/>
705 >      <compilerarg value="-Xprefer:source"/>
706 >      <compilerarg value="-XDignore.symbol.file=true"/>
707 >      <compilerarg value="-Xlint:all"/>
708 >      <compilerarg value="-Werror"/>
709 >      <compilerarg line="${build.args}"/>
710  
711      </javac>
712 +  </target>
713  
714 < <!--
715 <    <javac srcdir="${jtreg.src.dir}"
716 <          destdir="${build.testcases.dir}"
717 <            debug="${build.debug}"
718 <       debuglevel="${build.debuglevel}"
719 <      deprecation="${build.deprecation}"
720 <           source="${build.sourcelevel}"
721 <             fork="true">
714 >  <target name="4jdk8doclint"
715 >          depends="configure-compiler"
716 >          description="Finds doclint warnings">
717 >
718 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
719 >
720 >    <javac srcdir="${4jdk8src.dir}"
721 >           destdir="${build.4jdk8.classes.dir}"
722 >           debug="${build.debug}"
723 >           debuglevel="${build.debuglevel}"
724 >           deprecation="${build.deprecation}"
725 >           source="8"
726 >           target="8"
727 >           classpath=""
728 >           bootclasspath="${bootclasspath8}"
729 >           includeAntRuntime="false"
730 >           includeJavaRuntime="false"
731 >           encoding="ASCII"
732 >           executable="${javac8}"
733 >           fork="true">
734  
735 <      <compilerarg value="${bootclasspath.args}"/>
735 >      <include name="**/*.java"/>
736 >      <compilerarg value="-Xprefer:source"/>
737 >      <compilerarg value="-XDignore.symbol.file=true"/>
738 >      <compilerarg value="-Xlint:all"/>
739 >      <compilerarg value="-Xdoclint:all/protected"/>
740        <compilerarg line="${build.args}"/>
741  
441      <classpath refid="test.classpath"/>
442
742      </javac>
444 -->
445
743    </target>
744  
745  
746 <  <target name="run-tests"
747 <          depends="compile-tests">
746 >  <target name="4jdk8jar"
747 >          depends="4jdk8compile"
748 >          description="Builds library jar from compiled sources">
749 >
750 >    <jar destfile="${4jdk8product.jar}">
751 >      <fileset dir="${build.4jdk8.classes.dir}"/>
752 >      <manifest>
753 >        <attribute name="Built-By" value="${user.name}"/>
754 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
755 >      </manifest>
756 >    </jar>
757  
758 <    <!-- May be overridden by user.properties -->
453 <    <property name="testcase" value="*"/>
758 >  </target>
759  
455    <mkdir dir="${build.reports.dir}"/>
760  
761 <    <junit printsummary="true"
762 <             showoutput="true"
763 <          errorProperty="junit.failed"
764 <        failureProperty="junit.failed"
765 <                    dir="${build.reports.dir}"
766 <                   fork="true">
761 >  <target name="4jdk8-tck"
762 >          depends="4jdk8jar"
763 >          description="Runs tck tests for jsr166-4jdk8 directly">
764 >
765 >    <run-tck-tests
766 >      target="8"
767 >      workdir="${build.4jdk8.dir}"
768 >      classes="${4jdk8product.jar}">
769 >      <javac-elements>
770 >        <!-- JDK9+ test classes -->
771 >        <exclude name="*9Test.java"/>
772 >        <exclude name="*10Test.java"/>
773 >      </javac-elements>
774 >    </run-tck-tests>
775 >  </target>
776  
464      <jvmarg value="${bootclasspath.args}"/>
465      <jvmarg value="-server"/>
466      <jvmarg value="-showversion"/>
777  
778 <      <classpath refid="test.classpath"/>
778 >  <target name="4jdk8-jtreg"
779 >          depends="4jdk8jar"
780 >          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
781 >    <run-jtreg-tests
782 >       target="8"
783 >       workdir="${build.4jdk8.dir}"
784 >       classes="${4jdk8product.jar}"/>
785 >  </target>
786  
470      <formatter type="xml"/>
787  
788 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
789 <        <fileset dir="${tck.src.dir}">
790 <          <include name="**/${testcase}Test.java"/>
791 <        </fileset>
476 <      </batchtest>
477 <
478 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
479 <        <fileset dir="${test.src.dir}">
480 <          <include name="jsr166/test/**/${testcase}Test.java"/>
481 <        </fileset>
482 <      </batchtest>
483 <
484 < <!--
485 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
486 <        <fileset dir="${jtreg.src.dir}">
487 <          <include name="**/${testcase}Test.java"/>
488 <        </fileset>
489 <      </batchtest>
490 < -->
788 >  <target name="4jdk8-test"
789 >          depends="4jdk8-tck, 4jdk8-jtreg"
790 >          description="Runs tck and jtreg tests for jsr166-4jdk8">
791 >  </target>
792  
492    </junit>
793  
794 +  <target name="4jdk8docs"
795 +          description="Builds javadocs for src/jdk8 to dist dir">
796 +
797 +    <delete dir="${4jdk8docs.dir}"/>
798 +    <mkdir dir="${4jdk8docs.dir}"/>
799 +
800 +    <javadoc destdir="${4jdk8docs.dir}"
801 +             packagenames="none"
802 +             link="${java8.api.url}"
803 +             overview="${4jdk8src.dir}/intro.html"
804 +             access="${build.javadoc.access}"
805 +             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
806 +             classpath=""
807 +             executable="${javadoc8}"
808 +             failonerror = "true">
809 +      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
810 +        <include name="**/*.java"/>
811 +      </fileset>
812 +      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
813 +      <arg value="-XDignore.symbol.file=true"/>
814 +      <arg value="-tag"/>
815 +      <arg value="${javadoc.jls.option}"/>
816 + <!-- @apiNote currently unused -->
817 + <!--       <arg value="-tag"/> -->
818 + <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
819 +      <arg value="-tag"/>
820 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
821 +      <arg value="-tag"/>
822 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
823 +    </javadoc>
824    </target>
825  
826  
827 <  <target name="report-tests"
828 <          depends="run-tests">
827 >  <target name="4jdk8dist"
828 >          depends="4jdk8dist-jar, 4jdk8dist-docs"
829 >          description="Puts all distributable products in single hierarchy"/>
830 >
831  
832 <    <!-- Sets junit.report.format to frames if redirection is present,
833 <         otherwise sets it to noframes. -->
502 <    <available property="junit.report.format"
503 <                  value="frames"
504 <              classname="org.apache.xalan.lib.Redirect"
505 <    />
506 <    <property name="junit.report.format" value="noframes"/>
507 <
508 <    <junitreport todir="${build.reports.dir}">
509 <      <fileset dir="${build.reports.dir}">
510 <        <include name="TEST-*.xml"/>
511 <      </fileset>
512 <      <report styledir="${stylesheet.dir}"
513 <                format="${junit.report.format}"
514 <                 todir="${build.reports.dir}"
515 <      />
516 <    </junitreport>
832 >  <target name="4jdk8clean"
833 >          description="Removes all 4jdk8 build products">
834  
835 <    <fail message="Test Cases Failed" if="junit.failed"/>
835 >    <delete dir="${build.4jdk8.dir}"/>
836  
837    </target>
838  
839  
840 <  <target name="configure-compiler">
840 >  <target name="4jdk8dist-jar"
841 >          depends="4jdk8clean, 4jdk8jar">
842 >    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
843 >  </target>
844  
525    <property name="unchecked.option" value="-Xlint:unchecked"/>
845  
846 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
847 <      <istrue value="${build.warnunchecked}"/>
848 <    </condition>
846 >  <target name="4jdk8dist-docs"
847 >          depends="4jdk8clean, 4jdk8docs">
848 >    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
849 >  </target>
850  
531    <property name="warnunchecked.arg" value=""/>
851  
852  
853 <    <!-- Common options in javac invocations -->
854 <    <property name="build.args" value="${warnunchecked.arg}"/>
853 >  <!-- jsr166 4jdk7 -->
854 >
855 >  <target name="4jdk7compile"
856 >          depends="configure-compiler"
857 >          description="Compiles src/jdk7 sources, targeting jdk7">
858 >
859 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
860 >
861 >    <javac srcdir="${4jdk7src.dir}"
862 >           destdir="${build.4jdk7.classes.dir}"
863 >           debug="${build.debug}"
864 >           debuglevel="${build.debuglevel}"
865 >           deprecation="${build.deprecation}"
866 >           source="6"
867 >           target="6"
868 >           classpath=""
869 >           bootclasspath="${bootclasspath6}"
870 >           includeAntRuntime="false"
871 >           includeJavaRuntime="false"
872 >           encoding="ASCII"
873 >           executable="${javac7}"
874 >           fork="true">
875 >
876 >      <include name="**/*.java"/>
877 >      <compilerarg value="-Xprefer:source"/>
878 >      <compilerarg value="-XDignore.symbol.file=true"/>
879 >      <compilerarg value="-Xlint:all"/>
880 >      <compilerarg value="-Werror"/>
881 >      <compilerarg line="${build.args}"/>
882  
883 +    </javac>
884    </target>
885  
886 +  <target name="4jdk7doclint"
887 +          depends="configure-compiler"
888 +          description="Finds doclint warnings">
889 +
890 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
891 +
892 +    <javac srcdir="${4jdk7src.dir}"
893 +           destdir="${build.4jdk7.classes.dir}"
894 +           debug="${build.debug}"
895 +           debuglevel="${build.debuglevel}"
896 +           deprecation="${build.deprecation}"
897 +           source="6"
898 +           target="6"
899 +           classpath=""
900 +           bootclasspath="${bootclasspath6}"
901 +           includeAntRuntime="false"
902 +           includeJavaRuntime="false"
903 +           encoding="ASCII"
904 +           executable="${javac8}"
905 +           fork="true">
906 +
907 +      <include name="**/*.java"/>
908 +      <compilerarg value="-Xprefer:source"/>
909 +      <compilerarg value="-XDignore.symbol.file=true"/>
910 +      <compilerarg value="-Xlint:all"/>
911 +      <compilerarg value="-Xdoclint:all/protected"/>
912 +      <compilerarg line="${build.args}"/>
913  
914 <  <target name="configure-tests"
915 <       depends="configure-compiler">
914 >    </javac>
915 >  </target>
916  
543    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
544    <available property="junit.available"
545               classname="junit.framework.Protectable"/>
917  
918 <    <!-- Xalan -->
919 <    <available property="xalan.available"
920 <               classname="org.apache.xalan.Version"/>
918 >  <target name="4jdk7jar"
919 >          depends="4jdk7compile"
920 >          description="Builds library jar from compiled sources">
921  
922 +    <jar destfile="${4jdk7product.jar}">
923 +      <fileset dir="${build.4jdk7.classes.dir}"/>
924 +      <manifest>
925 +        <attribute name="Built-By" value="${user.name}"/>
926 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
927 +      </manifest>
928 +    </jar>
929  
930 <    <!-- Ant 1.6beta and later don't need or want this check -->
553 <    <!--
554 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
555 <          unless="junit.available"/>
930 >  </target>
931  
557    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
558          unless="xalan.available"/>
559    -->
932  
933 +  <target name="4jdk7-tck"
934 +          depends="4jdk7jar"
935 +          description="Runs tck tests for jsr166-4jdk7 directly">
936 +
937 +    <run-tck-tests
938 +      target="7"
939 +      workdir="${build.4jdk7.dir}"
940 +      classes="${4jdk7product.jar}">
941 +      <javac-elements>
942 +        <!-- JDK8+ test classes -->
943 +        <exclude name="*8Test.java"/>
944 +        <exclude name="*9Test.java"/>
945 +        <exclude name="*10Test.java"/>
946 +        <exclude name="DoubleAccumulatorTest.java"/>
947 +        <exclude name="DoubleAdderTest.java"/>
948 +        <exclude name="LongAccumulatorTest.java"/>
949 +        <exclude name="LongAdderTest.java"/>
950 +        <exclude name="CompletableFutureTest.java"/>
951 +        <exclude name="SplittableRandomTest.java"/>
952 +        <exclude name="StampedLockTest.java"/>
953 +        <exclude name="SubmissionPublisherTest.java"/>
954 +      </javac-elements>
955 +    </run-tck-tests>
956    </target>
957  
958  
959 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
960 +  <target name="4jdk7-tck-junit"
961 +          depends="4jdk7compile">
962  
963 <  <!-- Anthill targets -->
963 >    <junit printsummary="true"
964 >           showoutput="true"
965 >           errorProperty="junit.failed"
966 >           failureProperty="junit.failed"
967 >           includeantruntime="true"
968 >           jvm="${java7}"
969 >           fork="true">
970 >
971 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
972 >      <jvmarg value="-server"/>
973  
974 <  <target name="anthill-build">
974 >      <classpath>
975 >        <pathelement location="${junit.jar}"/>
976 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
977 >      </classpath>
978  
979 <    <!-- Override this in user.properties -->
570 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
979 >      <formatter type="brief"/>
980  
981 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
982 <      <arg value="-Xmx256000000"/>
983 <      <!-- classpath of new JVM -->
984 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
576 <      <!-- location of Ant home directory -->
577 <      <arg value="-Dant.home=${ant.home}"/>
578 <      <!-- the Ant main class -->
579 <      <arg value="org.apache.tools.ant.Main"/>
580 <      <!-- The build file -->
581 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
582 <      <!-- the target to build on the new Ant instance -->
583 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
584 <      <arg value="do-anthill-build"/>
585 <    </exec>
981 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
982 >      </test>
983 >
984 >    </junit>
985    </target>
986  
987 <  <target name="do-anthill-build"
988 <          depends="jar, test, docs, dist-docs"/>
987 >  <target name="4jdk7-jtreg"
988 >          depends="4jdk7jar"
989 >          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
990 >    <run-jtreg-tests
991 >       target="7"
992 >       workdir="${build.4jdk7.dir}"
993 >       classes="${4jdk7product.jar}"/>
994 >  </target>
995  
591  <target name="anthill-publish">
996  
997 <    <copy todir="${deployDir}/docs/private">
998 <      <fileset dir="${build.javadocs.dir}"/>
999 <    </copy>
997 >  <target name="4jdk7-test"
998 >          depends="4jdk7-tck, 4jdk7-jtreg"
999 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
1000 >  </target>
1001  
597    <copy todir="${deployDir}/docs/public">
598      <fileset dir="${dist.javadocs.dir}"/>
599    </copy>
1002  
1003 <    <copy tofile="${deployDir}/index.html"
1004 <          file="${basedir}/etc/anthill-index.html"/>
1003 >  <target name="4jdk7docs"
1004 >          description="Builds javadocs for src/jdk7 to dist dir">
1005 >
1006 >    <delete dir="${4jdk7docs.dir}"/>
1007 >    <mkdir dir="${4jdk7docs.dir}"/>
1008 >
1009 >    <javadoc destdir="${4jdk7docs.dir}"
1010 >             packagenames="none"
1011 >             link="${java7.api.url}"
1012 >             overview="${4jdk7src.dir}/intro.html"
1013 >             access="${build.javadoc.access}"
1014 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1015 >             classpath=""
1016 >             executable="${javadoc7}"
1017 >             failonerror = "true">
1018 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1019 >        <include name="**/*.java"/>
1020 >      </fileset>
1021 >      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1022 >      <arg value="-XDignore.symbol.file=true"/>
1023 >    </javadoc>
1024 >  </target>
1025  
1026 <    <copy todir="${deployDir}/notes">
1027 <      <fileset dir="${basedir}/etc/notes"/>
1028 <    </copy>
1026 >
1027 >  <target name="4jdk7dist"
1028 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
1029 >          description="Puts all distributable products in single hierarchy"/>
1030 >
1031 >
1032 >  <target name="4jdk7clean"
1033 >          description="Removes all 4jdk7 build products">
1034 >
1035 >    <delete dir="${build.4jdk7.dir}"/>
1036  
1037    </target>
1038  
1039  
1040 +  <target name="4jdk7dist-jar"
1041 +          depends="4jdk7clean, 4jdk7jar">
1042 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1043 +  </target>
1044  
612  <!-- Various demos and test programs -->
1045  
1046 +  <target name="4jdk7dist-docs"
1047 +          depends="4jdk7clean, 4jdk7docs">
1048 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1049 +  </target>
1050  
615  <target name="sample" depends="init, configure-compiler"
616          description="Standalone demo program">
1051  
1052 <    <mkdir dir="${build.testcases.dir}"/>
1052 >  <!-- jsr166x -->
1053  
1054 <    <javac srcdir="${test.src.dir}"
1055 <          destdir="${build.testcases.dir}"
1056 <            debug="${build.debug}"
1057 <       debuglevel="${build.debuglevel}"
1058 <      deprecation="${build.deprecation}"
625 <           source="${build.sourcelevel}"
626 <             fork="true">
1054 >  <target name="jsr166xcompile"
1055 >          depends="configure-compiler"
1056 >          description="Compiles jsr166x sources to build dir">
1057 >
1058 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
1059  
1060 <      <include name="jsr166/test/Sample.java"/>
1060 >    <javac srcdir="${topsrc.dir}"
1061 >           destdir="${build.jsr166x.classes.dir}"
1062 >           debug="${build.debug}"
1063 >           debuglevel="${build.debuglevel}"
1064 >           deprecation="${build.deprecation}"
1065 >           classpath=""
1066 >           bootclasspath="${bootclasspath6}"
1067 >           source="5"
1068 >           target="5"
1069 >           includeAntRuntime="false"
1070 >           includeJavaRuntime="false"
1071 >           encoding="ASCII"
1072 >           executable="${javac7}"
1073 >           fork="true">
1074 >
1075 >      <include name="jsr166x/**/*.java"/>
1076 >      <compilerarg value="-XDignore.symbol.file=true"/>
1077 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1078 >      <compilerarg value="-Werror"/>
1079 >      <compilerarg line="${build.args}"/>
1080  
1081      </javac>
1082 +  </target>
1083  
632    <copy todir="${build.testcases.dir}">
633      <fileset dir="${test.src.dir}">
634        <include name="**/*.properties"/>
635      </fileset>
636    </copy>
1084  
1085 +  <target name="jsr166xjar"
1086 +          depends="jsr166xcompile"
1087 +          description="Builds library jar from compiled sources">
1088 +
1089 +    <jar destfile="${jsr166x.jar}">
1090 +      <fileset dir="${build.jsr166x.classes.dir}"/>
1091 +      <manifest>
1092 +        <attribute name="Built-By" value="${user.name}"/>
1093 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1094 +      </manifest>
1095 +    </jar>
1096  
639    <java classname="jsr166.test.Sample" fork="true">
640      <classpath refid="test.classpath"/>
641      <!-- <jvmarg value="-ea"/> -->
642      <!-- <jvmarg value="-server"/> -->
643      <!-- <arg value="1000"/> -->
644    </java>
1097    </target>
1098  
1099  
1100 <  <target name="loops" depends="init, configure-compiler"
1101 <          description="Benchmark from Doug Lea's AQS paper">
1100 >  <target name="jsr166xdocs"
1101 >          description="Builds javadocs to dist dir">
1102  
1103 <    <mkdir dir="${build.loops.dir}"/>
1103 >    <delete dir="${jsr166xdocs.dir}"/>
1104 >    <mkdir dir="${jsr166xdocs.dir}"/>
1105  
1106 <    <javac srcdir="${loops.src.dir}"
1107 <          destdir="${build.loops.dir}"
1108 <            debug="${build.debug}"
1109 <       debuglevel="${build.debuglevel}"
1110 <      deprecation="${build.deprecation}"
1111 <           source="${build.sourcelevel}"
1112 <             fork="true">
1106 >    <javadoc destdir="${jsr166xdocs.dir}"
1107 >             packagenames="jsr166x.*"
1108 >             link="${java.api.url}"
1109 >             access="${build.javadoc.access}"
1110 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1111 >             bootclasspath="${bootclasspath6}"
1112 >             source="5"
1113 >             executable="${javadoc7}"
1114 >             failonerror = "true">
1115 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1116 >      <arg value="-XDignore.symbol.file=true"/>
1117  
1118 <      <compilerarg line="${build.args}"/>
1119 <      <classpath refid="loops.classpath"/>
1118 >    </javadoc>
1119 >  </target>
1120  
664    </javac>
1121  
1122 <    <java classname="ALoops" fork="true">
1123 <      <classpath refid="loops.classpath"/>
1124 <    </java>
1122 >  <target name="jsr166xdist"
1123 >          depends="jsr166xdist-jar, jsr166xdist-docs"
1124 >          description="Puts all distributable products in single hierarchy"/>
1125 >
1126 >
1127 >  <target name="jsr166xclean"
1128 >          description="Removes all jsr166x build products">
1129 >
1130 >    <delete dir="${build.jsr166x.dir}"/>
1131  
1132    </target>
1133  
1134  
1135 <  <target name="compile-j1" depends="init, configure-compiler">
1135 >  <target name="jsr166xdist-jar"
1136 >          depends="jsr166xclean, jsr166xjar">
1137 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1138 >  </target>
1139  
1140 <    <mkdir dir="${build.j1.dir}"/>
1140 >  <target name="jsr166xdist-docs"
1141 >          depends="jsr166xclean, jsr166xdocs">
1142 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1143 >  </target>
1144  
1145 <    <javac srcdir="${j1.src.dir}"
678 <          destdir="${build.j1.dir}"
679 <            debug="${build.debug}"
680 <       debuglevel="${build.debuglevel}"
681 <      deprecation="${build.deprecation}"
682 <           source="${build.sourcelevel}" >
1145 >  <!-- jsr166y -->
1146  
684      <include name="**/*.java"/>
685      <exclude name="**/dijkstra/**"/>
1147  
1148 +  <target name="jsr166ycompile"
1149 +          depends="configure-compiler"
1150 +          description="Compiles jsr166y sources">
1151 +
1152 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
1153 +
1154 +    <javac srcdir="${topsrc.dir}"
1155 +           destdir="${build.jsr166y.classes.dir}"
1156 +           debug="${build.debug}"
1157 +           debuglevel="${build.debuglevel}"
1158 +           deprecation="${build.deprecation}"
1159 +           source="6"
1160 +           target="6"
1161 +           classpath=""
1162 +           bootclasspath="${bootclasspath6}"
1163 +           includeAntRuntime="false"
1164 +           includeJavaRuntime="false"
1165 +           encoding="ASCII"
1166 +           executable="${javac7}"
1167 +           fork="true">
1168 +
1169 +      <include name="jsr166y/**/*.java"/>
1170 +      <compilerarg value="-XDignore.symbol.file=true"/>
1171 +      <compilerarg value="-Xlint:all"/>
1172 +      <compilerarg value="-Werror"/>
1173        <compilerarg line="${build.args}"/>
688      <classpath refid="j1.classpath"/>
1174  
1175      </javac>
1176 +  </target>
1177 +
1178 +
1179 +  <target name="jsr166yjar"
1180 +          depends="jsr166ycompile"
1181 +          description="Builds library jar from compiled sources">
1182 +
1183 +    <jar destfile="${jsr166y.jar}" index="true">
1184 +      <fileset dir="${build.jsr166y.classes.dir}"/>
1185 +      <manifest>
1186 +        <attribute name="Built-By" value="${user.name}"/>
1187 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1188 +      </manifest>
1189 +    </jar>
1190  
1191    </target>
1192  
1193  
1194 <  <target name="sw" depends="compile-j1"
1195 <          description="Runs the SwingWorker demo">
1194 >  <target name="jsr166ydocs"
1195 >          description="Builds javadocs to dist dir">
1196 >
1197 >    <delete dir="${jsr166ydocs.dir}"/>
1198 >    <mkdir dir="${jsr166ydocs.dir}"/>
1199 >
1200 >    <javadoc destdir="${jsr166ydocs.dir}"
1201 >             packagenames="jsr166y.*"
1202 >             link="${java.api.url}"
1203 >             access="${build.javadoc.access}"
1204 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1205 >             bootclasspath="${bootclasspath6}"
1206 >             source="6"
1207 >             executable="${javadoc7}"
1208 >             failonerror = "true">
1209 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1210 >      <arg value="-XDignore.symbol.file=true"/>
1211 >
1212 >    </javadoc>
1213 >  </target>
1214 >
1215 >
1216 >  <target name="jsr166ydist"
1217 >          depends="jsr166ydist-jar, jsr166ydist-docs"
1218 >          description="Puts all distributable products in single hierarchy"/>
1219  
698    <!--
699    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
700      <classpath refid="j1.classpath"/>
701    </java>
702    -->
1220  
1221 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
1221 >  <target name="jsr166yclean"
1222 >          description="Removes all jsr166y build products">
1223  
1224 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
707 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
708 <    </exec>
1224 >    <delete dir="${build.jsr166y.dir}"/>
1225  
1226    </target>
1227  
712  <target name="j1" depends="compile-j1"
713          description="Runs a standalone JavaOne program">
1228  
1229 <    <java classname="jsr166.bbuf.BoundedBufferDemo" fork="true">
1230 <      <classpath refid="j1.classpath"/>
1231 <      <jvmarg value="-server"/>
1232 <      <arg value="http://www.perl.com/"/>
719 <      <arg value="1"/>
720 <    </java>
1229 >  <target name="jsr166ydist-jar"
1230 >          depends="jsr166yclean, jsr166yjar">
1231 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1232 >  </target>
1233  
1234 +  <target name="jsr166ydist-docs"
1235 +          depends="jsr166yclean, jsr166ydocs">
1236 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1237    </target>
1238  
1239  
1240 <  <target name="test-j1" depends="compile-j1"
726 <          description="Runs testcases from the JavaOne source directories">
1240 >  <!-- extra166y -->
1241  
728    <junit printsummary="true"
729             showoutput="true"
730          errorProperty="junit.failed"
731        failureProperty="junit.failed"
732                    dir="${build.j1.dir}"
733                   fork="true">
734
735      <!-- <jvmarg value="-server"/> -->
736      <classpath refid="j1.classpath"/>
737      <formatter type="xml"/>
738
739      <batchtest todir="${build.j1.dir}">
740        <fileset dir="${j1.src.dir}">
741          <include name="**/*Test.java"/>
742        </fileset>
743      </batchtest>
1242  
1243 <    </junit>
1243 >  <target name="extra166ycompile"
1244 >          depends="configure-compiler, jsr166yjar"
1245 >          description="Compiles extra166y sources">
1246  
1247 <    <available property="junit.report.format"
1248 <                  value="frames"
1249 <              classname="org.apache.xalan.lib.Redirect"/>
1250 <    <property name="junit.report.format" value="noframes"/>
1251 <
1252 <    <junitreport todir="${build.j1.dir}">
1253 <      <fileset dir="${build.j1.dir}">
1254 <        <include name="TEST-*.xml"/>
1255 <      </fileset>
1256 <      <report styledir="${stylesheet.dir}"
1257 <                format="${junit.report.format}"
1258 <                 todir="${build.j1.dir}"
1259 <      />
1260 <    </junitreport>
1247 >    <mkdir dir="${build.extra166y.classes.dir}"/>
1248 >
1249 >    <javac srcdir="${topsrc.dir}"
1250 >           destdir="${build.extra166y.classes.dir}"
1251 >           debug="${build.debug}"
1252 >           debuglevel="${build.debuglevel}"
1253 >           deprecation="${build.deprecation}"
1254 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1255 >           classpath=""
1256 >           source="6"
1257 >           target="6"
1258 >           includeAntRuntime="false"
1259 >           includeJavaRuntime="false"
1260 >           encoding="ASCII"
1261 >           executable="${javac7}"
1262 >           fork="true">
1263  
1264 <    <fail message="Test Cases Failed" if="junit.failed"/>
1264 >      <include name="extra166y/**/*.java"/>
1265 >      <compilerarg value="-XDignore.symbol.file=true"/>
1266 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1267 >      <compilerarg value="-Werror"/>
1268 >      <compilerarg line="${build.args}"/>
1269  
1270 +    </javac>
1271    </target>
1272  
1273  
1274 +  <target name="extra166yjar"
1275 +          depends="extra166ycompile"
1276 +          description="Builds library jar from compiled sources">
1277  
1278 <  <!-- C++ and JNI definitions and demos -->
1278 >    <jar destfile="${extra166y.jar}" index="true">
1279 >      <fileset dir="${build.extra166y.classes.dir}"/>
1280 >      <manifest>
1281 >        <attribute name="Built-By" value="${user.name}"/>
1282 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1283 >      </manifest>
1284 >    </jar>
1285  
1286 <  <target name="configure-cpp">
1286 >  </target>
1287  
772    <!-- Define tasks and types -->
1288  
1289 <    <path id="cpptasks.path">
1290 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
776 <    </path>
777 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
778 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
1289 >  <target name="extra166ydocs"
1290 >          description="Builds javadocs to build dir">
1291  
1292 <    <!-- Set platform property for JNI includes -->
1292 >    <delete dir="${extra166ydocs.dir}"/>
1293 >    <mkdir dir="${extra166ydocs.dir}"/>
1294  
1295 <    <condition property="platform" value="linux">
1296 <      <os name="Linux"/>
1297 <    </condition>
1298 <    <condition property="platform" value="win32">
1299 <      <os family="windows"/>
1300 <    </condition>
1301 <    <condition property="platform" value="solaris">
1302 <      <os name="SunOS"/>
1303 <    </condition>
1295 >    <javadoc destdir="${extra166ydocs.dir}"
1296 >             packagenames="extra166y.*"
1297 >             link="${java.api.url}"
1298 >             access="${build.javadoc.access}"
1299 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1300 >             bootclasspath="${bootclasspath6}"
1301 >             source="6"
1302 >             executable="${javadoc7}">
1303 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1304 >      <arg value="-XDignore.symbol.file=true"/>
1305  
1306 +    </javadoc>
1307    </target>
1308  
1309  
1310 <  <target name="cppdemo" depends="configure-cpp">
1310 >  <target name="extra166ydist"
1311 >          depends="extra166ydist-jar, extra166ydist-docs"
1312 >          description="Puts all distributable products in single hierarchy"/>
1313  
797    <mkdir dir="${build.dir}"/>
1314  
1315 <    <cc multithreaded="true"
1316 <                 name="g++"
801 <               objdir="${build.dir}"
802 <              outfile="${build.dir}/CppDemo">
803 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
804 <      <libset libs="stdc++"/>
805 <    </cc>
1315 >  <target name="extra166yclean"
1316 >          description="Removes all extra166y build products">
1317  
1318 <    <exec executable="${build.dir}/CppDemo">
808 <      <arg line="count in word frequency of word in command line count"/>
809 <    </exec>
1318 >    <delete dir="${build.extra166y.dir}"/>
1319  
1320    </target>
1321  
1322  
1323 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
1323 >  <target name="extra166ydist-jar"
1324 >          depends="extra166yclean, extra166yjar">
1325 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1326 >  </target>
1327  
1328 <    <mkdir dir="${build.testcases.dir}"/>
1328 >  <target name="extra166ydist-docs"
1329 >          depends="extra166yclean, extra166ydocs">
1330 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1331 >  </target>
1332  
1333 <    <javac srcdir="${test.src.dir}"
1334 <          destdir="${build.testcases.dir}"
1335 <            debug="${build.debug}"
1336 <       debuglevel="${build.debuglevel}"
1337 <      deprecation="${build.deprecation}"
1338 <           source="${build.sourcelevel}"
1339 <             fork="true">
1340 <      <compilerarg value="${bootclasspath.args}"/>
1333 >  <!-- jsr166e -->
1334 >
1335 >  <property name="build.jsr166e.java.version" value="6"/>
1336 >  <property name="build.jsr166e.javac" value="${javac6}"/>
1337 >
1338 >  <target name="jsr166ecompile"
1339 >          depends="configure-compiler"
1340 >          description="Compiles jsr166e sources">
1341 >
1342 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1343 >
1344 >    <javac srcdir="${topsrc.dir}"
1345 >           destdir="${build.jsr166e.classes.dir}"
1346 >           debug="${build.debug}"
1347 >           debuglevel="${build.debuglevel}"
1348 >           deprecation="${build.deprecation}"
1349 >           source="${build.jsr166e.java.version}"
1350 >           target="${build.jsr166e.java.version}"
1351 >           classpath=""
1352 >           includeAntRuntime="false"
1353 >           includeJavaRuntime="false"
1354 >           executable="${build.jsr166e.javac}"
1355 >           fork="true">
1356 >
1357 >      <include name="jsr166e/**/*.java"/>
1358 >      <compilerarg value="-XDignore.symbol.file=true"/>
1359 >      <compilerarg value="-Xlint:all"/>
1360 >      <compilerarg value="-Werror"/>
1361        <compilerarg line="${build.args}"/>
1362 <      <classpath refid="test.classpath"/>
828 <      <include name="JniDemo.java"/>
1362 >
1363      </javac>
1364 +  </target>
1365  
1366 <    <javah destdir="${build.testcases.dir}"
1367 <      classpathref="test.classpath">
833 <      <class name="JniDemo"/>
834 <    </javah>
1366 >  <!-- jsr166e: find doclint errors -->
1367 >  <target name="jsr166edoclint">
1368  
1369 <    <cc multithreaded="true"
837 <                 name="g++"
838 <               objdir="${build.dir}"
839 <              outfile="${build.dir}/JniDemo"
840 <              outtype="shared">
1369 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1370  
1371 <      <compiler>
1372 <        <defineset>
1373 <          <define name="__int64" value="long long"/>
1374 <        </defineset>
1375 <        <includepath location="${java.home}/../include"/>
1376 <        <includepath location="${java.home}/../include/${platform}"/>
1377 <        <compilerarg value="-mno-cygwin"/>
1378 <      </compiler>
1371 >    <javac srcdir="${topsrc.dir}"
1372 >           destdir="${build.jsr166e.classes.dir}"
1373 >           debug="${build.debug}"
1374 >           debuglevel="${build.debuglevel}"
1375 >           deprecation="${build.deprecation}"
1376 >           source="${build.jsr166e.java.version}"
1377 >           target="${build.jsr166e.java.version}"
1378 >           classpath=""
1379 >           bootclasspath="${bootclasspath6}"
1380 >           includeAntRuntime="false"
1381 >           includeJavaRuntime="false"
1382 >           executable="${javac8}"
1383 >           fork="true">
1384 >
1385 >      <include name="jsr166e/**/*.java"/>
1386 >      <compilerarg value="-XDignore.symbol.file=true"/>
1387 >      <compilerarg value="-Xlint:all"/>
1388 >      <compilerarg value="-Werror"/>
1389 >      <compilerarg value="-Xdoclint:all/protected"/>
1390  
1391 <      <linker>
1392 <        <linkerarg value="--add-stdcall-alias"/>
853 <      </linker>
1391 >    </javac>
1392 >  </target>
1393  
855      <includepath location="${build.testcases.dir}"/>
1394  
1395 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
1395 >  <target name="jsr166ejar"
1396 >          depends="jsr166ecompile"
1397 >          description="Builds library jar from compiled sources">
1398  
1399 <      <libset libs="stdc++"/>
1399 >    <jar destfile="${jsr166e.jar}" index="true">
1400 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1401 >      <manifest>
1402 >        <attribute name="Built-By" value="${user.name}"/>
1403 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1404 >      </manifest>
1405 >    </jar>
1406  
1407 <    </cc>
1407 >  </target>
1408  
863    <!-- Necessary if windows, harmless if not -->
864    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
1409  
1410 <    <java classname="JniDemo" fork="true">
1411 <      <!-- Watch out: path separator hardwired to semicolon here! -->
1412 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
1413 <      <classpath refid="test.classpath"/>
1414 <      <arg line="count in word frequency of word in command line count"/>
871 <    </java>
1410 >  <target name="jsr166edocs"
1411 >          description="Builds javadocs to build dir">
1412 >
1413 >    <delete dir="${jsr166edocs.dir}"/>
1414 >    <mkdir dir="${jsr166edocs.dir}"/>
1415  
1416 +    <javadoc destdir="${jsr166edocs.dir}"
1417 +             packagenames="jsr166e.*"
1418 +             link="${java.api.url}"
1419 +             access="${build.javadoc.access}"
1420 +             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1421 +             source="${build.jsr166e.java.version}"
1422 +             executable="${javadoc7}"
1423 +             failonerror = "true">
1424 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1425 +      <arg value="-XDignore.symbol.file=true"/>
1426 +
1427 +    </javadoc>
1428    </target>
1429  
1430  
1431 +  <target name="jsr166e-tck-one-java-version"
1432 +          depends="jsr166ejar">
1433  
1434 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
1434 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1435  
1436 +    <run-tck-tests
1437 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1438 +      target="${build.jsr166e.java.version}"
1439 +      workdir="${build.jsr166e.dir}"
1440 +      classes="${jsr166e.jar}"/>
1441 +  </target>
1442  
1443 +  <target name="jsr166e-tck"
1444 +          description="Runs tck tests for jsr166e for multiple java versions">
1445  
1446 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
1447 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
1448 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
1449 <  <property name="pretiger.sourcelevel" value="1.4"/>
1446 > <!--     <antcall target="clean"/> -->
1447 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1448 > <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1449 > <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1450 > <!--     </antcall> -->
1451  
1452 <  <target name="defang"
1453 <       depends="init"
1454 <   description="Generates pre-Tiger compatible source">
1452 >    <antcall target="clean"/>
1453 >    <antcall target="jsr166e-tck-one-java-version">
1454 >      <param name="build.jsr166e.java.version" value="7"/>
1455 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1456 >    </antcall>
1457  
1458 <    <delete dir="${pretiger.src.dir}"/>
1459 <    <mkdir dir="${pretiger.src.dir}"/>
1458 >    <antcall target="clean"/>
1459 >    <antcall target="jsr166e-tck-one-java-version">
1460 >      <param name="build.jsr166e.java.version" value="6"/>
1461 >      <param name="build.jsr166e.javac" value="${javac6}"/>
1462 >    </antcall>
1463 >  </target>
1464  
893    <exec executable="perl">
894      <arg file="etc/defang.pl"/>
895      <!-- <arg value="-v"/> -->
896      <arg value="-s"/> <arg file="${src.dir}"/>
897      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
898    </exec>
1465  
1466 +  <target name="jsr166e-test"
1467 +          depends="jsr166e-tck"
1468 +          description="Runs all tests for jsr166e">
1469    </target>
1470  
1471 <  <target name="compile-pretiger"
1472 <          depends="init, configure-compiler, defang"
1473 <          description="Compiles pre-Tiger sources to build folder">
1471 >  <target name="jsr166edist"
1472 >          depends="jsr166edist-jar, jsr166edist-docs"
1473 >          description="Puts all distributable products in single hierarchy"/>
1474  
906    <mkdir dir="${build.pretiger.dir}"/>
1475  
1476 <    <javac srcdir="${pretiger.src.dir}"
1477 <          destdir="${build.pretiger.dir}"
1478 <            debug="${build.debug}"
1479 <       debuglevel="${build.debuglevel}"
912 <      deprecation="${build.deprecation}"
913 <           source="${pretiger.sourcelevel}"
914 <             fork="true">
1476 >  <target name="jsr166eclean"
1477 >          description="Removes all jsr166e build products">
1478 >    <delete dir="${build.jsr166e.dir}"/>
1479 >  </target>
1480  
916      <compilerarg line="${build.args}"/>
917      <exclude name="**/Thread.java"/>
1481  
1482 <    </javac>
1482 >  <target name="jsr166edist-jar"
1483 >          depends="jsr166eclean, jsr166ejar">
1484 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1485 >  </target>
1486  
1487 +  <target name="jsr166edist-docs"
1488 +          depends="jsr166eclean, jsr166edocs">
1489 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1490    </target>
1491  
923  <target name="pretiger" depends="compile-pretiger">
1492  
1493 <    <mkdir dir="${build.lib.dir}"/>
1493 > <!-- Find buglets that can be detected by static build tools -->
1494  
1495 <    <jar destfile="${pretiger.jar}">
1496 <      <fileset dir="${build.pretiger.dir}">
1497 <      </fileset>
1498 <    </jar>
1495 >  <target name="lint">
1496 >    <antcall target="dists">
1497 >      <param name="build.javadoc.access" value="public"/>
1498 >    </antcall>
1499 >  </target>
1500  
1501 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1502 +  <target name="lint-private">
1503 +    <antcall target="dist">
1504 +      <param name="build.javadoc.access" value="private"/>
1505 +    </antcall>
1506    </target>
1507  
1508 +
1509   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines