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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines