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.73 by dl, Tue Nov 8 00:13:41 2005 UTC vs.
Revision 1.180 by jsr166, Sun Sep 13 03:41:53 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines