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.69 by jsr166, Fri Jul 2 16:06:25 2004 UTC vs.
Revision 1.93 by jsr166, Mon Jan 14 08:58:47 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 >
62 >  <macrodef name="defjdklocations">
63 >    <attribute name="v"/>
64 >    <sequential>
65 >    <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
66 >    <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
67 >    <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
68 >    <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
69 >    <property name="bootclasspath@{v}"  
70 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
71 >    </sequential>
72 >  </macrodef>
73 >
74 >  <defjdklocations v="6"/>
75 >  <defjdklocations v="7"/>
76 >  <defjdklocations v="8"/>
77  
78    <!-- Source locations -->
79    <property name="src.dir"              location="${basedir}/src/main"/>
80    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
81    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
82    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
83    <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"/>
84    <property name="lib.dir"              location="${basedir}/lib"/>
85    <property name="dist.dir"             location="${basedir}/dist"/>
86 +  <property name="topsrc.dir"           location="${basedir}/src"/>
87 +  <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
88 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
89 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
90 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
91 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
92 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
93  
94    <!-- Distribution locations -->
95 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
95 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
96 >  <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
97 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
98 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
99 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
100 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
101  
102    <!-- Jar locations -->
103    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
104 +  <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
105 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
106 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
107 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
108 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
109    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
110  
111    <!-- Bootclasspath argument -->
112    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
113  
114 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
115 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
116 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
117 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
118 +
119 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
120 +  <!-- The below does not yet exist as of 2012-11 -->
121 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
122 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
123 +
124    <!-- Test classpath -->
125    <path id="test.classpath">
126      <pathelement location="${build.testcases.dir}"/>
# Line 75 | Line 132
132      <pathelement location="${build.loops.dir}"/>
133    </path>
134  
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
135  
136    <!-- Main targets -->
137  
138 +  <target name="dists"
139 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
140 +          description="Builds all public jars and docs"/>
141  
142    <target name="compile"
143            depends="init, configure-compiler"
# Line 101 | Line 154
154               fork="true">
155  
156        <include name="**/*.java"/>
157 +      <compilerarg value="-XDignore.symbol.file=true"/>
158 +
159 + <!--
160        <exclude name="java/lang/**"/>
161        <compilerarg line="${build.args}"/>
162 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
163 + -->
164  
165      </javac>
166  
# Line 136 | Line 194
194      <delete dir="${build.javadocs.dir}"/>
195      <mkdir dir="${build.javadocs.dir}"/>
196  
197 <    <javadoc destdir="${build.javadocs.dir}"
198 <                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:"/>
197 >    <!-- the packagenames="none" hack below prevents scanning the -->
198 >    <!-- sourcepath for packages -->
199  
200 <      <packageset dir="${src.dir}"/>
201 <
202 <    </javadoc>
203 <
204 <  </target>
205 <
206 <
207 <
208 <  <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}"/>
200 >    <javadoc destdir="${build.javadocs.dir}"
201 >             packagenames="none"
202 >             link="${jdkapidocs.url}"
203 >             overview="${src.dir}/intro.html"
204 >             sourcepath="${src.dir}:${jdksrc.dir}"
205 >             additionalparam="-XDignore.symbol.file=true" >
206 >      <fileset dir="${src.dir}" defaultexcludes="yes">
207 >        <include name="**/*.java"/>
208 >      </fileset>
209      </javadoc>
210  
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
211    </target>
212  
213  
# Line 199 | Line 217
217            description="Puts all distributable products in single hierarchy"/>
218  
219  
202
220    <target name="release"
221            depends="dist"
222            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 246 | Line 263
263      <delete dir="${dist.javadocs.dir}"/>
264      <mkdir dir="${dist.javadocs.dir}"/>
265  
266 <    <javadoc destdir="${dist.javadocs.dir}"
267 <                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}"/>
266 >    <!-- the packagenames="none" hack below prevents scanning the -->
267 >    <!-- sourcepath for packages -->
268  
269 +    <javadoc destdir="${dist.javadocs.dir}"
270 +             packagenames="none"
271 +             link="${jdkapidocs.url}"
272 +             overview="${src.dir}/intro.html"
273 +             sourcepath="${src.dir}:${jdksrc.dir}"
274 +             additionalparam="-XDignore.symbol.file=true" >
275 +      <fileset dir="${src.dir}" defaultexcludes="yes">
276 +        <include name="**/*.java"/>
277 +      </fileset>
278      </javadoc>
279  
280    </target>
# Line 280 | Line 302
302    </target>
303  
304  
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
305    <target name="compile-tests"
306            depends="jar">
307  
# Line 406 | Line 317
317  
318        <compilerarg value="${bootclasspath.args}"/>
319        <compilerarg line="${build.args}"/>
320 +      <compilerarg value="-XDignore.symbol.file=true"/>
321  
322        <classpath refid="test.classpath"/>
323  
# Line 423 | Line 335
335  
336        <compilerarg value="${bootclasspath.args}"/>
337        <compilerarg line="${build.args}"/>
338 +      <compilerarg value="-XDignore.symbol.file=true"/>
339  
340        <classpath refid="test.classpath"/>
341  
# Line 439 | Line 352
352  
353        <compilerarg value="${bootclasspath.args}"/>
354        <compilerarg line="${build.args}"/>
355 +      <compilerarg value="-XDignore.symbol.file=true"/>
356  
357        <classpath refid="test.classpath"/>
358  
# Line 511 | Line 425
425        <fileset dir="${build.reports.dir}">
426          <include name="TEST-*.xml"/>
427        </fileset>
428 <      <report styledir="${stylesheet.dir}"
515 <                format="${junit.report.format}"
516 <                 todir="${build.reports.dir}"
428 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
429        />
430      </junitreport>
431  
# Line 563 | Line 475
475    </target>
476  
477  
478 +  <!-- Various demos and test programs -->
479  
567  <!-- Anthill targets -->
480  
481 <  <target name="anthill-build">
481 >  <target name="loops" depends="init, configure-compiler"
482 >          description="Benchmark from Doug Lea's AQS paper">
483  
484 <    <!-- Override this in user.properties -->
572 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
484 >    <mkdir dir="${build.loops.dir}"/>
485  
486 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
487 <      <arg value="-Xmx256000000"/>
488 <      <!-- classpath of new JVM -->
489 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
490 <      <!-- location of Ant home directory -->
491 <      <arg value="-Dant.home=${ant.home}"/>
492 <      <!-- 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>
486 >    <javac srcdir="${loops.src.dir}"
487 >          destdir="${build.loops.dir}"
488 >            debug="${build.debug}"
489 >       debuglevel="${build.debuglevel}"
490 >      deprecation="${build.deprecation}"
491 >           source="${build.sourcelevel}"
492 >             fork="true">
493  
494 <  </target>
494 >      <compilerarg line="${build.args}"/>
495 >      <classpath refid="loops.classpath"/>
496 >      <compilerarg value="-XDignore.symbol.file=true"/>
497  
498 +    </javac>
499  
500 +    <java classname="ALoops" fork="true">
501 +      <classpath refid="loops.classpath"/>
502 +    </java>
503  
504 <  <!-- Various demos and test programs -->
504 >  </target>
505  
506  
507 <  <target name="sample" depends="init, configure-compiler"
618 <          description="Standalone demo program">
507 >  <!-- jdk7 -->
508  
620    <mkdir dir="${build.testcases.dir}"/>
509  
510 <    <javac srcdir="${test.src.dir}"
511 <          destdir="${build.testcases.dir}"
512 <            debug="${build.debug}"
513 <       debuglevel="${build.debuglevel}"
514 <      deprecation="${build.deprecation}"
515 <           source="${build.sourcelevel}"
516 <             fork="true">
510 >  <target name="jdk7compile"
511 >          depends="configure-compiler"
512 >          description="Compiles src/jdk7 sources">
513 >
514 >    <mkdir dir="${build.jdk7.classes.dir}"/>
515 >
516 >    <javac srcdir="${jdk7src.dir}"
517 >           destdir="${build.jdk7.classes.dir}"
518 >           debug="${build.debug}"
519 >           debuglevel="${build.debuglevel}"
520 >           deprecation="${build.deprecation}"
521 >           source="1.6"
522 >           classpath=""
523 >           bootclasspath="${bootclasspath6}"
524 >           includeAntRuntime="false"
525 >           includeJavaRuntime="false"
526 >           executable="${javac6}"
527 >           fork="true">
528  
529 <      <include name="jsr166/test/Sample.java"/>
529 >      <include name="**/*.java"/>
530 >      <compilerarg line="${build.args}"/>
531 >      <compilerarg value="-XDignore.symbol.file=true"/>
532 >      <compilerarg value="-Xlint:all"/>
533  
534      </javac>
535  
536 <    <copy todir="${build.testcases.dir}">
537 <      <fileset dir="${test.src.dir}">
538 <        <include name="**/*.properties"/>
536 >  </target>
537 >
538 >
539 >
540 >  <target name="jdk7jar"
541 >          depends="jdk7compile"
542 >          description="Builds library jar from compiled sources">
543 >
544 >    <mkdir dir="${build.jdk7.lib.dir}"/>
545 >
546 >    <jar destfile="${jdk7product.jar}" index="true">
547 >      <fileset dir="${build.jdk7.classes.dir}"/>
548 >    </jar>
549 >
550 >  </target>
551 >
552 >
553 >
554 >  <target name="jdk7docs"
555 >          description="Builds javadocs with custom tags to build folder">
556 >
557 >    <delete dir="${build.jdk7.docs.dir}"/>
558 >    <mkdir dir="${build.jdk7.docs.dir}"/>
559 >
560 >    <javadoc destdir="${build.jdk7.docs.dir}"
561 >             packagenames="none"
562 >             link="${jdkapi7docs.url}"
563 >             overview="${jdk7src.dir}/intro.html"
564 >             sourcepath="${jdk7src.dir}"
565 >             bootclasspath="${bootclasspath6}"
566 >             classpath=""
567 >             source="1.6"
568 >             executable="${javadoc7}"
569 >             additionalparam="-XDignore.symbol.file=true" >
570 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
571 >        <include name="**/*.java"/>
572        </fileset>
573 <    </copy>
573 >    </javadoc>
574 >
575 >  </target>
576  
577  
578 <    <java classname="jsr166.test.Sample" fork="true">
579 <      <classpath refid="test.classpath"/>
580 <      <!-- <jvmarg value="-ea"/> -->
581 <      <!-- <jvmarg value="-server"/> -->
582 <      <!-- <arg value="1000"/> -->
583 <    </java>
578 >  <target name="jdk7dist"
579 >          depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
580 >          description="Puts all distributable products in single hierarchy"/>
581 >
582 >
583 >
584 >  <target name="jdk7clean"
585 >          description="Removes all build products">
586 >
587 >    <delete dir="${build.jdk7.dir}"/>
588 >
589    </target>
590  
591  
650  <target name="loops" depends="init, configure-compiler"
651          description="Benchmark from Doug Lea's AQS paper">
592  
593 <    <mkdir dir="${build.loops.dir}"/>
593 >  <target name="jdk7dist-clean"
594 >          description="Removes all build and distribution products">
595  
596 <    <javac srcdir="${loops.src.dir}"
597 <          destdir="${build.loops.dir}"
596 >  </target>
597 >
598 >  <target name="jdk7dist-docs"
599 >          description="Builds javadocs without custom tags to dist folder">
600 >
601 >    <delete dir="${dist.jdk7.docs.dir}"/>
602 >    <mkdir dir="${dist.jdk7.docs.dir}"/>
603 >
604 >    <javadoc destdir="${dist.jdk7.docs.dir}"
605 >             packagenames="none"
606 >             link="${jdkapi7docs.url}"
607 >             overview="${jdk7src.dir}/intro.html"
608 >             sourcepath="${jdk7src.dir}"
609 >             classpath=""
610 >             executable="${javadoc7}"
611 >             bootclasspath="${bootclasspath6}"
612 >             source="1.6">
613 >      <arg value="-XDignore.symbol.file=true"/>
614 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
615 >        <include name="**/*.java"/>
616 >      </fileset>
617 >    </javadoc>
618 >
619 >  </target>
620 >
621 >  <target name="jdk7dist-jar"
622 >          depends="jdk7clean, jdk7jar">
623 >
624 >    <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
625 >
626 >  </target>
627 >
628 >  <!-- jsr166x -->
629 >
630 >
631 >  <target name="jsr166xcompile"
632 >          depends="init, configure-compiler"
633 >          description="Compiles jsr166x sources">
634 >
635 >    <mkdir dir="${build.jsr166x.dir}"/>
636 >
637 >    <javac srcdir="${jsr166xsrc.dir}"
638 >          destdir="${build.jsr166x.dir}"
639              debug="${build.debug}"
640         debuglevel="${build.debuglevel}"
641        deprecation="${build.deprecation}"
642             source="${build.sourcelevel}"
643               fork="true">
644  
645 +      <include name="**/*.java"/>
646        <compilerarg line="${build.args}"/>
647 <      <classpath refid="loops.classpath"/>
647 >      <compilerarg value="-XDignore.symbol.file=true"/>
648  
649      </javac>
650  
651 <    <java classname="ALoops" fork="true">
652 <      <classpath refid="loops.classpath"/>
653 <    </java>
651 >  </target>
652 >
653 >
654 >
655 >  <target name="jsr166xjar"
656 >          depends="jsr166xcompile"
657 >          description="Builds library jar from compiled sources">
658 >
659 >    <mkdir dir="${build.jsr166xlib.dir}"/>
660 >
661 >    <jar destfile="${jsr166xproduct.jar}">
662 >      <fileset dir="${build.jsr166x.dir}"/>
663 >    </jar>
664  
665    </target>
666  
667  
675  <target name="compile-j1" depends="init, configure-compiler">
668  
669 <    <mkdir dir="${build.j1.dir}"/>
669 >  <target name="jsr166xdocs"
670 >          description="Builds javadocs with custom tags to build folder">
671  
672 <    <javac srcdir="${j1.src.dir}"
673 <          destdir="${build.j1.dir}"
681 <            debug="${build.debug}"
682 <       debuglevel="${build.debuglevel}"
683 <      deprecation="${build.deprecation}"
684 <           source="${build.sourcelevel}" >
672 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
673 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
674  
675 <      <include name="**/*.java"/>
676 <      <exclude name="**/dijkstra/**"/>
675 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
676 >             packagenames="jsr166x"
677 >             link="${jdkapidocs.url}"
678 >             source="${build.sourcelevel}"
679 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
680 >             additionalparam="-XDignore.symbol.file=true" />
681  
682 <      <compilerarg line="${build.args}"/>
690 <      <classpath refid="j1.classpath"/>
682 >  </target>
683  
684 <    </javac>
684 >
685 >  <target name="jsr166xdist"
686 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
687 >          description="Puts all distributable products in single hierarchy"/>
688 >
689 >
690 >
691 >  <target name="jsr166xclean"
692 >          description="Removes all build products">
693 >
694 >    <delete dir="${build.jsr166x.dir}"/>
695 >    <delete dir="${build.jsr166xlib.dir}"/>
696  
697    </target>
698  
699  
697  <target name="sw" depends="compile-j1"
698          description="Runs the SwingWorker demo">
700  
701 <    <!--
702 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
703 <      <classpath refid="j1.classpath"/>
704 <    </java>
705 <    -->
701 >  <target name="jsr166xdist-clean"
702 >          description="Removes all build and distribution products">
703 >
704 >  </target>
705 >
706 >
707  
708 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
708 >  <target name="jsr166xdist-docs"
709 >          description="Builds javadocs without custom tags to dist folder">
710 >
711 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
712 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
713  
714 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
715 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
716 <    </exec>
714 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
715 >             packagenames="jsr166x"
716 >             link="${jdkapidocs.url}"
717 >             source="${build.sourcelevel}"
718 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
719 >             additionalparam="-XDignore.symbol.file=true" />
720  
721    </target>
722  
723 <  <target name="j1" depends="compile-j1"
724 <          description="Runs a standalone JavaOne program">
723 >  <target name="jsr166xdist-jar"
724 >          depends="jsr166xclean, jsr166xjar">
725  
726 <    <java classname="${j1.test}" fork="true">
718 <      <classpath refid="j1.classpath"/>
719 <      <jvmarg value="-client"/>
726 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
727  
728 <      <!-- TestPseudoRandom args -->
722 <      <arg value="2"/>
723 <      <arg value="25"/>
724 <      <arg value="100000"/>
728 >  </target>
729  
730 <      <!-- WebCrawler args -->
727 <      <!--
728 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
729 <      <arg value="http://www.priorartisans.com"/>
730 <      <arg value="25"/>
731 <      -->
730 >  <!-- jsr166y -->
731  
732 <    </java>
732 >
733 >  <target name="jsr166ycompile"
734 >          depends="init, configure-compiler"
735 >          description="Compiles jsr166y sources">
736 >
737 >    <mkdir dir="${build.jsr166y.dir}"/>
738 >
739 >    <javac srcdir="${jsr166ysrc.dir}"
740 >          destdir="${build.jsr166y.dir}"
741 >            debug="${build.debug}"
742 >       debuglevel="${build.debuglevel}"
743 >      deprecation="${build.deprecation}"
744 >           source="${build.sourcelevel}"
745 >             fork="true">
746 >
747 >      <include name="**/*.java"/>
748 >      <compilerarg line="${build.args}"/>
749 >      <compilerarg value="-XDignore.symbol.file=true"/>
750 >      <compilerarg value="${bootclasspath.args}"/>
751 >
752 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
753 >
754 >    </javac>
755  
756    </target>
757  
758  
738  <target name="test-j1" depends="compile-j1"
739          description="Runs testcases from the JavaOne source directories">
759  
760 <    <junit printsummary="true"
761 <             showoutput="true"
762 <          errorProperty="junit.failed"
744 <        failureProperty="junit.failed"
745 <                    dir="${build.j1.dir}"
746 <                   fork="true">
760 >  <target name="jsr166yjar"
761 >          depends="jsr166ycompile"
762 >          description="Builds library jar from compiled sources">
763  
764 <      <!-- <jvmarg value="-server"/> -->
749 <      <classpath refid="j1.classpath"/>
750 <      <formatter type="xml"/>
764 >    <mkdir dir="${build.jsr166ylib.dir}"/>
765  
766 <      <batchtest todir="${build.j1.dir}">
767 <        <fileset dir="${j1.src.dir}">
768 <          <include name="**/*Test.java"/>
755 <        </fileset>
756 <      </batchtest>
766 >    <jar destfile="${jsr166yproduct.jar}" index="true">
767 >      <fileset dir="${build.jsr166y.dir}"/>
768 >    </jar>
769  
770 <    </junit>
770 >  </target>
771  
760    <available property="junit.report.format"
761                  value="frames"
762              classname="org.apache.xalan.lib.Redirect"/>
763    <property name="junit.report.format" value="noframes"/>
772  
765    <junitreport todir="${build.j1.dir}">
766      <fileset dir="${build.j1.dir}">
767        <include name="TEST-*.xml"/>
768      </fileset>
769      <report styledir="${stylesheet.dir}"
770                format="${junit.report.format}"
771                 todir="${build.j1.dir}"
772      />
773    </junitreport>
773  
774 <    <fail message="Test Cases Failed" if="junit.failed"/>
774 >  <target name="jsr166ydocs"
775 >          description="Builds javadocs with custom tags to build folder">
776 >
777 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
778 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
779 >
780 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
781 >             packagenames="jsr166y"
782 >             link="${jdkapidocs.url}"
783 >             source="${build.sourcelevel}"
784 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
785 >             additionalparam="-XDignore.symbol.file=true" />
786  
787    </target>
788  
789  
790 +  <target name="jsr166ydist"
791 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
792 +          description="Puts all distributable products in single hierarchy"/>
793 +
794 +
795  
796 <  <!-- C++ and JNI definitions and demos -->
796 >  <target name="jsr166yclean"
797 >          description="Removes all build products">
798  
799 <  <target name="configure-cpp">
799 >    <delete dir="${build.jsr166y.dir}"/>
800 >    <delete dir="${build.jsr166ylib.dir}"/>
801  
802 <    <!-- Define tasks and types -->
802 >  </target>
803  
787    <path id="cpptasks.path">
788      <pathelement location="${lib.dir}/cpptasks.jar"/>
789    </path>
790    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
791    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
804  
793    <!-- Set platform property for JNI includes -->
805  
806 <    <condition property="platform" value="linux">
807 <      <os name="Linux"/>
797 <    </condition>
798 <    <condition property="platform" value="win32">
799 <      <os family="windows"/>
800 <    </condition>
801 <    <condition property="platform" value="solaris">
802 <      <os name="SunOS"/>
803 <    </condition>
806 >  <target name="jsr166ydist-clean"
807 >          description="Removes all build and distribution products">
808  
809    </target>
810  
811 +  <target name="jsr166ydist-docs"
812 +          description="Builds javadocs without custom tags to dist folder">
813  
814 <  <target name="cppdemo" depends="configure-cpp">
814 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
815 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
816  
817 <    <mkdir dir="${build.dir}"/>
817 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
818 >             packagenames="jsr166y"
819 >             link="${jdkapidocs.url}"
820 >             source="${build.sourcelevel}"
821 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
822 >             additionalparam="-XDignore.symbol.file=true" />
823 >
824 >  </target>
825  
826 <    <cc multithreaded="true"
827 <                 name="g++"
814 <               objdir="${build.dir}"
815 <              outfile="${build.dir}/CppDemo">
816 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
817 <      <libset libs="stdc++"/>
818 <    </cc>
826 >  <target name="jsr166ydist-jar"
827 >          depends="jsr166yclean, jsr166yjar">
828  
829 <    <exec executable="${build.dir}/CppDemo">
821 <      <arg line="count in word frequency of word in command line count"/>
822 <    </exec>
829 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
830  
831    </target>
832  
833  
834 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
834 >  <!-- extra166y -->
835  
829    <mkdir dir="${build.testcases.dir}"/>
836  
837 <    <javac srcdir="${test.src.dir}"
838 <          destdir="${build.testcases.dir}"
837 >  <target name="extra166ycompile"
838 >          depends="init, configure-compiler, jsr166ycompile"
839 >          description="Compiles extra166y sources">
840 >
841 >    <mkdir dir="${build.extra166y.dir}"/>
842 >
843 >    <javac srcdir="${extra166ysrc.dir}"
844 >          destdir="${build.extra166y.dir}"
845              debug="${build.debug}"
846 +            classpath="${jsr166yproduct.jar}"
847         debuglevel="${build.debuglevel}"
848        deprecation="${build.deprecation}"
849             source="${build.sourcelevel}"
850               fork="true">
851 <      <compilerarg value="${bootclasspath.args}"/>
851 >
852 >      <include name="**/*.java"/>
853        <compilerarg line="${build.args}"/>
854 <      <classpath refid="test.classpath"/>
855 <      <include name="JniDemo.java"/>
854 >      <compilerarg value="-XDignore.symbol.file=true"/>
855 >      <compilerarg value="${bootclasspath.args}"/>
856 >
857 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
858 >
859      </javac>
860  
861 <    <javah destdir="${build.testcases.dir}"
862 <      classpathref="test.classpath">
863 <      <class name="JniDemo"/>
864 <    </javah>
865 <
866 <    <cc multithreaded="true"
867 <                 name="g++"
868 <               objdir="${build.dir}"
869 <              outfile="${build.dir}/JniDemo"
870 <              outtype="shared">
871 <
872 <      <compiler>
873 <        <defineset>
874 <          <define name="__int64" value="long long"/>
875 <        </defineset>
876 <        <includepath location="${java.home}/../include"/>
877 <        <includepath location="${java.home}/../include/${platform}"/>
878 <        <compilerarg value="-mno-cygwin"/>
879 <      </compiler>
880 <
881 <      <linker>
882 <        <linkerarg value="--add-stdcall-alias"/>
883 <      </linker>
884 <
885 <      <includepath location="${build.testcases.dir}"/>
886 <
887 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
888 <
889 <      <libset libs="stdc++"/>
890 <
891 <    </cc>
892 <
893 <    <!-- Necessary if windows, harmless if not -->
894 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
895 <
896 <    <java classname="JniDemo" fork="true">
897 <      <!-- Watch out: path separator hardwired to semicolon here! -->
898 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
899 <      <classpath refid="test.classpath"/>
900 <      <arg line="count in word frequency of word in command line count"/>
901 <    </java>
861 >  </target>
862 >
863 >
864 >
865 >  <target name="extra166yjar"
866 >          depends="extra166ycompile"
867 >          description="Builds library jar from compiled sources">
868 >
869 >    <mkdir dir="${build.extra166ylib.dir}"/>
870 >
871 >    <jar destfile="${extra166yproduct.jar}" index="true">
872 >      <fileset dir="${build.extra166y.dir}"/>
873 >    </jar>
874 >
875 >  </target>
876 >
877 >
878 >
879 >  <target name="extra166ydocs"
880 >          description="Builds javadocs with custom tags to build folder">
881 >
882 >    <delete dir="${build.extra166yjavadocs.dir}"/>
883 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
884 >
885 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
886 >             packagenames="extra166y"
887 >             link="${jdkapidocs.url}"
888 >             source="${build.sourcelevel}"
889 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
890 >             additionalparam="-XDignore.symbol.file=true" />
891 >
892 >  </target>
893 >
894 >
895 >  <target name="extra166ydist"
896 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
897 >          description="Puts all distributable products in single hierarchy"/>
898 >
899 >
900 >
901 >  <target name="extra166yclean"
902 >          description="Removes all build products">
903 >
904 >    <delete dir="${build.extra166y.dir}"/>
905 >    <delete dir="${build.extra166ylib.dir}"/>
906  
907    </target>
908  
909  
910  
911 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
911 >  <target name="extra166ydist-clean"
912 >          description="Removes all build and distribution products">
913  
914 +  </target>
915  
916 +  <target name="extra166ydist-docs"
917 +          description="Builds javadocs without custom tags to dist folder">
918  
919 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
920 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
896 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
897 <  <property name="pretiger.sourcelevel" value="1.4"/>
919 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
920 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
921  
922 <  <target name="defang"
923 <       depends="init"
924 <   description="Generates pre-Tiger compatible source">
922 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
923 >             packagenames="extra166y"
924 >             link="${jdkapidocs.url}"
925 >             source="${build.sourcelevel}"
926 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
927 >             additionalparam="-XDignore.symbol.file=true" />
928 >
929 >  </target>
930  
931 <    <delete dir="${pretiger.src.dir}"/>
932 <    <mkdir dir="${pretiger.src.dir}"/>
931 >  <target name="extra166ydist-jar"
932 >          depends="extra166yclean, extra166yjar">
933  
934 <    <exec executable="perl">
907 <      <arg file="etc/defang.pl"/>
908 <      <!-- <arg value="-v"/> -->
909 <      <arg value="-s"/> <arg file="${src.dir}"/>
910 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
911 <    </exec>
934 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
935  
936    </target>
937  
938 <  <target name="compile-pretiger"
916 <          depends="init, configure-compiler, defang"
917 <          description="Compiles pre-Tiger sources to build folder">
938 >  <!-- jsr166e -->
939  
919    <mkdir dir="${build.pretiger.dir}"/>
940  
941 <    <javac srcdir="${pretiger.src.dir}"
942 <          destdir="${build.pretiger.dir}"
941 >  <target name="jsr166ecompile"
942 >          depends="init, configure-compiler"
943 >          description="Compiles jsr166e sources">
944 >
945 >    <mkdir dir="${build.jsr166e.dir}"/>
946 >
947 >    <javac srcdir="${jsr166esrc.dir}"
948 >          destdir="${build.jsr166e.dir}"
949              debug="${build.debug}"
950         debuglevel="${build.debuglevel}"
951        deprecation="${build.deprecation}"
952 <           source="${pretiger.sourcelevel}"
952 >           source="1.7"
953               fork="true">
954  
955 +      <include name="**/*.java"/>
956        <compilerarg line="${build.args}"/>
957 <      <exclude name="**/Thread.java"/>
957 >      <compilerarg value="-XDignore.symbol.file=true"/>
958 >      <compilerarg value="${bootclasspath.args}"/>
959 >
960 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
961  
962      </javac>
963  
964    </target>
965  
936  <target name="pretiger" depends="compile-pretiger">
966  
938    <mkdir dir="${build.lib.dir}"/>
967  
968 <    <jar destfile="${pretiger.jar}">
969 <      <fileset dir="${build.pretiger.dir}">
970 <      </fileset>
968 >  <target name="jsr166ejar"
969 >          depends="jsr166ecompile"
970 >          description="Builds library jar from compiled sources">
971 >
972 >    <mkdir dir="${build.jsr166elib.dir}"/>
973 >
974 >    <jar destfile="${jsr166eproduct.jar}" index="true">
975 >      <fileset dir="${build.jsr166e.dir}"/>
976      </jar>
977  
978    </target>
979  
980 +
981 +
982 +  <target name="jsr166edocs"
983 +          description="Builds javadocs with custom tags to build folder">
984 +
985 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
986 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
987 +
988 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
989 +             packagenames="jsr166e,jsr166e.extra"
990 +             link="${jdkapidocs.url}"
991 +             source="1.7"
992 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
993 +             additionalparam="-XDignore.symbol.file=true" />
994 +
995 +  </target>
996 +
997 +
998 +  <target name="jsr166edist"
999 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1000 +          description="Puts all distributable products in single hierarchy"/>
1001 +
1002 +
1003 +
1004 +  <target name="jsr166eclean"
1005 +          description="Removes all build products">
1006 +
1007 +    <delete dir="${build.jsr166e.dir}"/>
1008 +    <delete dir="${build.jsr166elib.dir}"/>
1009 +
1010 +  </target>
1011 +
1012 +
1013 +
1014 +  <target name="jsr166edist-clean"
1015 +          description="Removes all build and distribution products">
1016 +
1017 +  </target>
1018 +
1019 +  <target name="jsr166edist-docs"
1020 +          description="Builds javadocs without custom tags to dist folder">
1021 +
1022 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1023 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1024 +
1025 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1026 +             packagenames="jsr166e,jsr166e.extra"
1027 +             link="${jdkapidocs.url}"
1028 +             source="1.7"
1029 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1030 +             additionalparam="-XDignore.symbol.file=true" />
1031 +
1032 +  </target>
1033 +
1034 +  <target name="jsr166edist-jar"
1035 +          depends="jsr166eclean, jsr166ejar">
1036 +
1037 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1038 +
1039 +  </target>
1040 +
1041   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines