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.68 by jsr166, Mon Jun 14 17:22:09 2004 UTC vs.
Revision 1.92 by jsr166, Mon Jan 14 07:08:06 2013 UTC

# Line 21 | Line 21
21  
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
24 >  <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
28  
29    <!-- Build locations -->
30 <  <property name="build.dir"            location="build"/>
31 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
32 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
34 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
35 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
36 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
37 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
39 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
40 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >
38 >  <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
39 >  <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
40 >  <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
41 >  <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
42 >
43 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
44 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
45 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
46 >
47 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
48 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
49 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
50 >
51 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
52 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
53 >  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
54 >
55 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
56 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
57 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
58 >
59 >  <!-- JDK binary locations -->
60 >  <property name="jdks.home"  location="${user.home}/jdk"/>
61 >  <property name="jdk6.home"  location="${jdks.home}/jdk1.6.0"/>
62 >  <property name="jdk7.home"  location="${jdks.home}/jdk1.7.0"/>
63 >  <property name="jdk8.home"  location="${jdks.home}/jdk1.8.0"/>
64 >  <property name="javac6"     location="${jdk6.home}/bin/javac"/>
65 >  <property name="javac7"     location="${jdk7.home}/bin/javac"/>
66 >  <property name="javac8"     location="${jdk8.home}/bin/javac"/>
67 >  <property name="javadoc6"   location="${jdk6.home}/bin/javadoc"/>
68 >  <property name="javadoc7"   location="${jdk7.home}/bin/javadoc"/>
69 >  <property name="javadoc8"   location="${jdk8.home}/bin/javadoc"/>
70 >  <property name="bootdir6"   location="${jdk6.home}/jre/lib"/>
71 >  <property name="bootdir7"   location="${jdk7.home}/jre/lib"/>
72 >  <property name="bootdir8"   location="${jdk8.home}/jre/lib"/>
73 >  <property name="bootclasspath6"   value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/>
74 >  <property name="bootclasspath7"   value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/>
75 >  <property name="bootclasspath8"   value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/>
76  
77    <!-- Source locations -->
78    <property name="src.dir"              location="${basedir}/src/main"/>
79    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
80    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
81    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
82    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
51  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
52  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
83    <property name="lib.dir"              location="${basedir}/lib"/>
84    <property name="dist.dir"             location="${basedir}/dist"/>
85 +  <property name="topsrc.dir"           location="${basedir}/src"/>
86 +  <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
87 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
88 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
89 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
90 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
91 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
92  
93    <!-- Distribution locations -->
94 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
94 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
95 >  <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
96 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
97 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
98 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
99 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
100  
101    <!-- Jar locations -->
102    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
103 +  <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
104 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
105 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
106 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
107 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
108    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
109  
110    <!-- Bootclasspath argument -->
111    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
112  
113 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
114 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
115 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
116 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
117 +
118 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
119 +  <!-- The below does not yet exist as of 2012-11 -->
120 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
121 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
122 +
123    <!-- Test classpath -->
124    <path id="test.classpath">
125      <pathelement location="${build.testcases.dir}"/>
# Line 75 | Line 131
131      <pathelement location="${build.loops.dir}"/>
132    </path>
133  
78  <!-- J1 classpath -->
79  <path id="j1.classpath">
80    <pathelement location="${build.j1.dir}"/>
81    <pathelement location="${junit.jar}"/>
82    <pathelement location="${concurrent.jar}"/>
83  </path>
84
134  
135    <!-- Main targets -->
136  
137 +  <target name="dists"
138 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
139 +          description="Builds all public jars and docs"/>
140  
141    <target name="compile"
142            depends="init, configure-compiler"
# Line 101 | Line 153
153               fork="true">
154  
155        <include name="**/*.java"/>
156 +      <compilerarg value="-XDignore.symbol.file=true"/>
157 +
158 + <!--
159        <exclude name="java/lang/**"/>
160        <compilerarg line="${build.args}"/>
161 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
162 + -->
163  
164      </javac>
165  
# Line 136 | Line 193
193      <delete dir="${build.javadocs.dir}"/>
194      <mkdir dir="${build.javadocs.dir}"/>
195  
196 <    <javadoc destdir="${build.javadocs.dir}"
197 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
141 <            overview="${src.dir}/intro.html"
142 <              source="${build.sourcelevel}">
143 <
144 <      <tag name="revised" description="Last revised:"/>
145 <      <tag name="spec"    description="Specified by:"/>
196 >    <!-- the packagenames="none" hack below prevents scanning the -->
197 >    <!-- sourcepath for packages -->
198  
199 <      <packageset dir="${src.dir}"/>
200 <
201 <    </javadoc>
202 <
203 <  </target>
204 <
205 <
206 <
207 <  <target name="doccheck"
156 <          depends="filter-doccheck"
157 <          description="Reports on javadoc style errors">
158 <
159 <    <delete dir="${build.doccheck.dir}"/>
160 <    <mkdir dir="${build.doccheck.dir}"/>
161 <
162 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
163 <         docletpath="${lib.dir}/doccheck.jar"
164 <            destdir="${build.doccheck.dir}">
165 <      <packageset dir="${build.dc-filter.dir}"/>
199 >    <javadoc destdir="${build.javadocs.dir}"
200 >             packagenames="none"
201 >             link="${jdkapidocs.url}"
202 >             overview="${src.dir}/intro.html"
203 >             sourcepath="${src.dir}:${jdksrc.dir}"
204 >             additionalparam="-XDignore.symbol.file=true" >
205 >      <fileset dir="${src.dir}" defaultexcludes="yes">
206 >        <include name="**/*.java"/>
207 >      </fileset>
208      </javadoc>
209  
168    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
169
170  </target>
171
172
173
174  <target name="checkstyle"
175          depends="filter-src"
176          description="Reports on style errors in Java source (verbose, mostly chaff)">
177
178    <taskdef resource="checkstyletask.properties"
179            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
180
181    <mkdir dir="${build.checkstyle.dir}"/>
182
183    <checkstyle config="etc/checkstyle/sun_checks.xml"
184       failOnViolation="false">
185      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
186      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
187    </checkstyle>
188
189    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
190          out="${build.checkstyle.dir}/checkstyle-report.html"
191        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
192
210    </target>
211  
212  
# Line 199 | Line 216
216            description="Puts all distributable products in single hierarchy"/>
217  
218  
202
219    <target name="release"
220            depends="dist"
221            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 246 | Line 262
262      <delete dir="${dist.javadocs.dir}"/>
263      <mkdir dir="${dist.javadocs.dir}"/>
264  
265 <    <javadoc destdir="${dist.javadocs.dir}"
266 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
251 <            overview="${src.dir}/intro.html"
252 <              source="${build.sourcelevel}">
253 <
254 <      <packageset dir="${src.dir}"/>
265 >    <!-- the packagenames="none" hack below prevents scanning the -->
266 >    <!-- sourcepath for packages -->
267  
268 +    <javadoc destdir="${dist.javadocs.dir}"
269 +             packagenames="none"
270 +             link="${jdkapidocs.url}"
271 +             overview="${src.dir}/intro.html"
272 +             sourcepath="${src.dir}:${jdksrc.dir}"
273 +             additionalparam="-XDignore.symbol.file=true" >
274 +      <fileset dir="${src.dir}" defaultexcludes="yes">
275 +        <include name="**/*.java"/>
276 +      </fileset>
277      </javadoc>
278  
279    </target>
# Line 280 | Line 301
301    </target>
302  
303  
283  <target name="compile-ant-filter"
284          depends="init">
285
286    <mkdir dir="${build.ant.dir}"/>
287
288    <javac srcdir="${ant.src.dir}"
289          destdir="${build.ant.dir}"
290           source="1.4"/>
291
292  </target>
293
294
295  <target name="filter-src"
296          depends="compile-ant-filter">
297
298    <mkdir dir="${build.filter.src.dir}"/>
299
300    <copy todir="${build.filter.src.dir}">
301      <fileset dir="${src.dir}">
302        <include name="**/*.html"/>
303      </fileset>
304    </copy>
305
306    <copy todir="${build.filter.src.dir}">
307      <fileset dir="${src.dir}">
308        <exclude name="**/*.html"/>
309        <!-- Files excluded from dist-docs -->
310        <exclude name="java/util/Random.*"/>
311        <exclude name="sun/misc/Unsafe.*"/>
312      </fileset>
313      <!--
314      <filterchain>
315      -->
316
317        <!--
318         # This filter gets rid of angle-bracketed type parameters
319         # so that javadoc can run on the result. The following
320         # heuristic seems to work:
321         #
322         # For all lines not starting with space(s)-asterisk-space(s),
323         #   replace <something> with a space, where there may be more
324         #   than one right angle bracket at the end, and "something"
325         #   must not contain parens or pipes. (This may need some
326         #   tweaking.)
327         -->
328
329        <!--
330        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
331                      classpath="${build.ant.dir}">
332          <param name="notmatching" value="^\s+\*\s.*$"/>
333          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
334          <param name="replacement" value=" "/>
335        </filterreader>
336        -->
337
338      <!--
339      </filterchain>
340      -->
341    </copy>
342
343  </target>
344
345
346  <target name="filter-doccheck"
347          depends="filter-src">
348
349    <mkdir dir="${build.dc-filter.dir}"/>
350
351    <copy todir="${build.dc-filter.dir}">
352      <fileset dir="${build.filter.src.dir}">
353        <include name="**/*.html"/>
354      </fileset>
355    </copy>
356
357    <property name="generic.declarations"
358             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 {}"
359    />
360
361    <copy todir="${build.dc-filter.dir}">
362      <fileset dir="${build.filter.src.dir}">
363        <exclude name="**/*.html"/>
364      </fileset>
365      <filterchain>
366        <!--
367         # These two filters try to make the source look like
368         # something that doccheck can process. The first removes
369         # -source 1.4 assertions and the second adds in a bunch
370         # of single letter public nested marker interfaces so that
371         # the generic type parameters are recognized.
372         -->
373
374        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
375                      classpath="${build.ant.dir}">
376          <param name="matching"    value="^\s*assert[\s ].*$"/>
377          <param name="pattern"     value="assert"/>
378          <param name="replacement" value="//assert"/>
379        </filterreader>
380
381        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
382                      classpath="${build.ant.dir}">
383          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
384          <param name="pattern"     value="$"/>
385          <param name="replacement" value=" ${generic.declarations}"/>
386        </filterreader>
387
388      </filterchain>
389    </copy>
390
391  </target>
392
393
304    <target name="compile-tests"
305            depends="jar">
306  
# Line 406 | Line 316
316  
317        <compilerarg value="${bootclasspath.args}"/>
318        <compilerarg line="${build.args}"/>
319 +      <compilerarg value="-XDignore.symbol.file=true"/>
320  
321        <classpath refid="test.classpath"/>
322  
# Line 423 | Line 334
334  
335        <compilerarg value="${bootclasspath.args}"/>
336        <compilerarg line="${build.args}"/>
337 +      <compilerarg value="-XDignore.symbol.file=true"/>
338  
339        <classpath refid="test.classpath"/>
340  
# Line 439 | Line 351
351  
352        <compilerarg value="${bootclasspath.args}"/>
353        <compilerarg line="${build.args}"/>
354 +      <compilerarg value="-XDignore.symbol.file=true"/>
355  
356        <classpath refid="test.classpath"/>
357  
# Line 511 | Line 424
424        <fileset dir="${build.reports.dir}">
425          <include name="TEST-*.xml"/>
426        </fileset>
427 <      <report styledir="${stylesheet.dir}"
515 <                format="${junit.report.format}"
516 <                 todir="${build.reports.dir}"
427 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
428        />
429      </junitreport>
430  
# Line 563 | Line 474
474    </target>
475  
476  
477 +  <!-- Various demos and test programs -->
478  
567  <!-- Anthill targets -->
479  
480 <  <target name="anthill-build">
480 >  <target name="loops" depends="init, configure-compiler"
481 >          description="Benchmark from Doug Lea's AQS paper">
482  
483 <    <!-- Override this in user.properties -->
572 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
483 >    <mkdir dir="${build.loops.dir}"/>
484  
485 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
486 <      <arg value="-Xmx256000000"/>
487 <      <!-- classpath of new JVM -->
488 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
489 <      <!-- location of Ant home directory -->
490 <      <arg value="-Dant.home=${ant.home}"/>
491 <      <!-- the Ant main class -->
581 <      <arg value="org.apache.tools.ant.Main"/>
582 <      <!-- The build file -->
583 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
584 <      <!-- the target to build on the new Ant instance -->
585 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
586 <      <arg value="do-anthill-build"/>
587 <    </exec>
588 <  </target>
589 <
590 <  <target name="do-anthill-build"
591 <          depends="jar, test, docs, dist-docs"/>
592 <
593 <  <target name="anthill-publish">
594 <
595 <    <copy todir="${deployDir}/docs/private">
596 <      <fileset dir="${build.javadocs.dir}"/>
597 <    </copy>
598 <
599 <    <copy todir="${deployDir}/docs/public">
600 <      <fileset dir="${dist.javadocs.dir}"/>
601 <    </copy>
602 <
603 <    <copy tofile="${deployDir}/index.html"
604 <          file="${basedir}/etc/anthill-index.html"/>
605 <
606 <    <copy todir="${deployDir}/notes">
607 <      <fileset dir="${basedir}/etc/notes"/>
608 <    </copy>
485 >    <javac srcdir="${loops.src.dir}"
486 >          destdir="${build.loops.dir}"
487 >            debug="${build.debug}"
488 >       debuglevel="${build.debuglevel}"
489 >      deprecation="${build.deprecation}"
490 >           source="${build.sourcelevel}"
491 >             fork="true">
492  
493 <  </target>
493 >      <compilerarg line="${build.args}"/>
494 >      <classpath refid="loops.classpath"/>
495 >      <compilerarg value="-XDignore.symbol.file=true"/>
496  
497 +    </javac>
498  
499 +    <java classname="ALoops" fork="true">
500 +      <classpath refid="loops.classpath"/>
501 +    </java>
502  
503 <  <!-- Various demos and test programs -->
503 >  </target>
504  
505  
506 <  <target name="sample" depends="init, configure-compiler"
618 <          description="Standalone demo program">
506 >  <!-- jdk7 -->
507  
620    <mkdir dir="${build.testcases.dir}"/>
508  
509 <    <javac srcdir="${test.src.dir}"
510 <          destdir="${build.testcases.dir}"
511 <            debug="${build.debug}"
512 <       debuglevel="${build.debuglevel}"
513 <      deprecation="${build.deprecation}"
514 <           source="${build.sourcelevel}"
515 <             fork="true">
509 >  <target name="jdk7compile"
510 >          depends="configure-compiler"
511 >          description="Compiles src/jdk7 sources">
512 >
513 >    <mkdir dir="${build.jdk7.classes.dir}"/>
514 >
515 >    <javac srcdir="${jdk7src.dir}"
516 >           destdir="${build.jdk7.classes.dir}"
517 >           debug="${build.debug}"
518 >           debuglevel="${build.debuglevel}"
519 >           deprecation="${build.deprecation}"
520 >           source="1.6"
521 >           classpath=""
522 >           bootclasspath="${bootclasspath6}"
523 >           includeAntRuntime="false"
524 >           includeJavaRuntime="false"
525 >           executable="${javac6}"
526 >           fork="true">
527  
528 <      <include name="jsr166/test/Sample.java"/>
528 >      <include name="**/*.java"/>
529 >      <compilerarg line="${build.args}"/>
530 >      <compilerarg value="-XDignore.symbol.file=true"/>
531 >      <compilerarg value="-Xlint:all"/>
532  
533      </javac>
534  
535 <    <copy todir="${build.testcases.dir}">
536 <      <fileset dir="${test.src.dir}">
537 <        <include name="**/*.properties"/>
535 >  </target>
536 >
537 >
538 >
539 >  <target name="jdk7jar"
540 >          depends="jdk7compile"
541 >          description="Builds library jar from compiled sources">
542 >
543 >    <mkdir dir="${build.jdk7.lib.dir}"/>
544 >
545 >    <jar destfile="${jdk7product.jar}" index="true">
546 >      <fileset dir="${build.jdk7.classes.dir}"/>
547 >    </jar>
548 >
549 >  </target>
550 >
551 >
552 >
553 >  <target name="jdk7docs"
554 >          description="Builds javadocs with custom tags to build folder">
555 >
556 >    <delete dir="${build.jdk7.docs.dir}"/>
557 >    <mkdir dir="${build.jdk7.docs.dir}"/>
558 >
559 >    <javadoc destdir="${build.jdk7.docs.dir}"
560 >             packagenames="none"
561 >             link="${jdkapi7docs.url}"
562 >             overview="${jdk7src.dir}/intro.html"
563 >             sourcepath="${jdk7src.dir}"
564 >             bootclasspath="${bootclasspath6}"
565 >             classpath=""
566 >             source="1.6"
567 >             executable="${javadoc7}"
568 >             additionalparam="-XDignore.symbol.file=true" >
569 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
570 >        <include name="**/*.java"/>
571        </fileset>
572 <    </copy>
572 >    </javadoc>
573  
574 +  </target>
575 +
576 +
577 +  <target name="jdk7dist"
578 +          depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
579 +          description="Puts all distributable products in single hierarchy"/>
580 +
581 +
582 +
583 +  <target name="jdk7clean"
584 +          description="Removes all build products">
585 +
586 +    <delete dir="${build.jdk7.dir}"/>
587  
641    <java classname="jsr166.test.Sample" fork="true">
642      <classpath refid="test.classpath"/>
643      <!-- <jvmarg value="-ea"/> -->
644      <!-- <jvmarg value="-server"/> -->
645      <!-- <arg value="1000"/> -->
646    </java>
588    </target>
589  
590  
650  <target name="loops" depends="init, configure-compiler"
651          description="Benchmark from Doug Lea's AQS paper">
591  
592 <    <mkdir dir="${build.loops.dir}"/>
592 >  <target name="jdk7dist-clean"
593 >          description="Removes all build and distribution products">
594  
595 <    <javac srcdir="${loops.src.dir}"
596 <          destdir="${build.loops.dir}"
595 >  </target>
596 >
597 >  <target name="jdk7dist-docs"
598 >          description="Builds javadocs without custom tags to dist folder">
599 >
600 >    <delete dir="${dist.jdk7.docs.dir}"/>
601 >    <mkdir dir="${dist.jdk7.docs.dir}"/>
602 >
603 >    <javadoc destdir="${dist.jdk7.docs.dir}"
604 >             packagenames="none"
605 >             link="${jdkapi7docs.url}"
606 >             overview="${jdk7src.dir}/intro.html"
607 >             sourcepath="${jdk7src.dir}"
608 >             classpath=""
609 >             executable="${javadoc7}"
610 >             bootclasspath="${bootclasspath6}"
611 >             source="1.6">
612 >      <arg value="-XDignore.symbol.file=true"/>
613 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
614 >        <include name="**/*.java"/>
615 >      </fileset>
616 >    </javadoc>
617 >
618 >  </target>
619 >
620 >  <target name="jdk7dist-jar"
621 >          depends="jdk7clean, jdk7jar">
622 >
623 >    <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
624 >
625 >  </target>
626 >
627 >  <!-- jsr166x -->
628 >
629 >
630 >  <target name="jsr166xcompile"
631 >          depends="init, configure-compiler"
632 >          description="Compiles jsr166x sources">
633 >
634 >    <mkdir dir="${build.jsr166x.dir}"/>
635 >
636 >    <javac srcdir="${jsr166xsrc.dir}"
637 >          destdir="${build.jsr166x.dir}"
638              debug="${build.debug}"
639         debuglevel="${build.debuglevel}"
640        deprecation="${build.deprecation}"
641             source="${build.sourcelevel}"
642               fork="true">
643  
644 +      <include name="**/*.java"/>
645        <compilerarg line="${build.args}"/>
646 <      <classpath refid="loops.classpath"/>
646 >      <compilerarg value="-XDignore.symbol.file=true"/>
647  
648      </javac>
649  
650 <    <java classname="ALoops" fork="true">
651 <      <classpath refid="loops.classpath"/>
652 <    </java>
650 >  </target>
651 >
652 >
653 >
654 >  <target name="jsr166xjar"
655 >          depends="jsr166xcompile"
656 >          description="Builds library jar from compiled sources">
657 >
658 >    <mkdir dir="${build.jsr166xlib.dir}"/>
659 >
660 >    <jar destfile="${jsr166xproduct.jar}">
661 >      <fileset dir="${build.jsr166x.dir}"/>
662 >    </jar>
663  
664    </target>
665  
666  
675  <target name="compile-j1" depends="init, configure-compiler">
667  
668 <    <mkdir dir="${build.j1.dir}"/>
668 >  <target name="jsr166xdocs"
669 >          description="Builds javadocs with custom tags to build folder">
670  
671 <    <javac srcdir="${j1.src.dir}"
672 <          destdir="${build.j1.dir}"
681 <            debug="${build.debug}"
682 <       debuglevel="${build.debuglevel}"
683 <      deprecation="${build.deprecation}"
684 <           source="${build.sourcelevel}" >
671 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
672 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
673  
674 <      <include name="**/*.java"/>
675 <      <exclude name="**/dijkstra/**"/>
674 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
675 >             packagenames="jsr166x"
676 >             link="${jdkapidocs.url}"
677 >             source="${build.sourcelevel}"
678 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
679 >             additionalparam="-XDignore.symbol.file=true" />
680  
681 <      <compilerarg line="${build.args}"/>
690 <      <classpath refid="j1.classpath"/>
681 >  </target>
682  
683 <    </javac>
683 >
684 >  <target name="jsr166xdist"
685 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
686 >          description="Puts all distributable products in single hierarchy"/>
687 >
688 >
689 >
690 >  <target name="jsr166xclean"
691 >          description="Removes all build products">
692 >
693 >    <delete dir="${build.jsr166x.dir}"/>
694 >    <delete dir="${build.jsr166xlib.dir}"/>
695  
696    </target>
697  
698  
697  <target name="sw" depends="compile-j1"
698          description="Runs the SwingWorker demo">
699  
700 <    <!--
701 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
702 <      <classpath refid="j1.classpath"/>
703 <    </java>
704 <    -->
700 >  <target name="jsr166xdist-clean"
701 >          description="Removes all build and distribution products">
702  
703 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
703 >  </target>
704 >
705 >
706 >
707 >  <target name="jsr166xdist-docs"
708 >          description="Builds javadocs without custom tags to dist folder">
709  
710 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
711 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
712 <    </exec>
710 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
711 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
712 >
713 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
714 >             packagenames="jsr166x"
715 >             link="${jdkapidocs.url}"
716 >             source="${build.sourcelevel}"
717 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
718 >             additionalparam="-XDignore.symbol.file=true" />
719  
720    </target>
721  
722 <  <target name="j1" depends="compile-j1"
723 <          description="Runs a standalone JavaOne program">
722 >  <target name="jsr166xdist-jar"
723 >          depends="jsr166xclean, jsr166xjar">
724  
725 <    <java classname="${j1.test}" fork="true">
718 <      <classpath refid="j1.classpath"/>
719 <      <jvmarg value="-client"/>
725 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
726  
727 <      <!-- WebCrawler args -->
722 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
723 <      <arg value="http://www.priorartisans.com"/>
724 <      <arg value="25"/>
727 >  </target>
728  
729 <    </java>
729 >  <!-- jsr166y -->
730 >
731 >
732 >  <target name="jsr166ycompile"
733 >          depends="init, configure-compiler"
734 >          description="Compiles jsr166y sources">
735 >
736 >    <mkdir dir="${build.jsr166y.dir}"/>
737 >
738 >    <javac srcdir="${jsr166ysrc.dir}"
739 >          destdir="${build.jsr166y.dir}"
740 >            debug="${build.debug}"
741 >       debuglevel="${build.debuglevel}"
742 >      deprecation="${build.deprecation}"
743 >           source="${build.sourcelevel}"
744 >             fork="true">
745 >
746 >      <include name="**/*.java"/>
747 >      <compilerarg line="${build.args}"/>
748 >      <compilerarg value="-XDignore.symbol.file=true"/>
749 >      <compilerarg value="${bootclasspath.args}"/>
750 >
751 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
752 >
753 >    </javac>
754  
755    </target>
756  
757  
731  <target name="test-j1" depends="compile-j1"
732          description="Runs testcases from the JavaOne source directories">
758  
759 <    <junit printsummary="true"
760 <             showoutput="true"
761 <          errorProperty="junit.failed"
737 <        failureProperty="junit.failed"
738 <                    dir="${build.j1.dir}"
739 <                   fork="true">
759 >  <target name="jsr166yjar"
760 >          depends="jsr166ycompile"
761 >          description="Builds library jar from compiled sources">
762  
763 <      <!-- <jvmarg value="-server"/> -->
742 <      <classpath refid="j1.classpath"/>
743 <      <formatter type="xml"/>
763 >    <mkdir dir="${build.jsr166ylib.dir}"/>
764  
765 <      <batchtest todir="${build.j1.dir}">
766 <        <fileset dir="${j1.src.dir}">
767 <          <include name="**/*Test.java"/>
748 <        </fileset>
749 <      </batchtest>
765 >    <jar destfile="${jsr166yproduct.jar}" index="true">
766 >      <fileset dir="${build.jsr166y.dir}"/>
767 >    </jar>
768  
769 <    </junit>
769 >  </target>
770  
753    <available property="junit.report.format"
754                  value="frames"
755              classname="org.apache.xalan.lib.Redirect"/>
756    <property name="junit.report.format" value="noframes"/>
771  
758    <junitreport todir="${build.j1.dir}">
759      <fileset dir="${build.j1.dir}">
760        <include name="TEST-*.xml"/>
761      </fileset>
762      <report styledir="${stylesheet.dir}"
763                format="${junit.report.format}"
764                 todir="${build.j1.dir}"
765      />
766    </junitreport>
772  
773 <    <fail message="Test Cases Failed" if="junit.failed"/>
773 >  <target name="jsr166ydocs"
774 >          description="Builds javadocs with custom tags to build folder">
775 >
776 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
777 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
778 >
779 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
780 >             packagenames="jsr166y"
781 >             link="${jdkapidocs.url}"
782 >             source="${build.sourcelevel}"
783 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
784 >             additionalparam="-XDignore.symbol.file=true" />
785  
786    </target>
787  
788  
789 +  <target name="jsr166ydist"
790 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
791 +          description="Puts all distributable products in single hierarchy"/>
792 +
793 +
794  
795 <  <!-- C++ and JNI definitions and demos -->
795 >  <target name="jsr166yclean"
796 >          description="Removes all build products">
797  
798 <  <target name="configure-cpp">
798 >    <delete dir="${build.jsr166y.dir}"/>
799 >    <delete dir="${build.jsr166ylib.dir}"/>
800  
801 <    <!-- Define tasks and types -->
801 >  </target>
802  
780    <path id="cpptasks.path">
781      <pathelement location="${lib.dir}/cpptasks.jar"/>
782    </path>
783    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
784    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
803  
786    <!-- Set platform property for JNI includes -->
804  
805 <    <condition property="platform" value="linux">
806 <      <os name="Linux"/>
790 <    </condition>
791 <    <condition property="platform" value="win32">
792 <      <os family="windows"/>
793 <    </condition>
794 <    <condition property="platform" value="solaris">
795 <      <os name="SunOS"/>
796 <    </condition>
805 >  <target name="jsr166ydist-clean"
806 >          description="Removes all build and distribution products">
807  
808    </target>
809  
810 +  <target name="jsr166ydist-docs"
811 +          description="Builds javadocs without custom tags to dist folder">
812  
813 <  <target name="cppdemo" depends="configure-cpp">
813 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
814 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
815  
816 <    <mkdir dir="${build.dir}"/>
816 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
817 >             packagenames="jsr166y"
818 >             link="${jdkapidocs.url}"
819 >             source="${build.sourcelevel}"
820 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
821 >             additionalparam="-XDignore.symbol.file=true" />
822 >
823 >  </target>
824  
825 <    <cc multithreaded="true"
826 <                 name="g++"
807 <               objdir="${build.dir}"
808 <              outfile="${build.dir}/CppDemo">
809 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
810 <      <libset libs="stdc++"/>
811 <    </cc>
825 >  <target name="jsr166ydist-jar"
826 >          depends="jsr166yclean, jsr166yjar">
827  
828 <    <exec executable="${build.dir}/CppDemo">
814 <      <arg line="count in word frequency of word in command line count"/>
815 <    </exec>
828 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
829  
830    </target>
831  
832  
833 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
833 >  <!-- extra166y -->
834  
822    <mkdir dir="${build.testcases.dir}"/>
835  
836 <    <javac srcdir="${test.src.dir}"
837 <          destdir="${build.testcases.dir}"
836 >  <target name="extra166ycompile"
837 >          depends="init, configure-compiler, jsr166ycompile"
838 >          description="Compiles extra166y sources">
839 >
840 >    <mkdir dir="${build.extra166y.dir}"/>
841 >
842 >    <javac srcdir="${extra166ysrc.dir}"
843 >          destdir="${build.extra166y.dir}"
844              debug="${build.debug}"
845 +            classpath="${jsr166yproduct.jar}"
846         debuglevel="${build.debuglevel}"
847        deprecation="${build.deprecation}"
848             source="${build.sourcelevel}"
849               fork="true">
850 <      <compilerarg value="${bootclasspath.args}"/>
850 >
851 >      <include name="**/*.java"/>
852        <compilerarg line="${build.args}"/>
853 <      <classpath refid="test.classpath"/>
854 <      <include name="JniDemo.java"/>
853 >      <compilerarg value="-XDignore.symbol.file=true"/>
854 >      <compilerarg value="${bootclasspath.args}"/>
855 >
856 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
857 >
858      </javac>
859  
860 <    <javah destdir="${build.testcases.dir}"
861 <      classpathref="test.classpath">
862 <      <class name="JniDemo"/>
863 <    </javah>
864 <
865 <    <cc multithreaded="true"
866 <                 name="g++"
867 <               objdir="${build.dir}"
868 <              outfile="${build.dir}/JniDemo"
869 <              outtype="shared">
870 <
871 <      <compiler>
872 <        <defineset>
873 <          <define name="__int64" value="long long"/>
874 <        </defineset>
875 <        <includepath location="${java.home}/../include"/>
876 <        <includepath location="${java.home}/../include/${platform}"/>
877 <        <compilerarg value="-mno-cygwin"/>
878 <      </compiler>
879 <
880 <      <linker>
881 <        <linkerarg value="--add-stdcall-alias"/>
882 <      </linker>
883 <
884 <      <includepath location="${build.testcases.dir}"/>
885 <
886 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
887 <
888 <      <libset libs="stdc++"/>
889 <
890 <    </cc>
891 <
892 <    <!-- Necessary if windows, harmless if not -->
893 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
894 <
895 <    <java classname="JniDemo" fork="true">
896 <      <!-- Watch out: path separator hardwired to semicolon here! -->
897 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
898 <      <classpath refid="test.classpath"/>
899 <      <arg line="count in word frequency of word in command line count"/>
900 <    </java>
860 >  </target>
861 >
862 >
863 >
864 >  <target name="extra166yjar"
865 >          depends="extra166ycompile"
866 >          description="Builds library jar from compiled sources">
867 >
868 >    <mkdir dir="${build.extra166ylib.dir}"/>
869 >
870 >    <jar destfile="${extra166yproduct.jar}" index="true">
871 >      <fileset dir="${build.extra166y.dir}"/>
872 >    </jar>
873 >
874 >  </target>
875 >
876 >
877 >
878 >  <target name="extra166ydocs"
879 >          description="Builds javadocs with custom tags to build folder">
880 >
881 >    <delete dir="${build.extra166yjavadocs.dir}"/>
882 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
883 >
884 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
885 >             packagenames="extra166y"
886 >             link="${jdkapidocs.url}"
887 >             source="${build.sourcelevel}"
888 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
889 >             additionalparam="-XDignore.symbol.file=true" />
890 >
891 >  </target>
892 >
893 >
894 >  <target name="extra166ydist"
895 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
896 >          description="Puts all distributable products in single hierarchy"/>
897 >
898 >
899 >
900 >  <target name="extra166yclean"
901 >          description="Removes all build products">
902 >
903 >    <delete dir="${build.extra166y.dir}"/>
904 >    <delete dir="${build.extra166ylib.dir}"/>
905  
906    </target>
907  
908  
909  
910 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
910 >  <target name="extra166ydist-clean"
911 >          description="Removes all build and distribution products">
912  
913 +  </target>
914  
915 +  <target name="extra166ydist-docs"
916 +          description="Builds javadocs without custom tags to dist folder">
917  
918 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
919 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
889 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
890 <  <property name="pretiger.sourcelevel" value="1.4"/>
918 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
919 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
920  
921 <  <target name="defang"
922 <       depends="init"
923 <   description="Generates pre-Tiger compatible source">
921 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
922 >             packagenames="extra166y"
923 >             link="${jdkapidocs.url}"
924 >             source="${build.sourcelevel}"
925 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
926 >             additionalparam="-XDignore.symbol.file=true" />
927 >
928 >  </target>
929  
930 <    <delete dir="${pretiger.src.dir}"/>
931 <    <mkdir dir="${pretiger.src.dir}"/>
930 >  <target name="extra166ydist-jar"
931 >          depends="extra166yclean, extra166yjar">
932  
933 <    <exec executable="perl">
900 <      <arg file="etc/defang.pl"/>
901 <      <!-- <arg value="-v"/> -->
902 <      <arg value="-s"/> <arg file="${src.dir}"/>
903 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
904 <    </exec>
933 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
934  
935    </target>
936  
937 <  <target name="compile-pretiger"
909 <          depends="init, configure-compiler, defang"
910 <          description="Compiles pre-Tiger sources to build folder">
937 >  <!-- jsr166e -->
938  
912    <mkdir dir="${build.pretiger.dir}"/>
939  
940 <    <javac srcdir="${pretiger.src.dir}"
941 <          destdir="${build.pretiger.dir}"
940 >  <target name="jsr166ecompile"
941 >          depends="init, configure-compiler"
942 >          description="Compiles jsr166e sources">
943 >
944 >    <mkdir dir="${build.jsr166e.dir}"/>
945 >
946 >    <javac srcdir="${jsr166esrc.dir}"
947 >          destdir="${build.jsr166e.dir}"
948              debug="${build.debug}"
949         debuglevel="${build.debuglevel}"
950        deprecation="${build.deprecation}"
951 <           source="${pretiger.sourcelevel}"
951 >           source="1.7"
952               fork="true">
953  
954 +      <include name="**/*.java"/>
955        <compilerarg line="${build.args}"/>
956 <      <exclude name="**/Thread.java"/>
956 >      <compilerarg value="-XDignore.symbol.file=true"/>
957 >      <compilerarg value="${bootclasspath.args}"/>
958 >
959 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
960  
961      </javac>
962  
963    </target>
964  
929  <target name="pretiger" depends="compile-pretiger">
965  
931    <mkdir dir="${build.lib.dir}"/>
966  
967 <    <jar destfile="${pretiger.jar}">
968 <      <fileset dir="${build.pretiger.dir}">
969 <      </fileset>
967 >  <target name="jsr166ejar"
968 >          depends="jsr166ecompile"
969 >          description="Builds library jar from compiled sources">
970 >
971 >    <mkdir dir="${build.jsr166elib.dir}"/>
972 >
973 >    <jar destfile="${jsr166eproduct.jar}" index="true">
974 >      <fileset dir="${build.jsr166e.dir}"/>
975      </jar>
976  
977    </target>
978  
979 +
980 +
981 +  <target name="jsr166edocs"
982 +          description="Builds javadocs with custom tags to build folder">
983 +
984 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
985 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
986 +
987 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
988 +             packagenames="jsr166e,jsr166e.extra"
989 +             link="${jdkapidocs.url}"
990 +             source="1.7"
991 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
992 +             additionalparam="-XDignore.symbol.file=true" />
993 +
994 +  </target>
995 +
996 +
997 +  <target name="jsr166edist"
998 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
999 +          description="Puts all distributable products in single hierarchy"/>
1000 +
1001 +
1002 +
1003 +  <target name="jsr166eclean"
1004 +          description="Removes all build products">
1005 +
1006 +    <delete dir="${build.jsr166e.dir}"/>
1007 +    <delete dir="${build.jsr166elib.dir}"/>
1008 +
1009 +  </target>
1010 +
1011 +
1012 +
1013 +  <target name="jsr166edist-clean"
1014 +          description="Removes all build and distribution products">
1015 +
1016 +  </target>
1017 +
1018 +  <target name="jsr166edist-docs"
1019 +          description="Builds javadocs without custom tags to dist folder">
1020 +
1021 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1022 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1023 +
1024 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1025 +             packagenames="jsr166e,jsr166e.extra"
1026 +             link="${jdkapidocs.url}"
1027 +             source="1.7"
1028 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1029 +             additionalparam="-XDignore.symbol.file=true" />
1030 +
1031 +  </target>
1032 +
1033 +  <target name="jsr166edist-jar"
1034 +          depends="jsr166eclean, jsr166ejar">
1035 +
1036 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1037 +
1038 +  </target>
1039 +
1040   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines