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.74 by dl, Thu Sep 13 11:19:25 2007 UTC vs.
Revision 1.97 by jsr166, Tue Jan 15 01:15:02 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"/>
43 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
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.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>
42 >  <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
43 >
44 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
45    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
46    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
47  
48 <  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
48 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
49    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
50    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
51  
52 +  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
53 +  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
54 +  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
55 +
56 +  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
57 +  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
58 +  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
59 +
60 +  <!-- JDK binary locations -->
61 +  <property name="jdks.home"  location="${user.home}/jdk"/>
62 +
63 +  <macrodef name="defjdklocations">
64 +    <attribute name="v"/>
65 +    <sequential>
66 +    <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
67 +    <property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>
68 +    <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
69 +    <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
70 +    <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
71 +    <property name="bootclasspath@{v}"
72 +     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
73 +    </sequential>
74 +  </macrodef>
75 +
76 +  <defjdklocations v="6"/>
77 +  <defjdklocations v="7"/>
78 +  <defjdklocations v="8"/>
79 +
80 +  <macrodef name="run-tck-tests">
81 +    <attribute name="jvm"/>
82 +    <attribute name="tck.classes"/>
83 +    <attribute name="product.jar" default="${product.jar}"/>
84 +    <attribute name="jvmflags" default=""/>
85 +    <sequential>
86 +    <java classname="JSR166TestCase"
87 +          jvm="@{jvm}" fork="true">
88 +        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
89 +        <jvmarg line="@{jvmflags}"/>
90 +        <classpath>
91 +          <pathelement location="${junit.jar}"/>
92 +          <pathelement location="@{tck.classes}"/>
93 +        </classpath>
94 +    </java>
95 +    </sequential>
96 +  </macrodef>
97 +
98    <!-- Source locations -->
99    <property name="src.dir"              location="${basedir}/src/main"/>
100    <property name="test.src.dir"         location="${basedir}/src/test"/>
54  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
101    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
102    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
103    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
58  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
59  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
104    <property name="lib.dir"              location="${basedir}/lib"/>
105    <property name="dist.dir"             location="${basedir}/dist"/>
106    <property name="topsrc.dir"           location="${basedir}/src"/>
107 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
108 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
107 >  <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
108 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
109 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
110 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
111 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
112 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
113  
114    <!-- Distribution locations -->
115 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
115 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
116 >  <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
117    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
118    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
119 +  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
120 +  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
121  
122    <!-- Jar locations -->
123    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124 +  <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
125    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
126    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
127 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
128 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
129    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
76  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
130  
131    <!-- Bootclasspath argument -->
132    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133  
134 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138 +
139 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140 +  <!-- The below does not yet exist as of 2012-11 -->
141 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
143 +
144    <!-- Test classpath -->
145    <path id="test.classpath">
146      <pathelement location="${build.testcases.dir}"/>
# Line 89 | Line 152
152      <pathelement location="${build.loops.dir}"/>
153    </path>
154  
92  <!-- J1 classpath -->
93  <path id="j1.classpath">
94    <pathelement location="${build.classes.dir}"/>
95    <pathelement location="${build.j1.dir}"/>
96    <pathelement location="${junit.jar}"/>
97
98    <!-- Include dl.u.c for BoundedBuffer comparison -->
99    <pathelement location="${concurrent.jar}"/>
100  </path>
101
155  
156    <!-- Main targets -->
157  
158 +  <target name="dists"
159 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
160 +          description="Builds all public jars and docs"/>
161  
162    <target name="compile"
163            depends="init, configure-compiler"
# Line 118 | Line 174
174               fork="true">
175  
176        <include name="**/*.java"/>
177 <      <compilerarg value="-XDignore.symbol.file"/>
177 >      <compilerarg value="-XDignore.symbol.file=true"/>
178  
179   <!--
180        <exclude name="java/lang/**"/>
# Line 158 | Line 214
214      <delete dir="${build.javadocs.dir}"/>
215      <mkdir dir="${build.javadocs.dir}"/>
216  
217 <    <javadoc destdir="${build.javadocs.dir}"
218 <                link="http://java.sun.com/javase/6/docs/api/"
163 <            overview="${src.dir}/intro.html"
164 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
165 <    >          
166 <
167 <      <packageset dir="${src.dir}"/>
217 >    <!-- the packagenames="none" hack below prevents scanning the -->
218 >    <!-- sourcepath for packages -->
219  
220 +    <javadoc destdir="${build.javadocs.dir}"
221 +             packagenames="none"
222 +             link="${jdkapidocs.url}"
223 +             overview="${src.dir}/intro.html"
224 +             sourcepath="${src.dir}:${jdksrc.dir}"
225 +             additionalparam="-XDignore.symbol.file=true" >
226 +      <fileset dir="${src.dir}" defaultexcludes="yes">
227 +        <include name="**/*.java"/>
228 +      </fileset>
229      </javadoc>
230  
231    </target>
232  
233  
234  
175  <target name="doccheck"
176          depends="filter-doccheck"
177          description="Reports on javadoc style errors">
178
179    <delete dir="${build.doccheck.dir}"/>
180    <mkdir dir="${build.doccheck.dir}"/>
181
182    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
183         docletpath="${lib.dir}/doccheck.jar"
184            destdir="${build.doccheck.dir}">
185      <packageset dir="${build.dc-filter.dir}"/>
186    </javadoc>
187
188    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
189
190  </target>
191
192
193
194  <target name="checkstyle"
195          depends="filter-src"
196          description="Reports on style errors in Java source (verbose, mostly chaff)">
197
198    <taskdef resource="checkstyletask.properties"
199            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
200
201    <mkdir dir="${build.checkstyle.dir}"/>
202
203    <checkstyle config="etc/checkstyle/sun_checks.xml"
204       failOnViolation="false">
205      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
206      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
207    </checkstyle>
208
209    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
210          out="${build.checkstyle.dir}/checkstyle-report.html"
211        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
212
213  </target>
214
215
216
235    <target name="dist"
236            depends="init, dist-clean, dist-jar, dist-docs"
237            description="Puts all distributable products in single hierarchy"/>
238  
239  
222
240    <target name="release"
241            depends="dist"
242            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 266 | Line 283
283      <delete dir="${dist.javadocs.dir}"/>
284      <mkdir dir="${dist.javadocs.dir}"/>
285  
286 <    <javadoc destdir="${dist.javadocs.dir}"
287 <            link="http://java.sun.com/javase/6/docs/api/"
271 <            overview="${src.dir}/intro.html"
286 >    <!-- the packagenames="none" hack below prevents scanning the -->
287 >    <!-- sourcepath for packages -->
288  
289 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
290 <     >
291 < <!--
292 <      <packageset dir="${src.dir}" defaultexcludes="yes">
293 <      <include name="java/util/concurrent"/>
294 <      <include name="java/util/concurrent/atomic"/>
295 <      <include name="java/util/concurrent/locks"/>
296 <      </packageset>
281 < -->
282 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
283 <      <include name="main/java/util/concurrent/*.java"/>
284 <      <include name="main/java/util/concurrent/atomic/*.java"/>
285 <      <include name="main/java/util/concurrent/locks/*.java"/>
286 <      <include name="main/java/util/*.java"/>
287 < <!--
288 <      <include name="main/java/util/concurrent/*.html"/>
289 <      <include name="main/java/util/concurrent/atomic/*.html"/>
290 <      <include name="main/java/util/concurrent/locks/*.html"/>
291 <      <include name="main/java/util/*.html"/>
292 < -->
293 < <!--      <include name="jsr166x/*.java"/> -->
289 >    <javadoc destdir="${dist.javadocs.dir}"
290 >             packagenames="none"
291 >             link="${jdkapidocs.url}"
292 >             overview="${src.dir}/intro.html"
293 >             sourcepath="${src.dir}:${jdksrc.dir}"
294 >             additionalparam="-XDignore.symbol.file=true" >
295 >      <fileset dir="${src.dir}" defaultexcludes="yes">
296 >        <include name="**/*.java"/>
297        </fileset>
298      </javadoc>
299  
# Line 319 | Line 322
322    </target>
323  
324  
322  <target name="compile-ant-filter"
323          depends="init">
324
325    <mkdir dir="${build.ant.dir}"/>
326
327    <javac srcdir="${ant.src.dir}"
328          destdir="${build.ant.dir}"
329           source="1.4"/>
330
331  </target>
332
333
334  <target name="filter-src"
335          depends="compile-ant-filter">
336
337    <mkdir dir="${build.filter.src.dir}"/>
338
339    <copy todir="${build.filter.src.dir}">
340      <fileset dir="${src.dir}">
341        <include name="**/*.html"/>
342      </fileset>
343    </copy>
344
345    <copy todir="${build.filter.src.dir}">
346      <fileset dir="${src.dir}">
347        <exclude name="**/*.html"/>
348        <!-- Files excluded from dist-docs -->
349        <exclude name="java/util/Random.*"/>
350        <exclude name="sun/misc/Unsafe.*"/>
351      </fileset>
352      <!--
353      <filterchain>
354      -->
355
356        <!--
357         # This filter gets rid of angle-bracketed type parameters
358         # so that javadoc can run on the result. The following
359         # heuristic seems to work:
360         #
361         # For all lines not starting with space(s)-asterisk-space(s),
362         #   replace <something> with a space, where there may be more
363         #   than one right angle bracket at the end, and "something"
364         #   must not contain parens or pipes. (This may need some
365         #   tweaking.)
366         -->
367
368        <!--
369        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                      classpath="${build.ant.dir}">
371          <param name="notmatching" value="^\s+\*\s.*$"/>
372          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
373          <param name="replacement" value=" "/>
374        </filterreader>
375        -->
376
377      <!--
378      </filterchain>
379      -->
380    </copy>
381
382  </target>
383
384
385  <target name="filter-doccheck"
386          depends="filter-src">
387
388    <mkdir dir="${build.dc-filter.dir}"/>
389
390    <copy todir="${build.dc-filter.dir}">
391      <fileset dir="${build.filter.src.dir}">
392        <include name="**/*.html"/>
393      </fileset>
394    </copy>
395
396    <property name="generic.declarations"
397             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 {}"
398    />
399
400    <copy todir="${build.dc-filter.dir}">
401      <fileset dir="${build.filter.src.dir}">
402        <exclude name="**/*.html"/>
403      </fileset>
404      <filterchain>
405        <!--
406         # These two filters try to make the source look like
407         # something that doccheck can process. The first removes
408         # -source 1.4 assertions and the second adds in a bunch
409         # of single letter public nested marker interfaces so that
410         # the generic type parameters are recognized.
411         -->
412
413        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
414                      classpath="${build.ant.dir}">
415          <param name="matching"    value="^\s*assert[\s ].*$"/>
416          <param name="pattern"     value="assert"/>
417          <param name="replacement" value="//assert"/>
418        </filterreader>
419
420        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
421                      classpath="${build.ant.dir}">
422          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
423          <param name="pattern"     value="$"/>
424          <param name="replacement" value=" ${generic.declarations}"/>
425        </filterreader>
426
427      </filterchain>
428    </copy>
429
430  </target>
431
432
325    <target name="compile-tests"
326            depends="jar">
327  
# Line 445 | Line 337
337  
338        <compilerarg value="${bootclasspath.args}"/>
339        <compilerarg line="${build.args}"/>
340 +      <compilerarg value="-XDignore.symbol.file=true"/>
341  
342        <classpath refid="test.classpath"/>
343  
# Line 462 | Line 355
355  
356        <compilerarg value="${bootclasspath.args}"/>
357        <compilerarg line="${build.args}"/>
358 +      <compilerarg value="-XDignore.symbol.file=true"/>
359  
360        <classpath refid="test.classpath"/>
361  
# Line 478 | Line 372
372  
373        <compilerarg value="${bootclasspath.args}"/>
374        <compilerarg line="${build.args}"/>
375 +      <compilerarg value="-XDignore.symbol.file=true"/>
376  
377        <classpath refid="test.classpath"/>
378  
# Line 550 | Line 445
445        <fileset dir="${build.reports.dir}">
446          <include name="TEST-*.xml"/>
447        </fileset>
448 <      <report styledir="${stylesheet.dir}"
554 <                format="${junit.report.format}"
555 <                 todir="${build.reports.dir}"
448 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
449        />
450      </junitreport>
451  
# Line 602 | Line 495
495    </target>
496  
497  
605
606  <!-- Anthill targets -->
607
608  <target name="anthill-build">
609
610    <!-- Override this in user.properties -->
611    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
612
613    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
614      <arg value="-Xmx256000000"/>
615      <!-- classpath of new JVM -->
616      <arg value="-classpath"/> <arg path="${java.class.path}"/>
617      <!-- location of Ant home directory -->
618      <arg value="-Dant.home=${ant.home}"/>
619      <!-- the Ant main class -->
620      <arg value="org.apache.tools.ant.Main"/>
621      <!-- The build file -->
622      <arg value="-buildfile"/>  <arg value="build.xml"/>
623      <!-- the target to build on the new Ant instance -->
624      <arg value="-DJAVA_HOME=${tiger.home}"/>
625      <arg value="do-anthill-build"/>
626    </exec>
627  </target>
628
629  <target name="do-anthill-build"
630          depends="jar, test, docs, dist-docs"/>
631
632  <target name="anthill-publish">
633
634    <copy todir="${deployDir}/docs/private">
635      <fileset dir="${build.javadocs.dir}"/>
636    </copy>
637
638    <copy todir="${deployDir}/docs/public">
639      <fileset dir="${dist.javadocs.dir}"/>
640    </copy>
641
642    <copy tofile="${deployDir}/index.html"
643          file="${basedir}/etc/anthill-index.html"/>
644
645    <copy todir="${deployDir}/notes">
646      <fileset dir="${basedir}/etc/notes"/>
647    </copy>
648
649  </target>
650
651
652
498    <!-- Various demos and test programs -->
499  
500  
656  <target name="sample" depends="init, configure-compiler"
657          description="Standalone demo program">
658
659    <mkdir dir="${build.testcases.dir}"/>
660
661    <javac srcdir="${test.src.dir}"
662          destdir="${build.testcases.dir}"
663            debug="${build.debug}"
664       debuglevel="${build.debuglevel}"
665      deprecation="${build.deprecation}"
666           source="${build.sourcelevel}"
667             fork="true">
668
669      <include name="jsr166/test/Sample.java"/>
670
671    </javac>
672
673    <copy todir="${build.testcases.dir}">
674      <fileset dir="${test.src.dir}">
675        <include name="**/*.properties"/>
676      </fileset>
677    </copy>
678
679
680    <java classname="jsr166.test.Sample" fork="true">
681      <classpath refid="test.classpath"/>
682      <!-- <jvmarg value="-ea"/> -->
683      <!-- <jvmarg value="-server"/> -->
684      <!-- <arg value="1000"/> -->
685    </java>
686  </target>
687
688
501    <target name="loops" depends="init, configure-compiler"
502            description="Benchmark from Doug Lea's AQS paper">
503  
# Line 701 | Line 513
513  
514        <compilerarg line="${build.args}"/>
515        <classpath refid="loops.classpath"/>
516 +      <compilerarg value="-XDignore.symbol.file=true"/>
517  
518      </javac>
519  
# Line 711 | Line 524
524    </target>
525  
526  
527 <  <target name="compile-j1" depends="init, configure-compiler, compile">
527 >  <!-- jdk7 -->
528  
716    <mkdir dir="${build.j1.dir}"/>
529  
530 <    <javac srcdir="${j1.src.dir}"
531 <          destdir="${build.j1.dir}"
532 <            debug="${build.debug}"
533 <       debuglevel="${build.debuglevel}"
534 <      deprecation="${build.deprecation}"
535 <           source="${build.sourcelevel}" >
530 >  <target name="jdk7compile"
531 >          depends="configure-compiler"
532 >          description="Compiles src/jdk7 sources">
533 >
534 >    <mkdir dir="${build.jdk7.classes.dir}"/>
535 >
536 >    <javac srcdir="${jdk7src.dir}"
537 >           destdir="${build.jdk7.classes.dir}"
538 >           debug="${build.debug}"
539 >           debuglevel="${build.debuglevel}"
540 >           deprecation="${build.deprecation}"
541 >           source="1.6"
542 >           classpath=""
543 >           bootclasspath="${bootclasspath6}"
544 >           includeAntRuntime="false"
545 >           includeJavaRuntime="false"
546 >           executable="${javac7}"
547 >           fork="true">
548  
549        <include name="**/*.java"/>
726      <exclude name="**/dijkstra/**"/>
727
550        <compilerarg line="${build.args}"/>
551 <      <classpath refid="j1.classpath"/>
551 >      <compilerarg value="-XDignore.symbol.file=true"/>
552 >      <compilerarg value="-Xlint:all"/>
553  
554      </javac>
555  
556 <  </target>
556 >    <mkdir dir="${build.jdk7.lib.dir}"/>
557  
558 +    <jar destfile="${jdk7product.jar}" index="true">
559 +      <fileset dir="${build.jdk7.classes.dir}"/>
560 +    </jar>
561  
562 <  <target name="sw" depends="compile-j1"
737 <          description="Runs the SwingWorker demo">
562 >    <mkdir dir="${build.jdk7.tck.classes.dir}"/>
563  
564 <    <!--
565 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
566 <      <classpath refid="j1.classpath"/>
567 <    </java>
568 <    -->
564 >    <javac srcdir="${tck.src.dir}"
565 >           destdir="${build.jdk7.tck.classes.dir}"
566 >           debug="${build.debug}"
567 >           debuglevel="${build.debuglevel}"
568 >           deprecation="${build.deprecation}"
569 >           source="1.6"
570 >           classpath="${junit.jar}"
571 >           bootclasspath="${jdk7product.jar}:${bootclasspath6}"
572 >           includeAntRuntime="false"
573 >           includeJavaRuntime="false"
574 >           executable="${javac7}"
575 >           fork="true">
576  
577 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
577 >      <include name="**/*.java"/>
578 >      <compilerarg line="${build.args}"/>
579 >      <compilerarg value="-XDignore.symbol.file=true"/>
580 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
581  
582 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
748 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
749 <    </exec>
582 >    </javac>
583  
584    </target>
585  
753  <target name="j1" depends="compile-j1"
754          description="Runs a standalone JavaOne program">
755
756    <java classname="${j1.test}" fork="true">
757      <classpath refid="j1.classpath"/>
758      <jvmarg value="-client"/>
759
760      <!-- TestPseudoRandom args -->
761      <arg value="2"/>
762      <arg value="25"/>
763      <arg value="100000"/>
764
765      <!-- WebCrawler args -->
766      <!--
767      <arg value="jsr166.webcrawler.WebCrawler3"/>
768      <arg value="http://www.priorartisans.com"/>
769      <arg value="25"/>
770      -->
771
772    </java>
586  
587 +  <target name="run-jdk7-tck-tests"
588 +          depends="jdk7compile"
589 +          description="Runs tck tests for jsr166-jdk7 directly">
590 +    <run-tck-tests
591 +      jvm="${java7}"
592 +      tck.classes="${build.jdk7.tck.classes.dir}"
593 +      product.jar="${jdk7product.jar}"/>
594    </target>
595  
596  
597 <  <target name="test-j1" depends="compile-j1"
598 <          description="Runs testcases from the JavaOne source directories">
597 >  <target name="run-jdk7-tck-tests-via-junit-task"
598 >          depends="jdk7compile">
599  
600      <junit printsummary="true"
601 <             showoutput="true"
602 <          errorProperty="junit.failed"
603 <        failureProperty="junit.failed"
604 <                    dir="${build.j1.dir}"
605 <                   fork="true">
606 <
787 <      <!-- <jvmarg value="-server"/> -->
788 <      <classpath refid="j1.classpath"/>
789 <      <formatter type="xml"/>
601 >           showoutput="true"
602 >           errorProperty="junit.failed"
603 >           failureProperty="junit.failed"
604 >           includeantruntime="true"
605 >           jvm="${java7}"
606 >           fork="true">
607  
608 <      <batchtest todir="${build.j1.dir}">
609 <        <fileset dir="${j1.src.dir}">
793 <          <include name="**/*Test.java"/>
794 <        </fileset>
795 <      </batchtest>
796 <
797 <    </junit>
608 >      <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>
609 >      <jvmarg value="-server"/>
610  
611 <    <available property="junit.report.format"
612 <                  value="frames"
613 <              classname="org.apache.xalan.lib.Redirect"/>
614 <    <property name="junit.report.format" value="noframes"/>
611 >      <classpath>
612 >        <pathelement location="${junit.jar}"/>
613 >        <pathelement location="${build.jdk7.tck.classes.dir}"/>
614 >      </classpath>
615  
616 <    <junitreport todir="${build.j1.dir}">
805 <      <fileset dir="${build.j1.dir}">
806 <        <include name="TEST-*.xml"/>
807 <      </fileset>
808 <      <report styledir="${stylesheet.dir}"
809 <                format="${junit.report.format}"
810 <                 todir="${build.j1.dir}"
811 <      />
812 <    </junitreport>
616 >      <formatter type="brief"/>
617  
618 <    <fail message="Test Cases Failed" if="junit.failed"/>
618 >      <test name="JSR166TestCase" haltonfailure="no">
619 >      </test>
620  
621 +    </junit>
622    </target>
623  
624  
625 +  <target name="jdk7docs"
626 +          description="Builds javadocs with custom tags to build folder">
627  
628 <  <!-- C++ and JNI definitions and demos -->
629 <
822 <  <target name="configure-cpp">
823 <
824 <    <!-- Define tasks and types -->
825 <
826 <    <path id="cpptasks.path">
827 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
828 <    </path>
829 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
830 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
831 <
832 <    <!-- Set platform property for JNI includes -->
628 >    <delete dir="${build.jdk7.docs.dir}"/>
629 >    <mkdir dir="${build.jdk7.docs.dir}"/>
630  
631 <    <condition property="platform" value="linux">
632 <      <os name="Linux"/>
633 <    </condition>
634 <    <condition property="platform" value="win32">
635 <      <os family="windows"/>
636 <    </condition>
637 <    <condition property="platform" value="solaris">
638 <      <os name="SunOS"/>
639 <    </condition>
631 >    <javadoc destdir="${build.jdk7.docs.dir}"
632 >             packagenames="none"
633 >             link="${jdkapi7docs.url}"
634 >             overview="${jdk7src.dir}/intro.html"
635 >             sourcepath="${jdk7src.dir}"
636 >             bootclasspath="${bootclasspath6}"
637 >             classpath=""
638 >             source="1.6"
639 >             executable="${javadoc7}"
640 >             additionalparam="-XDignore.symbol.file=true" >
641 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
642 >        <include name="**/*.java"/>
643 >      </fileset>
644 >    </javadoc>
645  
646    </target>
647  
648  
649 <  <target name="cppdemo" depends="configure-cpp">
650 <
651 <    <mkdir dir="${build.dir}"/>
850 <
851 <    <cc multithreaded="true"
852 <                 name="g++"
853 <               objdir="${build.dir}"
854 <              outfile="${build.dir}/CppDemo">
855 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
856 <      <libset libs="stdc++"/>
857 <    </cc>
858 <
859 <    <exec executable="${build.dir}/CppDemo">
860 <      <arg line="count in word frequency of word in command line count"/>
861 <    </exec>
862 <
863 <  </target>
864 <
649 >  <target name="jdk7dist"
650 >          depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
651 >          description="Puts all distributable products in single hierarchy"/>
652  
866  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
653  
868    <mkdir dir="${build.testcases.dir}"/>
654  
655 <    <javac srcdir="${test.src.dir}"
656 <          destdir="${build.testcases.dir}"
872 <            debug="${build.debug}"
873 <       debuglevel="${build.debuglevel}"
874 <      deprecation="${build.deprecation}"
875 <           source="${build.sourcelevel}"
876 <             fork="true">
877 <      <compilerarg value="${bootclasspath.args}"/>
878 <      <compilerarg line="${build.args}"/>
879 <      <classpath refid="test.classpath"/>
880 <      <include name="JniDemo.java"/>
881 <    </javac>
655 >  <target name="jdk7clean"
656 >          description="Removes all build products">
657  
658 <    <javah destdir="${build.testcases.dir}"
884 <      classpathref="test.classpath">
885 <      <class name="JniDemo"/>
886 <    </javah>
887 <
888 <    <cc multithreaded="true"
889 <                 name="g++"
890 <               objdir="${build.dir}"
891 <              outfile="${build.dir}/JniDemo"
892 <              outtype="shared">
893 <
894 <      <compiler>
895 <        <defineset>
896 <          <define name="__int64" value="long long"/>
897 <        </defineset>
898 <        <includepath location="${java.home}/../include"/>
899 <        <includepath location="${java.home}/../include/${platform}"/>
900 <        <compilerarg value="-mno-cygwin"/>
901 <      </compiler>
902 <
903 <      <linker>
904 <        <linkerarg value="--add-stdcall-alias"/>
905 <      </linker>
906 <
907 <      <includepath location="${build.testcases.dir}"/>
908 <
909 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
910 <
911 <      <libset libs="stdc++"/>
912 <
913 <    </cc>
914 <
915 <    <!-- Necessary if windows, harmless if not -->
916 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
917 <
918 <    <java classname="JniDemo" fork="true">
919 <      <!-- Watch out: path separator hardwired to semicolon here! -->
920 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
921 <      <classpath refid="test.classpath"/>
922 <      <arg line="count in word frequency of word in command line count"/>
923 <    </java>
658 >    <delete dir="${build.jdk7.dir}"/>
659  
660    </target>
661  
662  
663  
664 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
665 <
931 <
932 <
933 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
934 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
935 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
936 <  <property name="pretiger.sourcelevel" value="1.4"/>
937 <
938 <  <target name="defang"
939 <       depends="init"
940 <   description="Generates pre-Tiger compatible source">
941 <
942 <    <delete dir="${pretiger.src.dir}"/>
943 <    <mkdir dir="${pretiger.src.dir}"/>
944 <
945 <    <exec executable="perl">
946 <      <arg file="etc/defang.pl"/>
947 <      <!-- <arg value="-v"/> -->
948 <      <arg value="-s"/> <arg file="${src.dir}"/>
949 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
950 <    </exec>
664 >  <target name="jdk7dist-clean"
665 >          description="Removes all build and distribution products">
666  
667    </target>
668  
669 <  <target name="compile-pretiger"
670 <          depends="init, configure-compiler, defang"
956 <          description="Compiles pre-Tiger sources to build folder">
957 <
958 <    <mkdir dir="${build.pretiger.dir}"/>
959 <
960 <    <javac srcdir="${pretiger.src.dir}"
961 <          destdir="${build.pretiger.dir}"
962 <            debug="${build.debug}"
963 <       debuglevel="${build.debuglevel}"
964 <      deprecation="${build.deprecation}"
965 <           source="${pretiger.sourcelevel}"
966 <             fork="true">
669 >  <target name="jdk7dist-docs"
670 >          description="Builds javadocs without custom tags to dist folder">
671  
672 <      <compilerarg line="${build.args}"/>
673 <      <exclude name="**/Thread.java"/>
672 >    <delete dir="${dist.jdk7.docs.dir}"/>
673 >    <mkdir dir="${dist.jdk7.docs.dir}"/>
674  
675 <    </javac>
675 >    <javadoc destdir="${dist.jdk7.docs.dir}"
676 >             packagenames="none"
677 >             link="${jdkapi7docs.url}"
678 >             overview="${jdk7src.dir}/intro.html"
679 >             sourcepath="${jdk7src.dir}"
680 >             classpath=""
681 >             executable="${javadoc7}"
682 >             bootclasspath="${bootclasspath6}"
683 >             source="1.6">
684 >      <arg value="-XDignore.symbol.file=true"/>
685 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
686 >        <include name="**/*.java"/>
687 >      </fileset>
688 >    </javadoc>
689  
690    </target>
691  
692 <  <target name="pretiger" depends="compile-pretiger">
693 <
977 <    <mkdir dir="${build.lib.dir}"/>
692 >  <target name="jdk7dist-jar"
693 >          depends="jdk7clean, jdk7compile">
694  
695 <    <jar destfile="${pretiger.jar}">
980 <      <fileset dir="${build.pretiger.dir}">
981 <      </fileset>
982 <    </jar>
695 >    <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
696  
697    </target>
698  
# Line 1002 | Line 715
715  
716        <include name="**/*.java"/>
717        <compilerarg line="${build.args}"/>
718 +      <compilerarg value="-XDignore.symbol.file=true"/>
719  
720      </javac>
721  
# Line 1030 | Line 744
744      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
745  
746      <javadoc destdir="${build.jsr166xjavadocs.dir}"
747 <             link="http://java.sun.com/javase/6/docs/api/"
748 <
749 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
750 <
751 <    >
1038 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039 <      <include name="jsr166x"/>
1040 <      </packageset>
1041 <
1042 <
1043 <    </javadoc>
747 >             packagenames="jsr166x"
748 >             link="${jdkapidocs.url}"
749 >             source="${build.sourcelevel}"
750 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
751 >             additionalparam="-XDignore.symbol.file=true" />
752  
753    </target>
754  
# Line 1075 | Line 783
783      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
784  
785      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
786 <                link="http://java.sun.com/javase/6/docs/api/"
787 <              source="${build.sourcelevel}">
788 <
789 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
790 <      <include name="jsr166x"/>
1083 <      </packageset>
1084 <
1085 <    </javadoc>
786 >             packagenames="jsr166x"
787 >             link="${jdkapidocs.url}"
788 >             source="${build.sourcelevel}"
789 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
790 >             additionalparam="-XDignore.symbol.file=true" />
791  
792    </target>
793  
# Line 1112 | Line 817
817  
818        <include name="**/*.java"/>
819        <compilerarg line="${build.args}"/>
820 +      <compilerarg value="-XDignore.symbol.file=true"/>
821        <compilerarg value="${bootclasspath.args}"/>
822  
823   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 1128 | Line 834
834  
835      <mkdir dir="${build.jsr166ylib.dir}"/>
836  
837 <    <jar destfile="${jsr166yproduct.jar}">
837 >    <jar destfile="${jsr166yproduct.jar}" index="true">
838        <fileset dir="${build.jsr166y.dir}"/>
839      </jar>
840  
# Line 1143 | Line 849
849      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
850  
851      <javadoc destdir="${build.jsr166yjavadocs.dir}"
852 <                link="http://java.sun.com/javase/6/docs/api/"
853 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
854 <
855 <    >
856 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
1151 <      <include name="jsr166y"/>
1152 <      </packageset>
1153 <
1154 <
1155 <    </javadoc>
852 >             packagenames="jsr166y"
853 >             link="${jdkapidocs.url}"
854 >             source="${build.sourcelevel}"
855 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
856 >             additionalparam="-XDignore.symbol.file=true" />
857  
858    </target>
859  
# Line 1185 | Line 886
886      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
887  
888      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
889 <                link="http://java.sun.com/javase/6/docs/api/"
890 <              source="${build.sourcelevel}">
891 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
892 <      <include name="jsr166y/*.java"/>
893 <      <include name="jsr166y/forkjoin/*.java"/>
1193 <            </fileset>
1194 <    </javadoc>
889 >             packagenames="jsr166y"
890 >             link="${jdkapidocs.url}"
891 >             source="${build.sourcelevel}"
892 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
893 >             additionalparam="-XDignore.symbol.file=true" />
894  
895    </target>
896  
# Line 1202 | Line 901
901  
902    </target>
903  
904 +
905 +  <!-- extra166y -->
906 +
907 +
908 +  <target name="extra166ycompile"
909 +          depends="init, configure-compiler, jsr166ycompile"
910 +          description="Compiles extra166y sources">
911 +
912 +    <mkdir dir="${build.extra166y.dir}"/>
913 +
914 +    <javac srcdir="${extra166ysrc.dir}"
915 +          destdir="${build.extra166y.dir}"
916 +            debug="${build.debug}"
917 +            classpath="${jsr166yproduct.jar}"
918 +       debuglevel="${build.debuglevel}"
919 +      deprecation="${build.deprecation}"
920 +           source="${build.sourcelevel}"
921 +             fork="true">
922 +
923 +      <include name="**/*.java"/>
924 +      <compilerarg line="${build.args}"/>
925 +      <compilerarg value="-XDignore.symbol.file=true"/>
926 +      <compilerarg value="${bootclasspath.args}"/>
927 +
928 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
929 +
930 +    </javac>
931 +
932 +  </target>
933 +
934 +
935 +
936 +  <target name="extra166yjar"
937 +          depends="extra166ycompile"
938 +          description="Builds library jar from compiled sources">
939 +
940 +    <mkdir dir="${build.extra166ylib.dir}"/>
941 +
942 +    <jar destfile="${extra166yproduct.jar}" index="true">
943 +      <fileset dir="${build.extra166y.dir}"/>
944 +    </jar>
945 +
946 +  </target>
947 +
948 +
949 +
950 +  <target name="extra166ydocs"
951 +          description="Builds javadocs with custom tags to build folder">
952 +
953 +    <delete dir="${build.extra166yjavadocs.dir}"/>
954 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
955 +
956 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
957 +             packagenames="extra166y"
958 +             link="${jdkapidocs.url}"
959 +             source="${build.sourcelevel}"
960 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
961 +             additionalparam="-XDignore.symbol.file=true" />
962 +
963 +  </target>
964 +
965 +
966 +  <target name="extra166ydist"
967 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
968 +          description="Puts all distributable products in single hierarchy"/>
969 +
970 +
971 +
972 +  <target name="extra166yclean"
973 +          description="Removes all build products">
974 +
975 +    <delete dir="${build.extra166y.dir}"/>
976 +    <delete dir="${build.extra166ylib.dir}"/>
977 +
978 +  </target>
979 +
980 +
981 +
982 +  <target name="extra166ydist-clean"
983 +          description="Removes all build and distribution products">
984 +
985 +  </target>
986 +
987 +  <target name="extra166ydist-docs"
988 +          description="Builds javadocs without custom tags to dist folder">
989 +
990 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
991 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
992 +
993 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
994 +             packagenames="extra166y"
995 +             link="${jdkapidocs.url}"
996 +             source="${build.sourcelevel}"
997 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
998 +             additionalparam="-XDignore.symbol.file=true" />
999 +
1000 +  </target>
1001 +
1002 +  <target name="extra166ydist-jar"
1003 +          depends="extra166yclean, extra166yjar">
1004 +
1005 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1006 +
1007 +  </target>
1008 +
1009 +  <!-- jsr166e -->
1010 +
1011 +  <target name="jsr166ecompile"
1012 +          depends="configure-compiler"
1013 +          description="Compiles jsr166e sources">
1014 +
1015 +    <mkdir dir="${build.jsr166e.dir}"/>
1016 +
1017 +    <javac srcdir="${topsrc.dir}"
1018 +           destdir="${build.jsr166e.dir}"
1019 +           debug="${build.debug}"
1020 +           debuglevel="${build.debuglevel}"
1021 +           deprecation="${build.deprecation}"
1022 +           source="1.7"
1023 +           classpath=""
1024 +           includeAntRuntime="false"
1025 +           includeJavaRuntime="false"
1026 +           executable="${javac7}"
1027 +           fork="true">
1028 +
1029 +      <include name="jsr166e/**/*.java"/>
1030 +      <compilerarg line="${build.args}"/>
1031 +      <compilerarg value="-XDignore.symbol.file=true"/>
1032 +      <compilerarg value="-Xlint:all"/>
1033 +
1034 +    </javac>
1035 +
1036 +  </target>
1037 +
1038 +
1039 +
1040 +  <target name="jsr166ejar"
1041 +          depends="jsr166ecompile"
1042 +          description="Builds library jar from compiled sources">
1043 +
1044 +    <mkdir dir="${build.jsr166elib.dir}"/>
1045 +
1046 +    <jar destfile="${jsr166eproduct.jar}" index="true">
1047 +      <fileset dir="${build.jsr166e.dir}"/>
1048 +    </jar>
1049 +
1050 +  </target>
1051 +
1052 +
1053 +
1054 +  <target name="jsr166edocs"
1055 +          description="Builds javadocs with custom tags to build folder">
1056 +
1057 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
1058 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1059 +
1060 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
1061 +             packagenames="jsr166e,jsr166e.extra"
1062 +             link="${jdkapi7docs.url}"
1063 +             source="1.7"
1064 +             sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
1065 +             executable="${javadoc7}"
1066 +             additionalparam="-XDignore.symbol.file=true" >
1067 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1068 +        <include name="jsr166e/**/*.java"/>
1069 +      </fileset>
1070 +    </javadoc>
1071 +
1072 +  </target>
1073 +
1074 +
1075 +  <target name="jsr166edist"
1076 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1077 +          description="Puts all distributable products in single hierarchy"/>
1078 +
1079 +
1080 +
1081 +  <target name="jsr166eclean"
1082 +          description="Removes all build products">
1083 +
1084 +    <delete dir="${build.jsr166e.dir}"/>
1085 +    <delete dir="${build.jsr166elib.dir}"/>
1086 +
1087 +  </target>
1088 +
1089 +
1090 +
1091 +  <target name="jsr166edist-clean"
1092 +          description="Removes all build and distribution products">
1093 +
1094 +  </target>
1095 +
1096 +  <target name="jsr166edist-docs"
1097 +          description="Builds javadocs without custom tags to dist folder">
1098 +
1099 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1100 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1101 +
1102 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1103 +             packagenames="jsr166e,jsr166e.extra"
1104 +             link="${jdkapidocs.url}"
1105 +             source="1.7"
1106 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1107 +             additionalparam="-XDignore.symbol.file=true" />
1108 +
1109 +  </target>
1110 +
1111 +  <target name="jsr166edist-jar"
1112 +          depends="jsr166eclean, jsr166ejar">
1113 +
1114 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1115 +
1116 +  </target>
1117 +
1118   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines