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.32 by tim, Thu May 29 04:35:42 2003 UTC vs.
Revision 1.93 by jsr166, Mon Jan 14 08:58:47 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines