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.98 by jsr166, Wed Jan 16 07:39:51 2013 UTC

# Line 8 | Line 8
8  
9    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.
11 +
12 +  The repository contains all dependencies except for ant and the JDK
13 +  itself.  Because the JDK version matters and because different
14 +  targets require different JDKs, we assume that users have created a
15 +  hierarchy containing:
16 +  $HOME/jdk/jdk6
17 +  $HOME/jdk/jdk7
18 +  $HOME/jdk/jdk8
19 +  where each of the above is a JDK or a symlink to same.
20   ------------------------------------------------------------------------------
21    </description>
22  
# Line 21 | Line 30
30  
31  
32    <!-- Compilation options -->
33 <  <property name="build.sourcelevel"    value="1.5"/>
33 >  <property name="build.sourcelevel"    value="1.6"/>
34    <property name="build.debug"          value="true"/>
35    <property name="build.debuglevel"     value="source,lines,vars"/>
36    <property name="build.deprecation"    value="false"/>
37  
38    <!-- Build locations -->
39 <  <property name="build.dir"            location="build"/>
40 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
41 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
42 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
43 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
44 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
45 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
46 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
47 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
48 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
49 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
50 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
51 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
52 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
39 >  <property name="build.dir"                   location="build"/>
40 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
41 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
42 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
43 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
44 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
45 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
46 >
47 >  <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
48 >  <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
49 >  <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
50 >  <property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>
51 >  <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
52 >
53 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
54    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
55    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
56  
57 <  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
57 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
58    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
59    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
60  
61 +  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62 +  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
63 +  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
64 +
65 +  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
66 +  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
67 +  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
68 +
69 +  <!-- JDK binary locations -->
70 +  <property name="jdks.home"  location="${user.home}/jdk"/>
71 +
72 +  <macrodef name="defjdklocations">
73 +    <attribute name="v"/>
74 +    <sequential>
75 +    <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
76 +    <property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>
77 +    <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
78 +    <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
79 +    <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
80 +    <property name="bootclasspath@{v}"
81 +     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
82 +    </sequential>
83 +  </macrodef>
84 +
85 +  <defjdklocations v="6"/>
86 +  <defjdklocations v="7"/>
87 +  <defjdklocations v="8"/>
88 +
89 +  <macrodef name="run-tck-tests">
90 +    <attribute name="jvm"/>
91 +    <attribute name="tck.classes"/>
92 +    <attribute name="product.jar" default="${product.jar}"/>
93 +    <attribute name="jvmflags" default=""/>
94 +    <sequential>
95 +    <java classname="JSR166TestCase"
96 +          jvm="@{jvm}" fork="true">
97 +        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
98 +        <jvmarg line="@{jvmflags}"/>
99 +        <classpath>
100 +          <pathelement location="${junit.jar}"/>
101 +          <pathelement location="@{tck.classes}"/>
102 +        </classpath>
103 +    </java>
104 +    </sequential>
105 +  </macrodef>
106 +
107    <!-- Source locations -->
108    <property name="src.dir"              location="${basedir}/src/main"/>
109    <property name="test.src.dir"         location="${basedir}/src/test"/>
54  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
110    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
111    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
112    <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"/>
113    <property name="lib.dir"              location="${basedir}/lib"/>
114    <property name="dist.dir"             location="${basedir}/dist"/>
115    <property name="topsrc.dir"           location="${basedir}/src"/>
116 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
117 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
116 >  <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
117 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
118 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
119 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
120 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
121 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
122  
123    <!-- Distribution locations -->
124 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
124 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
125 >  <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
126    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
127    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
128 +  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
129 +  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
130  
131    <!-- Jar locations -->
132    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
133 +  <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
134    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
135    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
136 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
137 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
138    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
76  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
139  
140    <!-- Bootclasspath argument -->
141    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
142  
143 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
144 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
145 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
146 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
147 +
148 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
149 +  <!-- The below does not yet exist as of 2012-11 -->
150 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
151 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
152 +
153    <!-- Test classpath -->
154    <path id="test.classpath">
155      <pathelement location="${build.testcases.dir}"/>
# Line 89 | Line 161
161      <pathelement location="${build.loops.dir}"/>
162    </path>
163  
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
164  
165    <!-- Main targets -->
166  
167 +  <target name="dists"
168 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
169 +          description="Builds all public jars and docs"/>
170  
171    <target name="compile"
172            depends="init, configure-compiler"
# Line 118 | Line 183
183               fork="true">
184  
185        <include name="**/*.java"/>
186 <      <compilerarg value="-XDignore.symbol.file"/>
186 >      <compilerarg value="-XDignore.symbol.file=true"/>
187  
188   <!--
189        <exclude name="java/lang/**"/>
# Line 158 | Line 223
223      <delete dir="${build.javadocs.dir}"/>
224      <mkdir dir="${build.javadocs.dir}"/>
225  
226 <    <javadoc destdir="${build.javadocs.dir}"
227 <                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}"/>
168 <
169 <    </javadoc>
170 <
171 <  </target>
172 <
173 <
226 >    <!-- the packagenames="none" hack below prevents scanning the -->
227 >    <!-- sourcepath for packages -->
228  
229 <  <target name="doccheck"
230 <          depends="filter-doccheck"
231 <          description="Reports on javadoc style errors">
232 <
233 <    <delete dir="${build.doccheck.dir}"/>
234 <    <mkdir dir="${build.doccheck.dir}"/>
235 <
236 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
237 <         docletpath="${lib.dir}/doccheck.jar"
184 <            destdir="${build.doccheck.dir}">
185 <      <packageset dir="${build.dc-filter.dir}"/>
229 >    <javadoc destdir="${build.javadocs.dir}"
230 >             packagenames="none"
231 >             link="${jdkapidocs.url}"
232 >             overview="${src.dir}/intro.html"
233 >             sourcepath="${src.dir}:${jdksrc.dir}"
234 >             additionalparam="-XDignore.symbol.file=true" >
235 >      <fileset dir="${src.dir}" defaultexcludes="yes">
236 >        <include name="**/*.java"/>
237 >      </fileset>
238      </javadoc>
239  
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
240    </target>
241  
242  
# Line 219 | Line 246
246            description="Puts all distributable products in single hierarchy"/>
247  
248  
222
249    <target name="release"
250            depends="dist"
251            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 266 | Line 292
292      <delete dir="${dist.javadocs.dir}"/>
293      <mkdir dir="${dist.javadocs.dir}"/>
294  
295 <    <javadoc destdir="${dist.javadocs.dir}"
296 <            link="http://java.sun.com/javase/6/docs/api/"
271 <            overview="${src.dir}/intro.html"
295 >    <!-- the packagenames="none" hack below prevents scanning the -->
296 >    <!-- sourcepath for packages -->
297  
298 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
299 <     >
300 < <!--
301 <      <packageset dir="${src.dir}" defaultexcludes="yes">
302 <      <include name="java/util/concurrent"/>
303 <      <include name="java/util/concurrent/atomic"/>
304 <      <include name="java/util/concurrent/locks"/>
305 <      </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"/> -->
298 >    <javadoc destdir="${dist.javadocs.dir}"
299 >             packagenames="none"
300 >             link="${jdkapidocs.url}"
301 >             overview="${src.dir}/intro.html"
302 >             sourcepath="${src.dir}:${jdksrc.dir}"
303 >             additionalparam="-XDignore.symbol.file=true" >
304 >      <fileset dir="${src.dir}" defaultexcludes="yes">
305 >        <include name="**/*.java"/>
306        </fileset>
307      </javadoc>
308  
# Line 319 | Line 331
331    </target>
332  
333  
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
334    <target name="compile-tests"
335            depends="jar">
336  
# Line 445 | Line 346
346  
347        <compilerarg value="${bootclasspath.args}"/>
348        <compilerarg line="${build.args}"/>
349 +      <compilerarg value="-XDignore.symbol.file=true"/>
350  
351        <classpath refid="test.classpath"/>
352  
# Line 462 | Line 364
364  
365        <compilerarg value="${bootclasspath.args}"/>
366        <compilerarg line="${build.args}"/>
367 +      <compilerarg value="-XDignore.symbol.file=true"/>
368  
369        <classpath refid="test.classpath"/>
370  
# Line 478 | Line 381
381  
382        <compilerarg value="${bootclasspath.args}"/>
383        <compilerarg line="${build.args}"/>
384 +      <compilerarg value="-XDignore.symbol.file=true"/>
385  
386        <classpath refid="test.classpath"/>
387  
# Line 550 | Line 454
454        <fileset dir="${build.reports.dir}">
455          <include name="TEST-*.xml"/>
456        </fileset>
457 <      <report styledir="${stylesheet.dir}"
554 <                format="${junit.report.format}"
555 <                 todir="${build.reports.dir}"
457 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
458        />
459      </junitreport>
460  
# Line 602 | Line 504
504    </target>
505  
506  
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
507    <!-- Various demos and test programs -->
508  
509  
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
510    <target name="loops" depends="init, configure-compiler"
511            description="Benchmark from Doug Lea's AQS paper">
512  
# Line 701 | Line 522
522  
523        <compilerarg line="${build.args}"/>
524        <classpath refid="loops.classpath"/>
525 +      <compilerarg value="-XDignore.symbol.file=true"/>
526  
527      </javac>
528  
# Line 711 | Line 533
533    </target>
534  
535  
536 <  <target name="compile-j1" depends="init, configure-compiler, compile">
536 >  <!-- jdk7 -->
537  
716    <mkdir dir="${build.j1.dir}"/>
538  
539 <    <javac srcdir="${j1.src.dir}"
540 <          destdir="${build.j1.dir}"
541 <            debug="${build.debug}"
542 <       debuglevel="${build.debuglevel}"
543 <      deprecation="${build.deprecation}"
544 <           source="${build.sourcelevel}" >
539 >  <target name="jdk7compile"
540 >          depends="configure-compiler"
541 >          description="Compiles src/jdk7 sources">
542 >
543 >    <mkdir dir="${build.jdk7.classes.dir}"/>
544 >
545 >    <javac srcdir="${jdk7src.dir}"
546 >           destdir="${build.jdk7.classes.dir}"
547 >           debug="${build.debug}"
548 >           debuglevel="${build.debuglevel}"
549 >           deprecation="${build.deprecation}"
550 >           source="1.6"
551 >           classpath=""
552 >           bootclasspath="${bootclasspath6}"
553 >           includeAntRuntime="false"
554 >           includeJavaRuntime="false"
555 >           executable="${javac7}"
556 >           fork="true">
557  
558        <include name="**/*.java"/>
726      <exclude name="**/dijkstra/**"/>
727
559        <compilerarg line="${build.args}"/>
560 <      <classpath refid="j1.classpath"/>
560 >      <compilerarg value="-XDignore.symbol.file=true"/>
561 >      <compilerarg value="-Xlint:all"/>
562  
563      </javac>
564  
565 <  </target>
565 >    <mkdir dir="${build.jdk7.lib.dir}"/>
566  
567 +    <jar destfile="${jdk7product.jar}" index="true">
568 +      <fileset dir="${build.jdk7.classes.dir}"/>
569 +    </jar>
570  
571 <  <target name="sw" depends="compile-j1"
737 <          description="Runs the SwingWorker demo">
571 >    <mkdir dir="${build.jdk7.tck.classes.dir}"/>
572  
573 <    <!--
574 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
575 <      <classpath refid="j1.classpath"/>
576 <    </java>
577 <    -->
573 >    <javac srcdir="${tck.src.dir}"
574 >           destdir="${build.jdk7.tck.classes.dir}"
575 >           debug="${build.debug}"
576 >           debuglevel="${build.debuglevel}"
577 >           deprecation="${build.deprecation}"
578 >           source="1.6"
579 >           classpath="${junit.jar}"
580 >           bootclasspath="${jdk7product.jar}:${bootclasspath6}"
581 >           includeAntRuntime="false"
582 >           includeJavaRuntime="false"
583 >           executable="${javac7}"
584 >           fork="true">
585  
586 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
586 >      <include name="**/*.java"/>
587 >      <compilerarg line="${build.args}"/>
588 >      <compilerarg value="-XDignore.symbol.file=true"/>
589 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
590  
591 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
748 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
749 <    </exec>
591 >    </javac>
592  
593    </target>
594  
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>
595  
596 +  <target name="run-jdk7-tck-tests"
597 +          depends="jdk7compile"
598 +          description="Runs tck tests for jsr166-jdk7 directly">
599 +    <run-tck-tests
600 +      jvm="${java7}"
601 +      tck.classes="${build.jdk7.tck.classes.dir}"
602 +      product.jar="${jdk7product.jar}"/>
603    </target>
604  
605  
606 <  <target name="test-j1" depends="compile-j1"
607 <          description="Runs testcases from the JavaOne source directories">
606 >  <target name="run-jdk7-tck-tests-via-junit-task"
607 >          depends="jdk7compile">
608  
609      <junit printsummary="true"
610 <             showoutput="true"
611 <          errorProperty="junit.failed"
612 <        failureProperty="junit.failed"
613 <                    dir="${build.j1.dir}"
614 <                   fork="true">
615 <
787 <      <!-- <jvmarg value="-server"/> -->
788 <      <classpath refid="j1.classpath"/>
789 <      <formatter type="xml"/>
790 <
791 <      <batchtest todir="${build.j1.dir}">
792 <        <fileset dir="${j1.src.dir}">
793 <          <include name="**/*Test.java"/>
794 <        </fileset>
795 <      </batchtest>
610 >           showoutput="true"
611 >           errorProperty="junit.failed"
612 >           failureProperty="junit.failed"
613 >           includeantruntime="true"
614 >           jvm="${java7}"
615 >           fork="true">
616  
617 <    </junit>
617 >      <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>
618 >      <jvmarg value="-server"/>
619  
620 <    <available property="junit.report.format"
621 <                  value="frames"
622 <              classname="org.apache.xalan.lib.Redirect"/>
623 <    <property name="junit.report.format" value="noframes"/>
620 >      <classpath>
621 >        <pathelement location="${junit.jar}"/>
622 >        <pathelement location="${build.jdk7.tck.classes.dir}"/>
623 >      </classpath>
624  
625 <    <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>
625 >      <formatter type="brief"/>
626  
627 <    <fail message="Test Cases Failed" if="junit.failed"/>
627 >      <test name="JSR166TestCase" haltonfailure="no">
628 >      </test>
629  
630 +    </junit>
631    </target>
632  
633  
634 +  <target name="jdk7docs"
635 +          description="Builds javadocs with custom tags to build folder">
636  
637 <  <!-- C++ and JNI definitions and demos -->
638 <
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 -->
637 >    <delete dir="${build.jdk7.docs.dir}"/>
638 >    <mkdir dir="${build.jdk7.docs.dir}"/>
639  
640 <    <condition property="platform" value="linux">
641 <      <os name="Linux"/>
642 <    </condition>
643 <    <condition property="platform" value="win32">
644 <      <os family="windows"/>
645 <    </condition>
646 <    <condition property="platform" value="solaris">
647 <      <os name="SunOS"/>
648 <    </condition>
640 >    <javadoc destdir="${build.jdk7.docs.dir}"
641 >             packagenames="none"
642 >             link="${jdkapi7docs.url}"
643 >             overview="${jdk7src.dir}/intro.html"
644 >             sourcepath="${jdk7src.dir}"
645 >             bootclasspath="${bootclasspath6}"
646 >             classpath=""
647 >             source="1.6"
648 >             executable="${javadoc7}"
649 >             additionalparam="-XDignore.symbol.file=true" >
650 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
651 >        <include name="**/*.java"/>
652 >      </fileset>
653 >    </javadoc>
654  
655    </target>
656  
657  
658 <  <target name="cppdemo" depends="configure-cpp">
659 <
660 <    <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>
658 >  <target name="jdk7dist"
659 >          depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
660 >          description="Puts all distributable products in single hierarchy"/>
661  
662  
866  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
663  
664 <    <mkdir dir="${build.testcases.dir}"/>
665 <
870 <    <javac srcdir="${test.src.dir}"
871 <          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>
664 >  <target name="jdk7clean"
665 >          description="Removes all build products">
666  
667 <    <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>
667 >    <delete dir="${build.jdk7.dir}"/>
668  
669    </target>
670  
671  
672  
673 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
674 <
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>
673 >  <target name="jdk7dist-clean"
674 >          description="Removes all build and distribution products">
675  
676    </target>
677  
678 <  <target name="compile-pretiger"
679 <          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">
678 >  <target name="jdk7dist-docs"
679 >          description="Builds javadocs without custom tags to dist folder">
680  
681 <      <compilerarg line="${build.args}"/>
682 <      <exclude name="**/Thread.java"/>
681 >    <delete dir="${dist.jdk7.docs.dir}"/>
682 >    <mkdir dir="${dist.jdk7.docs.dir}"/>
683  
684 <    </javac>
684 >    <javadoc destdir="${dist.jdk7.docs.dir}"
685 >             packagenames="none"
686 >             link="${jdkapi7docs.url}"
687 >             overview="${jdk7src.dir}/intro.html"
688 >             sourcepath="${jdk7src.dir}"
689 >             classpath=""
690 >             executable="${javadoc7}"
691 >             bootclasspath="${bootclasspath6}"
692 >             source="1.6">
693 >      <arg value="-XDignore.symbol.file=true"/>
694 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
695 >        <include name="**/*.java"/>
696 >      </fileset>
697 >    </javadoc>
698  
699    </target>
700  
701 <  <target name="pretiger" depends="compile-pretiger">
702 <
977 <    <mkdir dir="${build.lib.dir}"/>
701 >  <target name="jdk7dist-jar"
702 >          depends="jdk7clean, jdk7compile">
703  
704 <    <jar destfile="${pretiger.jar}">
980 <      <fileset dir="${build.pretiger.dir}">
981 <      </fileset>
982 <    </jar>
704 >    <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
705  
706    </target>
707  
# Line 1002 | Line 724
724  
725        <include name="**/*.java"/>
726        <compilerarg line="${build.args}"/>
727 +      <compilerarg value="-XDignore.symbol.file=true"/>
728  
729      </javac>
730  
# Line 1030 | Line 753
753      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
754  
755      <javadoc destdir="${build.jsr166xjavadocs.dir}"
756 <             link="http://java.sun.com/javase/6/docs/api/"
757 <
758 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
759 <
760 <    >
1038 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039 <      <include name="jsr166x"/>
1040 <      </packageset>
1041 <
1042 <
1043 <    </javadoc>
756 >             packagenames="jsr166x"
757 >             link="${jdkapidocs.url}"
758 >             source="${build.sourcelevel}"
759 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
760 >             additionalparam="-XDignore.symbol.file=true" />
761  
762    </target>
763  
# Line 1075 | Line 792
792      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
793  
794      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
795 <                link="http://java.sun.com/javase/6/docs/api/"
796 <              source="${build.sourcelevel}">
797 <
798 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
799 <      <include name="jsr166x"/>
1083 <      </packageset>
1084 <
1085 <    </javadoc>
795 >             packagenames="jsr166x"
796 >             link="${jdkapidocs.url}"
797 >             source="${build.sourcelevel}"
798 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
799 >             additionalparam="-XDignore.symbol.file=true" />
800  
801    </target>
802  
# Line 1112 | Line 826
826  
827        <include name="**/*.java"/>
828        <compilerarg line="${build.args}"/>
829 +      <compilerarg value="-XDignore.symbol.file=true"/>
830        <compilerarg value="${bootclasspath.args}"/>
831  
832   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 1128 | Line 843
843  
844      <mkdir dir="${build.jsr166ylib.dir}"/>
845  
846 <    <jar destfile="${jsr166yproduct.jar}">
846 >    <jar destfile="${jsr166yproduct.jar}" index="true">
847        <fileset dir="${build.jsr166y.dir}"/>
848      </jar>
849  
# Line 1143 | Line 858
858      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
859  
860      <javadoc destdir="${build.jsr166yjavadocs.dir}"
861 <                link="http://java.sun.com/javase/6/docs/api/"
862 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
863 <
864 <    >
865 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
1151 <      <include name="jsr166y"/>
1152 <      </packageset>
1153 <
1154 <
1155 <    </javadoc>
861 >             packagenames="jsr166y"
862 >             link="${jdkapidocs.url}"
863 >             source="${build.sourcelevel}"
864 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
865 >             additionalparam="-XDignore.symbol.file=true" />
866  
867    </target>
868  
# Line 1185 | Line 895
895      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
896  
897      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
898 <                link="http://java.sun.com/javase/6/docs/api/"
899 <              source="${build.sourcelevel}">
900 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
901 <      <include name="jsr166y/*.java"/>
902 <      <include name="jsr166y/forkjoin/*.java"/>
1193 <            </fileset>
1194 <    </javadoc>
898 >             packagenames="jsr166y"
899 >             link="${jdkapidocs.url}"
900 >             source="${build.sourcelevel}"
901 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
902 >             additionalparam="-XDignore.symbol.file=true" />
903  
904    </target>
905  
# Line 1202 | Line 910
910  
911    </target>
912  
913 +
914 +  <!-- extra166y -->
915 +
916 +
917 +  <target name="extra166ycompile"
918 +          depends="init, configure-compiler, jsr166ycompile"
919 +          description="Compiles extra166y sources">
920 +
921 +    <mkdir dir="${build.extra166y.dir}"/>
922 +
923 +    <javac srcdir="${extra166ysrc.dir}"
924 +          destdir="${build.extra166y.dir}"
925 +            debug="${build.debug}"
926 +            classpath="${jsr166yproduct.jar}"
927 +       debuglevel="${build.debuglevel}"
928 +      deprecation="${build.deprecation}"
929 +           source="${build.sourcelevel}"
930 +             fork="true">
931 +
932 +      <include name="**/*.java"/>
933 +      <compilerarg line="${build.args}"/>
934 +      <compilerarg value="-XDignore.symbol.file=true"/>
935 +      <compilerarg value="${bootclasspath.args}"/>
936 +
937 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
938 +
939 +    </javac>
940 +
941 +  </target>
942 +
943 +
944 +
945 +  <target name="extra166yjar"
946 +          depends="extra166ycompile"
947 +          description="Builds library jar from compiled sources">
948 +
949 +    <mkdir dir="${build.extra166ylib.dir}"/>
950 +
951 +    <jar destfile="${extra166yproduct.jar}" index="true">
952 +      <fileset dir="${build.extra166y.dir}"/>
953 +    </jar>
954 +
955 +  </target>
956 +
957 +
958 +
959 +  <target name="extra166ydocs"
960 +          description="Builds javadocs with custom tags to build folder">
961 +
962 +    <delete dir="${build.extra166yjavadocs.dir}"/>
963 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
964 +
965 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
966 +             packagenames="extra166y"
967 +             link="${jdkapidocs.url}"
968 +             source="${build.sourcelevel}"
969 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
970 +             additionalparam="-XDignore.symbol.file=true" />
971 +
972 +  </target>
973 +
974 +
975 +  <target name="extra166ydist"
976 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
977 +          description="Puts all distributable products in single hierarchy"/>
978 +
979 +
980 +
981 +  <target name="extra166yclean"
982 +          description="Removes all build products">
983 +
984 +    <delete dir="${build.extra166y.dir}"/>
985 +    <delete dir="${build.extra166ylib.dir}"/>
986 +
987 +  </target>
988 +
989 +
990 +
991 +  <target name="extra166ydist-clean"
992 +          description="Removes all build and distribution products">
993 +
994 +  </target>
995 +
996 +  <target name="extra166ydist-docs"
997 +          description="Builds javadocs without custom tags to dist folder">
998 +
999 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
1000 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
1001 +
1002 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
1003 +             packagenames="extra166y"
1004 +             link="${jdkapidocs.url}"
1005 +             source="${build.sourcelevel}"
1006 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1007 +             additionalparam="-XDignore.symbol.file=true" />
1008 +
1009 +  </target>
1010 +
1011 +  <target name="extra166ydist-jar"
1012 +          depends="extra166yclean, extra166yjar">
1013 +
1014 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1015 +
1016 +  </target>
1017 +
1018 +  <!-- jsr166e -->
1019 +
1020 +  <target name="jsr166ecompile"
1021 +          depends="configure-compiler"
1022 +          description="Compiles jsr166e sources">
1023 +
1024 +    <mkdir dir="${build.jsr166e.dir}"/>
1025 +
1026 +    <javac srcdir="${topsrc.dir}"
1027 +           destdir="${build.jsr166e.dir}"
1028 +           debug="${build.debug}"
1029 +           debuglevel="${build.debuglevel}"
1030 +           deprecation="${build.deprecation}"
1031 +           source="1.7"
1032 +           classpath=""
1033 +           includeAntRuntime="false"
1034 +           includeJavaRuntime="false"
1035 +           executable="${javac7}"
1036 +           fork="true">
1037 +
1038 +      <include name="jsr166e/**/*.java"/>
1039 +      <compilerarg line="${build.args}"/>
1040 +      <compilerarg value="-XDignore.symbol.file=true"/>
1041 +      <compilerarg value="-Xlint:all"/>
1042 +
1043 +    </javac>
1044 +
1045 +  </target>
1046 +
1047 +
1048 +
1049 +  <target name="jsr166ejar"
1050 +          depends="jsr166ecompile"
1051 +          description="Builds library jar from compiled sources">
1052 +
1053 +    <mkdir dir="${build.jsr166elib.dir}"/>
1054 +
1055 +    <jar destfile="${jsr166eproduct.jar}" index="true">
1056 +      <fileset dir="${build.jsr166e.dir}"/>
1057 +    </jar>
1058 +
1059 +  </target>
1060 +
1061 +
1062 +
1063 +  <target name="jsr166edocs"
1064 +          description="Builds javadocs with custom tags to build folder">
1065 +
1066 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
1067 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1068 +
1069 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
1070 +             packagenames="jsr166e,jsr166e.extra"
1071 +             link="${jdkapi7docs.url}"
1072 +             source="1.7"
1073 +             sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
1074 +             executable="${javadoc7}"
1075 +             additionalparam="-XDignore.symbol.file=true" >
1076 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1077 +        <include name="jsr166e/**/*.java"/>
1078 +      </fileset>
1079 +    </javadoc>
1080 +
1081 +  </target>
1082 +
1083 +
1084 +  <target name="jsr166edist"
1085 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1086 +          description="Puts all distributable products in single hierarchy"/>
1087 +
1088 +
1089 +
1090 +  <target name="jsr166eclean"
1091 +          description="Removes all build products">
1092 +
1093 +    <delete dir="${build.jsr166e.dir}"/>
1094 +    <delete dir="${build.jsr166elib.dir}"/>
1095 +
1096 +  </target>
1097 +
1098 +
1099 +
1100 +  <target name="jsr166edist-clean"
1101 +          description="Removes all build and distribution products">
1102 +
1103 +  </target>
1104 +
1105 +  <target name="jsr166edist-docs"
1106 +          description="Builds javadocs without custom tags to dist folder">
1107 +
1108 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1109 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1110 +
1111 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1112 +             packagenames="jsr166e,jsr166e.extra"
1113 +             link="${jdkapidocs.url}"
1114 +             source="1.7"
1115 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1116 +             additionalparam="-XDignore.symbol.file=true" />
1117 +
1118 +  </target>
1119 +
1120 +  <target name="jsr166edist-jar"
1121 +          depends="jsr166eclean, jsr166ejar">
1122 +
1123 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1124 +
1125 +  </target>
1126 +
1127   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines