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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines