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.110 by jsr166, Sun Jan 20 01:09:12 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  
114    <!-- Distribution locations -->
115 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
115 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121  
122    <!-- Jar locations -->
123 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
125 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
123 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130  
131    <!-- Bootclasspath argument -->
132    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133  
134 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138 +
139 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140 +  <!-- The below does not yet exist as of 2012-11 -->
141 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142 +
143 +  <!-- Default jdk api doc location (latest stable release seems best) -->
144 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145 +
146    <!-- Test classpath -->
147    <path id="test.classpath">
148      <pathelement location="${build.testcases.dir}"/>
# Line 75 | Line 154
154      <pathelement location="${build.loops.dir}"/>
155    </path>
156  
157 <  <!-- J1 classpath -->
158 <  <path id="j1.classpath">
159 <    <pathelement location="${build.j1.dir}"/>
160 <    <pathelement location="${junit.jar}"/>
161 <    <pathelement location="${concurrent.jar}"/>
162 <  </path>
84 <
157 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
158 >  <!-- TODO: How do we get &trade to work? -->
159 >  <!-- TODO: Why isn't @jls a "standard" tag? -->
160 >  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161 >  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
162 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
163  
164    <!-- Main targets -->
165  
166 +  <target name="dists"
167 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168 +          description="Builds all public jars and docs"/>
169  
170    <target name="compile"
171 <          depends="init, configure-compiler"
172 <          description="Compiles main sources to build folder">
171 >          depends="configure-compiler"
172 >          description="Compiles src/main sources to build dir">
173  
174      <mkdir dir="${build.classes.dir}"/>
175  
176      <javac srcdir="${src.dir}"
177 <          destdir="${build.classes.dir}"
178 <            debug="${build.debug}"
179 <       debuglevel="${build.debuglevel}"
180 <      deprecation="${build.deprecation}"
181 <           source="${build.sourcelevel}"
182 <             fork="true">
177 >           destdir="${build.classes.dir}"
178 >           debug="${build.debug}"
179 >           debuglevel="${build.debuglevel}"
180 >           deprecation="${build.deprecation}"
181 >           classpath=""
182 >           includeAntRuntime="false"
183 >           includeJavaRuntime="false"
184 >           executable="${javac8}"
185 >           fork="true">
186  
187        <include name="**/*.java"/>
188 +      <compilerarg line="${build.args}"/>
189 +      <compilerarg value="-XDignore.symbol.file=true"/>
190 +      <compilerarg value="-Xlint:all"/>
191 +
192 + <!--
193        <exclude name="java/lang/**"/>
194        <compilerarg line="${build.args}"/>
195 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
196 + -->
197  
198      </javac>
199  
# Line 114 | Line 205
205            depends="compile"
206            description="Builds library jar from compiled sources">
207  
117    <mkdir dir="${build.lib.dir}"/>
118
208      <jar destfile="${product.jar}">
209        <fileset dir="${build.classes.dir}"/>
210      </jar>
# Line 125 | Line 214
214  
215  
216    <target name="test"
217 <          depends="init, configure-tests, report-tests"
217 >          depends="configure-tests, report-tests"
218            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219  
220  
221  
222    <target name="docs"
223 <          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>
223 >          description="Builds javadocs for src/main to dist dir">
224  
225 +    <delete dir="${dist.javadocs.dir}"/>
226 +    <mkdir dir="${dist.javadocs.dir}"/>
227  
228 +    <!-- the packagenames="none" hack below prevents scanning the -->
229 +    <!-- sourcepath for packages -->
230  
231 <  <target name="doccheck"
232 <          depends="filter-doccheck"
233 <          description="Reports on javadoc style errors">
234 <
235 <    <delete dir="${build.doccheck.dir}"/>
236 <    <mkdir dir="${build.doccheck.dir}"/>
237 <
238 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
239 <         docletpath="${lib.dir}/doccheck.jar"
240 <            destdir="${build.doccheck.dir}">
241 <      <packageset dir="${build.dc-filter.dir}"/>
231 >    <javadoc destdir="${dist.javadocs.dir}"
232 >             packagenames="none"
233 >             link="${jdkapi8docs.url}"
234 >             overview="${src.dir}/intro.html"
235 >             sourcepath="${src.dir}:${jdk8src.dir}"
236 >             classpath=""
237 >             executable="${javadoc8}">
238 >      <arg value="-XDignore.symbol.file=true"/>
239 >      <arg value="-tag"/>
240 >      <arg value="${javadoc.jls.option}"/>
241 >      <fileset dir="${src.dir}" defaultexcludes="yes">
242 >        <include name="**/*.java"/>
243 >      </fileset>
244      </javadoc>
245  
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
246    </target>
247  
248  
249  
250    <target name="dist"
251 <          depends="init, dist-clean, dist-jar, dist-docs"
251 >          depends="dist-clean, dist-jar, docs"
252            description="Puts all distributable products in single hierarchy"/>
253  
254  
202
255    <target name="release"
256            depends="dist"
257            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 224 | Line 276
276            description="Removes all build products">
277  
278      <delete dir="${build.dir}"/>
227    <delete dir="${build.classes.dir}"/>
228    <delete dir="${build.lib.dir}"/>
279  
280    </target>
281  
# Line 240 | Line 290
290  
291  
292  
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
293    <!-- Internal targets -->
294  
295  
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
296    <target name="dist-jar"
297            depends="clean, jar">
298  
# Line 280 | Line 301
301    </target>
302  
303  
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
304    <target name="compile-tests"
305            depends="jar">
306  
# Line 406 | Line 316
316  
317        <compilerarg value="${bootclasspath.args}"/>
318        <compilerarg line="${build.args}"/>
319 +      <compilerarg value="-XDignore.symbol.file=true"/>
320  
321        <classpath refid="test.classpath"/>
322  
# Line 423 | Line 334
334  
335        <compilerarg value="${bootclasspath.args}"/>
336        <compilerarg line="${build.args}"/>
337 +      <compilerarg value="-XDignore.symbol.file=true"/>
338  
339        <classpath refid="test.classpath"/>
340  
# Line 439 | Line 351
351  
352        <compilerarg value="${bootclasspath.args}"/>
353        <compilerarg line="${build.args}"/>
354 +      <compilerarg value="-XDignore.symbol.file=true"/>
355  
356        <classpath refid="test.classpath"/>
357  
# Line 511 | Line 424
424        <fileset dir="${build.reports.dir}">
425          <include name="TEST-*.xml"/>
426        </fileset>
427 <      <report styledir="${stylesheet.dir}"
515 <                format="${junit.report.format}"
516 <                 todir="${build.reports.dir}"
427 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
428        />
429      </junitreport>
430  
# Line 563 | Line 474
474    </target>
475  
476  
477 +  <!-- Various demos and test programs -->
478  
567  <!-- Anthill targets -->
479  
480 <  <target name="anthill-build">
480 >  <target name="loops" depends="configure-compiler"
481 >          description="Benchmark from Doug Lea's AQS paper">
482  
483 <    <!-- Override this in user.properties -->
572 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
483 >    <mkdir dir="${build.loops.dir}"/>
484  
485 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
486 <      <arg value="-Xmx256000000"/>
487 <      <!-- classpath of new JVM -->
488 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
489 <      <!-- location of Ant home directory -->
490 <      <arg value="-Dant.home=${ant.home}"/>
491 <      <!-- the Ant main class -->
492 <      <arg value="org.apache.tools.ant.Main"/>
493 <      <!-- The build file -->
494 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
495 <      <!-- the target to build on the new Ant instance -->
496 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
497 <      <arg value="do-anthill-build"/>
498 <    </exec>
499 <  </target>
500 <
501 <  <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>
485 >    <javac srcdir="${loops.src.dir}"
486 >          destdir="${build.loops.dir}"
487 >            debug="${build.debug}"
488 >       debuglevel="${build.debuglevel}"
489 >      deprecation="${build.deprecation}"
490 >           source="${build.sourcelevel}"
491 >             fork="true">
492 >
493 >      <compilerarg line="${build.args}"/>
494 >      <classpath refid="loops.classpath"/>
495 >      <compilerarg value="-XDignore.symbol.file=true"/>
496 >
497 >    </javac>
498 >
499 >    <java classname="ALoops" fork="true">
500 >      <classpath refid="loops.classpath"/>
501 >    </java>
502  
503    </target>
504  
505  
506 +  <!-- jsr166 4jdk7 -->
507  
614  <!-- Various demos and test programs -->
508  
509 +  <target name="4jdk7compile"
510 +          depends="configure-compiler"
511 +          description="Compiles src/jdk7 sources, targeting jdk7">
512 +
513 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
514 +
515 +    <javac srcdir="${4jdk7src.dir}"
516 +           destdir="${build.4jdk7.classes.dir}"
517 +           debug="${build.debug}"
518 +           debuglevel="${build.debuglevel}"
519 +           deprecation="${build.deprecation}"
520 +           source="6"
521 +           classpath=""
522 +           bootclasspath="${bootclasspath6}"
523 +           includeAntRuntime="false"
524 +           includeJavaRuntime="false"
525 +           executable="${javac7}"
526 +           fork="true">
527  
528 <  <target name="sample" depends="init, configure-compiler"
529 <          description="Standalone demo program">
528 >      <include name="**/*.java"/>
529 >      <compilerarg line="${build.args}"/>
530 >      <compilerarg value="-XDignore.symbol.file=true"/>
531 >      <compilerarg value="-Xlint:all"/>
532  
533 <    <mkdir dir="${build.testcases.dir}"/>
533 >    </javac>
534  
535 <    <javac srcdir="${test.src.dir}"
536 <          destdir="${build.testcases.dir}"
537 <            debug="${build.debug}"
538 <       debuglevel="${build.debuglevel}"
539 <      deprecation="${build.deprecation}"
627 <           source="${build.sourcelevel}"
628 <             fork="true">
535 >    <jar destfile="${4jdk7product.jar}" index="true">
536 >      <fileset dir="${build.4jdk7.classes.dir}"/>
537 >    </jar>
538 >
539 >    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
540  
541 <      <include name="jsr166/test/Sample.java"/>
541 >    <javac srcdir="${tck.src.dir}"
542 >           destdir="${build.4jdk7.tck.classes.dir}"
543 >           debug="${build.debug}"
544 >           debuglevel="${build.debuglevel}"
545 >           deprecation="${build.deprecation}"
546 >           source="6"
547 >           classpath="${junit.jar}"
548 >           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
549 >           includeAntRuntime="false"
550 >           includeJavaRuntime="false"
551 >           executable="${javac7}"
552 >           fork="true">
553 >
554 >      <include name="**/*.java"/>
555 >      <compilerarg line="${build.args}"/>
556 >      <compilerarg value="-XDignore.symbol.file=true"/>
557 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
558  
559      </javac>
560  
561 <    <copy todir="${build.testcases.dir}">
635 <      <fileset dir="${test.src.dir}">
636 <        <include name="**/*.properties"/>
637 <      </fileset>
638 <    </copy>
561 >  </target>
562  
563  
564 <    <java classname="jsr166.test.Sample" fork="true">
565 <      <classpath refid="test.classpath"/>
566 <      <!-- <jvmarg value="-ea"/> -->
567 <      <!-- <jvmarg value="-server"/> -->
568 <      <!-- <arg value="1000"/> -->
569 <    </java>
564 >  <target name="4jdk7-test-tck"
565 >          depends="4jdk7compile"
566 >          description="Runs tck tests for jsr166-4jdk7 directly">
567 >    <run-tck-tests
568 >      jvm="${java7}"
569 >      tck.classes="${build.4jdk7.tck.classes.dir}"
570 >      product.jar="${4jdk7product.jar}"/>
571    </target>
572  
573  
574 <  <target name="loops" depends="init, configure-compiler"
575 <          description="Benchmark from Doug Lea's AQS paper">
574 >  <target name="4jdk7-test-tck-junit"
575 >          depends="4jdk7compile"
576 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
577  
578 <    <mkdir dir="${build.loops.dir}"/>
578 >    <junit printsummary="true"
579 >           showoutput="true"
580 >           errorProperty="junit.failed"
581 >           failureProperty="junit.failed"
582 >           includeantruntime="true"
583 >           jvm="${java7}"
584 >           fork="true">
585  
586 <    <javac srcdir="${loops.src.dir}"
587 <          destdir="${build.loops.dir}"
657 <            debug="${build.debug}"
658 <       debuglevel="${build.debuglevel}"
659 <      deprecation="${build.deprecation}"
660 <           source="${build.sourcelevel}"
661 <             fork="true">
586 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
587 >      <jvmarg value="-server"/>
588  
589 <      <compilerarg line="${build.args}"/>
590 <      <classpath refid="loops.classpath"/>
589 >      <classpath>
590 >        <pathelement location="${junit.jar}"/>
591 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
592 >      </classpath>
593  
594 <    </javac>
594 >      <formatter type="brief"/>
595  
596 <    <java classname="ALoops" fork="true">
597 <      <classpath refid="loops.classpath"/>
670 <    </java>
596 >      <test name="JSR166TestCase" haltonfailure="no">
597 >      </test>
598  
599 +    </junit>
600    </target>
601  
602  
603 <  <target name="compile-j1" depends="init, configure-compiler">
603 >  <target name="4jdk7docs"
604 >          description="Builds javadocs for src/jdk7 to dist dir">
605  
606 <    <mkdir dir="${build.j1.dir}"/>
606 >    <delete dir="${dist.4jdk7.docs.dir}"/>
607 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
608  
609 <    <javac srcdir="${j1.src.dir}"
610 <          destdir="${build.j1.dir}"
611 <            debug="${build.debug}"
612 <       debuglevel="${build.debuglevel}"
613 <      deprecation="${build.deprecation}"
614 <           source="${build.sourcelevel}" >
609 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
610 >             packagenames="none"
611 >             link="${jdkapi7docs.url}"
612 >             overview="${4jdk7src.dir}/intro.html"
613 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
614 >             classpath=""
615 >             executable="${javadoc7}">
616 >      <arg value="-XDignore.symbol.file=true"/>
617 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
618 >        <include name="**/*.java"/>
619 >      </fileset>
620 >    </javadoc>
621  
622 <      <include name="**/*.java"/>
623 <      <exclude name="**/dijkstra/**"/>
622 >  </target>
623 >
624 >
625 >  <target name="4jdk7dist"
626 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
627 >          description="Puts all distributable products in single hierarchy"/>
628 >
629 >
630 >
631 >  <target name="4jdk7clean"
632 >          description="Removes all 4jdk7 build products">
633 >
634 >    <delete dir="${build.4jdk7.dir}"/>
635 >
636 >  </target>
637  
638 +
639 +
640 +  <target name="4jdk7dist-clean"
641 +          description="Removes all build and distribution products">
642 +
643 +  </target>
644 +
645 +  <target name="4jdk7dist-jar"
646 +          depends="4jdk7clean, 4jdk7compile">
647 +
648 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
649 +
650 +  </target>
651 +
652 +
653 +  <!-- jsr166x -->
654 +
655 +  <target name="jsr166xcompile"
656 +          depends="configure-compiler"
657 +          description="Compiles jsr166x sources to build dir">
658 +
659 +    <mkdir dir="${build.jsr166x.dir}"/>
660 +
661 +    <javac srcdir="${topsrc.dir}"
662 +           destdir="${build.jsr166x.dir}"
663 +           debug="${build.debug}"
664 +           debuglevel="${build.debuglevel}"
665 +           deprecation="${build.deprecation}"
666 +           classpath=""
667 +           source="5"
668 +           bootclasspath="${bootclasspath6}"
669 +           includeAntRuntime="false"
670 +           includeJavaRuntime="false"
671 +           executable="${javac7}"
672 +           fork="true">
673 +
674 +      <include name="jsr166x/**/*.java"/>
675        <compilerarg line="${build.args}"/>
676 <      <classpath refid="j1.classpath"/>
676 >      <compilerarg value="-XDignore.symbol.file=true"/>
677 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
678  
679      </javac>
680  
681    </target>
682  
683  
697  <target name="sw" depends="compile-j1"
698          description="Runs the SwingWorker demo">
684  
685 <    <!--
686 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
687 <      <classpath refid="j1.classpath"/>
688 <    </java>
689 <    -->
685 >  <target name="jsr166xjar"
686 >          depends="jsr166xcompile"
687 >          description="Builds library jar from compiled sources">
688 >
689 >    <jar destfile="${jsr166x.jar}">
690 >      <fileset dir="${build.jsr166x.dir}"/>
691 >    </jar>
692 >
693 >  </target>
694  
706    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
695  
696 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
697 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
698 <    </exec>
696 >
697 >  <target name="jsr166xdocs"
698 >          description="Builds javadocs to dist dir">
699 >
700 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
701 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
702 >
703 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
704 >             packagenames="jsr166x.*"
705 >             link="${jdkapidocs.url}"
706 >             source="5"
707 >             bootclasspath="${bootclasspath6}"
708 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
709 >             executable="${javadoc7}"
710 >             additionalparam="-XDignore.symbol.file=true" />
711  
712    </target>
713  
714  <target name="j1" depends="compile-j1"
715          description="Runs a standalone JavaOne program">
714  
715 <    <java classname="${j1.test}" fork="true">
716 <      <classpath refid="j1.classpath"/>
717 <      <jvmarg value="-client"/>
715 >  <target name="jsr166xdist"
716 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
717 >          description="Puts all distributable products in single hierarchy"/>
718 >
719  
721      <!-- TestPseudoRandom args -->
722      <arg value="2"/>
723      <arg value="25"/>
724      <arg value="100000"/>
720  
721 <      <!-- WebCrawler args -->
722 <      <!--
728 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
729 <      <arg value="http://www.priorartisans.com"/>
730 <      <arg value="25"/>
731 <      -->
721 >  <target name="jsr166xclean"
722 >          description="Removes all jsr166x build products">
723  
724 <    </java>
724 >    <delete dir="${build.jsr166x.dir}"/>
725  
726    </target>
727  
728  
738  <target name="test-j1" depends="compile-j1"
739          description="Runs testcases from the JavaOne source directories">
729  
730 <    <junit printsummary="true"
731 <             showoutput="true"
743 <          errorProperty="junit.failed"
744 <        failureProperty="junit.failed"
745 <                    dir="${build.j1.dir}"
746 <                   fork="true">
730 >  <target name="jsr166xdist-clean"
731 >          description="Removes all build and distribution products">
732  
733 <      <!-- <jvmarg value="-server"/> -->
749 <      <classpath refid="j1.classpath"/>
750 <      <formatter type="xml"/>
733 >  </target>
734  
752      <batchtest todir="${build.j1.dir}">
753        <fileset dir="${j1.src.dir}">
754          <include name="**/*Test.java"/>
755        </fileset>
756      </batchtest>
735  
736 <    </junit>
736 >  <target name="jsr166xdist-jar"
737 >          depends="jsr166xclean, jsr166xjar">
738  
739 <    <available property="junit.report.format"
761 <                  value="frames"
762 <              classname="org.apache.xalan.lib.Redirect"/>
763 <    <property name="junit.report.format" value="noframes"/>
739 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
740  
741 <    <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>
741 >  </target>
742  
743 <    <fail message="Test Cases Failed" if="junit.failed"/>
743 >  <!-- jsr166y -->
744 >
745 >
746 >  <target name="jsr166ycompile"
747 >          depends="configure-compiler"
748 >          description="Compiles jsr166y sources">
749  
750 +    <mkdir dir="${build.jsr166y.dir}"/>
751 +
752 +    <javac srcdir="${topsrc.dir}"
753 +           destdir="${build.jsr166y.dir}"
754 +           debug="${build.debug}"
755 +           debuglevel="${build.debuglevel}"
756 +           deprecation="${build.deprecation}"
757 +           source="6"
758 +           classpath=""
759 +           bootclasspath="${bootclasspath6}"
760 +           includeAntRuntime="false"
761 +           includeJavaRuntime="false"
762 +           executable="${javac7}"
763 +           fork="true">
764 +
765 +      <include name="jsr166y/**/*.java"/>
766 +      <compilerarg line="${build.args}"/>
767 +      <compilerarg value="-XDignore.symbol.file=true"/>
768 +      <compilerarg value="-Xlint:all"/>
769 +    </javac>
770    </target>
771  
772  
773 +  <target name="jsr166yjar"
774 +          depends="jsr166ycompile"
775 +          description="Builds library jar from compiled sources">
776  
777 <  <!-- C++ and JNI definitions and demos -->
777 >    <jar destfile="${jsr166y.jar}" index="true">
778 >      <fileset dir="${build.jsr166y.dir}"/>
779 >    </jar>
780  
781 <  <target name="configure-cpp">
781 >  </target>
782  
785    <!-- Define tasks and types -->
783  
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"/>
784  
785 <    <!-- Set platform property for JNI includes -->
785 >  <target name="jsr166ydocs"
786 >          description="Builds javadocs to dist dir">
787  
788 <    <condition property="platform" value="linux">
789 <      <os name="Linux"/>
790 <    </condition>
791 <    <condition property="platform" value="win32">
792 <      <os family="windows"/>
793 <    </condition>
794 <    <condition property="platform" value="solaris">
795 <      <os name="SunOS"/>
796 <    </condition>
788 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
789 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
790 >
791 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
792 >             packagenames="jsr166y.*"
793 >             link="${jdkapidocs.url}"
794 >             source="6"
795 >             bootclasspath="${bootclasspath6}"
796 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
797 >             executable="${javadoc7}"
798 >             additionalparam="-XDignore.symbol.file=true" />
799  
800    </target>
801  
802  
803 <  <target name="cppdemo" depends="configure-cpp">
803 >  <target name="jsr166ydist"
804 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
805 >          description="Puts all distributable products in single hierarchy"/>
806 >
807  
810    <mkdir dir="${build.dir}"/>
808  
809 <    <cc multithreaded="true"
810 <                 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>
809 >  <target name="jsr166yclean"
810 >          description="Removes all jsr166y build products">
811  
812 <    <exec executable="${build.dir}/CppDemo">
821 <      <arg line="count in word frequency of word in command line count"/>
822 <    </exec>
812 >    <delete dir="${build.jsr166y.dir}"/>
813  
814    </target>
815  
816  
827  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
817  
818 <    <mkdir dir="${build.testcases.dir}"/>
818 >  <target name="jsr166ydist-clean"
819 >          description="Removes all build and distribution products">
820  
821 <    <javac srcdir="${test.src.dir}"
822 <          destdir="${build.testcases.dir}"
823 <            debug="${build.debug}"
824 <       debuglevel="${build.debuglevel}"
825 <      deprecation="${build.deprecation}"
826 <           source="${build.sourcelevel}"
827 <             fork="true">
828 <      <compilerarg value="${bootclasspath.args}"/>
821 >  </target>
822 >
823 >  <target name="jsr166ydist-jar"
824 >          depends="jsr166yclean, jsr166yjar">
825 >
826 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
827 >
828 >  </target>
829 >
830 >
831 >  <!-- extra166y -->
832 >
833 >
834 >  <target name="extra166ycompile"
835 >          depends="configure-compiler, jsr166yjar"
836 >          description="Compiles extra166y sources">
837 >
838 >    <mkdir dir="${build.extra166y.dir}"/>
839 >
840 >    <javac srcdir="${topsrc.dir}"
841 >           destdir="${build.extra166y.dir}"
842 >           debug="${build.debug}"
843 >           debuglevel="${build.debuglevel}"
844 >           deprecation="${build.deprecation}"
845 >           classpath=""
846 >           source="6"
847 >           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
848 >           includeAntRuntime="false"
849 >           includeJavaRuntime="false"
850 >           executable="${javac7}"
851 >           fork="true">
852 >
853 >      <include name="extra166y/**/*.java"/>
854        <compilerarg line="${build.args}"/>
855 <      <classpath refid="test.classpath"/>
856 <      <include name="JniDemo.java"/>
855 >      <compilerarg value="-XDignore.symbol.file=true"/>
856 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
857 >
858      </javac>
859  
860 <    <javah destdir="${build.testcases.dir}"
861 <      classpathref="test.classpath">
846 <      <class name="JniDemo"/>
847 <    </javah>
860 >  </target>
861 >
862  
849    <cc multithreaded="true"
850                 name="g++"
851               objdir="${build.dir}"
852              outfile="${build.dir}/JniDemo"
853              outtype="shared">
863  
864 <      <compiler>
865 <        <defineset>
866 <          <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>
864 >  <target name="extra166yjar"
865 >          depends="extra166ycompile"
866 >          description="Builds library jar from compiled sources">
867  
868 <      <linker>
869 <        <linkerarg value="--add-stdcall-alias"/>
870 <      </linker>
868 >    <jar destfile="${extra166y.jar}" index="true">
869 >      <fileset dir="${build.extra166y.dir}"/>
870 >    </jar>
871  
872 <      <includepath location="${build.testcases.dir}"/>
872 >  </target>
873  
870      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
874  
872      <libset libs="stdc++"/>
875  
876 <    </cc>
876 >  <target name="extra166ydocs"
877 >          description="Builds javadocs to build dir">
878  
879 <    <!-- Necessary if windows, harmless if not -->
880 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
879 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
880 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
881  
882 <    <java classname="JniDemo" fork="true">
883 <      <!-- Watch out: path separator hardwired to semicolon here! -->
884 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
885 <      <classpath refid="test.classpath"/>
886 <      <arg line="count in word frequency of word in command line count"/>
887 <    </java>
882 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
883 >             packagenames="extra166y.*"
884 >             link="${jdkapidocs.url}"
885 >             source="6"
886 >             bootclasspath="${bootclasspath6}"
887 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
888 >             executable="${javadoc7}"
889 >             additionalparam="-XDignore.symbol.file=true" />
890  
891    </target>
892  
893  
894 +  <target name="extra166ydist"
895 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
896 +          description="Puts all distributable products in single hierarchy"/>
897  
890  <!-- Backward compatibility, work in progress (some files not checked in) -->
898  
899  
900 +  <target name="extra166yclean"
901 +          description="Removes all extra166y build products">
902  
903 <  <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"/>
903 >    <delete dir="${build.extra166y.dir}"/>
904  
905 <  <target name="defang"
900 <       depends="init"
901 <   description="Generates pre-Tiger compatible source">
905 >  </target>
906  
903    <delete dir="${pretiger.src.dir}"/>
904    <mkdir dir="${pretiger.src.dir}"/>
907  
908 <    <exec executable="perl">
909 <      <arg file="etc/defang.pl"/>
910 <      <!-- <arg value="-v"/> -->
909 <      <arg value="-s"/> <arg file="${src.dir}"/>
910 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
911 <    </exec>
908 >
909 >  <target name="extra166ydist-clean"
910 >          description="Removes all build and distribution products">
911  
912    </target>
913  
914 <  <target name="compile-pretiger"
915 <          depends="init, configure-compiler, defang"
917 <          description="Compiles pre-Tiger sources to build folder">
914 >  <target name="extra166ydist-jar"
915 >          depends="extra166yclean, extra166yjar">
916  
917 <    <mkdir dir="${build.pretiger.dir}"/>
917 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
918  
919 <    <javac srcdir="${pretiger.src.dir}"
920 <          destdir="${build.pretiger.dir}"
921 <            debug="${build.debug}"
922 <       debuglevel="${build.debuglevel}"
923 <      deprecation="${build.deprecation}"
924 <           source="${pretiger.sourcelevel}"
925 <             fork="true">
919 >  </target>
920 >
921 >  <!-- jsr166e -->
922 >
923 >  <target name="jsr166ecompile"
924 >          depends="configure-compiler"
925 >          description="Compiles jsr166e sources">
926  
927 +    <mkdir dir="${build.jsr166e.dir}"/>
928 +
929 +    <javac srcdir="${topsrc.dir}"
930 +           destdir="${build.jsr166e.dir}"
931 +           debug="${build.debug}"
932 +           debuglevel="${build.debuglevel}"
933 +           deprecation="${build.deprecation}"
934 +           source="7"
935 +           classpath=""
936 +           includeAntRuntime="false"
937 +           includeJavaRuntime="false"
938 +           executable="${javac7}"
939 +           fork="true">
940 +
941 +      <include name="jsr166e/**/*.java"/>
942        <compilerarg line="${build.args}"/>
943 <      <exclude name="**/Thread.java"/>
943 >      <compilerarg value="-XDignore.symbol.file=true"/>
944 >      <compilerarg value="-Xlint:all"/>
945  
946      </javac>
947  
948    </target>
949  
936  <target name="pretiger" depends="compile-pretiger">
950  
938    <mkdir dir="${build.lib.dir}"/>
951  
952 <    <jar destfile="${pretiger.jar}">
953 <      <fileset dir="${build.pretiger.dir}">
954 <      </fileset>
952 >  <target name="jsr166ejar"
953 >          depends="jsr166ecompile"
954 >          description="Builds library jar from compiled sources">
955 >
956 >    <jar destfile="${jsr166e.jar}" index="true">
957 >      <fileset dir="${build.jsr166e.dir}"/>
958      </jar>
959  
960    </target>
961  
962 +
963 +
964 +  <target name="jsr166edocs"
965 +          description="Builds javadocs to build dir">
966 +
967 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
968 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
969 +
970 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
971 +             packagenames="jsr166e.*"
972 +             link="${jdkapidocs.url}"
973 +             source="7"
974 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
975 +             executable="${javadoc7}"
976 +             additionalparam="-XDignore.symbol.file=true" >
977 +    </javadoc>
978 +
979 +  </target>
980 +
981 +
982 +  <target name="jsr166edist"
983 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
984 +          description="Puts all distributable products in single hierarchy"/>
985 +
986 +
987 +
988 +  <target name="jsr166eclean"
989 +          description="Removes all jsr166e build products">
990 +
991 +    <delete dir="${build.jsr166e.dir}"/>
992 +
993 +  </target>
994 +
995 +
996 +  <target name="jsr166edist-clean"
997 +          description="Removes all build and distribution products">
998 +
999 +  </target>
1000 +
1001 +  <target name="jsr166edist-jar"
1002 +          depends="jsr166eclean, jsr166ejar">
1003 +
1004 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1005 +
1006 +  </target>
1007 +
1008   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines