ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.73 by dl, Tue Nov 8 00:13:41 2005 UTC vs.
Revision 1.94 by jsr166, Mon Jan 14 18:50:46 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.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"/>
50  <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"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <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="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
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"/>
69  <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 82 | Line 132
132      <pathelement location="${build.loops.dir}"/>
133    </path>
134  
85  <!-- J1 classpath -->
86  <path id="j1.classpath">
87    <pathelement location="${build.classes.dir}"/>
88    <pathelement location="${build.j1.dir}"/>
89    <pathelement location="${junit.jar}"/>
90
91    <!-- Include dl.u.c for BoundedBuffer comparison -->
92    <pathelement location="${concurrent.jar}"/>
93  </path>
94
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 111 | 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}"/>
# Line 149 | 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.5.0/docs/api"
154 <            overview="${src.dir}/intro.html"
155 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
156 <    >          
157 <
158 <      <packageset dir="${src.dir}"/>
159 <
160 <    </javadoc>
161 <
162 <  </target>
197 >    <!-- the packagenames="none" hack below prevents scanning the -->
198 >    <!-- sourcepath for packages -->
199  
200 <
201 <
202 <  <target name="doccheck"
203 <          depends="filter-doccheck"
204 <          description="Reports on javadoc style errors">
205 <
206 <    <delete dir="${build.doccheck.dir}"/>
207 <    <mkdir dir="${build.doccheck.dir}"/>
208 <
173 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
174 <         docletpath="${lib.dir}/doccheck.jar"
175 <            destdir="${build.doccheck.dir}">
176 <      <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  
179    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
180
181  </target>
182
183
184
185  <target name="checkstyle"
186          depends="filter-src"
187          description="Reports on style errors in Java source (verbose, mostly chaff)">
188
189    <taskdef resource="checkstyletask.properties"
190            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
191
192    <mkdir dir="${build.checkstyle.dir}"/>
193
194    <checkstyle config="etc/checkstyle/sun_checks.xml"
195       failOnViolation="false">
196      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
197      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
198    </checkstyle>
199
200    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
201          out="${build.checkstyle.dir}/checkstyle-report.html"
202        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
203
211    </target>
212  
213  
# Line 210 | Line 217
217            description="Puts all distributable products in single hierarchy"/>
218  
219  
213
220    <target name="release"
221            depends="dist"
222            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 257 | 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.5.0/docs/api"
262 <            overview="${src.dir}/intro.html"
266 >    <!-- the packagenames="none" hack below prevents scanning the -->
267 >    <!-- sourcepath for packages -->
268  
269 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
270 <     >
271 <      <packageset dir="${src.dir}" defaultexcludes="yes">
272 <      <include name="java/util/concurrent"/>
273 <      <include name="java/util/concurrent/atomic"/>
274 <      <include name="java/util/concurrent/locks"/>
275 <      </packageset>
276 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
272 <      <include name="main/java/util/*.java"/>
273 <      <include name="main/java/util/*.html"/>
274 < <!--      <include name="jsr166x/*.java"/> -->
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  
# Line 300 | Line 302
302    </target>
303  
304  
303  <target name="compile-ant-filter"
304          depends="init">
305
306    <mkdir dir="${build.ant.dir}"/>
307
308    <javac srcdir="${ant.src.dir}"
309          destdir="${build.ant.dir}"
310           source="1.4"/>
311
312  </target>
313
314
315  <target name="filter-src"
316          depends="compile-ant-filter">
317
318    <mkdir dir="${build.filter.src.dir}"/>
319
320    <copy todir="${build.filter.src.dir}">
321      <fileset dir="${src.dir}">
322        <include name="**/*.html"/>
323      </fileset>
324    </copy>
325
326    <copy todir="${build.filter.src.dir}">
327      <fileset dir="${src.dir}">
328        <exclude name="**/*.html"/>
329        <!-- Files excluded from dist-docs -->
330        <exclude name="java/util/Random.*"/>
331        <exclude name="sun/misc/Unsafe.*"/>
332      </fileset>
333      <!--
334      <filterchain>
335      -->
336
337        <!--
338         # This filter gets rid of angle-bracketed type parameters
339         # so that javadoc can run on the result. The following
340         # heuristic seems to work:
341         #
342         # For all lines not starting with space(s)-asterisk-space(s),
343         #   replace <something> with a space, where there may be more
344         #   than one right angle bracket at the end, and "something"
345         #   must not contain parens or pipes. (This may need some
346         #   tweaking.)
347         -->
348
349        <!--
350        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
351                      classpath="${build.ant.dir}">
352          <param name="notmatching" value="^\s+\*\s.*$"/>
353          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
354          <param name="replacement" value=" "/>
355        </filterreader>
356        -->
357
358      <!--
359      </filterchain>
360      -->
361    </copy>
362
363  </target>
364
365
366  <target name="filter-doccheck"
367          depends="filter-src">
368
369    <mkdir dir="${build.dc-filter.dir}"/>
370
371    <copy todir="${build.dc-filter.dir}">
372      <fileset dir="${build.filter.src.dir}">
373        <include name="**/*.html"/>
374      </fileset>
375    </copy>
376
377    <property name="generic.declarations"
378             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
379    />
380
381    <copy todir="${build.dc-filter.dir}">
382      <fileset dir="${build.filter.src.dir}">
383        <exclude name="**/*.html"/>
384      </fileset>
385      <filterchain>
386        <!--
387         # These two filters try to make the source look like
388         # something that doccheck can process. The first removes
389         # -source 1.4 assertions and the second adds in a bunch
390         # of single letter public nested marker interfaces so that
391         # the generic type parameters are recognized.
392         -->
393
394        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
395                      classpath="${build.ant.dir}">
396          <param name="matching"    value="^\s*assert[\s ].*$"/>
397          <param name="pattern"     value="assert"/>
398          <param name="replacement" value="//assert"/>
399        </filterreader>
400
401        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
402                      classpath="${build.ant.dir}">
403          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
404          <param name="pattern"     value="$"/>
405          <param name="replacement" value=" ${generic.declarations}"/>
406        </filterreader>
407
408      </filterchain>
409    </copy>
410
411  </target>
412
413
305    <target name="compile-tests"
306            depends="jar">
307  
# Line 426 | 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 443 | 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 459 | 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 531 | Line 425
425        <fileset dir="${build.reports.dir}">
426          <include name="TEST-*.xml"/>
427        </fileset>
428 <      <report styledir="${stylesheet.dir}"
535 <                format="${junit.report.format}"
536 <                 todir="${build.reports.dir}"
428 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
429        />
430      </junitreport>
431  
# Line 583 | Line 475
475    </target>
476  
477  
586
587  <!-- Anthill targets -->
588
589  <target name="anthill-build">
590
591    <!-- Override this in user.properties -->
592    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
593
594    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
595      <arg value="-Xmx256000000"/>
596      <!-- classpath of new JVM -->
597      <arg value="-classpath"/> <arg path="${java.class.path}"/>
598      <!-- location of Ant home directory -->
599      <arg value="-Dant.home=${ant.home}"/>
600      <!-- the Ant main class -->
601      <arg value="org.apache.tools.ant.Main"/>
602      <!-- The build file -->
603      <arg value="-buildfile"/>  <arg value="build.xml"/>
604      <!-- the target to build on the new Ant instance -->
605      <arg value="-DJAVA_HOME=${tiger.home}"/>
606      <arg value="do-anthill-build"/>
607    </exec>
608  </target>
609
610  <target name="do-anthill-build"
611          depends="jar, test, docs, dist-docs"/>
612
613  <target name="anthill-publish">
614
615    <copy todir="${deployDir}/docs/private">
616      <fileset dir="${build.javadocs.dir}"/>
617    </copy>
618
619    <copy todir="${deployDir}/docs/public">
620      <fileset dir="${dist.javadocs.dir}"/>
621    </copy>
622
623    <copy tofile="${deployDir}/index.html"
624          file="${basedir}/etc/anthill-index.html"/>
625
626    <copy todir="${deployDir}/notes">
627      <fileset dir="${basedir}/etc/notes"/>
628    </copy>
629
630  </target>
631
632
633
478    <!-- Various demos and test programs -->
479  
480  
637  <target name="sample" depends="init, configure-compiler"
638          description="Standalone demo program">
639
640    <mkdir dir="${build.testcases.dir}"/>
641
642    <javac srcdir="${test.src.dir}"
643          destdir="${build.testcases.dir}"
644            debug="${build.debug}"
645       debuglevel="${build.debuglevel}"
646      deprecation="${build.deprecation}"
647           source="${build.sourcelevel}"
648             fork="true">
649
650      <include name="jsr166/test/Sample.java"/>
651
652    </javac>
653
654    <copy todir="${build.testcases.dir}">
655      <fileset dir="${test.src.dir}">
656        <include name="**/*.properties"/>
657      </fileset>
658    </copy>
659
660
661    <java classname="jsr166.test.Sample" fork="true">
662      <classpath refid="test.classpath"/>
663      <!-- <jvmarg value="-ea"/> -->
664      <!-- <jvmarg value="-server"/> -->
665      <!-- <arg value="1000"/> -->
666    </java>
667  </target>
668
669
481    <target name="loops" depends="init, configure-compiler"
482            description="Benchmark from Doug Lea's AQS paper">
483  
# Line 682 | Line 493
493  
494        <compilerarg line="${build.args}"/>
495        <classpath refid="loops.classpath"/>
496 +      <compilerarg value="-XDignore.symbol.file=true"/>
497  
498      </javac>
499  
# Line 692 | Line 504
504    </target>
505  
506  
507 <  <target name="compile-j1" depends="init, configure-compiler, compile">
507 >  <!-- jdk7 -->
508  
697    <mkdir dir="${build.j1.dir}"/>
509  
510 <    <javac srcdir="${j1.src.dir}"
511 <          destdir="${build.j1.dir}"
512 <            debug="${build.debug}"
513 <       debuglevel="${build.debuglevel}"
514 <      deprecation="${build.deprecation}"
515 <           source="${build.sourcelevel}" >
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="**/*.java"/>
707      <exclude name="**/dijkstra/**"/>
708
530        <compilerarg line="${build.args}"/>
531 <      <classpath refid="j1.classpath"/>
531 >      <compilerarg value="-XDignore.symbol.file=true"/>
532 >      <compilerarg value="-Xlint:all"/>
533  
534      </javac>
535  
536    </target>
537  
538  
717  <target name="sw" depends="compile-j1"
718          description="Runs the SwingWorker demo">
539  
540 <    <!--
541 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
542 <      <classpath refid="j1.classpath"/>
723 <    </java>
724 <    -->
540 >  <target name="jdk7jar"
541 >          depends="jdk7compile"
542 >          description="Builds library jar from compiled sources">
543  
544 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
544 >    <mkdir dir="${build.jdk7.lib.dir}"/>
545  
546 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
547 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
548 <    </exec>
546 >    <jar destfile="${jdk7product.jar}" index="true">
547 >      <fileset dir="${build.jdk7.classes.dir}"/>
548 >    </jar>
549  
550    </target>
551  
734  <target name="j1" depends="compile-j1"
735          description="Runs a standalone JavaOne program">
552  
737    <java classname="${j1.test}" fork="true">
738      <classpath refid="j1.classpath"/>
739      <jvmarg value="-client"/>
553  
554 <      <!-- TestPseudoRandom args -->
555 <      <arg value="2"/>
743 <      <arg value="25"/>
744 <      <arg value="100000"/>
554 >  <target name="jdk7docs"
555 >          description="Builds javadocs with custom tags to build folder">
556  
557 <      <!-- WebCrawler args -->
558 <      <!--
748 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
749 <      <arg value="http://www.priorartisans.com"/>
750 <      <arg value="25"/>
751 <      -->
557 >    <delete dir="${build.jdk7.docs.dir}"/>
558 >    <mkdir dir="${build.jdk7.docs.dir}"/>
559  
560 <    </java>
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 >    </javadoc>
574  
575    </target>
576  
577  
578 <  <target name="test-j1" depends="compile-j1"
579 <          description="Runs testcases from the JavaOne source directories">
578 >  <target name="jdk7dist"
579 >          depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
580 >          description="Puts all distributable products in single hierarchy"/>
581  
761    <junit printsummary="true"
762             showoutput="true"
763          errorProperty="junit.failed"
764        failureProperty="junit.failed"
765                    dir="${build.j1.dir}"
766                   fork="true">
582  
768      <!-- <jvmarg value="-server"/> -->
769      <classpath refid="j1.classpath"/>
770      <formatter type="xml"/>
583  
584 <      <batchtest todir="${build.j1.dir}">
585 <        <fileset dir="${j1.src.dir}">
774 <          <include name="**/*Test.java"/>
775 <        </fileset>
776 <      </batchtest>
584 >  <target name="jdk7clean"
585 >          description="Removes all build products">
586  
587 <    </junit>
587 >    <delete dir="${build.jdk7.dir}"/>
588  
589 <    <available property="junit.report.format"
781 <                  value="frames"
782 <              classname="org.apache.xalan.lib.Redirect"/>
783 <    <property name="junit.report.format" value="noframes"/>
589 >  </target>
590  
591 <    <junitreport todir="${build.j1.dir}">
592 <      <fileset dir="${build.j1.dir}">
593 <        <include name="TEST-*.xml"/>
591 >
592 >
593 >  <target name="jdk7dist-clean"
594 >          description="Removes all build and distribution products">
595 >
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 <      <report styledir="${stylesheet.dir}"
790 <                format="${junit.report.format}"
791 <                 todir="${build.j1.dir}"
792 <      />
793 <    </junitreport>
617 >    </javadoc>
618  
619 <    <fail message="Test Cases Failed" if="junit.failed"/>
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 <  <!-- C++ and JNI definitions and demos -->
631 >  <target name="jsr166xcompile"
632 >          depends="init, configure-compiler"
633 >          description="Compiles jsr166x sources">
634  
635 <  <target name="configure-cpp">
635 >    <mkdir dir="${build.jsr166x.dir}"/>
636  
637 <    <!-- Define tasks and types -->
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 <    <path id="cpptasks.path">
646 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
647 <    </path>
648 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
649 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
645 >      <include name="**/*.java"/>
646 >      <compilerarg line="${build.args}"/>
647 >      <compilerarg value="-XDignore.symbol.file=true"/>
648 >
649 >    </javac>
650 >
651 >  </target>
652  
813    <!-- Set platform property for JNI includes -->
653  
654 <    <condition property="platform" value="linux">
655 <      <os name="Linux"/>
656 <    </condition>
657 <    <condition property="platform" value="win32">
658 <      <os family="windows"/>
659 <    </condition>
660 <    <condition property="platform" value="solaris">
661 <      <os name="SunOS"/>
662 <    </condition>
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  
828  <target name="cppdemo" depends="configure-cpp">
668  
669 <    <mkdir dir="${build.dir}"/>
669 >  <target name="jsr166xdocs"
670 >          description="Builds javadocs with custom tags to build folder">
671  
672 <    <cc multithreaded="true"
673 <                 name="g++"
834 <               objdir="${build.dir}"
835 <              outfile="${build.dir}/CppDemo">
836 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
837 <      <libset libs="stdc++"/>
838 <    </cc>
672 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
673 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
674  
675 <    <exec executable="${build.dir}/CppDemo">
676 <      <arg line="count in word frequency of word in command line count"/>
677 <    </exec>
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    </target>
683  
684  
685 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
685 >  <target name="jsr166xdist"
686 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
687 >          description="Puts all distributable products in single hierarchy"/>
688  
849    <mkdir dir="${build.testcases.dir}"/>
689  
851    <javac srcdir="${test.src.dir}"
852          destdir="${build.testcases.dir}"
853            debug="${build.debug}"
854       debuglevel="${build.debuglevel}"
855      deprecation="${build.deprecation}"
856           source="${build.sourcelevel}"
857             fork="true">
858      <compilerarg value="${bootclasspath.args}"/>
859      <compilerarg line="${build.args}"/>
860      <classpath refid="test.classpath"/>
861      <include name="JniDemo.java"/>
862    </javac>
690  
691 <    <javah destdir="${build.testcases.dir}"
692 <      classpathref="test.classpath">
693 <      <class name="JniDemo"/>
694 <    </javah>
695 <
869 <    <cc multithreaded="true"
870 <                 name="g++"
871 <               objdir="${build.dir}"
872 <              outfile="${build.dir}/JniDemo"
873 <              outtype="shared">
874 <
875 <      <compiler>
876 <        <defineset>
877 <          <define name="__int64" value="long long"/>
878 <        </defineset>
879 <        <includepath location="${java.home}/../include"/>
880 <        <includepath location="${java.home}/../include/${platform}"/>
881 <        <compilerarg value="-mno-cygwin"/>
882 <      </compiler>
883 <
884 <      <linker>
885 <        <linkerarg value="--add-stdcall-alias"/>
886 <      </linker>
887 <
888 <      <includepath location="${build.testcases.dir}"/>
889 <
890 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
891 <
892 <      <libset libs="stdc++"/>
893 <
894 <    </cc>
895 <
896 <    <!-- Necessary if windows, harmless if not -->
897 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
898 <
899 <    <java classname="JniDemo" fork="true">
900 <      <!-- Watch out: path separator hardwired to semicolon here! -->
901 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
902 <      <classpath refid="test.classpath"/>
903 <      <arg line="count in word frequency of word in command line count"/>
904 <    </java>
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  
700  
701 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
701 >  <target name="jsr166xdist-clean"
702 >          description="Removes all build and distribution products">
703  
704 +  </target>
705  
706  
914  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
915  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
916  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
917  <property name="pretiger.sourcelevel" value="1.4"/>
707  
708 <  <target name="defang"
709 <       depends="init"
921 <   description="Generates pre-Tiger compatible source">
708 >  <target name="jsr166xdist-docs"
709 >          description="Builds javadocs without custom tags to dist folder">
710  
711 <    <delete dir="${pretiger.src.dir}"/>
712 <    <mkdir dir="${pretiger.src.dir}"/>
711 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
712 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
713  
714 <    <exec executable="perl">
715 <      <arg file="etc/defang.pl"/>
716 <      <!-- <arg value="-v"/> -->
717 <      <arg value="-s"/> <arg file="${src.dir}"/>
718 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
719 <    </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="compile-pretiger"
724 <          depends="init, configure-compiler, defang"
725 <          description="Compiles pre-Tiger sources to build folder">
723 >  <target name="jsr166xdist-jar"
724 >          depends="jsr166xclean, jsr166xjar">
725 >
726 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
727 >
728 >  </target>
729  
730 <    <mkdir dir="${build.pretiger.dir}"/>
730 >  <!-- jsr166y -->
731  
732 <    <javac srcdir="${pretiger.src.dir}"
733 <          destdir="${build.pretiger.dir}"
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="${pretiger.sourcelevel}"
744 >           source="${build.sourcelevel}"
745               fork="true">
746  
747 +      <include name="**/*.java"/>
748        <compilerarg line="${build.args}"/>
749 <      <exclude name="**/Thread.java"/>
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  
956  <target name="pretiger" depends="compile-pretiger">
758  
958    <mkdir dir="${build.lib.dir}"/>
759  
760 <    <jar destfile="${pretiger.jar}">
761 <      <fileset dir="${build.pretiger.dir}">
762 <      </fileset>
760 >  <target name="jsr166yjar"
761 >          depends="jsr166ycompile"
762 >          description="Builds library jar from compiled sources">
763 >
764 >    <mkdir dir="${build.jsr166ylib.dir}"/>
765 >
766 >    <jar destfile="${jsr166yproduct.jar}" index="true">
767 >      <fileset dir="${build.jsr166y.dir}"/>
768      </jar>
769  
770    </target>
771  
967  <!-- jsr166x -->
772  
773  
774 <  <target name="jsr166xcompile"
775 <          depends="init, configure-compiler"
972 <          description="Compiles jsr166x sources">
774 >  <target name="jsr166ydocs"
775 >          description="Builds javadocs with custom tags to build folder">
776  
777 <    <mkdir dir="${build.jsr166x.dir}"/>
777 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
778 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
779  
780 <    <javac srcdir="${jsr166xsrc.dir}"
781 <          destdir="${build.jsr166x.dir}"
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 >  <target name="jsr166yclean"
797 >          description="Removes all build products">
798 >
799 >    <delete dir="${build.jsr166y.dir}"/>
800 >    <delete dir="${build.jsr166ylib.dir}"/>
801 >
802 >  </target>
803 >
804 >
805 >
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 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
815 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
816 >
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 >  <target name="jsr166ydist-jar"
827 >          depends="jsr166yclean, jsr166yjar">
828 >
829 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
830 >
831 >  </target>
832 >
833 >
834 >  <!-- extra166y -->
835 >
836 >
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}"
# Line 983 | Line 851
851  
852        <include name="**/*.java"/>
853        <compilerarg line="${build.args}"/>
854 +      <compilerarg value="-XDignore.symbol.file=true"/>
855 +      <compilerarg value="${bootclasspath.args}"/>
856 +
857 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
858  
859      </javac>
860  
# Line 990 | Line 862
862  
863  
864  
865 <  <target name="jsr166xjar"
866 <          depends="jsr166xcompile"
865 >  <target name="extra166yjar"
866 >          depends="extra166ycompile"
867            description="Builds library jar from compiled sources">
868  
869 <    <mkdir dir="${build.jsr166xlib.dir}"/>
869 >    <mkdir dir="${build.extra166ylib.dir}"/>
870  
871 <    <jar destfile="${jsr166xproduct.jar}">
872 <      <fileset dir="${build.jsr166x.dir}"/>
871 >    <jar destfile="${extra166yproduct.jar}" index="true">
872 >      <fileset dir="${build.extra166y.dir}"/>
873      </jar>
874  
875    </target>
876  
877  
878  
879 <  <target name="jsr166xdocs"
879 >  <target name="extra166ydocs"
880            description="Builds javadocs with custom tags to build folder">
881  
882 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
883 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1012 <
1013 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1014 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1015 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1016 <
1017 <    >
1018 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1019 <      <include name="jsr166x"/>
1020 <      </packageset>
882 >    <delete dir="${build.extra166yjavadocs.dir}"/>
883 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
884  
885 <
886 <    </javadoc>
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="jsr166xdist"
896 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
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="jsr166xclean"
901 >  <target name="extra166yclean"
902            description="Removes all build products">
903  
904 <    <delete dir="${build.jsr166x.dir}"/>
905 <    <delete dir="${build.jsr166xlib.dir}"/>
904 >    <delete dir="${build.extra166y.dir}"/>
905 >    <delete dir="${build.extra166ylib.dir}"/>
906  
907    </target>
908  
909  
910  
911 <  <target name="jsr166xdist-clean"
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 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
920 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
921  
922 <  <target name="jsr166xdist-docs"
923 <          description="Builds javadocs without custom tags to dist folder">
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 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1055 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
929 >  </target>
930  
931 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
932 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1059 <              source="${build.sourcelevel}">
931 >  <target name="extra166ydist-jar"
932 >          depends="extra166yclean, extra166yjar">
933  
934 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1062 <      <include name="jsr166x"/>
1063 <      </packageset>
934 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
935  
936 <    </javadoc>
936 >  </target>
937 >
938 >  <!-- jsr166e -->
939 >
940 >
941 >  <target name="jsr166ecompile"
942 >          depends="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="1.7"
953 >           classpath=""
954 >           includeAntRuntime="false"
955 >           includeJavaRuntime="false"
956 >           executable="${javac7}"
957 >           fork="true">
958 >
959 >      <include name="**/*.java"/>
960 >      <compilerarg line="${build.args}"/>
961 >      <compilerarg value="-XDignore.symbol.file=true"/>
962 >      <compilerarg value="-Xlint:all"/>
963 >
964 >    </javac>
965  
966    </target>
967  
1069  <target name="jsr166xdist-jar"
1070          depends="jsr166xclean, jsr166xjar">
968  
969 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
969 >
970 >  <target name="jsr166ejar"
971 >          depends="jsr166ecompile"
972 >          description="Builds library jar from compiled sources">
973 >
974 >    <mkdir dir="${build.jsr166elib.dir}"/>
975 >
976 >    <jar destfile="${jsr166eproduct.jar}" index="true">
977 >      <fileset dir="${build.jsr166e.dir}"/>
978 >    </jar>
979 >
980 >  </target>
981 >
982 >
983 >
984 >  <target name="jsr166edocs"
985 >          description="Builds javadocs with custom tags to build folder">
986 >
987 >    <delete dir="${build.jsr166ejavadocs.dir}"/>
988 >    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
989 >
990 >    <javadoc destdir="${build.jsr166ejavadocs.dir}"
991 >             packagenames="jsr166e,jsr166e.extra"
992 >             link="${jdkapidocs.url}"
993 >             source="1.7"
994 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
995 >             additionalparam="-XDignore.symbol.file=true" />
996 >
997 >  </target>
998 >
999 >
1000 >  <target name="jsr166edist"
1001 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1002 >          description="Puts all distributable products in single hierarchy"/>
1003 >
1004 >
1005 >
1006 >  <target name="jsr166eclean"
1007 >          description="Removes all build products">
1008 >
1009 >    <delete dir="${build.jsr166e.dir}"/>
1010 >    <delete dir="${build.jsr166elib.dir}"/>
1011 >
1012 >  </target>
1013 >
1014 >
1015 >
1016 >  <target name="jsr166edist-clean"
1017 >          description="Removes all build and distribution products">
1018 >
1019 >  </target>
1020 >
1021 >  <target name="jsr166edist-docs"
1022 >          description="Builds javadocs without custom tags to dist folder">
1023 >
1024 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1025 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1026 >
1027 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1028 >             packagenames="jsr166e,jsr166e.extra"
1029 >             link="${jdkapidocs.url}"
1030 >             source="1.7"
1031 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1032 >             additionalparam="-XDignore.symbol.file=true" />
1033 >
1034 >  </target>
1035 >
1036 >  <target name="jsr166edist-jar"
1037 >          depends="jsr166eclean, jsr166ejar">
1038 >
1039 >    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1040  
1041    </target>
1042  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines