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.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.129 by jsr166, Wed Jan 23 07:17:13 2013 UTC

# Line 8 | Line 8
8  
9    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.
11 +
12 +  The repository contains all dependencies except for ant and the JDK
13 +  itself.  Because the JDK version matters and because different
14 +  targets require different JDKs, we assume that users have created a
15 +  hierarchy containing:
16 +  $HOME/jdk/jdk6
17 +  $HOME/jdk/jdk7
18 +  $HOME/jdk/jdk8
19 +  where each of the above is a JDK or a symlink to same, and
20 +  $HOME/jdk/src/jdk6
21 +  $HOME/jdk/src/jdk7
22 +  $HOME/jdk/src/jdk8
23 +  where each of the above is a complete JDK source tree
24 +  (e.g. mercurial forest) or a symlink to same.
25   ------------------------------------------------------------------------------
26    </description>
27  
28 <  <target name="usage" description="Advises user to run with -projecthelp">
29 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
28 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
29 >    <java classname="org.apache.tools.ant.Main">
30 >      <arg value="-projecthelp" />
31 >    </java>
32    </target>
33  
34  
# Line 21 | Line 37
37  
38  
39    <!-- Compilation options -->
40 <  <property name="build.sourcelevel"    value="1.5"/>
40 >  <property name="build.sourcelevel"    value="6"/>
41    <property name="build.debug"          value="true"/>
42    <property name="build.debuglevel"     value="source,lines,vars"/>
43    <property name="build.deprecation"    value="false"/>
44  
45    <!-- Build locations -->
46 <  <property name="build.dir"            location="build"/>
47 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
48 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
49 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
50 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
51 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
52 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
53 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
54 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
55 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
56 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
57 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
58 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
59 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
60 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
61 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
46 >  <property name="build.dir"                   location="build"/>
47 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
48 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
49 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
50 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
51 >
52 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
53 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
54 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
55 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
56 >
57 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
58 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
59 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
60 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
61 >
62 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
63 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
64 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
65 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
66 >
67 >  <!-- JDK locations -->
68 >  <property name="jdks.home"  location="${user.home}/jdk"/>
69 >
70 >  <macrodef name="defjdklocations">
71 >    <attribute name="v"/>
72 >    <sequential>
73 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
74 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
75 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
76 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
77 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
78 >    <local name="boot.jar.dir"/>
79 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
80 >    <path id="bootclasspath@{v}">
81 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
82 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
83 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
84 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
85 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
86 >    </path>
87 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
88 >    </sequential>
89 >  </macrodef>
90 >
91 >  <macrodef name="mirror-dir">
92 >    <attribute name="src"/>
93 >    <attribute name="dst"/>
94 >    <sequential>
95 >    <delete dir="@{dst}"/>
96 >    <mkdir dir="@{dst}"/>
97 >    <copy todir="@{dst}" preservelastmodified="true">
98 >      <fileset dir="@{src}"/>
99 >    </copy>
100 >    </sequential>
101 >  </macrodef>
102 >
103 >  <defjdklocations v="6"/>
104 >  <defjdklocations v="7"/>
105 >  <defjdklocations v="8"/>
106  
107    <!-- Source locations -->
108    <property name="src.dir"              location="${basedir}/src/main"/>
109    <property name="test.src.dir"         location="${basedir}/src/test"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
110    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
111    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
112    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
113    <property name="lib.dir"              location="${basedir}/lib"/>
114    <property name="dist.dir"             location="${basedir}/dist"/>
115    <property name="topsrc.dir"           location="${basedir}/src"/>
116 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
117 <
118 <  <!-- Distribution locations -->
119 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
120 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
116 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
117 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
118 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
119 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
120 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
121 >
122 >  <!-- Javadoc locations -->
123 >  <property name="docs.dir"          location="${build.dir}/docs"/>
124 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
125 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
126 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
127 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
128 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
129 >
130 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
131 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
132 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
133 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
134 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
135 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
136  
137    <!-- Jar locations -->
138 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
140 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
141 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
142 <
143 <  <!-- Bootclasspath argument -->
144 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
138 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
139 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
140 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
141 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
142 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
143 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
144 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
145 >
146 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
147 >  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
148 >  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
149 >  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
150 >
151 >  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
152 >  <!-- The below does not yet exist as of 2013-01 -->
153 >  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
154 >
155 >  <!-- Default jdk api doc location (latest stable release seems best) -->
156 >  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
157 >
158 >  <!-- Define the "jtreg" task -->
159 >  <!-- See the docs in "jtreg -onlineHelp" -->
160 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
161 >           classpath="${lib.dir}/jtreg.jar" />
162  
163    <!-- Test classpath -->
164    <path id="test.classpath">
# Line 77 | Line 166
166      <pathelement location="${junit.jar}"/>
167    </path>
168  
169 +  <macrodef name="run-tck-tests">
170 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
171 +    <attribute name="source" default="6"/>
172 +    <attribute name="target"/>
173 +    <attribute name="workdir"/>
174 +    <attribute name="classes"/>
175 +    <attribute name="jvmflags" default=""/>
176 +    <sequential>
177 +
178 +    <mkdir dir="@{workdir}/tck-classes"/>
179 +
180 +    <javac srcdir="@{tck.src.dir}"
181 +           destdir="@{workdir}/tck-classes"
182 +           debug="${build.debug}"
183 +           debuglevel="${build.debuglevel}"
184 +           deprecation="${build.deprecation}"
185 +           source="@{source}"
186 +           classpath="${junit.jar}"
187 +           bootclasspath="@{classes}:${bootclasspath@{source}}"
188 +           includeAntRuntime="false"
189 +           includeJavaRuntime="false"
190 +           executable="${javac@{target}}"
191 +           fork="true">
192 +
193 +      <include name="*.java"/>
194 +      <compilerarg value="-XDignore.symbol.file=true"/>
195 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
196 +      <compilerarg line="${build.args}"/>
197 +
198 +    </javac>
199 +
200 +    <java classname="JSR166TestCase"
201 +          failonerror="true"
202 +          jvm="${java@{target}}"
203 +          fork="true">
204 +        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
205 +        <jvmarg line="@{jvmflags}"/>
206 +        <classpath>
207 +          <pathelement location="${junit.jar}"/>
208 +          <pathelement location="@{workdir}/tck-classes"/>
209 +        </classpath>
210 +    </java>
211 +
212 +    </sequential>
213 +  </macrodef>
214 +
215    <!-- ALoops classpath -->
216    <path id="loops.classpath">
217      <pathelement location="${build.loops.dir}"/>
218    </path>
219  
220 <  <!-- J1 classpath -->
221 <  <path id="j1.classpath">
222 <    <pathelement location="${build.j1.dir}"/>
88 <    <pathelement location="${junit.jar}"/>
89 <    <pathelement location="${concurrent.jar}"/>
90 <  </path>
91 <
220 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
221 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
222 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
223  
224    <!-- Main targets -->
225  
226 +  <target name="dists"
227 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
228 +          description="Builds all public jars and docs"/>
229  
230    <target name="compile"
231 <          depends="init, configure-compiler"
232 <          description="Compiles main sources to build folder">
231 >          depends="configure-compiler"
232 >          description="Compiles src/main sources to build dir">
233  
234      <mkdir dir="${build.classes.dir}"/>
235  
236      <javac srcdir="${src.dir}"
237 <          destdir="${build.classes.dir}"
238 <            debug="${build.debug}"
239 <       debuglevel="${build.debuglevel}"
240 <      deprecation="${build.deprecation}"
241 <           source="${build.sourcelevel}"
242 <             fork="true">
237 >           destdir="${build.classes.dir}"
238 >           debug="${build.debug}"
239 >           debuglevel="${build.debuglevel}"
240 >           deprecation="${build.deprecation}"
241 >           classpath=""
242 >           includeAntRuntime="false"
243 >           includeJavaRuntime="false"
244 >           executable="${javac8}"
245 >           fork="true">
246  
247        <include name="**/*.java"/>
248 <      <exclude name="java/lang/**"/>
248 >      <compilerarg value="-XDignore.symbol.file=true"/>
249 >      <compilerarg value="-Xlint:all"/>
250        <compilerarg line="${build.args}"/>
251  
252      </javac>
115
253    </target>
254  
255  
119
256    <target name="jar"
257            depends="compile"
258            description="Builds library jar from compiled sources">
259  
124    <mkdir dir="${build.lib.dir}"/>
125
260      <jar destfile="${product.jar}">
261        <fileset dir="${build.classes.dir}"/>
262      </jar>
129
263    </target>
264  
265  
133
266    <target name="test"
267 <          depends="init, configure-tests, report-tests"
267 >          depends="configure-tests, report-tests"
268            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
269  
270  
139
271    <target name="docs"
272 <          description="Builds javadocs with custom tags to build folder">
142 <
143 <    <delete dir="${build.javadocs.dir}"/>
144 <    <mkdir dir="${build.javadocs.dir}"/>
145 <
146 <    <javadoc destdir="${build.javadocs.dir}"
147 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
148 <            overview="${src.dir}/intro.html"
149 <              source="${build.sourcelevel}">
272 >          description="Builds javadocs for src/main to dist dir">
273  
274 <      <tag name="revised" description="Last revised:"/>
275 <      <tag name="spec"    description="Specified by:"/>
274 >    <delete dir="${docs.dir}"/>
275 >    <mkdir dir="${docs.dir}"/>
276  
277 <      <packageset dir="${src.dir}"/>
278 <
156 <    </javadoc>
277 >    <!-- the packagenames="none" hack below prevents scanning the -->
278 >    <!-- sourcepath for packages -->
279  
280 <  </target>
281 <
282 <
283 <
284 <  <target name="doccheck"
285 <          depends="filter-doccheck"
286 <          description="Reports on javadoc style errors">
287 <
288 <    <delete dir="${build.doccheck.dir}"/>
289 <    <mkdir dir="${build.doccheck.dir}"/>
290 <
291 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
292 <         docletpath="${lib.dir}/doccheck.jar"
171 <            destdir="${build.doccheck.dir}">
172 <      <packageset dir="${build.dc-filter.dir}"/>
280 >    <javadoc destdir="${docs.dir}"
281 >             packagenames="none"
282 >             link="${jdkapi8docs.url}"
283 >             overview="${src.dir}/intro.html"
284 >             sourcepath="${src.dir}:${jdk8src.dir}"
285 >             classpath=""
286 >             executable="${javadoc8}">
287 >      <fileset dir="${src.dir}" defaultexcludes="yes">
288 >        <include name="**/*.java"/>
289 >      </fileset>
290 >      <arg value="-XDignore.symbol.file=true"/>
291 >      <arg value="-tag"/>
292 >      <arg value="${javadoc.jls.option}"/>
293      </javadoc>
174
175    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
176
177  </target>
178
179
180
181  <target name="checkstyle"
182          depends="filter-src"
183          description="Reports on style errors in Java source (verbose, mostly chaff)">
184
185    <taskdef resource="checkstyletask.properties"
186            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187
188    <mkdir dir="${build.checkstyle.dir}"/>
189
190    <checkstyle config="etc/checkstyle/sun_checks.xml"
191       failOnViolation="false">
192      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194    </checkstyle>
195
196    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
197          out="${build.checkstyle.dir}/checkstyle-report.html"
198        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199
294    </target>
295  
296  
203
297    <target name="dist"
298 <          depends="init, dist-clean, dist-jar, dist-docs"
298 >          depends="dist-clean, dist-jar, dist-docs"
299            description="Puts all distributable products in single hierarchy"/>
300  
301  
209
302    <target name="release"
303            depends="dist"
304            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 222 | Line 314
314        <exclude name="**/SyntaxTest.java"/>
315        <exclude name="**/SuperfluousAbstract.java"/>
316      </jar>
225
317    </target>
318  
319  
229
320    <target name="clean"
321            description="Removes all build products">
322  
323      <delete dir="${build.dir}"/>
234    <delete dir="${build.classes.dir}"/>
235    <delete dir="${build.lib.dir}"/>
324  
325    </target>
326  
327  
240
328    <target name="dist-clean"
329            description="Removes all build and distribution products">
330  
# Line 246 | Line 333
333    </target>
334  
335  
249
250  <target name="dist-docs"
251          description="Builds javadocs without custom tags to dist folder">
252
253    <delete dir="${dist.javadocs.dir}"/>
254    <mkdir dir="${dist.javadocs.dir}"/>
255
256    <javadoc destdir="${dist.javadocs.dir}"
257                link="http://java.sun.com/j2se/1.4.2/docs/api"
258            overview="${src.dir}/intro.html"
259              source="${build.sourcelevel}">
260
261      <packageset dir="${src.dir}"/>
262
263    </javadoc>
264
265  </target>
266
267
268
336    <!-- Internal targets -->
337  
338  
272  <target name="init">
273
274    <!-- Version is kept in a separate file -->
275    <loadfile property="version" srcFile="version.properties"/>
276    <echo>Building JSR-166 version ${version}</echo>
277    <echo>java.home is ${java.home}</echo>
278
279  </target>
280
281
339    <target name="dist-jar"
340            depends="clean, jar">
284
341      <copy file="${product.jar}" todir="${dist.dir}"/>
286
287  </target>
288
289
290  <target name="compile-ant-filter"
291          depends="init">
292
293    <mkdir dir="${build.ant.dir}"/>
294
295    <javac srcdir="${ant.src.dir}"
296          destdir="${build.ant.dir}"
297           source="1.4"/>
298
299  </target>
300
301
302  <target name="filter-src"
303          depends="compile-ant-filter">
304
305    <mkdir dir="${build.filter.src.dir}"/>
306
307    <copy todir="${build.filter.src.dir}">
308      <fileset dir="${src.dir}">
309        <include name="**/*.html"/>
310      </fileset>
311    </copy>
312
313    <copy todir="${build.filter.src.dir}">
314      <fileset dir="${src.dir}">
315        <exclude name="**/*.html"/>
316        <!-- Files excluded from dist-docs -->
317        <exclude name="java/util/Random.*"/>
318        <exclude name="sun/misc/Unsafe.*"/>
319      </fileset>
320      <!--
321      <filterchain>
322      -->
323
324        <!--
325         # This filter gets rid of angle-bracketed type parameters
326         # so that javadoc can run on the result. The following
327         # heuristic seems to work:
328         #
329         # For all lines not starting with space(s)-asterisk-space(s),
330         #   replace <something> with a space, where there may be more
331         #   than one right angle bracket at the end, and "something"
332         #   must not contain parens or pipes. (This may need some
333         #   tweaking.)
334         -->
335
336        <!--
337        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
338                      classpath="${build.ant.dir}">
339          <param name="notmatching" value="^\s+\*\s.*$"/>
340          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
341          <param name="replacement" value=" "/>
342        </filterreader>
343        -->
344
345      <!--
346      </filterchain>
347      -->
348    </copy>
349
342    </target>
343  
344 <
345 <  <target name="filter-doccheck"
346 <          depends="filter-src">
355 <
356 <    <mkdir dir="${build.dc-filter.dir}"/>
357 <
358 <    <copy todir="${build.dc-filter.dir}">
359 <      <fileset dir="${build.filter.src.dir}">
360 <        <include name="**/*.html"/>
361 <      </fileset>
362 <    </copy>
363 <
364 <    <property name="generic.declarations"
365 <             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 {}"
366 <    />
367 <
368 <    <copy todir="${build.dc-filter.dir}">
369 <      <fileset dir="${build.filter.src.dir}">
370 <        <exclude name="**/*.html"/>
371 <      </fileset>
372 <      <filterchain>
373 <        <!--
374 <         # These two filters try to make the source look like
375 <         # something that doccheck can process. The first removes
376 <         # -source 1.4 assertions and the second adds in a bunch
377 <         # of single letter public nested marker interfaces so that
378 <         # the generic type parameters are recognized.
379 <         -->
380 <
381 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
382 <                      classpath="${build.ant.dir}">
383 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
384 <          <param name="pattern"     value="assert"/>
385 <          <param name="replacement" value="//assert"/>
386 <        </filterreader>
387 <
388 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389 <                      classpath="${build.ant.dir}">
390 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
391 <          <param name="pattern"     value="$"/>
392 <          <param name="replacement" value=" ${generic.declarations}"/>
393 <        </filterreader>
394 <
395 <      </filterchain>
396 <    </copy>
397 <
344 >  <target name="dist-docs"
345 >          depends="clean, docs">
346 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
347    </target>
348  
349  
# Line 404 | Line 353
353      <mkdir dir="${build.testcases.dir}"/>
354  
355      <javac srcdir="${tck.src.dir}"
356 <          destdir="${build.testcases.dir}"
357 <            debug="${build.debug}"
358 <       debuglevel="${build.debuglevel}"
359 <      deprecation="${build.deprecation}"
360 <           source="${build.sourcelevel}"
361 <             fork="true">
356 >           destdir="${build.testcases.dir}"
357 >           debug="${build.debug}"
358 >           debuglevel="${build.debuglevel}"
359 >           deprecation="${build.deprecation}"
360 >           source="6"
361 >           classpath="${junit.jar}"
362 >           bootclasspath="@{product.jar}:${bootclasspath6}"
363 >           includeAntRuntime="false"
364 >           includeJavaRuntime="false"
365 >           executable="${javac8}"
366 >           fork="true">
367  
368 <      <compilerarg value="${bootclasspath.args}"/>
368 >      <include name="**/*.java"/>
369 >      <compilerarg value="-XDignore.symbol.file=true"/>
370 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
371        <compilerarg line="${build.args}"/>
372  
417      <classpath refid="test.classpath"/>
418
373      </javac>
374  
375      <javac srcdir="${test.src.dir}"
376 <          destdir="${build.testcases.dir}"
377 <            debug="${build.debug}"
378 <       debuglevel="${build.debuglevel}"
379 <      deprecation="${build.deprecation}"
380 <           source="${build.sourcelevel}"
381 <             fork="true">
382 <
383 <      <include name="jsr166/test/**"/>
384 <
385 <      <compilerarg value="${bootclasspath.args}"/>
376 >           destdir="${build.testcases.dir}"
377 >           debug="${build.debug}"
378 >           debuglevel="${build.debuglevel}"
379 >           deprecation="${build.deprecation}"
380 >           source="6"
381 >           classpath=""
382 >           bootclasspath="@{product.jar}:${bootclasspath6}"
383 >           includeAntRuntime="false"
384 >           includeJavaRuntime="false"
385 >           executable="${javac8}"
386 >           fork="true">
387 >
388 >      <include name="jsr166/test/**/*.java"/>
389 >      <compilerarg value="-XDignore.symbol.file=true"/>
390 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
391        <compilerarg line="${build.args}"/>
392  
434      <classpath refid="test.classpath"/>
435
393      </javac>
394  
395   <!--
# Line 444 | Line 401
401             source="${build.sourcelevel}"
402               fork="true">
403  
404 <      <compilerarg value="${bootclasspath.args}"/>
404 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
405 >      <compilerarg value="-XDignore.symbol.file=true"/>
406        <compilerarg line="${build.args}"/>
407  
450      <classpath refid="test.classpath"/>
451
408      </javac>
409   -->
410  
# Line 468 | Line 424
424            errorProperty="junit.failed"
425          failureProperty="junit.failed"
426                      dir="${build.reports.dir}"
427 +                    jvm="${java8}"
428                     fork="true">
429  
430 <      <jvmarg value="${bootclasspath.args}"/>
430 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
431        <jvmarg value="-server"/>
432        <jvmarg value="-showversion"/>
433  
# Line 518 | Line 475
475        <fileset dir="${build.reports.dir}">
476          <include name="TEST-*.xml"/>
477        </fileset>
478 <      <report styledir="${stylesheet.dir}"
522 <                format="${junit.report.format}"
523 <                 todir="${build.reports.dir}"
478 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
479        />
480      </junitreport>
481  
# Line 570 | Line 525
525    </target>
526  
527  
573
574  <!-- Anthill targets -->
575
576  <target name="anthill-build">
577
578    <!-- Override this in user.properties -->
579    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
580
581    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
582      <arg value="-Xmx256000000"/>
583      <!-- classpath of new JVM -->
584      <arg value="-classpath"/> <arg path="${java.class.path}"/>
585      <!-- location of Ant home directory -->
586      <arg value="-Dant.home=${ant.home}"/>
587      <!-- the Ant main class -->
588      <arg value="org.apache.tools.ant.Main"/>
589      <!-- The build file -->
590      <arg value="-buildfile"/>  <arg value="build.xml"/>
591      <!-- the target to build on the new Ant instance -->
592      <arg value="-DJAVA_HOME=${tiger.home}"/>
593      <arg value="do-anthill-build"/>
594    </exec>
595  </target>
596
597  <target name="do-anthill-build"
598          depends="jar, test, docs, dist-docs"/>
599
600  <target name="anthill-publish">
601
602    <copy todir="${deployDir}/docs/private">
603      <fileset dir="${build.javadocs.dir}"/>
604    </copy>
605
606    <copy todir="${deployDir}/docs/public">
607      <fileset dir="${dist.javadocs.dir}"/>
608    </copy>
609
610    <copy tofile="${deployDir}/index.html"
611          file="${basedir}/etc/anthill-index.html"/>
612
613    <copy todir="${deployDir}/notes">
614      <fileset dir="${basedir}/etc/notes"/>
615    </copy>
616
617  </target>
618
619
620
528    <!-- Various demos and test programs -->
529  
530  
531 <  <target name="sample" depends="init, configure-compiler"
625 <          description="Standalone demo program">
626 <
627 <    <mkdir dir="${build.testcases.dir}"/>
628 <
629 <    <javac srcdir="${test.src.dir}"
630 <          destdir="${build.testcases.dir}"
631 <            debug="${build.debug}"
632 <       debuglevel="${build.debuglevel}"
633 <      deprecation="${build.deprecation}"
634 <           source="${build.sourcelevel}"
635 <             fork="true">
636 <
637 <      <include name="jsr166/test/Sample.java"/>
638 <
639 <    </javac>
640 <
641 <    <copy todir="${build.testcases.dir}">
642 <      <fileset dir="${test.src.dir}">
643 <        <include name="**/*.properties"/>
644 <      </fileset>
645 <    </copy>
646 <
647 <
648 <    <java classname="jsr166.test.Sample" fork="true">
649 <      <classpath refid="test.classpath"/>
650 <      <!-- <jvmarg value="-ea"/> -->
651 <      <!-- <jvmarg value="-server"/> -->
652 <      <!-- <arg value="1000"/> -->
653 <    </java>
654 <  </target>
655 <
656 <
657 <  <target name="loops" depends="init, configure-compiler"
531 >  <target name="loops" depends="configure-compiler"
532            description="Benchmark from Doug Lea's AQS paper">
533  
534      <mkdir dir="${build.loops.dir}"/>
# Line 669 | Line 543
543  
544        <compilerarg line="${build.args}"/>
545        <classpath refid="loops.classpath"/>
546 +      <compilerarg value="-XDignore.symbol.file=true"/>
547  
548      </javac>
549  
# Line 679 | Line 554
554    </target>
555  
556  
557 <  <target name="compile-j1" depends="init, configure-compiler">
683 <
684 <    <mkdir dir="${build.j1.dir}"/>
557 >  <!-- jsr166 4jdk7 -->
558  
559 <    <javac srcdir="${j1.src.dir}"
560 <          destdir="${build.j1.dir}"
561 <            debug="${build.debug}"
562 <       debuglevel="${build.debuglevel}"
563 <      deprecation="${build.deprecation}"
564 <           source="${build.sourcelevel}" >
559 >  <target name="4jdk7compile"
560 >          depends="configure-compiler"
561 >          description="Compiles src/jdk7 sources, targeting jdk7">
562 >
563 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
564 >
565 >    <javac srcdir="${4jdk7src.dir}"
566 >           destdir="${build.4jdk7.classes.dir}"
567 >           debug="${build.debug}"
568 >           debuglevel="${build.debuglevel}"
569 >           deprecation="${build.deprecation}"
570 >           source="6"
571 >           classpath=""
572 >           bootclasspath="${bootclasspath6}"
573 >           includeAntRuntime="false"
574 >           includeJavaRuntime="false"
575 >           executable="${javac7}"
576 >           fork="true">
577  
578        <include name="**/*.java"/>
579 <      <exclude name="**/dijkstra/**"/>
580 <
579 >      <compilerarg value="-XDignore.symbol.file=true"/>
580 >      <compilerarg value="-Xlint:all"/>
581        <compilerarg line="${build.args}"/>
697      <classpath refid="j1.classpath"/>
582  
583      </javac>
584 +  </target>
585 +
586 +
587 +  <target name="4jdk7jar"
588 +          depends="4jdk7compile"
589 +          description="Builds library jar from compiled sources">
590 +
591 +    <jar destfile="${4jdk7product.jar}">
592 +      <fileset dir="${build.4jdk7.classes.dir}"/>
593 +    </jar>
594  
595    </target>
596  
597  
598 <  <target name="sw" depends="compile-j1"
599 <          description="Runs the SwingWorker demo">
598 >  <target name="4jdk7-test-tck"
599 >          depends="4jdk7jar"
600 >          description="Runs tck tests for jsr166-4jdk7 directly">
601  
602 <    <!--
603 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
604 <      <classpath refid="j1.classpath"/>
605 <    </java>
606 <    -->
602 >    <run-tck-tests
603 >      target="7"
604 >      workdir="${build.4jdk7.dir}"
605 >      classes="${4jdk7product.jar}"/>
606 >  </target>
607 >
608 >
609 >  <target name="4jdk7-test-tck-junit"
610 >          depends="4jdk7compile"
611 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
612 >
613 >    <junit printsummary="true"
614 >           showoutput="true"
615 >           errorProperty="junit.failed"
616 >           failureProperty="junit.failed"
617 >           includeantruntime="true"
618 >           jvm="${java7}"
619 >           fork="true">
620 >
621 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
622 >      <jvmarg value="-server"/>
623 >
624 >      <classpath>
625 >        <pathelement location="${junit.jar}"/>
626 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
627 >      </classpath>
628 >
629 >      <formatter type="brief"/>
630 >
631 >      <test name="JSR166TestCase" haltonfailure="no">
632 >      </test>
633  
634 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
634 >    </junit>
635 >  </target>
636 >
637 >  <target name="4jdk7-test-jtreg"
638 >          depends="4jdk7compile"
639 >          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
640 >    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
641 >    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
642 >    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
643 >    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
644 >    <jtreg dir="${jtreg.src.dir}"
645 >           jdk="${jdk7.home}"
646 >           workDir="${build.4jdk7.dir}/JTwork"
647 >           reportDir="${build.4jdk7.dir}/JTreport">
648 >
649 >      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
650 >      <arg value="-agentvm"/>
651 >      <arg value="-v:nopass,fail"/>
652 >      <arg value="-vmoptions:-esa -ea"/>
653 >      <arg value="-automatic"/>
654 >      <arg value="-k:!ignore"/>
655 >    </jtreg>
656 >  </target>
657  
715    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
716      <arg value="${build.j1.dir}/SwingWorker.html"/>
717    </exec>
658  
659 +  <target name="4jdk7-test"
660 +          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
661 +          description="Runs tck and jtreg tests for jsr166-4jdk7">
662    </target>
663  
721  <target name="j1" depends="compile-j1"
722          description="Runs a standalone JavaOne program">
664  
665 <    <java classname="${j1.test}" fork="true">
666 <      <classpath refid="j1.classpath"/>
667 <      <jvmarg value="-client"/>
665 >  <target name="4jdk7docs"
666 >          description="Builds javadocs for src/jdk7 to dist dir">
667 >
668 >    <delete dir="${4jdk7docs.dir}"/>
669 >    <mkdir dir="${4jdk7docs.dir}"/>
670 >
671 >    <javadoc destdir="${4jdk7docs.dir}"
672 >             packagenames="none"
673 >             link="${jdkapi7docs.url}"
674 >             overview="${4jdk7src.dir}/intro.html"
675 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
676 >             classpath=""
677 >             executable="${javadoc7}">
678 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
679 >        <include name="**/*.java"/>
680 >      </fileset>
681 >      <arg value="-XDignore.symbol.file=true"/>
682 >    </javadoc>
683 >  </target>
684  
728      <!-- TestPseudoRandom args -->
729      <arg value="2"/>
730      <arg value="25"/>
731      <arg value="100000"/>
685  
686 <      <!-- WebCrawler args -->
687 <      <!--
688 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
736 <      <arg value="http://www.priorartisans.com"/>
737 <      <arg value="25"/>
738 <      -->
686 >  <target name="4jdk7dist"
687 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
688 >          description="Puts all distributable products in single hierarchy"/>
689  
690 <    </java>
690 >
691 >  <target name="4jdk7clean"
692 >          description="Removes all 4jdk7 build products">
693 >
694 >    <delete dir="${build.4jdk7.dir}"/>
695  
696    </target>
697  
698  
699 <  <target name="test-j1" depends="compile-j1"
700 <          description="Runs testcases from the JavaOne source directories">
699 >  <target name="4jdk7dist-clean"
700 >          description="Removes all build and distribution products">
701  
702 <    <junit printsummary="true"
749 <             showoutput="true"
750 <          errorProperty="junit.failed"
751 <        failureProperty="junit.failed"
752 <                    dir="${build.j1.dir}"
753 <                   fork="true">
702 >  </target>
703  
704 <      <!-- <jvmarg value="-server"/> -->
705 <      <classpath refid="j1.classpath"/>
706 <      <formatter type="xml"/>
704 >  <target name="4jdk7dist-jar"
705 >          depends="4jdk7clean, 4jdk7jar">
706 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
707 >  </target>
708  
759      <batchtest todir="${build.j1.dir}">
760        <fileset dir="${j1.src.dir}">
761          <include name="**/*Test.java"/>
762        </fileset>
763      </batchtest>
709  
710 <    </junit>
710 >  <target name="4jdk7dist-docs"
711 >          depends="4jdk7clean, 4jdk7docs">
712 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
713 >  </target>
714  
767    <available property="junit.report.format"
768                  value="frames"
769              classname="org.apache.xalan.lib.Redirect"/>
770    <property name="junit.report.format" value="noframes"/>
715  
716 <    <junitreport todir="${build.j1.dir}">
773 <      <fileset dir="${build.j1.dir}">
774 <        <include name="TEST-*.xml"/>
775 <      </fileset>
776 <      <report styledir="${stylesheet.dir}"
777 <                format="${junit.report.format}"
778 <                 todir="${build.j1.dir}"
779 <      />
780 <    </junitreport>
716 >  <!-- jsr166x -->
717  
718 <    <fail message="Test Cases Failed" if="junit.failed"/>
718 >  <target name="jsr166xcompile"
719 >          depends="configure-compiler"
720 >          description="Compiles jsr166x sources to build dir">
721 >
722 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
723 >
724 >    <javac srcdir="${topsrc.dir}"
725 >           destdir="${build.jsr166x.classes.dir}"
726 >           debug="${build.debug}"
727 >           debuglevel="${build.debuglevel}"
728 >           deprecation="${build.deprecation}"
729 >           classpath=""
730 >           bootclasspath="${bootclasspath6}"
731 >           source="5"
732 >           includeAntRuntime="false"
733 >           includeJavaRuntime="false"
734 >           executable="${javac7}"
735 >           fork="true">
736 >
737 >      <include name="jsr166x/**/*.java"/>
738 >      <compilerarg value="-XDignore.symbol.file=true"/>
739 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
740 >      <compilerarg line="${build.args}"/>
741  
742 +    </javac>
743    </target>
744  
745  
746 +  <target name="jsr166xjar"
747 +          depends="jsr166xcompile"
748 +          description="Builds library jar from compiled sources">
749  
750 <  <!-- C++ and JNI definitions and demos -->
750 >    <jar destfile="${jsr166x.jar}">
751 >      <fileset dir="${build.jsr166x.classes.dir}"/>
752 >    </jar>
753  
754 <  <target name="configure-cpp">
754 >  </target>
755  
792    <!-- Define tasks and types -->
756  
757 <    <path id="cpptasks.path">
758 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
796 <    </path>
797 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
757 >  <target name="jsr166xdocs"
758 >          description="Builds javadocs to dist dir">
759  
760 <    <!-- Set platform property for JNI includes -->
760 >    <delete dir="${jsr166xdocs.dir}"/>
761 >    <mkdir dir="${jsr166xdocs.dir}"/>
762  
763 <    <condition property="platform" value="linux">
764 <      <os name="Linux"/>
765 <    </condition>
766 <    <condition property="platform" value="win32">
767 <      <os family="windows"/>
768 <    </condition>
769 <    <condition property="platform" value="solaris">
770 <      <os name="SunOS"/>
810 <    </condition>
763 >    <javadoc destdir="${jsr166xdocs.dir}"
764 >             packagenames="jsr166x.*"
765 >             link="${jdkapidocs.url}"
766 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
767 >             bootclasspath="${bootclasspath6}"
768 >             source="5"
769 >             executable="${javadoc7}">
770 >      <arg value="-XDignore.symbol.file=true"/>
771  
772 +    </javadoc>
773    </target>
774  
775  
776 <  <target name="cppdemo" depends="configure-cpp">
776 >  <target name="jsr166xdist"
777 >          depends="jsr166xdist-jar, jsr166xdist-docs"
778 >          description="Puts all distributable products in single hierarchy"/>
779  
817    <mkdir dir="${build.dir}"/>
780  
781 <    <cc multithreaded="true"
782 <                 name="g++"
821 <               objdir="${build.dir}"
822 <              outfile="${build.dir}/CppDemo">
823 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
824 <      <libset libs="stdc++"/>
825 <    </cc>
781 >  <target name="jsr166xclean"
782 >          description="Removes all jsr166x build products">
783  
784 <    <exec executable="${build.dir}/CppDemo">
828 <      <arg line="count in word frequency of word in command line count"/>
829 <    </exec>
784 >    <delete dir="${build.jsr166x.dir}"/>
785  
786    </target>
787  
788  
789 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
789 >  <target name="jsr166xdist-clean"
790 >          description="Removes all build and distribution products">
791  
792 <    <mkdir dir="${build.testcases.dir}"/>
792 >  </target>
793  
838    <javac srcdir="${test.src.dir}"
839          destdir="${build.testcases.dir}"
840            debug="${build.debug}"
841       debuglevel="${build.debuglevel}"
842      deprecation="${build.deprecation}"
843           source="${build.sourcelevel}"
844             fork="true">
845      <compilerarg value="${bootclasspath.args}"/>
846      <compilerarg line="${build.args}"/>
847      <classpath refid="test.classpath"/>
848      <include name="JniDemo.java"/>
849    </javac>
794  
795 <    <javah destdir="${build.testcases.dir}"
796 <      classpathref="test.classpath">
797 <      <class name="JniDemo"/>
798 <    </javah>
855 <
856 <    <cc multithreaded="true"
857 <                 name="g++"
858 <               objdir="${build.dir}"
859 <              outfile="${build.dir}/JniDemo"
860 <              outtype="shared">
861 <
862 <      <compiler>
863 <        <defineset>
864 <          <define name="__int64" value="long long"/>
865 <        </defineset>
866 <        <includepath location="${java.home}/../include"/>
867 <        <includepath location="${java.home}/../include/${platform}"/>
868 <        <compilerarg value="-mno-cygwin"/>
869 <      </compiler>
870 <
871 <      <linker>
872 <        <linkerarg value="--add-stdcall-alias"/>
873 <      </linker>
874 <
875 <      <includepath location="${build.testcases.dir}"/>
876 <
877 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878 <
879 <      <libset libs="stdc++"/>
880 <
881 <    </cc>
882 <
883 <    <!-- Necessary if windows, harmless if not -->
884 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885 <
886 <    <java classname="JniDemo" fork="true">
887 <      <!-- Watch out: path separator hardwired to semicolon here! -->
888 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889 <      <classpath refid="test.classpath"/>
890 <      <arg line="count in word frequency of word in command line count"/>
891 <    </java>
795 >  <target name="jsr166xdist-jar"
796 >          depends="jsr166xclean, jsr166xjar">
797 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
798 >  </target>
799  
800 +  <target name="jsr166xdist-docs"
801 +          depends="jsr166xclean, jsr166xdocs">
802 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
803    </target>
804  
805 +  <!-- jsr166y -->
806  
807  
808 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
808 >  <target name="jsr166ycompile"
809 >          depends="configure-compiler"
810 >          description="Compiles jsr166y sources">
811 >
812 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
813 >
814 >    <javac srcdir="${topsrc.dir}"
815 >           destdir="${build.jsr166y.classes.dir}"
816 >           debug="${build.debug}"
817 >           debuglevel="${build.debuglevel}"
818 >           deprecation="${build.deprecation}"
819 >           source="6"
820 >           classpath=""
821 >           bootclasspath="${bootclasspath6}"
822 >           includeAntRuntime="false"
823 >           includeJavaRuntime="false"
824 >           executable="${javac7}"
825 >           fork="true">
826 >
827 >      <include name="jsr166y/**/*.java"/>
828 >      <compilerarg value="-XDignore.symbol.file=true"/>
829 >      <compilerarg value="-Xlint:all"/>
830 >      <compilerarg line="${build.args}"/>
831  
832 +    </javac>
833 +  </target>
834 +
835 +
836 +  <target name="jsr166yjar"
837 +          depends="jsr166ycompile"
838 +          description="Builds library jar from compiled sources">
839  
840 +    <jar destfile="${jsr166y.jar}" index="true">
841 +      <fileset dir="${build.jsr166y.classes.dir}"/>
842 +    </jar>
843 +
844 +  </target>
845  
901  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
902  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
903  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
904  <property name="pretiger.sourcelevel" value="1.4"/>
846  
847 <  <target name="defang"
848 <       depends="init"
908 <   description="Generates pre-Tiger compatible source">
847 >  <target name="jsr166ydocs"
848 >          description="Builds javadocs to dist dir">
849  
850 <    <delete dir="${pretiger.src.dir}"/>
851 <    <mkdir dir="${pretiger.src.dir}"/>
850 >    <delete dir="${jsr166ydocs.dir}"/>
851 >    <mkdir dir="${jsr166ydocs.dir}"/>
852  
853 <    <exec executable="perl">
854 <      <arg file="etc/defang.pl"/>
855 <      <!-- <arg value="-v"/> -->
856 <      <arg value="-s"/> <arg file="${src.dir}"/>
857 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
858 <    </exec>
853 >    <javadoc destdir="${jsr166ydocs.dir}"
854 >             packagenames="jsr166y.*"
855 >             link="${jdkapidocs.url}"
856 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
857 >             bootclasspath="${bootclasspath6}"
858 >             source="6"
859 >             executable="${javadoc7}">
860 >      <arg value="-XDignore.symbol.file=true"/>
861  
862 +    </javadoc>
863    </target>
864  
922  <target name="compile-pretiger"
923          depends="init, configure-compiler, defang"
924          description="Compiles pre-Tiger sources to build folder">
865  
866 <    <mkdir dir="${build.pretiger.dir}"/>
866 >  <target name="jsr166ydist"
867 >          depends="jsr166ydist-jar, jsr166ydist-docs"
868 >          description="Puts all distributable products in single hierarchy"/>
869  
928    <javac srcdir="${pretiger.src.dir}"
929          destdir="${build.pretiger.dir}"
930            debug="${build.debug}"
931       debuglevel="${build.debuglevel}"
932      deprecation="${build.deprecation}"
933           source="${pretiger.sourcelevel}"
934             fork="true">
870  
871 <      <compilerarg line="${build.args}"/>
872 <      <exclude name="**/Thread.java"/>
871 >  <target name="jsr166yclean"
872 >          description="Removes all jsr166y build products">
873  
874 <    </javac>
874 >    <delete dir="${build.jsr166y.dir}"/>
875  
876    </target>
877  
943  <target name="pretiger" depends="compile-pretiger">
878  
879 <    <mkdir dir="${build.lib.dir}"/>
879 >  <target name="jsr166ydist-clean"
880 >          description="Removes all build and distribution products">
881  
882 <    <jar destfile="${pretiger.jar}">
948 <      <fileset dir="${build.pretiger.dir}">
949 <      </fileset>
950 <    </jar>
882 >  </target>
883  
884 +  <target name="jsr166ydist-jar"
885 +          depends="jsr166yclean, jsr166yjar">
886 +    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
887    </target>
888  
889 <  <!-- jsr166x -->
889 >  <target name="jsr166ydist-docs"
890 >          depends="jsr166yclean, jsr166ydocs">
891 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
892 >  </target>
893  
894  
895 <  <target name="jsr166xcompile"
958 <          depends="init, configure-compiler"
959 <          description="Compiles jsr166x sources">
895 >  <!-- extra166y -->
896  
961    <mkdir dir="${build.jsr166x.dir}"/>
897  
898 <    <javac srcdir="${jsr166xsrc.dir}"
899 <          destdir="${build.jsr166x.dir}"
900 <            debug="${build.debug}"
966 <       debuglevel="${build.debuglevel}"
967 <      deprecation="${build.deprecation}"
968 <           source="${build.sourcelevel}"
969 <             fork="true">
898 >  <target name="extra166ycompile"
899 >          depends="configure-compiler, jsr166yjar"
900 >          description="Compiles extra166y sources">
901  
902 <      <include name="**/*.java"/>
902 >    <mkdir dir="${build.extra166y.classes.dir}"/>
903 >
904 >    <javac srcdir="${topsrc.dir}"
905 >           destdir="${build.extra166y.classes.dir}"
906 >           debug="${build.debug}"
907 >           debuglevel="${build.debuglevel}"
908 >           deprecation="${build.deprecation}"
909 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
910 >           classpath=""
911 >           source="6"
912 >           includeAntRuntime="false"
913 >           includeJavaRuntime="false"
914 >           executable="${javac7}"
915 >           fork="true">
916 >
917 >      <include name="extra166y/**/*.java"/>
918 >      <compilerarg value="-XDignore.symbol.file=true"/>
919 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
920        <compilerarg line="${build.args}"/>
921  
922      </javac>
975
923    </target>
924  
925  
926 <
927 <  <target name="jsr166xjar"
981 <          depends="jsr166xcompile"
926 >  <target name="extra166yjar"
927 >          depends="extra166ycompile"
928            description="Builds library jar from compiled sources">
929  
930 <    <mkdir dir="${build.jsr166xlib.dir}"/>
931 <
986 <    <jar destfile="${jsr166xproduct.jar}">
987 <      <fileset dir="${build.jsr166x.dir}"/>
930 >    <jar destfile="${extra166y.jar}" index="true">
931 >      <fileset dir="${build.extra166y.classes.dir}"/>
932      </jar>
933  
934    </target>
935  
936  
937 +  <target name="extra166ydocs"
938 +          description="Builds javadocs to build dir">
939  
940 <  <target name="jsr166xdocs"
941 <          description="Builds javadocs with custom tags to build folder">
940 >    <delete dir="${extra166ydocs.dir}"/>
941 >    <mkdir dir="${extra166ydocs.dir}"/>
942  
943 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
944 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
943 >    <javadoc destdir="${extra166ydocs.dir}"
944 >             packagenames="extra166y.*"
945 >             link="${jdkapidocs.url}"
946 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
947 >             bootclasspath="${bootclasspath6}"
948 >             source="6"
949 >             executable="${javadoc7}">
950 >      <arg value="-XDignore.symbol.file=true"/>
951  
952 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
953 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1002 <    >
1003 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1004 <      <include name="jsr166x"/>
1005 <      </packageset>
952 >    </javadoc>
953 >  </target>
954  
955  
956 <    </javadoc>
956 >  <target name="extra166ydist"
957 >          depends="extra166ydist-jar, extra166ydist-docs"
958 >          description="Puts all distributable products in single hierarchy"/>
959 >
960 >
961 >  <target name="extra166yclean"
962 >          description="Removes all extra166y build products">
963 >
964 >    <delete dir="${build.extra166y.dir}"/>
965  
966    </target>
967  
968  
969 <  <target name="jsr166xdist"
970 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1015 <          description="Puts all distributable products in single hierarchy"/>
969 >  <target name="extra166ydist-clean"
970 >          description="Removes all build and distribution products">
971  
972 +  </target>
973  
974 +  <target name="extra166ydist-jar"
975 +          depends="extra166yclean, extra166yjar">
976 +    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
977 +  </target>
978 +
979 +  <target name="extra166ydist-docs"
980 +          depends="extra166yclean, extra166ydocs">
981 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
982 +  </target>
983 +
984 +  <!-- jsr166e -->
985 +
986 +  <target name="jsr166ecompile"
987 +          depends="configure-compiler"
988 +          description="Compiles jsr166e sources">
989 +
990 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
991 +
992 +    <javac srcdir="${topsrc.dir}"
993 +           destdir="${build.jsr166e.classes.dir}"
994 +           debug="${build.debug}"
995 +           debuglevel="${build.debuglevel}"
996 +           deprecation="${build.deprecation}"
997 +           source="7"
998 +           classpath=""
999 +           includeAntRuntime="false"
1000 +           includeJavaRuntime="false"
1001 +           executable="${javac7}"
1002 +           fork="true">
1003 +
1004 +      <include name="jsr166e/**/*.java"/>
1005 +      <compilerarg value="-XDignore.symbol.file=true"/>
1006 +      <compilerarg value="-Xlint:all"/>
1007 +      <compilerarg line="${build.args}"/>
1008  
1009 <  <target name="jsr166xclean"
1010 <          description="Removes all build products">
1009 >    </javac>
1010 >  </target>
1011  
1012 <    <delete dir="${build.jsr166x.dir}"/>
1013 <    <delete dir="${build.jsr166xlib.dir}"/>
1012 >
1013 >  <target name="jsr166ejar"
1014 >          depends="jsr166ecompile"
1015 >          description="Builds library jar from compiled sources">
1016 >
1017 >    <jar destfile="${jsr166e.jar}" index="true">
1018 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1019 >    </jar>
1020  
1021    </target>
1022  
1023  
1024 +  <target name="jsr166edocs"
1025 +          description="Builds javadocs to build dir">
1026  
1027 <  <target name="jsr166xdist-clean"
1028 <          description="Removes all build and distribution products">
1027 >    <delete dir="${jsr166edocs.dir}"/>
1028 >    <mkdir dir="${jsr166edocs.dir}"/>
1029 >
1030 >    <javadoc destdir="${jsr166edocs.dir}"
1031 >             packagenames="jsr166e.*"
1032 >             link="${jdkapidocs.url}"
1033 >             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1034 >             source="7"
1035 >             executable="${javadoc7}">
1036 >      <arg value="-XDignore.symbol.file=true"/>
1037  
1038 +    </javadoc>
1039    </target>
1040  
1041  
1042 +  <target name="jsr166e-test-tck"
1043 +          depends="jsr166ejar"
1044 +          description="Runs tck tests for jsr166e">
1045  
1046 <  <target name="jsr166xdist-docs"
1047 <          description="Builds javadocs without custom tags to dist folder">
1046 >    <run-tck-tests
1047 >      tck.src.dir="${test.src.dir}/tck-jsr166e"
1048 >      source="7"
1049 >      target="8"
1050 >      workdir="${build.jsr166e.dir}"
1051 >      classes="${jsr166e.jar}"/>
1052 >  </target>
1053  
1039    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1040    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1054  
1055 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1056 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1057 <              source="${build.sourcelevel}">
1045 <
1046 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1047 <      <include name="jsr166x"/>
1048 <      </packageset>
1055 >  <target name="jsr166edist"
1056 >          depends="jsr166edist-jar, jsr166edist-docs"
1057 >          description="Puts all distributable products in single hierarchy"/>
1058  
1050    </javadoc>
1059  
1060 +  <target name="jsr166eclean"
1061 +          description="Removes all jsr166e build products">
1062 +    <delete dir="${build.jsr166e.dir}"/>
1063    </target>
1064  
1054  <target name="jsr166xdist-jar"
1055          depends="jsr166xclean, jsr166xjar">
1065  
1066 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1066 >  <target name="jsr166edist-clean"
1067 >          description="Removes all build and distribution products">
1068 >
1069 >  </target>
1070 >
1071 >  <target name="jsr166edist-jar"
1072 >          depends="jsr166eclean, jsr166ejar">
1073 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1074 >  </target>
1075  
1076 +  <target name="jsr166edist-docs"
1077 +          depends="jsr166eclean, jsr166edocs">
1078 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1079    </target>
1080  
1081   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines