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.28 by tim, Wed May 28 13:37:59 2003 UTC vs.
Revision 1.92 by jsr166, Mon Jan 14 07:08:06 2013 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage">
2  
3    <description>
4 <    Build file for JSR-166
4 > ------------------------------------------------------------------------------
5 >  Build file for JSR-166
6  
7 <    JUnit 3.8 or better must be in ${ant.home}/lib for the test target to work.
7 <  </description>
7 >  Usage: ant [target]
8  
9 +  User-specific settings are read from user.properties.
10 +  See user.properties.sample for an explanation of some useful settings.
11 + ------------------------------------------------------------------------------
12 +  </description>
13  
14 <  <target name="usage" description="Prints this message">
15 <    <echo>
12 < ant [target], where target is one of:
13 <
14 < usage       (default) Prints this message
15 < compile     Compiles all sources to build folder
16 < jar         Builds library jar from compiled sources
17 < test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18 < docs        Builds javadocs with custom tags to build folder
19 < dist-docs   Builds javadocs without custom tags to dist folder
20 < dist        Puts all distributable products in single hierarchy
21 <
22 < clean       Removes all build products
23 < dist-clean  Removes all build and distribution products
24 <
25 < checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26 < doccheck    Reports on javadoc style errors (not working yet)
27 <    </echo>
14 >  <target name="usage" description="Advises user to run with -projecthelp">
15 >    <echo>Run "ant -projecthelp" for full usage information.</echo>
16    </target>
17  
18 +
19    <!-- User-specific settings -->
20    <property file="user.properties"/>
21  
33  <!-- Set build.warnings in user.properties to turn on -warnunchecked -->
34  <!-- <property name="build.warnings" value=""/> -->
35
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
39 <  <property name="build.docsourcelevel" value="1.4"/>
24 >  <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
28  
29    <!-- Build locations -->
30 <  <property name="build.dir"            location="build"/>
31 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
32 <  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
33 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
34 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
35 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
36 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
38 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
39 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
40 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >
38 >  <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
39 >  <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
40 >  <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
41 >  <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
42 >
43 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
44 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
45 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
46 >
47 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
48 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
49 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
50 >
51 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
52 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
53 >  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
54 >
55 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
56 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
57 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
58 >
59 >  <!-- JDK binary locations -->
60 >  <property name="jdks.home"  location="${user.home}/jdk"/>
61 >  <property name="jdk6.home"  location="${jdks.home}/jdk1.6.0"/>
62 >  <property name="jdk7.home"  location="${jdks.home}/jdk1.7.0"/>
63 >  <property name="jdk8.home"  location="${jdks.home}/jdk1.8.0"/>
64 >  <property name="javac6"     location="${jdk6.home}/bin/javac"/>
65 >  <property name="javac7"     location="${jdk7.home}/bin/javac"/>
66 >  <property name="javac8"     location="${jdk8.home}/bin/javac"/>
67 >  <property name="javadoc6"   location="${jdk6.home}/bin/javadoc"/>
68 >  <property name="javadoc7"   location="${jdk7.home}/bin/javadoc"/>
69 >  <property name="javadoc8"   location="${jdk8.home}/bin/javadoc"/>
70 >  <property name="bootdir6"   location="${jdk6.home}/jre/lib"/>
71 >  <property name="bootdir7"   location="${jdk7.home}/jre/lib"/>
72 >  <property name="bootdir8"   location="${jdk8.home}/jre/lib"/>
73 >  <property name="bootclasspath6"   value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/>
74 >  <property name="bootclasspath7"   value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/>
75 >  <property name="bootclasspath8"   value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/>
76  
77    <!-- Source locations -->
78    <property name="src.dir"              location="${basedir}/src/main"/>
59  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
79    <property name="test.src.dir"         location="${basedir}/src/test"/>
80 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
81 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
80 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
81 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
82 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
83    <property name="lib.dir"              location="${basedir}/lib"/>
84    <property name="dist.dir"             location="${basedir}/dist"/>
85 +  <property name="topsrc.dir"           location="${basedir}/src"/>
86 +  <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
87 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
88 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
89 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
90 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
91 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
92  
93    <!-- Distribution locations -->
94 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
94 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
95 >  <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
96 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
97 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
98 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
99 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
100  
101    <!-- Jar locations -->
102    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
103 <  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
104 <  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
103 >  <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
104 >  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
105 >  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
106 >  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
107 >  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
108    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
74  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
75
76
77
78  <!--
79   ! Bootclasspath munging for source compilation.
80   -->
81
82  <path id="javac.bootclasspath.prefix">
83    <!-- <pathelement location="${src.dir}"/> -->
84    <pathelement location="${javac.jar}"/>
85  </path>
86
87  <path id="javac.bootclasspath">
88    <!-- <pathelement location="${src.dir}"/> -->
89    <pathelement location="${collect.jar}"/>
90    <pathelement location="${rt.jar}"/>
91  </path>
92
93  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
94  <property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>
95
96  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
97  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
98
109  
110 +  <!-- Bootclasspath argument -->
111 +  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
112  
113 <  <!--
114 <   ! Bootclasspath munging for testing, so JUnit can test our local
115 <   ! modifications to java.*.
116 <   -->
113 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
114 >  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
115 >  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
116 >  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
117 >
118 >  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
119 >  <!-- The below does not yet exist as of 2012-11 -->
120 >  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
121 >  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
122  
123 +  <!-- Test classpath -->
124    <path id="test.classpath">
107    <pathelement location="${product.jar}"/>
125      <pathelement location="${build.testcases.dir}"/>
126      <pathelement location="${junit.jar}"/>
127    </path>
128  
129 <  <!-- Flatten test classpath into a platform-appropriate string -->
130 <  <property name="test.classpath" refid="test.classpath"/>
131 <
132 <  <!-- Turn the flattened test classpath into a javac argument -->
116 <  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
117 <
118 <
119 <
120 <  <!-- Files excluded from emulation and dist-docs -->
121 <  <patternset id="emulation.excludes">
122 <    <exclude name="java/util/Random.*"/>
123 <    <exclude name="sun/misc/Unsafe.*"/>
124 <  </patternset>
125 <
129 >  <!-- ALoops classpath -->
130 >  <path id="loops.classpath">
131 >    <pathelement location="${build.loops.dir}"/>
132 >  </path>
133  
134  
135    <!-- Main targets -->
136  
137 +  <target name="dists"
138 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
139 +          description="Builds all public jars and docs"/>
140 +
141    <target name="compile"
142 <          depends="init"
142 >          depends="init, configure-compiler"
143            description="Compiles main sources to build folder">
144  
145      <mkdir dir="${build.classes.dir}"/>
# Line 141 | Line 152 | ant [target], where target is one of:
152             source="${build.sourcelevel}"
153               fork="true">
154  
155 <      <bootclasspath refid="javac.bootclasspath"/>
156 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
155 >      <include name="**/*.java"/>
156 >      <compilerarg value="-XDignore.symbol.file=true"/>
157 >
158 > <!--
159 >      <exclude name="java/lang/**"/>
160 >      <compilerarg line="${build.args}"/>
161 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
162 > -->
163  
164      </javac>
165  
166    </target>
167  
168  
152  <target name="jar"
153          depends="native-jar, emulation-jar"
154          description="Builds library jar from compiled sources"/>
155
169  
170 <  <target name="test"
171 <          depends="init, check-junit, report-tests"
172 <          description="Runs all tests (requires JUnit 3.8+ in ${ant.home}/lib)" />
160 <
161 <
162 <  <target name="checkstyle"
163 <          depends="filter-src"
164 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
170 >  <target name="jar"
171 >          depends="compile"
172 >          description="Builds library jar from compiled sources">
173  
174 <    <taskdef resource="checkstyletask.properties"
167 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
174 >    <mkdir dir="${build.lib.dir}"/>
175  
176 <    <checkstyle>
177 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
178 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
172 <    </checkstyle>
176 >    <jar destfile="${product.jar}">
177 >      <fileset dir="${build.classes.dir}"/>
178 >    </jar>
179  
180    </target>
181  
182  
177  <target name="doccheck"
178          depends="filter-src"
179          description="Reports on javadoc style errors (not working yet)">
183  
184 <    <delete dir="${build.doccheck.dir}"/>
185 <    <mkdir dir="${build.doccheck.dir}"/>
186 <
184 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
185 <         docletpath="${lib.dir}/doccheck.jar"
186 <            destdir="${build.doccheck.dir}">
187 <      <packageset dir="${build.filter.src.dir}"/>
188 <    </javadoc>
184 >  <target name="test"
185 >          depends="init, configure-tests, report-tests"
186 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
187  
190  </target>
188  
189  
190    <target name="docs"
194          depends="filter-src"
191            description="Builds javadocs with custom tags to build folder">
192  
193      <delete dir="${build.javadocs.dir}"/>
194      <mkdir dir="${build.javadocs.dir}"/>
195  
196 <    <javadoc destdir="${build.javadocs.dir}"
197 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
202 <            overview="${src.dir}/intro.html"
203 <              source="${build.docsourcelevel}">
204 <
205 <      <tag name="revised" description="Last revised:"/>
206 <      <tag name="spec" description="Specified by:"/>
207 <      <tag name="editor" description="Last edited by:"/>
208 <      <tag name="fixme" description="FIX ME:"/>
209 <      <packageset dir="${build.filter.src.dir}"/>
196 >    <!-- the packagenames="none" hack below prevents scanning the -->
197 >    <!-- sourcepath for packages -->
198  
199 +    <javadoc destdir="${build.javadocs.dir}"
200 +             packagenames="none"
201 +             link="${jdkapidocs.url}"
202 +             overview="${src.dir}/intro.html"
203 +             sourcepath="${src.dir}:${jdksrc.dir}"
204 +             additionalparam="-XDignore.symbol.file=true" >
205 +      <fileset dir="${src.dir}" defaultexcludes="yes">
206 +        <include name="**/*.java"/>
207 +      </fileset>
208      </javadoc>
209  
210    </target>
211  
212  
216  <!--
217   # javac -s doesn't reliably generate compilable code. It generates
218   # bridge methods (marked as "synthetic") that can have identical
219   # signatures to existing methods except for the return value.
220   -->
221  <target name="strip"
222          depends="init">
213  
214 <    <mkdir dir="${build.stripped.dir}"/>
215 <
216 <    <javac srcdir="${src.dir}"
227 <          destdir="${build.stripped.dir}"
228 <            debug="${build.debug}"
229 <       debuglevel="${build.debuglevel}"
230 <      deprecation="${build.deprecation}"
231 <           source="${build.sourcelevel}"
232 <             fork="true">
214 >  <target name="dist"
215 >          depends="init, dist-clean, dist-jar, dist-docs"
216 >          description="Puts all distributable products in single hierarchy"/>
217  
234      <bootclasspath refid="javac.bootclasspath"/>
235      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
218  
219 <    </javac>
219 >  <target name="release"
220 >          depends="dist"
221 >          description="Puts entire CVS tree, plus distribution productions, in a jar">
222 >
223 >    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
224 >
225 >    <jar basedir="${basedir}" destfile="${release.jar}">
226 >      <!-- <exclude name="build/**"/> -->
227 >      <exclude name="${release.jar}"/>
228 >      <exclude name="user.properties"/>
229 >      <exclude name="etc/notes/**"/>
230 >      <exclude name="src/emulation/**"/>
231 >      <exclude name="**/SyntaxTest.java"/>
232 >      <exclude name="**/SuperfluousAbstract.java"/>
233 >    </jar>
234  
235    </target>
236  
237  
242  <target name="dist"
243          depends="init, dist-clean, dist-jar, dist-docs"
244          description="Puts all distributable products in single hierarchy"/>
245
238  
239    <target name="clean"
240            description="Removes all build products">
# Line 254 | Line 246 | ant [target], where target is one of:
246    </target>
247  
248  
249 +
250    <target name="dist-clean"
251            description="Removes all build and distribution products">
252  
# Line 262 | Line 255 | ant [target], where target is one of:
255    </target>
256  
257  
258 +
259    <target name="dist-docs"
266          depends="filter-src"
260            description="Builds javadocs without custom tags to dist folder">
261  
262      <delete dir="${dist.javadocs.dir}"/>
263      <mkdir dir="${dist.javadocs.dir}"/>
264  
265 <    <javadoc destdir="${dist.javadocs.dir}"
266 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
274 <            overview="${src.dir}/intro.html"
275 <              source="${build.docsourcelevel}">
276 <
277 <      <packageset dir="${build.filter.src.dir}"/>
265 >    <!-- the packagenames="none" hack below prevents scanning the -->
266 >    <!-- sourcepath for packages -->
267  
268 +    <javadoc destdir="${dist.javadocs.dir}"
269 +             packagenames="none"
270 +             link="${jdkapidocs.url}"
271 +             overview="${src.dir}/intro.html"
272 +             sourcepath="${src.dir}:${jdksrc.dir}"
273 +             additionalparam="-XDignore.symbol.file=true" >
274 +      <fileset dir="${src.dir}" defaultexcludes="yes">
275 +        <include name="**/*.java"/>
276 +      </fileset>
277      </javadoc>
278  
279    </target>
# Line 284 | Line 282 | ant [target], where target is one of:
282  
283    <!-- Internal targets -->
284  
287  <target name="set-warnings-if" if="build.warnings">
285  
286 <    <property name="build.warnings.option" value="-warnunchecked"/>
286 >  <target name="init">
287 >
288 >    <!-- Version is kept in a separate file -->
289 >    <loadfile property="version" srcFile="version.properties"/>
290 >    <echo>Building JSR-166 version ${version}</echo>
291 >    <echo>java.home is ${java.home}</echo>
292  
293    </target>
294  
295  
296 <  <target name="set-warnings-unless" unless="build.warnings">
296 >  <target name="dist-jar"
297 >          depends="clean, jar">
298  
299 <    <property name="build.warnings.option" value=""/>
299 >    <copy file="${product.jar}" todir="${dist.dir}"/>
300  
301    </target>
302  
303  
304 <  <target name="init"
305 <          depends="set-warnings-if, set-warnings-unless">
304 >  <target name="compile-tests"
305 >          depends="jar">
306 >
307 >    <mkdir dir="${build.testcases.dir}"/>
308 >
309 >    <javac srcdir="${tck.src.dir}"
310 >          destdir="${build.testcases.dir}"
311 >            debug="${build.debug}"
312 >       debuglevel="${build.debuglevel}"
313 >      deprecation="${build.deprecation}"
314 >           source="${build.sourcelevel}"
315 >             fork="true">
316 >
317 >      <compilerarg value="${bootclasspath.args}"/>
318 >      <compilerarg line="${build.args}"/>
319 >      <compilerarg value="-XDignore.symbol.file=true"/>
320  
321 <    <!-- Version is kept in a separate file -->
322 <    <loadfile property="version" srcFile="version.properties"/>
323 <    <echo>Building JSR-166 version ${version}</echo>
321 >      <classpath refid="test.classpath"/>
322 >
323 >    </javac>
324 >
325 >    <javac srcdir="${test.src.dir}"
326 >          destdir="${build.testcases.dir}"
327 >            debug="${build.debug}"
328 >       debuglevel="${build.debuglevel}"
329 >      deprecation="${build.deprecation}"
330 >           source="${build.sourcelevel}"
331 >             fork="true">
332 >
333 >      <include name="jsr166/test/**"/>
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 >
341 >    </javac>
342 >
343 > <!--
344 >    <javac srcdir="${jtreg.src.dir}"
345 >          destdir="${build.testcases.dir}"
346 >            debug="${build.debug}"
347 >       debuglevel="${build.debuglevel}"
348 >      deprecation="${build.deprecation}"
349 >           source="${build.sourcelevel}"
350 >             fork="true">
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 >
358 >    </javac>
359 > -->
360  
361    </target>
362  
363  
364 <  <target name="init-jar">
364 >  <target name="run-tests"
365 >          depends="compile-tests">
366  
367 <    <mkdir dir="${build.lib.dir}"/>
367 >    <!-- May be overridden by user.properties -->
368 >    <property name="testcase" value="*"/>
369 >
370 >    <mkdir dir="${build.reports.dir}"/>
371 >
372 >    <junit printsummary="true"
373 >             showoutput="true"
374 >          errorProperty="junit.failed"
375 >        failureProperty="junit.failed"
376 >                    dir="${build.reports.dir}"
377 >                   fork="true">
378 >
379 >      <jvmarg value="${bootclasspath.args}"/>
380 >      <jvmarg value="-server"/>
381 >      <jvmarg value="-showversion"/>
382 >
383 >      <classpath refid="test.classpath"/>
384 >
385 >      <formatter type="xml"/>
386 >
387 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
388 >        <fileset dir="${tck.src.dir}">
389 >          <include name="**/${testcase}Test.java"/>
390 >        </fileset>
391 >      </batchtest>
392 >
393 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
394 >        <fileset dir="${test.src.dir}">
395 >          <include name="jsr166/test/**/${testcase}Test.java"/>
396 >        </fileset>
397 >      </batchtest>
398 >
399 > <!--
400 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
401 >        <fileset dir="${jtreg.src.dir}">
402 >          <include name="**/${testcase}Test.java"/>
403 >        </fileset>
404 >      </batchtest>
405 > -->
406 >
407 >    </junit>
408  
409    </target>
410  
411  
412 <  <target name="native-jar"
413 <          depends="compile, init-jar"
320 <          unless="build.emulation">
412 >  <target name="report-tests"
413 >          depends="run-tests">
414  
415 <    <jar destfile="${product.jar}">
416 <      <fileset dir="${build.classes.dir}"/>
415 >    <!-- Sets junit.report.format to frames if redirection is present,
416 >         otherwise sets it to noframes. -->
417 >    <available property="junit.report.format"
418 >                  value="frames"
419 >              classname="org.apache.xalan.lib.Redirect"
420 >    />
421 >    <property name="junit.report.format" value="noframes"/>
422 >
423 >    <junitreport todir="${build.reports.dir}">
424 >      <fileset dir="${build.reports.dir}">
425 >        <include name="TEST-*.xml"/>
426 >      </fileset>
427 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
428 >      />
429 >    </junitreport>
430 >
431 >    <fail message="Test Cases Failed" if="junit.failed"/>
432 >
433 >  </target>
434 >
435 >
436 >  <target name="configure-compiler">
437 >
438 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
439 >
440 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
441 >      <istrue value="${build.warnunchecked}"/>
442 >    </condition>
443 >
444 >    <property name="warnunchecked.arg" value=""/>
445 >
446 >
447 >    <!-- Common options in javac invocations -->
448 >    <property name="build.args" value="${warnunchecked.arg}"/>
449 >
450 >  </target>
451 >
452 >
453 >  <target name="configure-tests"
454 >       depends="configure-compiler">
455 >
456 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
457 >    <available property="junit.available"
458 >               classname="junit.framework.Protectable"/>
459 >
460 >    <!-- Xalan -->
461 >    <available property="xalan.available"
462 >               classname="org.apache.xalan.Version"/>
463 >
464 >
465 >    <!-- Ant 1.6beta and later don't need or want this check -->
466 >    <!--
467 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
468 >          unless="junit.available"/>
469 >
470 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
471 >          unless="xalan.available"/>
472 >    -->
473 >
474 >  </target>
475 >
476 >
477 >  <!-- Various demos and test programs -->
478 >
479 >
480 >  <target name="loops" depends="init, configure-compiler"
481 >          description="Benchmark from Doug Lea's AQS paper">
482 >
483 >    <mkdir dir="${build.loops.dir}"/>
484 >
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 >  <!-- jdk7 -->
507 >
508 >
509 >  <target name="jdk7compile"
510 >          depends="configure-compiler"
511 >          description="Compiles src/jdk7 sources">
512 >
513 >    <mkdir dir="${build.jdk7.classes.dir}"/>
514 >
515 >    <javac srcdir="${jdk7src.dir}"
516 >           destdir="${build.jdk7.classes.dir}"
517 >           debug="${build.debug}"
518 >           debuglevel="${build.debuglevel}"
519 >           deprecation="${build.deprecation}"
520 >           source="1.6"
521 >           classpath=""
522 >           bootclasspath="${bootclasspath6}"
523 >           includeAntRuntime="false"
524 >           includeJavaRuntime="false"
525 >           executable="${javac6}"
526 >           fork="true">
527 >
528 >      <include name="**/*.java"/>
529 >      <compilerarg line="${build.args}"/>
530 >      <compilerarg value="-XDignore.symbol.file=true"/>
531 >      <compilerarg value="-Xlint:all"/>
532 >
533 >    </javac>
534 >
535 >  </target>
536 >
537 >
538 >
539 >  <target name="jdk7jar"
540 >          depends="jdk7compile"
541 >          description="Builds library jar from compiled sources">
542 >
543 >    <mkdir dir="${build.jdk7.lib.dir}"/>
544 >
545 >    <jar destfile="${jdk7product.jar}" index="true">
546 >      <fileset dir="${build.jdk7.classes.dir}"/>
547      </jar>
548  
549    </target>
550  
551  
329  <target name="base-jar"
330          depends="compile, init-jar">
552  
553 <    <jar destfile="${product.jar}">
554 <      <fileset dir="${build.classes.dir}">
555 <        <patternset refid="emulation.excludes"/>
553 >  <target name="jdk7docs"
554 >          description="Builds javadocs with custom tags to build folder">
555 >
556 >    <delete dir="${build.jdk7.docs.dir}"/>
557 >    <mkdir dir="${build.jdk7.docs.dir}"/>
558 >
559 >    <javadoc destdir="${build.jdk7.docs.dir}"
560 >             packagenames="none"
561 >             link="${jdkapi7docs.url}"
562 >             overview="${jdk7src.dir}/intro.html"
563 >             sourcepath="${jdk7src.dir}"
564 >             bootclasspath="${bootclasspath6}"
565 >             classpath=""
566 >             source="1.6"
567 >             executable="${javadoc7}"
568 >             additionalparam="-XDignore.symbol.file=true" >
569 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
570 >        <include name="**/*.java"/>
571 >      </fileset>
572 >    </javadoc>
573 >
574 >  </target>
575 >
576 >
577 >  <target name="jdk7dist"
578 >          depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
579 >          description="Puts all distributable products in single hierarchy"/>
580 >
581 >
582 >
583 >  <target name="jdk7clean"
584 >          description="Removes all build products">
585 >
586 >    <delete dir="${build.jdk7.dir}"/>
587 >
588 >  </target>
589 >
590 >
591 >
592 >  <target name="jdk7dist-clean"
593 >          description="Removes all build and distribution products">
594 >
595 >  </target>
596 >
597 >  <target name="jdk7dist-docs"
598 >          description="Builds javadocs without custom tags to dist folder">
599 >
600 >    <delete dir="${dist.jdk7.docs.dir}"/>
601 >    <mkdir dir="${dist.jdk7.docs.dir}"/>
602 >
603 >    <javadoc destdir="${dist.jdk7.docs.dir}"
604 >             packagenames="none"
605 >             link="${jdkapi7docs.url}"
606 >             overview="${jdk7src.dir}/intro.html"
607 >             sourcepath="${jdk7src.dir}"
608 >             classpath=""
609 >             executable="${javadoc7}"
610 >             bootclasspath="${bootclasspath6}"
611 >             source="1.6">
612 >      <arg value="-XDignore.symbol.file=true"/>
613 >      <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
614 >        <include name="**/*.java"/>
615        </fileset>
616 +    </javadoc>
617 +
618 +  </target>
619 +
620 +  <target name="jdk7dist-jar"
621 +          depends="jdk7clean, jdk7jar">
622 +
623 +    <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
624 +
625 +  </target>
626 +
627 +  <!-- jsr166x -->
628 +
629 +
630 +  <target name="jsr166xcompile"
631 +          depends="init, configure-compiler"
632 +          description="Compiles jsr166x sources">
633 +
634 +    <mkdir dir="${build.jsr166x.dir}"/>
635 +
636 +    <javac srcdir="${jsr166xsrc.dir}"
637 +          destdir="${build.jsr166x.dir}"
638 +            debug="${build.debug}"
639 +       debuglevel="${build.debuglevel}"
640 +      deprecation="${build.deprecation}"
641 +           source="${build.sourcelevel}"
642 +             fork="true">
643 +
644 +      <include name="**/*.java"/>
645 +      <compilerarg line="${build.args}"/>
646 +      <compilerarg value="-XDignore.symbol.file=true"/>
647 +
648 +    </javac>
649 +
650 +  </target>
651 +
652 +
653 +
654 +  <target name="jsr166xjar"
655 +          depends="jsr166xcompile"
656 +          description="Builds library jar from compiled sources">
657 +
658 +    <mkdir dir="${build.jsr166xlib.dir}"/>
659 +
660 +    <jar destfile="${jsr166xproduct.jar}">
661 +      <fileset dir="${build.jsr166x.dir}"/>
662      </jar>
663  
664    </target>
665  
666  
341  <target name="compile-emulation"
342          depends="init"
343          if="build.emulation">
667  
668 <    <mkdir dir="${build.emulation.dir}"/>
668 >  <target name="jsr166xdocs"
669 >          description="Builds javadocs with custom tags to build folder">
670 >
671 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
672 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
673 >
674 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
675 >             packagenames="jsr166x"
676 >             link="${jdkapidocs.url}"
677 >             source="${build.sourcelevel}"
678 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
679 >             additionalparam="-XDignore.symbol.file=true" />
680 >
681 >  </target>
682 >
683 >
684 >  <target name="jsr166xdist"
685 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
686 >          description="Puts all distributable products in single hierarchy"/>
687 >
688 >
689 >
690 >  <target name="jsr166xclean"
691 >          description="Removes all build products">
692 >
693 >    <delete dir="${build.jsr166x.dir}"/>
694 >    <delete dir="${build.jsr166xlib.dir}"/>
695 >
696 >  </target>
697 >
698 >
699 >
700 >  <target name="jsr166xdist-clean"
701 >          description="Removes all build and distribution products">
702 >
703 >  </target>
704 >
705 >
706 >
707 >  <target name="jsr166xdist-docs"
708 >          description="Builds javadocs without custom tags to dist folder">
709 >
710 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
711 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
712 >
713 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
714 >             packagenames="jsr166x"
715 >             link="${jdkapidocs.url}"
716 >             source="${build.sourcelevel}"
717 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
718 >             additionalparam="-XDignore.symbol.file=true" />
719 >
720 >  </target>
721 >
722 >  <target name="jsr166xdist-jar"
723 >          depends="jsr166xclean, jsr166xjar">
724 >
725 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
726 >
727 >  </target>
728 >
729 >  <!-- jsr166y -->
730 >
731  
732 <    <javac srcdir="${emulation.src.dir}"
733 <          destdir="${build.emulation.dir}"
732 >  <target name="jsr166ycompile"
733 >          depends="init, configure-compiler"
734 >          description="Compiles jsr166y sources">
735 >
736 >    <mkdir dir="${build.jsr166y.dir}"/>
737 >
738 >    <javac srcdir="${jsr166ysrc.dir}"
739 >          destdir="${build.jsr166y.dir}"
740              debug="${build.debug}"
741         debuglevel="${build.debuglevel}"
742        deprecation="${build.deprecation}"
743             source="${build.sourcelevel}"
744               fork="true">
745  
746 <      <bootclasspath refid="javac.bootclasspath"/>
747 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
746 >      <include name="**/*.java"/>
747 >      <compilerarg line="${build.args}"/>
748 >      <compilerarg value="-XDignore.symbol.file=true"/>
749 >      <compilerarg value="${bootclasspath.args}"/>
750 >
751 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
752  
753      </javac>
754  
755    </target>
756  
757  
363  <target name="emulation-jar"
364          depends="base-jar, compile-emulation"
365          if="build.emulation">
758  
759 <    <jar destfile="${product.jar}" update="true" duplicate="add">
760 <      <fileset dir="${build.emulation.dir}"/>
759 >  <target name="jsr166yjar"
760 >          depends="jsr166ycompile"
761 >          description="Builds library jar from compiled sources">
762 >
763 >    <mkdir dir="${build.jsr166ylib.dir}"/>
764 >
765 >    <jar destfile="${jsr166yproduct.jar}" index="true">
766 >      <fileset dir="${build.jsr166y.dir}"/>
767      </jar>
768  
769    </target>
770  
771  
374  <target name="dist-jar"
375          depends="clean, jar">
772  
773 <    <copy file="${product.jar}" todir="${dist.dir}"/>
773 >  <target name="jsr166ydocs"
774 >          description="Builds javadocs with custom tags to build folder">
775 >
776 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
777 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
778 >
779 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
780 >             packagenames="jsr166y"
781 >             link="${jdkapidocs.url}"
782 >             source="${build.sourcelevel}"
783 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
784 >             additionalparam="-XDignore.symbol.file=true" />
785  
786    </target>
787  
788  
789 <  <target name="compile-ant-filter"
790 <          depends="init">
789 >  <target name="jsr166ydist"
790 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
791 >          description="Puts all distributable products in single hierarchy"/>
792  
385    <mkdir dir="${build.ant.dir}"/>
793  
794 <    <javac srcdir="${ant.src.dir}"
795 <          destdir="${build.ant.dir}"
796 <           source="1.4"
797 <    />
794 >
795 >  <target name="jsr166yclean"
796 >          description="Removes all build products">
797 >
798 >    <delete dir="${build.jsr166y.dir}"/>
799 >    <delete dir="${build.jsr166ylib.dir}"/>
800  
801    </target>
802  
803  
395  <target name="filter-src"
396          depends="compile-ant-filter">
804  
805 <    <mkdir dir="${build.filter.src.dir}"/>
805 >  <target name="jsr166ydist-clean"
806 >          description="Removes all build and distribution products">
807 >
808 >  </target>
809  
810 <    <copy todir="${build.filter.src.dir}">
811 <      <fileset dir="${src.dir}">
812 <        <patternset refid="emulation.excludes"/>
813 <      </fileset>
814 <      <filterchain>
815 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
816 <                      classpath="${build.ant.dir}">
817 <          <!--
818 <           # These arguments are to get rid of angle-bracketed type
819 <           # parameters so that javadoc can run on the result. The
820 <           # following heuristic that seems to work:
821 <           #
412 <           # For all lines not starting with space(s)-asterisk-space(s),
413 <           #   replace <something> with a space, where there may be more
414 <           #   than one right angle bracket at the end, and "something"
415 <           #   must not contain parens or pipes. (This may need some
416 <           #   tweaking.)
417 <           -->
418 <          <param name="notmatching" value="^\s+\*\s.*$"/>
419 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
420 <          <param name="replacement" value=" "/>
421 <        </filterreader>
422 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
423 <                      classpath="${build.ant.dir}">
424 <          <!--
425 <           # These arguments are to uncomment lines beginning with
426 <           # "//@" so that javadoc can see imports that are needed
427 <           # to resolve links but that shouldn't be in the compiled
428 <           # code.
429 <           -->
430 <          <param name="matching" value="^//@.*$"/>
431 <          <param name="pattern" value="^//@"/>
432 <          <param name="replacement" value=""/>
433 <        </filterreader>
434 <      </filterchain>
435 <    </copy>
810 >  <target name="jsr166ydist-docs"
811 >          description="Builds javadocs without custom tags to dist folder">
812 >
813 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
814 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
815 >
816 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
817 >             packagenames="jsr166y"
818 >             link="${jdkapidocs.url}"
819 >             source="${build.sourcelevel}"
820 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
821 >             additionalparam="-XDignore.symbol.file=true" />
822  
823    </target>
824  
825 +  <target name="jsr166ydist-jar"
826 +          depends="jsr166yclean, jsr166yjar">
827  
828 <  <target name="compile-tests"
441 <          depends="jar">
828 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
829  
830 <    <mkdir dir="${build.testcases.dir}"/>
830 >  </target>
831  
832 <    <javac srcdir="${test.src.dir}"
833 <          destdir="${build.testcases.dir}"
832 >
833 >  <!-- extra166y -->
834 >
835 >
836 >  <target name="extra166ycompile"
837 >          depends="init, configure-compiler, jsr166ycompile"
838 >          description="Compiles extra166y sources">
839 >
840 >    <mkdir dir="${build.extra166y.dir}"/>
841 >
842 >    <javac srcdir="${extra166ysrc.dir}"
843 >          destdir="${build.extra166y.dir}"
844              debug="${build.debug}"
845 +            classpath="${jsr166yproduct.jar}"
846         debuglevel="${build.debuglevel}"
847        deprecation="${build.deprecation}"
848             source="${build.sourcelevel}"
849               fork="true">
850  
851 <      <bootclasspath refid="javac.bootclasspath"/>
852 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
853 <      <classpath refid="test.classpath"/>
851 >      <include name="**/*.java"/>
852 >      <compilerarg line="${build.args}"/>
853 >      <compilerarg value="-XDignore.symbol.file=true"/>
854 >      <compilerarg value="${bootclasspath.args}"/>
855 >
856 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
857  
858      </javac>
859  
860    </target>
861  
862  
462  <target name="run-tests"
463          depends="compile-tests">
863  
864 <    <!-- May be overridden by user.properties -->
865 <    <property name="testcase" value="*"/>
864 >  <target name="extra166yjar"
865 >          depends="extra166ycompile"
866 >          description="Builds library jar from compiled sources">
867  
868 <    <mkdir dir="${build.reports.dir}"/>
868 >    <mkdir dir="${build.extra166ylib.dir}"/>
869  
870 <    <junit printsummary="true"
871 <             showoutput="true"
872 <          errorProperty="junit.failed"
473 <        failureProperty="junit.failed"
474 <                    dir="${build.reports.dir}"
475 <                   fork="true">
870 >    <jar destfile="${extra166yproduct.jar}" index="true">
871 >      <fileset dir="${build.extra166y.dir}"/>
872 >    </jar>
873  
874 <      <jvmarg value="${test.javac.args}"/>
874 >  </target>
875  
479      <formatter type="xml"/>
876  
481      <batchtest todir="${build.reports.dir}">
482        <fileset dir="${test.src.dir}">
483          <include name="**/${testcase}Test.java"/>
484        </fileset>
485      </batchtest>
877  
878 <    </junit>
878 >  <target name="extra166ydocs"
879 >          description="Builds javadocs with custom tags to build folder">
880 >
881 >    <delete dir="${build.extra166yjavadocs.dir}"/>
882 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
883 >
884 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
885 >             packagenames="extra166y"
886 >             link="${jdkapidocs.url}"
887 >             source="${build.sourcelevel}"
888 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
889 >             additionalparam="-XDignore.symbol.file=true" />
890  
891    </target>
892  
893  
894 <  <target name="report-tests"
895 <          depends="run-tests">
894 >  <target name="extra166ydist"
895 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
896 >          description="Puts all distributable products in single hierarchy"/>
897  
495    <!-- Sets junit.report.format to frames if Xalan is present,
496         otherwise sets it to noframes. -->
497    <available property="junit.report.format"
498                  value="frames"
499              classname="org.apache.xalan.lib.Redirect"
500    />
501    <property name="junit.report.format" value="noframes"/>
898  
503    <junitreport todir="${build.reports.dir}">
504      <fileset dir="${build.reports.dir}">
505        <include name="TEST-*.xml"/>
506      </fileset>
507      <report styledir="${stylesheet.dir}"
508                format="${junit.report.format}"
509                 todir="${build.reports.dir}"
510      />
511    </junitreport>
899  
900 <    <fail message="Test Cases Failed" if="junit.failed"/>
900 >  <target name="extra166yclean"
901 >          description="Removes all build products">
902 >
903 >    <delete dir="${build.extra166y.dir}"/>
904 >    <delete dir="${build.extra166ylib.dir}"/>
905  
906    </target>
907  
908  
518  <target name="check-junit">
909  
910 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
911 <    <available property="junit.available"
522 <               classname="junit.framework.Protectable"/>
910 >  <target name="extra166ydist-clean"
911 >          description="Removes all build and distribution products">
912  
913 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
914 <          unless="junit.available"/>
913 >  </target>
914 >
915 >  <target name="extra166ydist-docs"
916 >          description="Builds javadocs without custom tags to dist folder">
917 >
918 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
919 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
920 >
921 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
922 >             packagenames="extra166y"
923 >             link="${jdkapidocs.url}"
924 >             source="${build.sourcelevel}"
925 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
926 >             additionalparam="-XDignore.symbol.file=true" />
927 >
928 >  </target>
929 >
930 >  <target name="extra166ydist-jar"
931 >          depends="extra166yclean, extra166yjar">
932 >
933 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
934 >
935 >  </target>
936 >
937 >  <!-- jsr166e -->
938 >
939 >
940 >  <target name="jsr166ecompile"
941 >          depends="init, configure-compiler"
942 >          description="Compiles jsr166e sources">
943 >
944 >    <mkdir dir="${build.jsr166e.dir}"/>
945 >
946 >    <javac srcdir="${jsr166esrc.dir}"
947 >          destdir="${build.jsr166e.dir}"
948 >            debug="${build.debug}"
949 >       debuglevel="${build.debuglevel}"
950 >      deprecation="${build.deprecation}"
951 >           source="1.7"
952 >             fork="true">
953 >
954 >      <include name="**/*.java"/>
955 >      <compilerarg line="${build.args}"/>
956 >      <compilerarg value="-XDignore.symbol.file=true"/>
957 >      <compilerarg value="${bootclasspath.args}"/>
958 >
959 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
960 >
961 >    </javac>
962 >
963 >  </target>
964 >
965 >
966 >
967 >  <target name="jsr166ejar"
968 >          depends="jsr166ecompile"
969 >          description="Builds library jar from compiled sources">
970 >
971 >    <mkdir dir="${build.jsr166elib.dir}"/>
972 >
973 >    <jar destfile="${jsr166eproduct.jar}" index="true">
974 >      <fileset dir="${build.jsr166e.dir}"/>
975 >    </jar>
976 >
977 >  </target>
978 >
979 >
980 >
981 >  <target name="jsr166edocs"
982 >          description="Builds javadocs with custom tags to build folder">
983 >
984 >    <delete dir="${build.jsr166ejavadocs.dir}"/>
985 >    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
986 >
987 >    <javadoc destdir="${build.jsr166ejavadocs.dir}"
988 >             packagenames="jsr166e,jsr166e.extra"
989 >             link="${jdkapidocs.url}"
990 >             source="1.7"
991 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
992 >             additionalparam="-XDignore.symbol.file=true" />
993  
994    </target>
995  
996  
997 +  <target name="jsr166edist"
998 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
999 +          description="Puts all distributable products in single hierarchy"/>
1000 +
1001 +
1002 +
1003 +  <target name="jsr166eclean"
1004 +          description="Removes all build products">
1005 +
1006 +    <delete dir="${build.jsr166e.dir}"/>
1007 +    <delete dir="${build.jsr166elib.dir}"/>
1008 +
1009 +  </target>
1010  
531  <!-- Anthill targets -->
1011  
533  <target name="anthill-build"
534          depends="jar, test, docs, dist-docs"/>
1012  
1013 <  <target name="anthill-publish">
1013 >  <target name="jsr166edist-clean"
1014 >          description="Removes all build and distribution products">
1015  
1016 <    <copy todir="${deployDir}/docs/private">
539 <      <fileset dir="${build.javadocs.dir}"/>
540 <    </copy>
1016 >  </target>
1017  
1018 <    <copy todir="${deployDir}/docs/public">
1019 <      <fileset dir="${dist.javadocs.dir}"/>
544 <    </copy>
1018 >  <target name="jsr166edist-docs"
1019 >          description="Builds javadocs without custom tags to dist folder">
1020  
1021 <    <copy tofile="${deployDir}/index.html"
1022 <          file="${basedir}/etc/anthill-index.html"/>
1021 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1022 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1023  
1024 <    <copy todir="${deployDir}/notes">
1025 <      <fileset dir="${basedir}/etc/notes"/>
1026 <    </copy>
1024 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1025 >             packagenames="jsr166e,jsr166e.extra"
1026 >             link="${jdkapidocs.url}"
1027 >             source="1.7"
1028 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1029 >             additionalparam="-XDignore.symbol.file=true" />
1030  
1031    </target>
1032  
1033 +  <target name="jsr166edist-jar"
1034 +          depends="jsr166eclean, jsr166ejar">
1035 +
1036 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1037 +
1038 +  </target>
1039  
1040   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines