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.60 by tim, Mon Dec 8 03:10:54 2003 UTC vs.
Revision 1.101 by jsr166, Sat Jan 19 17:30:36 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="1.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.lib.dir"        location="${build.dir}/lib"/>
48 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
49 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
50 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
51 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
52 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
53 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
54 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
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.lib.dir"               location="${build.dir}/lib"/>
49 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
51 >
52 >  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53 >  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54 >  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55 >  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56 >  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57 >
58 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61 >
62 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65 >
66 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68 >  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69 >
70 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73 >
74 >  <!-- JDK binary locations -->
75 >  <property name="jdks.home"  location="${user.home}/jdk"/>
76 >
77 >  <macrodef name="defjdklocations">
78 >    <attribute name="v"/>
79 >    <sequential>
80 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84 >    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86 >    <property name="bootclasspath@{v}"
87 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88 >    </sequential>
89 >  </macrodef>
90 >
91 >  <defjdklocations v="6"/>
92 >  <defjdklocations v="7"/>
93 >  <defjdklocations v="8"/>
94 >
95 >  <macrodef name="run-tck-tests">
96 >    <attribute name="jvm"/>
97 >    <attribute name="tck.classes"/>
98 >    <attribute name="product.jar" default="${product.jar}"/>
99 >    <attribute name="jvmflags" default=""/>
100 >    <sequential>
101 >    <java classname="JSR166TestCase"
102 >          jvm="@{jvm}" fork="true">
103 >        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104 >        <jvmarg line="@{jvmflags}"/>
105 >        <classpath>
106 >          <pathelement location="${junit.jar}"/>
107 >          <pathelement location="@{tck.classes}"/>
108 >        </classpath>
109 >    </java>
110 >    </sequential>
111 >  </macrodef>
112  
113    <!-- Source locations -->
114    <property name="src.dir"              location="${basedir}/src/main"/>
115    <property name="test.src.dir"         location="${basedir}/src/test"/>
116 +  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
117    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
118 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
47 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
118 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
119    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>
121 +  <property name="topsrc.dir"           location="${basedir}/src"/>
122 +  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128  
129    <!-- Distribution locations -->
130 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
130 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131 >  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136  
137    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139 +  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
145 <  
145 >
146    <!-- Bootclasspath argument -->
147    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148  
149 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153 +
154 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155 +  <!-- The below does not yet exist as of 2012-11 -->
156 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158 +
159    <!-- Test classpath -->
160    <path id="test.classpath">
161      <pathelement location="${build.testcases.dir}"/>
162      <pathelement location="${junit.jar}"/>
163    </path>
164  
165 +  <!-- ALoops classpath -->
166 +  <path id="loops.classpath">
167 +    <pathelement location="${build.loops.dir}"/>
168 +  </path>
169  
170 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
171 +  <!-- TODO: How do we get &trade to work? -->
172 +  <!-- TODO: Why isn't @jls a "standard" tag? -->
173 +  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174 +  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176  
177    <!-- Main targets -->
178  
179 +  <target name="dists"
180 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
181 +          description="Builds all public jars and docs"/>
182  
183    <target name="compile"
184 <          depends="init, configure-compiler"
185 <          description="Compiles main sources to build folder">
184 >          depends="configure-compiler"
185 >          description="Compiles src/main sources to build folder">
186  
187      <mkdir dir="${build.classes.dir}"/>
188  
189      <javac srcdir="${src.dir}"
190 <          destdir="${build.classes.dir}"
191 <            debug="${build.debug}"
192 <       debuglevel="${build.debuglevel}"
193 <      deprecation="${build.deprecation}"
194 <           source="${build.sourcelevel}"
195 <             fork="true">
190 >           destdir="${build.classes.dir}"
191 >           debug="${build.debug}"
192 >           debuglevel="${build.debuglevel}"
193 >           deprecation="${build.deprecation}"
194 >           classpath=""
195 >           includeAntRuntime="false"
196 >           includeJavaRuntime="false"
197 >           executable="${javac8}"
198 >           fork="true">
199 >
200 >      <include name="**/*.java"/>
201 >      <compilerarg line="${build.args}"/>
202 >      <compilerarg value="-XDignore.symbol.file=true"/>
203 >      <compilerarg value="-Xlint:all"/>
204  
205 + <!--
206 +      <exclude name="java/lang/**"/>
207        <compilerarg line="${build.args}"/>
208 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
209 + -->
210  
211      </javac>
212  
# Line 112 | Line 235
235  
236  
237    <target name="docs"
238 <          description="Builds javadocs with custom tags to build folder">
116 <
117 <    <delete dir="${build.javadocs.dir}"/>
118 <    <mkdir dir="${build.javadocs.dir}"/>
119 <
120 <    <javadoc destdir="${build.javadocs.dir}"
121 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
122 <            overview="${src.dir}/intro.html"
123 <              source="${build.sourcelevel}">
124 <
125 <      <tag name="revised" description="Last revised:"/>
126 <      <tag name="spec"    description="Specified by:"/>
127 <
128 <      <packageset dir="${src.dir}"/>
129 <
130 <    </javadoc>
131 <
132 <  </target>
238 >          description="Builds javadocs for src/main">
239  
240 +    <delete dir="${dist.javadocs.dir}"/>
241 +    <mkdir dir="${dist.javadocs.dir}"/>
242  
243 +    <!-- the packagenames="none" hack below prevents scanning the -->
244 +    <!-- sourcepath for packages -->
245  
246 <  <target name="doccheck"
247 <          depends="filter-doccheck"
248 <          description="Reports on javadoc style errors">
249 <
250 <    <delete dir="${build.doccheck.dir}"/>
251 <    <mkdir dir="${build.doccheck.dir}"/>
252 <
253 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
254 <         docletpath="${lib.dir}/doccheck.jar"
255 <            destdir="${build.doccheck.dir}">
256 <      <packageset dir="${build.dc-filter.dir}"/>
246 >    <javadoc destdir="${dist.javadocs.dir}"
247 >             packagenames="none"
248 >             link="${jdkapi8docs.url}"
249 >             overview="${src.dir}/intro.html"
250 >             sourcepath="${src.dir}:${jdk8src.dir}"
251 >             classpath=""
252 >             executable="${javadoc8}">
253 >      <arg value="-XDignore.symbol.file=true"/>
254 >      <arg value="-tag"/>
255 >      <arg value="${javadoc.jls.option}"/>
256 >      <fileset dir="${src.dir}" defaultexcludes="yes">
257 >        <include name="**/*.java"/>
258 >      </fileset>
259      </javadoc>
260  
149    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
150
261    </target>
262  
263  
264  
155  <target name="checkstyle"
156          depends="filter-src"
157          description="Reports on style errors in Java source (verbose, mostly chaff)">
158
159    <taskdef resource="checkstyletask.properties"
160            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
161
162    <mkdir dir="${build.checkstyle.dir}"/>
163    
164    <checkstyle config="etc/checkstyle/sun_checks.xml"
165       failOnViolation="false">
166      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
167      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
168    </checkstyle>
169    
170    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
171          out="${build.checkstyle.dir}/checkstyle-report.html"
172        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
173
174  </target>
175
176  
177
265    <target name="dist"
266 <          depends="init, dist-clean, dist-jar, dist-docs"
266 >          depends="init, dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>
268  
269  
183
270    <target name="release"
271            depends="dist"
272            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 221 | Line 307
307  
308  
309  
224  <target name="dist-docs"
225          description="Builds javadocs without custom tags to dist folder">
226
227    <delete dir="${dist.javadocs.dir}"/>
228    <mkdir dir="${dist.javadocs.dir}"/>
229
230    <javadoc destdir="${dist.javadocs.dir}"
231                link="http://java.sun.com/j2se/1.4.2/docs/api"
232            overview="${src.dir}/intro.html"
233              source="${build.sourcelevel}">
234
235      <packageset dir="${src.dir}"/>
236
237    </javadoc>
238
239  </target>
240
241
242
310    <!-- Internal targets -->
311  
312  
# Line 261 | Line 328
328    </target>
329  
330  
264  <target name="compile-ant-filter"
265          depends="init">
266
267    <mkdir dir="${build.ant.dir}"/>
268
269    <javac srcdir="${ant.src.dir}"
270          destdir="${build.ant.dir}"
271           source="1.4"
272    />
273
274  </target>
275
276
277  <target name="filter-src"
278          depends="compile-ant-filter">
279
280    <mkdir dir="${build.filter.src.dir}"/>
281
282    <copy todir="${build.filter.src.dir}">
283      <fileset dir="${src.dir}">
284        <include name="**/*.html"/>
285      </fileset>
286    </copy>
287
288    <copy todir="${build.filter.src.dir}">
289      <fileset dir="${src.dir}">
290        <exclude name="**/*.html"/>
291        <!-- Files excluded from dist-docs -->
292        <exclude name="java/util/Random.*"/>
293        <exclude name="sun/misc/Unsafe.*"/>
294      </fileset>
295      <!--
296      <filterchain>
297      -->
298
299        <!--
300         # This filter gets rid of angle-bracketed type parameters
301         # so that javadoc can run on the result. The following
302         # heuristic seems to work:
303         #
304         # For all lines not starting with space(s)-asterisk-space(s),
305         #   replace <something> with a space, where there may be more
306         #   than one right angle bracket at the end, and "something"
307         #   must not contain parens or pipes. (This may need some
308         #   tweaking.)
309         -->
310
311        <!--
312        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
313                      classpath="${build.ant.dir}">
314          <param name="notmatching" value="^\s+\*\s.*$"/>
315          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
316          <param name="replacement" value=" "/>
317        </filterreader>
318        -->
319
320      <!--
321      </filterchain>
322      -->
323    </copy>
324
325  </target>
326
327
328  <target name="filter-doccheck"
329          depends="filter-src">
330
331    <mkdir dir="${build.dc-filter.dir}"/>
332
333    <copy todir="${build.dc-filter.dir}">
334      <fileset dir="${build.filter.src.dir}">
335        <include name="**/*.html"/>
336      </fileset>
337    </copy>
338
339    <property name="generic.declarations"
340             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 {}"
341    />
342
343    <copy todir="${build.dc-filter.dir}">
344      <fileset dir="${build.filter.src.dir}">
345        <exclude name="**/*.html"/>
346      </fileset>
347      <filterchain>
348        <!--
349         # These two filters try to make the source look like
350         # something that doccheck can process. The first removes
351         # -source 1.4 assertions and the second adds in a bunch
352         # of single letter public nested marker interfaces so that
353         # the generic type parameters are recognized.
354         -->
355
356        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
357                      classpath="${build.ant.dir}">
358          <param name="matching"    value="^\s*assert[\s ].*$"/>
359          <param name="pattern"     value="assert"/>
360          <param name="replacement" value="//assert"/>
361        </filterreader>
362
363        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
364                      classpath="${build.ant.dir}">
365          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
366          <param name="pattern"     value="$"/>
367          <param name="replacement" value=" ${generic.declarations}"/>
368        </filterreader>
369
370      </filterchain>
371    </copy>
372
373  </target>
374
375
331    <target name="compile-tests"
332            depends="jar">
333  
# Line 388 | Line 343
343  
344        <compilerarg value="${bootclasspath.args}"/>
345        <compilerarg line="${build.args}"/>
346 <      
346 >      <compilerarg value="-XDignore.symbol.file=true"/>
347 >
348        <classpath refid="test.classpath"/>
349  
350      </javac>
# Line 402 | Line 358
358               fork="true">
359  
360        <include name="jsr166/test/**"/>
361 <      
361 >
362 >      <compilerarg value="${bootclasspath.args}"/>
363 >      <compilerarg line="${build.args}"/>
364 >      <compilerarg value="-XDignore.symbol.file=true"/>
365 >
366 >      <classpath refid="test.classpath"/>
367 >
368 >    </javac>
369 >
370 > <!--
371 >    <javac srcdir="${jtreg.src.dir}"
372 >          destdir="${build.testcases.dir}"
373 >            debug="${build.debug}"
374 >       debuglevel="${build.debuglevel}"
375 >      deprecation="${build.deprecation}"
376 >           source="${build.sourcelevel}"
377 >             fork="true">
378 >
379        <compilerarg value="${bootclasspath.args}"/>
380        <compilerarg line="${build.args}"/>
381 <      
381 >      <compilerarg value="-XDignore.symbol.file=true"/>
382 >
383        <classpath refid="test.classpath"/>
384  
385      </javac>
386 + -->
387  
388    </target>
389  
# Line 429 | Line 404
404                     fork="true">
405  
406        <jvmarg value="${bootclasspath.args}"/>
407 <      
407 >      <jvmarg value="-server"/>
408 >      <jvmarg value="-showversion"/>
409 >
410        <classpath refid="test.classpath"/>
411  
412        <formatter type="xml"/>
413  
414 <      <batchtest todir="${build.reports.dir}">
414 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
415          <fileset dir="${tck.src.dir}">
416            <include name="**/${testcase}Test.java"/>
417          </fileset>
418 +      </batchtest>
419 +
420 +      <batchtest todir="${build.reports.dir}" if="do.test.old">
421          <fileset dir="${test.src.dir}">
422            <include name="jsr166/test/**/${testcase}Test.java"/>
423          </fileset>
424        </batchtest>
425  
426 + <!--
427 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
428 +        <fileset dir="${jtreg.src.dir}">
429 +          <include name="**/${testcase}Test.java"/>
430 +        </fileset>
431 +      </batchtest>
432 + -->
433 +
434      </junit>
435  
436    </target>
# Line 463 | Line 451
451        <fileset dir="${build.reports.dir}">
452          <include name="TEST-*.xml"/>
453        </fileset>
454 <      <report styledir="${stylesheet.dir}"
467 <                format="${junit.report.format}"
468 <                 todir="${build.reports.dir}"
454 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
455        />
456      </junitreport>
457  
# Line 502 | Line 488
488      <available property="xalan.available"
489                 classname="org.apache.xalan.Version"/>
490  
491 <              
491 >
492      <!-- Ant 1.6beta and later don't need or want this check -->
493 <    <!--    
493 >    <!--
494      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
495            unless="junit.available"/>
496  
# Line 515 | Line 501
501    </target>
502  
503  
504 +  <!-- Various demos and test programs -->
505  
519  <!-- Anthill targets -->
506  
507 <  <target name="anthill-build">
508 <  
509 <    <!-- Override this in user.properties -->
510 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
511 <    
512 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
513 <      <arg value="-Xmx256000000"/>
514 <      <!-- classpath of new JVM -->
515 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
516 <      <!-- location of Ant home directory -->
517 <      <arg value="-Dant.home=${ant.home}"/>
518 <      <!-- the Ant main class -->
519 <      <arg value="org.apache.tools.ant.Main"/>
520 <      <!-- The build file -->
521 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
522 <      <!-- the target to build on the new Ant instance -->
523 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
524 <      <arg value="do-anthill-build"/>
525 <    </exec>
507 >  <target name="loops" depends="init, configure-compiler"
508 >          description="Benchmark from Doug Lea's AQS paper">
509 >
510 >    <mkdir dir="${build.loops.dir}"/>
511 >
512 >    <javac srcdir="${loops.src.dir}"
513 >          destdir="${build.loops.dir}"
514 >            debug="${build.debug}"
515 >       debuglevel="${build.debuglevel}"
516 >      deprecation="${build.deprecation}"
517 >           source="${build.sourcelevel}"
518 >             fork="true">
519 >
520 >      <compilerarg line="${build.args}"/>
521 >      <classpath refid="loops.classpath"/>
522 >      <compilerarg value="-XDignore.symbol.file=true"/>
523 >
524 >    </javac>
525 >
526 >    <java classname="ALoops" fork="true">
527 >      <classpath refid="loops.classpath"/>
528 >    </java>
529 >
530 >  </target>
531 >
532 >
533 >  <!-- jsr166 4jdk7 -->
534 >
535 >
536 >  <target name="4jdk7compile"
537 >          depends="configure-compiler"
538 >          description="Compiles src/jdk7 sources, targeting jdk7">
539 >
540 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
541 >
542 >    <javac srcdir="${4jdk7src.dir}"
543 >           destdir="${build.4jdk7.classes.dir}"
544 >           debug="${build.debug}"
545 >           debuglevel="${build.debuglevel}"
546 >           deprecation="${build.deprecation}"
547 >           source="1.6"
548 >           classpath=""
549 >           bootclasspath="${bootclasspath6}"
550 >           includeAntRuntime="false"
551 >           includeJavaRuntime="false"
552 >           executable="${javac7}"
553 >           fork="true">
554 >
555 >      <include name="**/*.java"/>
556 >      <compilerarg line="${build.args}"/>
557 >      <compilerarg value="-XDignore.symbol.file=true"/>
558 >      <compilerarg value="-Xlint:all"/>
559 >
560 >    </javac>
561 >
562 >    <mkdir dir="${build.4jdk7.lib.dir}"/>
563 >
564 >    <jar destfile="${4jdk7product.jar}" index="true">
565 >      <fileset dir="${build.4jdk7.classes.dir}"/>
566 >    </jar>
567 >
568 >    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
569 >
570 >    <javac srcdir="${tck.src.dir}"
571 >           destdir="${build.4jdk7.tck.classes.dir}"
572 >           debug="${build.debug}"
573 >           debuglevel="${build.debuglevel}"
574 >           deprecation="${build.deprecation}"
575 >           source="1.6"
576 >           classpath="${junit.jar}"
577 >           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
578 >           includeAntRuntime="false"
579 >           includeJavaRuntime="false"
580 >           executable="${javac7}"
581 >           fork="true">
582 >
583 >      <include name="**/*.java"/>
584 >      <compilerarg line="${build.args}"/>
585 >      <compilerarg value="-XDignore.symbol.file=true"/>
586 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
587 >
588 >    </javac>
589 >
590 >  </target>
591 >
592 >
593 >  <target name="4jdk7-test-tck"
594 >          depends="4jdk7compile"
595 >          description="Runs tck tests for jsr166-4jdk7 directly">
596 >    <run-tck-tests
597 >      jvm="${java7}"
598 >      tck.classes="${build.4jdk7.tck.classes.dir}"
599 >      product.jar="${4jdk7product.jar}"/>
600    </target>
541  
542  <target name="do-anthill-build"
543          depends="jar, test, docs, dist-docs"/>
601  
545  <target name="anthill-publish">
602  
603 <    <copy todir="${deployDir}/docs/private">
604 <      <fileset dir="${build.javadocs.dir}"/>
605 <    </copy>
603 >  <target name="4jdk7-test-tck-junit"
604 >          depends="4jdk7compile"
605 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
606  
607 <    <copy todir="${deployDir}/docs/public">
608 <      <fileset dir="${dist.javadocs.dir}"/>
609 <    </copy>
607 >    <junit printsummary="true"
608 >           showoutput="true"
609 >           errorProperty="junit.failed"
610 >           failureProperty="junit.failed"
611 >           includeantruntime="true"
612 >           jvm="${java7}"
613 >           fork="true">
614 >
615 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
616 >      <jvmarg value="-server"/>
617 >
618 >      <classpath>
619 >        <pathelement location="${junit.jar}"/>
620 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
621 >      </classpath>
622  
623 <    <copy tofile="${deployDir}/index.html"
556 <          file="${basedir}/etc/anthill-index.html"/>
623 >      <formatter type="brief"/>
624  
625 <    <copy todir="${deployDir}/notes">
626 <      <fileset dir="${basedir}/etc/notes"/>
560 <    </copy>
625 >      <test name="JSR166TestCase" haltonfailure="no">
626 >      </test>
627  
628 +    </junit>
629    </target>
630  
631  
632 +  <target name="4jdk7docs"
633 +          description="Builds javadocs with custom tags to build folder">
634  
635 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
635 >    <delete dir="${build.4jdk7.docs.dir}"/>
636 >    <mkdir dir="${build.4jdk7.docs.dir}"/>
637  
638 +    <javadoc destdir="${build.4jdk7.docs.dir}"
639 +             packagenames="none"
640 +             link="${jdkapi7docs.url}"
641 +             overview="${4jdk7src.dir}/intro.html"
642 +             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
643 +             classpath=""
644 +             executable="${javadoc7}">
645 +      <arg value="-XDignore.symbol.file=true"/>
646 +      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
647 +        <include name="**/*.java"/>
648 +      </fileset>
649 +    </javadoc>
650  
651 <  <target name="compat" depends="jar">
652 <  
653 <    <mkdir dir="${build.testcases.dir}"/>
654 <    
655 <    <javac srcdir="${test.src.dir}"
656 <          destdir="${build.testcases.dir}"
651 >  </target>
652 >
653 >
654 >  <target name="4jdk7dist"
655 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
656 >          description="Puts all distributable products in single hierarchy"/>
657 >
658 >
659 >
660 >  <target name="4jdk7clean"
661 >          description="Removes all build products">
662 >
663 >    <delete dir="${build.4jdk7.dir}"/>
664 >
665 >  </target>
666 >
667 >
668 >
669 >  <target name="4jdk7dist-clean"
670 >          description="Removes all build and distribution products">
671 >
672 >  </target>
673 >
674 >  <target name="4jdk7dist-docs"
675 >          description="Builds javadocs without custom tags to dist folder">
676 >
677 >    <delete dir="${dist.4jdk7.docs.dir}"/>
678 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
679 >
680 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
681 >             packagenames="none"
682 >             link="${jdkapi7docs.url}"
683 >             overview="${4jdk7src.dir}/intro.html"
684 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
685 >             classpath=""
686 >             executable="${javadoc7}">
687 >      <arg value="-XDignore.symbol.file=true"/>
688 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
689 >        <include name="**/*.java"/>
690 >      </fileset>
691 >    </javadoc>
692 >
693 >  </target>
694 >
695 >  <target name="4jdk7dist-jar"
696 >          depends="4jdk7clean, 4jdk7compile">
697 >
698 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
699 >
700 >  </target>
701 >
702 >  <!-- jsr166x -->
703 >
704 >
705 >  <target name="jsr166xcompile"
706 >          depends="init, configure-compiler"
707 >          description="Compiles jsr166x sources">
708 >
709 >    <mkdir dir="${build.jsr166x.dir}"/>
710 >
711 >    <javac srcdir="${jsr166xsrc.dir}"
712 >          destdir="${build.jsr166x.dir}"
713              debug="${build.debug}"
714         debuglevel="${build.debuglevel}"
715        deprecation="${build.deprecation}"
716             source="${build.sourcelevel}"
717               fork="true">
718 <            
719 <      <compilerarg value="${bootclasspath.args}"/>
718 >
719 >      <include name="**/*.java"/>
720        <compilerarg line="${build.args}"/>
721 <      
722 <      <classpath refid="test.classpath"/>
723 <      
724 <      <include name="Compatibility.java"/>
725 <      
726 <    </javac>
727 <    
728 <            
729 <    <java classname="Compatibility" fork="true">
730 <      <jvmarg value="${bootclasspath.args}"/>
731 <      <classpath refid="test.classpath"/>
732 <    </java>
721 >      <compilerarg value="-XDignore.symbol.file=true"/>
722 >
723 >    </javac>
724 >
725 >  </target>
726 >
727 >
728 >
729 >  <target name="jsr166xjar"
730 >          depends="jsr166xcompile"
731 >          description="Builds library jar from compiled sources">
732 >
733 >    <mkdir dir="${build.jsr166xlib.dir}"/>
734 >
735 >    <jar destfile="${jsr166xproduct.jar}">
736 >      <fileset dir="${build.jsr166x.dir}"/>
737 >    </jar>
738 >
739 >  </target>
740 >
741 >
742 >
743 >  <target name="jsr166xdocs"
744 >          description="Builds javadocs with custom tags to build folder">
745 >
746 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
747 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
748 >
749 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
750 >             packagenames="jsr166x"
751 >             link="${jdkapidocs.url}"
752 >             source="${build.sourcelevel}"
753 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
754 >             additionalparam="-XDignore.symbol.file=true" />
755 >
756 >  </target>
757 >
758 >
759 >  <target name="jsr166xdist"
760 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
761 >          description="Puts all distributable products in single hierarchy"/>
762 >
763 >
764 >
765 >  <target name="jsr166xclean"
766 >          description="Removes all build products">
767 >
768 >    <delete dir="${build.jsr166x.dir}"/>
769 >    <delete dir="${build.jsr166xlib.dir}"/>
770 >
771 >  </target>
772 >
773 >
774 >
775 >  <target name="jsr166xdist-clean"
776 >          description="Removes all build and distribution products">
777 >
778 >  </target>
779 >
780 >
781 >
782 >  <target name="jsr166xdist-docs"
783 >          description="Builds javadocs without custom tags to dist folder">
784 >
785 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
786 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
787 >
788 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
789 >             packagenames="jsr166x"
790 >             link="${jdkapidocs.url}"
791 >             source="${build.sourcelevel}"
792 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
793 >             additionalparam="-XDignore.symbol.file=true" />
794 >
795    </target>
796  
797 +  <target name="jsr166xdist-jar"
798 +          depends="jsr166xclean, jsr166xjar">
799  
800 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
801  
802 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
600 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
601 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
602 <  <property name="pretiger.sourcelevel" value="1.4"/>
603 <  
604 <  <target name="defang"
605 <       depends="init"
606 <   description="Generates pre-Tiger compatible source">
607 <  
608 <    <delete dir="${pretiger.src.dir}"/>
609 <    <mkdir dir="${pretiger.src.dir}"/>
610 <  
611 <    <exec executable="perl">
612 <      <arg file="etc/defang.pl"/>
613 <      <!-- <arg value="-v"/> -->
614 <      <arg value="-s"/> <arg file="${src.dir}"/>
615 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
616 <    </exec>
617 <    
618 <  </target>
619 <
620 <  <target name="compile-pretiger"
621 <          depends="init, configure-compiler, defang"
622 <          description="Compiles pre-Tiger sources to build folder">
802 >  </target>
803  
804 <    <mkdir dir="${build.pretiger.dir}"/>
804 >  <!-- jsr166y -->
805  
806 <    <javac srcdir="${pretiger.src.dir}"
807 <          destdir="${build.pretiger.dir}"
806 >
807 >  <target name="jsr166ycompile"
808 >          depends="init, configure-compiler"
809 >          description="Compiles jsr166y sources">
810 >
811 >    <mkdir dir="${build.jsr166y.dir}"/>
812 >
813 >    <javac srcdir="${jsr166ysrc.dir}"
814 >          destdir="${build.jsr166y.dir}"
815              debug="${build.debug}"
816         debuglevel="${build.debuglevel}"
817        deprecation="${build.deprecation}"
818 <           source="${pretiger.sourcelevel}"
818 >           source="${build.sourcelevel}"
819               fork="true">
820  
821 +      <include name="**/*.java"/>
822        <compilerarg line="${build.args}"/>
823 <      <exclude name="**/Thread.java"/>
823 >      <compilerarg value="-XDignore.symbol.file=true"/>
824 >      <compilerarg value="${bootclasspath.args}"/>
825 >
826 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
827  
828      </javac>
829  
830    </target>
640  
641  <target name="pretiger" depends="compile-pretiger">
831  
832 <    <mkdir dir="${build.lib.dir}"/>
833 <    
834 <    <jar destfile="${pretiger.jar}">
835 <      <fileset dir="${build.pretiger.dir}">
836 <      </fileset>
832 >
833 >
834 >  <target name="jsr166yjar"
835 >          depends="jsr166ycompile"
836 >          description="Builds library jar from compiled sources">
837 >
838 >    <mkdir dir="${build.jsr166ylib.dir}"/>
839 >
840 >    <jar destfile="${jsr166yproduct.jar}" index="true">
841 >      <fileset dir="${build.jsr166y.dir}"/>
842 >    </jar>
843 >
844 >  </target>
845 >
846 >
847 >
848 >  <target name="jsr166ydocs"
849 >          description="Builds javadocs with custom tags to build folder">
850 >
851 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
852 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
853 >
854 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
855 >             packagenames="jsr166y"
856 >             link="${jdkapidocs.url}"
857 >             source="${build.sourcelevel}"
858 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
859 >             additionalparam="-XDignore.symbol.file=true" />
860 >
861 >  </target>
862 >
863 >
864 >  <target name="jsr166ydist"
865 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
866 >          description="Puts all distributable products in single hierarchy"/>
867 >
868 >
869 >
870 >  <target name="jsr166yclean"
871 >          description="Removes all build products">
872 >
873 >    <delete dir="${build.jsr166y.dir}"/>
874 >    <delete dir="${build.jsr166ylib.dir}"/>
875 >
876 >  </target>
877 >
878 >
879 >
880 >  <target name="jsr166ydist-clean"
881 >          description="Removes all build and distribution products">
882 >
883 >  </target>
884 >
885 >  <target name="jsr166ydist-docs"
886 >          description="Builds javadocs without custom tags to dist folder">
887 >
888 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
889 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
890 >
891 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
892 >             packagenames="jsr166y"
893 >             link="${jdkapidocs.url}"
894 >             source="${build.sourcelevel}"
895 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
896 >             additionalparam="-XDignore.symbol.file=true" />
897 >
898 >  </target>
899 >
900 >  <target name="jsr166ydist-jar"
901 >          depends="jsr166yclean, jsr166yjar">
902 >
903 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
904 >
905 >  </target>
906 >
907 >
908 >  <!-- extra166y -->
909 >
910 >
911 >  <target name="extra166ycompile"
912 >          depends="init, configure-compiler, jsr166ycompile"
913 >          description="Compiles extra166y sources">
914 >
915 >    <mkdir dir="${build.extra166y.dir}"/>
916 >
917 >    <javac srcdir="${extra166ysrc.dir}"
918 >          destdir="${build.extra166y.dir}"
919 >            debug="${build.debug}"
920 >            classpath="${jsr166yproduct.jar}"
921 >       debuglevel="${build.debuglevel}"
922 >      deprecation="${build.deprecation}"
923 >           source="${build.sourcelevel}"
924 >             fork="true">
925 >
926 >      <include name="**/*.java"/>
927 >      <compilerarg line="${build.args}"/>
928 >      <compilerarg value="-XDignore.symbol.file=true"/>
929 >      <compilerarg value="${bootclasspath.args}"/>
930 >
931 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
932 >
933 >    </javac>
934 >
935 >  </target>
936 >
937 >
938 >
939 >  <target name="extra166yjar"
940 >          depends="extra166ycompile"
941 >          description="Builds library jar from compiled sources">
942 >
943 >    <mkdir dir="${build.extra166ylib.dir}"/>
944 >
945 >    <jar destfile="${extra166yproduct.jar}" index="true">
946 >      <fileset dir="${build.extra166y.dir}"/>
947      </jar>
948 <    
948 >
949 >  </target>
950 >
951 >
952 >
953 >  <target name="extra166ydocs"
954 >          description="Builds javadocs with custom tags to build folder">
955 >
956 >    <delete dir="${build.extra166yjavadocs.dir}"/>
957 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
958 >
959 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
960 >             packagenames="extra166y"
961 >             link="${jdkapidocs.url}"
962 >             source="${build.sourcelevel}"
963 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
964 >             additionalparam="-XDignore.symbol.file=true" />
965 >
966 >  </target>
967 >
968 >
969 >  <target name="extra166ydist"
970 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
971 >          description="Puts all distributable products in single hierarchy"/>
972 >
973 >
974 >
975 >  <target name="extra166yclean"
976 >          description="Removes all build products">
977 >
978 >    <delete dir="${build.extra166y.dir}"/>
979 >    <delete dir="${build.extra166ylib.dir}"/>
980 >
981 >  </target>
982 >
983 >
984 >
985 >  <target name="extra166ydist-clean"
986 >          description="Removes all build and distribution products">
987 >
988 >  </target>
989 >
990 >  <target name="extra166ydist-docs"
991 >          description="Builds javadocs without custom tags to dist folder">
992 >
993 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
994 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
995 >
996 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
997 >             packagenames="extra166y"
998 >             link="${jdkapidocs.url}"
999 >             source="${build.sourcelevel}"
1000 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1001 >             additionalparam="-XDignore.symbol.file=true" />
1002 >
1003 >  </target>
1004 >
1005 >  <target name="extra166ydist-jar"
1006 >          depends="extra166yclean, extra166yjar">
1007 >
1008 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1009 >
1010 >  </target>
1011 >
1012 >  <!-- jsr166e -->
1013 >
1014 >  <target name="jsr166ecompile"
1015 >          depends="configure-compiler"
1016 >          description="Compiles jsr166e sources">
1017 >
1018 >    <mkdir dir="${build.jsr166e.dir}"/>
1019 >
1020 >    <javac srcdir="${topsrc.dir}"
1021 >           destdir="${build.jsr166e.dir}"
1022 >           debug="${build.debug}"
1023 >           debuglevel="${build.debuglevel}"
1024 >           deprecation="${build.deprecation}"
1025 >           source="1.7"
1026 >           classpath=""
1027 >           includeAntRuntime="false"
1028 >           includeJavaRuntime="false"
1029 >           executable="${javac7}"
1030 >           fork="true">
1031 >
1032 >      <include name="jsr166e/**/*.java"/>
1033 >      <compilerarg line="${build.args}"/>
1034 >      <compilerarg value="-XDignore.symbol.file=true"/>
1035 >      <compilerarg value="-Xlint:all"/>
1036 >
1037 >    </javac>
1038 >
1039 >  </target>
1040 >
1041 >
1042 >
1043 >  <target name="jsr166ejar"
1044 >          depends="jsr166ecompile"
1045 >          description="Builds library jar from compiled sources">
1046 >
1047 >    <mkdir dir="${build.jsr166elib.dir}"/>
1048 >
1049 >    <jar destfile="${jsr166eproduct.jar}" index="true">
1050 >      <fileset dir="${build.jsr166e.dir}"/>
1051 >    </jar>
1052 >
1053 >  </target>
1054 >
1055 >
1056 >
1057 >  <target name="jsr166edocs"
1058 >          description="Builds javadocs with custom tags to build folder">
1059 >
1060 >    <delete dir="${build.jsr166ejavadocs.dir}"/>
1061 >    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1062 >
1063 >    <javadoc destdir="${build.jsr166ejavadocs.dir}"
1064 >             packagenames="jsr166e,jsr166e.extra"
1065 >             link="${jdkapi7docs.url}"
1066 >             source="1.7"
1067 >             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1068 >             executable="${javadoc7}"
1069 >             additionalparam="-XDignore.symbol.file=true" >
1070 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1071 >        <include name="jsr166e/**/*.java"/>
1072 >      </fileset>
1073 >    </javadoc>
1074 >
1075 >  </target>
1076 >
1077 >
1078 >  <target name="jsr166edist"
1079 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1080 >          description="Puts all distributable products in single hierarchy"/>
1081 >
1082 >
1083 >
1084 >  <target name="jsr166eclean"
1085 >          description="Removes all build products">
1086 >
1087 >    <delete dir="${build.jsr166e.dir}"/>
1088 >    <delete dir="${build.jsr166elib.dir}"/>
1089 >
1090 >  </target>
1091 >
1092 >
1093 >
1094 >  <target name="jsr166edist-clean"
1095 >          description="Removes all build and distribution products">
1096 >
1097 >  </target>
1098 >
1099 >  <target name="jsr166edist-docs"
1100 >          description="Builds javadocs without custom tags to dist folder">
1101 >
1102 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1103 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1104 >
1105 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1106 >             packagenames="jsr166e,jsr166e.extra"
1107 >             link="${jdkapidocs.url}"
1108 >             source="1.7"
1109 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1110 >             additionalparam="-XDignore.symbol.file=true" />
1111 >
1112 >  </target>
1113 >
1114 >  <target name="jsr166edist-jar"
1115 >          depends="jsr166eclean, jsr166ejar">
1116 >
1117 >    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1118 >
1119    </target>
1120  
1121   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines