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.36 by tim, Thu May 29 17:29:08 2003 UTC vs.
Revision 1.85 by jsr166, Sat May 28 00:57:34 2011 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 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40 >
41 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44 >
45 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48  
49    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>
45  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
51    <property name="test.src.dir"         location="${basedir}/src/test"/>
52 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
53 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
52 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
55    <property name="lib.dir"              location="${basedir}/lib"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>
57 <
57 >  <property name="topsrc.dir"           location="${basedir}/src"/>
58 >  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59 >  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60 >  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62    <!-- Distribution locations -->
63 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67  
68    <!-- Jar locations -->
69    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59
60
74  
75 <  <!-- Files excluded from emulation and dist-docs -->
76 <  <patternset id="emulation.excludes">
64 <    <exclude name="java/util/Random.*"/>
65 <    <exclude name="sun/misc/Unsafe.*"/>
66 <  </patternset>
75 >  <!-- Bootclasspath argument -->
76 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
78 +  <!-- Test classpath -->
79 +  <path id="test.classpath">
80 +    <pathelement location="${build.testcases.dir}"/>
81 +    <pathelement location="${junit.jar}"/>
82 +  </path>
83 +
84 +  <!-- ALoops classpath -->
85 +  <path id="loops.classpath">
86 +    <pathelement location="${build.loops.dir}"/>
87 +  </path>
88  
89  
90    <!-- Main targets -->
91  
92 +  <target name="dists"
93 +          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94 +          description="Builds all public jars and docs"/>
95 +
96    <target name="compile"
97 <          depends="init, configure-compiler, prepare-src"
97 >          depends="init, configure-compiler"
98            description="Compiles main sources to build folder">
99  
76    <property name="prepare.src.dir" value="${src.dir}"/>
77
100      <mkdir dir="${build.classes.dir}"/>
101  
102 <    <javac srcdir="${prepare.src.dir}"
102 >    <javac srcdir="${src.dir}"
103            destdir="${build.classes.dir}"
104              debug="${build.debug}"
105         debuglevel="${build.debuglevel}"
# Line 85 | Line 107
107             source="${build.sourcelevel}"
108               fork="true">
109  
110 <      <bootclasspath refid="javac.bootclasspath"/>
111 <      <compilerarg line="${build.javac.args}"/>
110 >      <include name="**/*.java"/>
111 >      <compilerarg value="-XDignore.symbol.file=true"/>
112 >
113 > <!--
114 >      <exclude name="java/lang/**"/>
115 >      <compilerarg line="${build.args}"/>
116 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 > -->
118  
119      </javac>
120  
121    </target>
122  
123  
96  <target name="jar"
97          depends="configure-emulation, init-jar, native-jar, emulation-jar"
98          description="Builds library jar from compiled sources"/>
99
100
101  <target name="test"
102          depends="init, configure-tests, report-tests"
103          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104
124  
125 <  <target name="checkstyle"
126 <          depends="filter-src"
127 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
125 >  <target name="jar"
126 >          depends="compile"
127 >          description="Builds library jar from compiled sources">
128  
129 <    <taskdef resource="checkstyletask.properties"
111 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
129 >    <mkdir dir="${build.lib.dir}"/>
130  
131 <    <checkstyle>
132 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
133 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
116 <    </checkstyle>
131 >    <jar destfile="${product.jar}">
132 >      <fileset dir="${build.classes.dir}"/>
133 >    </jar>
134  
135    </target>
136  
137  
121  <target name="doccheck"
122          depends="filter-src"
123          description="Reports on javadoc style errors (not working yet)">
124
125    <delete dir="${build.doccheck.dir}"/>
126    <mkdir dir="${build.doccheck.dir}"/>
138  
139 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
140 <         docletpath="${lib.dir}/doccheck.jar"
141 <            destdir="${build.doccheck.dir}">
131 <      <packageset dir="${build.filter.src.dir}"/>
132 <    </javadoc>
139 >  <target name="test"
140 >          depends="init, configure-tests, report-tests"
141 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
142  
134  </target>
143  
144  
145    <target name="docs"
138          depends="filter-src"
146            description="Builds javadocs with custom tags to build folder">
147  
148      <delete dir="${build.javadocs.dir}"/>
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
152 >                link="http://download.oracle.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.docsourcelevel}">
155 <
149 <      <tag name="revised" description="Last revised:"/>
150 <      <tag name="spec"    description="Specified by:"/>
151 <      <tag name="editor"  description="Last edited by:"/>
152 <      <tag name="fixme"   description="FIX ME:"/>
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >
156  
157 <      <packageset dir="${build.filter.src.dir}"/>
157 >      <packageset dir="${src.dir}"/>
158  
159      </javadoc>
160  
161    </target>
162  
163  
161  <target name="strip"
162          depends="init, configure-compiler"
163          description="Strip generics from java source (not working yet)">
164
165    <mkdir dir="${build.stripped.dir}"/>
164  
165 <    <!--
166 <     # javac -s doesn't reliably generate compilable code. It generates
167 <     # bridge methods (marked as "synthetic") that can have identical
170 <     # signatures to existing methods except for the return value.
171 <     -->
172 <    <javac srcdir="${src.dir}"
173 <          destdir="${build.stripped.dir}"
174 <            debug="${build.debug}"
175 <       debuglevel="${build.debuglevel}"
176 <      deprecation="${build.deprecation}"
177 <           source="${build.sourcelevel}"
178 <             fork="true">
165 >  <target name="dist"
166 >          depends="init, dist-clean, dist-jar, dist-docs"
167 >          description="Puts all distributable products in single hierarchy"/>
168  
180      <bootclasspath refid="javac.bootclasspath"/>
181      <compilerarg line="${build.javac.args} -s"/>
169  
170 <    </javac>
170 >  <target name="release"
171 >          depends="dist"
172 >          description="Puts entire CVS tree, plus distribution productions, in a jar">
173 >
174 >    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
175 >
176 >    <jar basedir="${basedir}" destfile="${release.jar}">
177 >      <!-- <exclude name="build/**"/> -->
178 >      <exclude name="${release.jar}"/>
179 >      <exclude name="user.properties"/>
180 >      <exclude name="etc/notes/**"/>
181 >      <exclude name="src/emulation/**"/>
182 >      <exclude name="**/SyntaxTest.java"/>
183 >      <exclude name="**/SuperfluousAbstract.java"/>
184 >    </jar>
185  
186    </target>
187  
188  
188  <target name="dist"
189          depends="init, dist-clean, dist-jar, dist-docs"
190          description="Puts all distributable products in single hierarchy"/>
191
189  
190    <target name="clean"
191            description="Removes all build products">
# Line 200 | Line 197
197    </target>
198  
199  
200 +
201    <target name="dist-clean"
202            description="Removes all build and distribution products">
203  
# Line 208 | Line 206
206    </target>
207  
208  
209 +
210    <target name="dist-docs"
212          depends="filter-src"
211            description="Builds javadocs without custom tags to dist folder">
212  
213      <delete dir="${dist.javadocs.dir}"/>
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216      <javadoc destdir="${dist.javadocs.dir}"
217 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
217 >            link="http://download.oracle.com/javase/6/docs/api/"
218              overview="${src.dir}/intro.html"
221              source="${build.docsourcelevel}">
222
223      <packageset dir="${build.filter.src.dir}"/>
219  
220 +            sourcepath="${src.dir}:${jdksrc.dir}"
221 +     >
222 + <!--
223 +      <packageset dir="${src.dir}" defaultexcludes="yes">
224 +      <include name="java/util/concurrent"/>
225 +      <include name="java/util/concurrent/atomic"/>
226 +      <include name="java/util/concurrent/locks"/>
227 +      </packageset>
228 + -->
229 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230 +      <include name="main/java/util/concurrent/*.java"/>
231 +      <include name="main/java/util/concurrent/atomic/*.java"/>
232 +      <include name="main/java/util/concurrent/locks/*.java"/>
233 +      <include name="main/java/util/*.java"/>
234 + <!--
235 +      <include name="main/java/util/concurrent/*.html"/>
236 +      <include name="main/java/util/concurrent/atomic/*.html"/>
237 +      <include name="main/java/util/concurrent/locks/*.html"/>
238 +      <include name="main/java/util/*.html"/>
239 + -->
240 + <!--      <include name="jsr166x/*.java"/> -->
241 +      </fileset>
242      </javadoc>
243  
244    </target>
# Line 236 | Line 253
253      <!-- Version is kept in a separate file -->
254      <loadfile property="version" srcFile="version.properties"/>
255      <echo>Building JSR-166 version ${version}</echo>
256 +    <echo>java.home is ${java.home}</echo>
257  
258    </target>
259  
260  
261 <  <target name="init-jar">
262 <
245 <    <mkdir dir="${build.lib.dir}"/>
246 <
247 <  </target>
248 <
249 <
250 <  <target name="native-jar"
251 <          depends="compile"
252 <          unless="build.emulation.true">
261 >  <target name="dist-jar"
262 >          depends="clean, jar">
263  
264 <    <jar destfile="${product.jar}">
255 <      <fileset dir="${build.classes.dir}"/>
256 <    </jar>
264 >    <copy file="${product.jar}" todir="${dist.dir}"/>
265  
266    </target>
267  
268  
269 <  <target name="compile-emulation"
270 <          depends="init, configure-compiler"
263 <          if="build.emulation.true">
269 >  <target name="compile-tests"
270 >          depends="jar">
271  
272 <    <mkdir dir="${build.emulation.dir}"/>
272 >    <mkdir dir="${build.testcases.dir}"/>
273  
274 <    <javac srcdir="${emulation.src.dir}"
275 <          destdir="${build.emulation.dir}"
274 >    <javac srcdir="${tck.src.dir}"
275 >          destdir="${build.testcases.dir}"
276              debug="${build.debug}"
277         debuglevel="${build.debuglevel}"
278        deprecation="${build.deprecation}"
279             source="${build.sourcelevel}"
280               fork="true">
281  
282 <      <bootclasspath refid="javac.bootclasspath"/>
283 <      <compilerarg line="${build.javac.args}"/>
284 <
278 <    </javac>
279 <
280 <  </target>
281 <
282 <
283 <  <target name="emulation-jar"
284 <          depends="compile-emulation"
285 <          if="build.emulation.true">
286 <
287 <
288 <    <jar destfile="${product.jar}" duplicate="add">
289 <      <fileset dir="${build.classes.dir}">
290 <        <patternset refid="emulation.excludes"/>
291 <      </fileset>
292 <      <fileset dir="${build.emulation.dir}"/>
293 <    </jar>
282 >      <compilerarg value="${bootclasspath.args}"/>
283 >      <compilerarg line="${build.args}"/>
284 >      <compilerarg value="-XDignore.symbol.file=true"/>
285  
286 <  </target>
296 <
297 <
298 <  <target name="dist-jar"
299 <          depends="clean, jar">
300 <
301 <    <copy file="${product.jar}" todir="${dist.dir}"/>
302 <
303 <  </target>
304 <
305 <
306 <  <target name="compile-ant-filter"
307 <          depends="init">
308 <
309 <    <mkdir dir="${build.ant.dir}"/>
310 <
311 <    <javac srcdir="${ant.src.dir}"
312 <          destdir="${build.ant.dir}"
313 <           source="1.4"
314 <    />
315 <
316 <  </target>
317 <
318 <
319 <  <target name="filter-src"
320 <          depends="compile-ant-filter">
321 <
322 <    <mkdir dir="${build.filter.src.dir}"/>
323 <
324 <    <copy todir="${build.filter.src.dir}">
325 <      <fileset dir="${src.dir}">
326 <        <include name="**/*.html"/>
327 <      </fileset>
328 <    </copy>
329 <
330 <    <!-- Not needed now, used for doccheck filtering:
331 <    <property name="generic.declarations"
332 <             value="public interface E {} public interface T {} public interface K {} public interface V {}"
333 <    />
334 <    -->
335 <
336 <    <copy todir="${build.filter.src.dir}">
337 <      <fileset dir="${src.dir}">
338 <        <exclude name="**/*.html"/>
339 <        <patternset refid="emulation.excludes"/>
340 <      </fileset>
341 <      <filterchain>
286 >      <classpath refid="test.classpath"/>
287  
288 <        <!--
344 <         # This filter gets rid of angle-bracketed type parameters
345 <         # so that javadoc can run on the result. The following
346 <         # heuristic seems to work:
347 <         #
348 <         # For all lines not starting with space(s)-asterisk-space(s),
349 <         #   replace <something> with a space, where there may be more
350 <         #   than one right angle bracket at the end, and "something"
351 <         #   must not contain parens or pipes. (This may need some
352 <         #   tweaking.)
353 <         -->
354 <
355 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
356 <                      classpath="${build.ant.dir}">
357 <          <param name="notmatching" value="^\s+\*\s.*$"/>
358 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
359 <          <param name="replacement" value=" "/>
360 <        </filterreader>
361 <
362 <
363 <        <!--
364 <         # This filter uncomments lines beginning with "//@" so that
365 <         # javadoc can see imports that are needed to resolve links
366 <         # but that shouldn't be in the compiled code.
367 <         -->
368 <
369 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370 <                      classpath="${build.ant.dir}">
371 <          <param name="matching"    value="^//@.*$"/>
372 <          <param name="pattern"     value="^//@"/>
373 <          <param name="replacement" value=""/>
374 <        </filterreader>
375 <
376 <
377 <        <!--
378 <         # The next two filters try to make the source look like
379 <         # something that doccheck can process. The first removes
380 <         # -source 1.4 assertions and the second adds in a bunch
381 <         # of single letter public nested marker interfaces so that
382 <         # the generic type parameters are recognized.
383 <         #
384 <         # Currently commented out because doccheck doesn't work. :-(
385 <         -->
386 <
387 <        <!--
388 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389 <                      classpath="${build.ant.dir}">
390 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
391 <          <param name="pattern"     value="assert"/>
392 <          <param name="replacement" value="//assert"/>
393 <        </filterreader>
394 <
395 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
396 <                      classpath="${build.ant.dir}">
397 <          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
398 <          <param name="pattern"     value="$"/>
399 <          <param name="replacement" value=" ${generic.declarations}"/>
400 <        </filterreader>
401 <        -->
288 >    </javac>
289  
290 <      </filterchain>
291 <    </copy>
290 >    <javac srcdir="${test.src.dir}"
291 >          destdir="${build.testcases.dir}"
292 >            debug="${build.debug}"
293 >       debuglevel="${build.debuglevel}"
294 >      deprecation="${build.deprecation}"
295 >           source="${build.sourcelevel}"
296 >             fork="true">
297  
298 <  </target>
298 >      <include name="jsr166/test/**"/>
299  
300 +      <compilerarg value="${bootclasspath.args}"/>
301 +      <compilerarg line="${build.args}"/>
302 +      <compilerarg value="-XDignore.symbol.file=true"/>
303  
304 <  <target name="compile-tests"
410 <          depends="jar">
304 >      <classpath refid="test.classpath"/>
305  
306 <    <mkdir dir="${build.testcases.dir}"/>
306 >    </javac>
307  
308 <    <javac srcdir="${test.src.dir}"
308 > <!--
309 >    <javac srcdir="${jtreg.src.dir}"
310            destdir="${build.testcases.dir}"
311              debug="${build.debug}"
312         debuglevel="${build.debuglevel}"
# Line 419 | Line 314
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        <classpath refid="test.classpath"/>
423      <bootclasspath refid="javac.bootclasspath"/>
424      <compilerarg line="${build.javac.args}"/>
322  
323      </javac>
324 + -->
325  
326    </target>
327  
# Line 443 | Line 341
341                      dir="${build.reports.dir}"
342                     fork="true">
343  
344 <      <jvmarg value="${test.bootclasspath.arg}"/>
344 >      <jvmarg value="${bootclasspath.args}"/>
345 >      <jvmarg value="-server"/>
346 >      <jvmarg value="-showversion"/>
347 >
348 >      <classpath refid="test.classpath"/>
349  
350        <formatter type="xml"/>
351  
352 <      <batchtest todir="${build.reports.dir}">
352 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
353 >        <fileset dir="${tck.src.dir}">
354 >          <include name="**/${testcase}Test.java"/>
355 >        </fileset>
356 >      </batchtest>
357 >
358 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
359          <fileset dir="${test.src.dir}">
360 +          <include name="jsr166/test/**/${testcase}Test.java"/>
361 +        </fileset>
362 +      </batchtest>
363 +
364 + <!--
365 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
366 +        <fileset dir="${jtreg.src.dir}">
367            <include name="**/${testcase}Test.java"/>
368          </fileset>
369        </batchtest>
370 + -->
371  
372      </junit>
373  
# Line 461 | Line 377
377    <target name="report-tests"
378            depends="run-tests">
379  
380 <    <!-- Sets junit.report.format to frames if Xalan is present,
380 >    <!-- Sets junit.report.format to frames if redirection is present,
381           otherwise sets it to noframes. -->
382      <available property="junit.report.format"
383                    value="frames"
# Line 473 | Line 389
389        <fileset dir="${build.reports.dir}">
390          <include name="TEST-*.xml"/>
391        </fileset>
392 <      <report styledir="${stylesheet.dir}"
477 <                format="${junit.report.format}"
478 <                 todir="${build.reports.dir}"
392 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
393        />
394      </junitreport>
395  
# Line 486 | Line 400
400  
401    <target name="configure-compiler">
402  
403 <    <property name="gjc.version"
490 <             value="2.0"/>
403 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
404  
405 <    <condition property="build.novariance" value="-novariance">
406 <      <and>
494 <        <equals arg1="${gjc.version}" arg2="2.0"/>
495 <        <or>
496 <          <not><isset property="gjc.novariance"/></not>
497 <          <istrue value="${gjc.novariance}"/>
498 <        </or>
499 <      </and>
405 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
406 >      <istrue value="${build.warnunchecked}"/>
407      </condition>
408  
409 <    <property name="build.novariance"
503 <             value=""/>
409 >    <property name="warnunchecked.arg" value=""/>
410  
505    <property name="gjc.dir"
506             value="${lib.dir}/gjc"/>
411  
412 <    <property name="javac.jar"
413 <          location="${gjc.dir}/${gjc.version}/javac.jar"/>
412 >    <!-- Common options in javac invocations -->
413 >    <property name="build.args" value="${warnunchecked.arg}"/>
414  
415 <    <property name="collect.jar"
512 <          location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
415 >  </target>
416  
417  
418 <    <condition property="build.warnunchecked" value="-warnunchecked">
419 <      <istrue value="${gjc.warnunchecked}"/>
517 <    </condition>
418 >  <target name="configure-tests"
419 >       depends="configure-compiler">
420  
421 <    <property name="build.warnunchecked" value=""/>
421 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
422 >    <available property="junit.available"
423 >               classname="junit.framework.Protectable"/>
424  
425 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
426 <      <istrue value="${build.nothreads}"/>
427 <    </condition>
425 >    <!-- Xalan -->
426 >    <available property="xalan.available"
427 >               classname="org.apache.xalan.Version"/>
428  
429  
430 +    <!-- Ant 1.6beta and later don't need or want this check -->
431      <!--
432 <     ! Bootclasspath munging for source compilation.
433 <     -->
432 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
433 >          unless="junit.available"/>
434  
435 <    <path id="javac.bootclasspath.prefix">
436 <      <!-- <pathelement location="${src.dir}"/> -->
437 <      <pathelement location="${javac.jar}"/>
533 <    </path>
534 <
535 <    <path id="javac.bootclasspath">
536 <      <!-- <pathelement location="${src.dir}"/> -->
537 <      <pathelement location="${collect.jar}"/>
538 <      <pathelement location="${rt.jar}"/>
539 <    </path>
540 <
541 <    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
542 <    <property name="javac.bootclasspath.prefix"
543 <             refid="javac.bootclasspath.prefix"/>
544 <
545 <    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
546 <    <property name="build.bootclasspath.arg"
547 <             value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
548 <
549 <    <!-- Flatten bootclasspath for trace message -->
550 <    <property name="javac.bootclasspath"
551 <             refid="javac.bootclasspath"/>
435 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
436 >          unless="xalan.available"/>
437 >    -->
438  
439 <    <!-- Common options in javac invocations -->
440 <    <property name="build.javac.args"
441 <             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
439 >  </target>
440 >
441 >
442 >  <!-- Various demos and test programs -->
443 >
444 >
445 >  <target name="loops" depends="init, configure-compiler"
446 >          description="Benchmark from Doug Lea's AQS paper">
447  
448 <    <echo>javac ${build.javac.args}</echo>
449 <    <echo>bootclasspath=${javac.bootclasspath}</echo>
448 >    <mkdir dir="${build.loops.dir}"/>
449 >
450 >    <javac srcdir="${loops.src.dir}"
451 >          destdir="${build.loops.dir}"
452 >            debug="${build.debug}"
453 >       debuglevel="${build.debuglevel}"
454 >      deprecation="${build.deprecation}"
455 >           source="${build.sourcelevel}"
456 >             fork="true">
457 >
458 >      <compilerarg line="${build.args}"/>
459 >      <classpath refid="loops.classpath"/>
460 >      <compilerarg value="-XDignore.symbol.file=true"/>
461 >
462 >    </javac>
463 >
464 >    <java classname="ALoops" fork="true">
465 >      <classpath refid="loops.classpath"/>
466 >    </java>
467  
468    </target>
469  
470  
471 <  <target name="prepare-src"
564 <          depends="configure-compiler"
565 <          if="prepare.src.dir">
471 >  <!-- jsr166x -->
472  
473 <    <mkdir dir="${prepare.src.dir}"/>
474 <    <copy todir="${prepare.src.dir}">
475 <      <fileset dir="${src.dir}">
476 <        <exclude name="java/lang/**"/>
477 <      </fileset>
478 <    </copy>
473 >
474 >  <target name="jsr166xcompile"
475 >          depends="init, configure-compiler"
476 >          description="Compiles jsr166x sources">
477 >
478 >    <mkdir dir="${build.jsr166x.dir}"/>
479 >
480 >    <javac srcdir="${jsr166xsrc.dir}"
481 >          destdir="${build.jsr166x.dir}"
482 >            debug="${build.debug}"
483 >       debuglevel="${build.debuglevel}"
484 >      deprecation="${build.deprecation}"
485 >           source="${build.sourcelevel}"
486 >             fork="true">
487 >
488 >      <include name="**/*.java"/>
489 >      <compilerarg line="${build.args}"/>
490 >      <compilerarg value="-XDignore.symbol.file=true"/>
491 >
492 >    </javac>
493  
494    </target>
495  
496  
577  <target name="configure-emulation">
497  
498 <    <condition property="build.emulation.true">
499 <      <or>
500 <        <and>
501 <          <os family="windows"/>
502 <          <not>
503 <            <isset property="build.emulation"/>
504 <          </not>
505 <        </and>
506 <        <istrue value="${build.emulation}"/>
588 <      </or>
589 <    </condition>
498 >  <target name="jsr166xjar"
499 >          depends="jsr166xcompile"
500 >          description="Builds library jar from compiled sources">
501 >
502 >    <mkdir dir="${build.jsr166xlib.dir}"/>
503 >
504 >    <jar destfile="${jsr166xproduct.jar}">
505 >      <fileset dir="${build.jsr166x.dir}"/>
506 >    </jar>
507  
508    </target>
509  
510  
594  <target name="configure-tests">
511  
512 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
513 <    <available property="junit.available"
598 <               classname="junit.framework.Protectable"/>
512 >  <target name="jsr166xdocs"
513 >          description="Builds javadocs with custom tags to build folder">
514  
515 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
516 <          unless="junit.available"/>
515 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
516 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
517  
518 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
519 +             packagenames="jsr166x"
520 +             link="http://download.oracle.com/javase/6/docs/api/"
521 +             source="${build.sourcelevel}"
522 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
523  
524 <    <!--
525 <     ! Bootclasspath munging for testing, so JUnit can test our local
526 <     ! modifications to java.*.
527 <     -->
524 >  </target>
525 >
526 >
527 >  <target name="jsr166xdist"
528 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529 >          description="Puts all distributable products in single hierarchy"/>
530 >
531 >
532 >
533 >  <target name="jsr166xclean"
534 >          description="Removes all build products">
535 >
536 >    <delete dir="${build.jsr166x.dir}"/>
537 >    <delete dir="${build.jsr166xlib.dir}"/>
538 >
539 >  </target>
540 >
541 >
542 >
543 >  <target name="jsr166xdist-clean"
544 >          description="Removes all build and distribution products">
545 >
546 >  </target>
547 >
548 >
549 >
550 >  <target name="jsr166xdist-docs"
551 >          description="Builds javadocs without custom tags to dist folder">
552 >
553 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
554 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555 >
556 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
557 >             packagenames="jsr166x"
558 >             link="http://download.oracle.com/javase/6/docs/api/"
559 >             source="${build.sourcelevel}"
560 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
561 >
562 >  </target>
563 >
564 >  <target name="jsr166xdist-jar"
565 >          depends="jsr166xclean, jsr166xjar">
566 >
567 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
568 >
569 >  </target>
570 >
571 >  <!-- jsr166y -->
572 >
573 >
574 >  <target name="jsr166ycompile"
575 >          depends="init, configure-compiler"
576 >          description="Compiles jsr166y sources">
577 >
578 >    <mkdir dir="${build.jsr166y.dir}"/>
579 >
580 >    <javac srcdir="${jsr166ysrc.dir}"
581 >          destdir="${build.jsr166y.dir}"
582 >            debug="${build.debug}"
583 >       debuglevel="${build.debuglevel}"
584 >      deprecation="${build.deprecation}"
585 >           source="${build.sourcelevel}"
586 >             fork="true">
587 >
588 >      <include name="**/*.java"/>
589 >      <compilerarg line="${build.args}"/>
590 >      <compilerarg value="-XDignore.symbol.file=true"/>
591 >      <compilerarg value="${bootclasspath.args}"/>
592 >
593 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
594 >
595 >    </javac>
596 >
597 >  </target>
598 >
599 >
600 >
601 >  <target name="jsr166yjar"
602 >          depends="jsr166ycompile"
603 >          description="Builds library jar from compiled sources">
604 >
605 >    <mkdir dir="${build.jsr166ylib.dir}"/>
606 >
607 >    <jar destfile="${jsr166yproduct.jar}" index="true">
608 >      <fileset dir="${build.jsr166y.dir}"/>
609 >    </jar>
610 >
611 >  </target>
612 >
613 >
614 >
615 >  <target name="jsr166ydocs"
616 >          description="Builds javadocs with custom tags to build folder">
617 >
618 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
619 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
620 >
621 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
622 >             packagenames="jsr166y"
623 >             link="http://download.oracle.com/javase/6/docs/api/"
624 >             source="${build.sourcelevel}"
625 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
626 >
627 >  </target>
628  
609    <path id="test.classpath">
610      <pathelement location="${product.jar}"/>
611      <pathelement location="${build.testcases.dir}"/>
612      <pathelement location="${junit.jar}"/>
613    </path>
629  
630 <    <!-- Flatten test classpath into a platform-appropriate string -->
631 <    <property name="test.classpath" refid="test.classpath"/>
630 >  <target name="jsr166ydist"
631 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
632 >          description="Puts all distributable products in single hierarchy"/>
633 >
634 >
635 >
636 >  <target name="jsr166yclean"
637 >          description="Removes all build products">
638  
639 <    <!-- Turn the flattened test classpath into a javac argument -->
640 <    <property name="test.bootclasspath.arg"
620 <             value='-Xbootclasspath/p:${test.classpath}'/>
639 >    <delete dir="${build.jsr166y.dir}"/>
640 >    <delete dir="${build.jsr166ylib.dir}"/>
641  
642    </target>
643  
644  
645  
646 <  <!-- Anthill targets -->
646 >  <target name="jsr166ydist-clean"
647 >          description="Removes all build and distribution products">
648  
649 <  <target name="anthill-build"
629 <          depends="jar, test, docs, dist-docs"/>
649 >  </target>
650  
651 <  <target name="anthill-publish">
651 >  <target name="jsr166ydist-docs"
652 >          description="Builds javadocs without custom tags to dist folder">
653  
654 <    <copy todir="${deployDir}/docs/private">
655 <      <fileset dir="${build.javadocs.dir}"/>
635 <    </copy>
654 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
655 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
656  
657 <    <copy todir="${deployDir}/docs/public">
658 <      <fileset dir="${dist.javadocs.dir}"/>
659 <    </copy>
657 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
658 >             packagenames="jsr166y"
659 >             link="http://download.oracle.com/javase/6/docs/api/"
660 >             source="${build.sourcelevel}"
661 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
662 >
663 >  </target>
664  
665 <    <copy tofile="${deployDir}/index.html"
666 <          file="${basedir}/etc/anthill-index.html"/>
665 >  <target name="jsr166ydist-jar"
666 >          depends="jsr166yclean, jsr166yjar">
667  
668 <    <copy todir="${deployDir}/notes">
645 <      <fileset dir="${basedir}/etc/notes"/>
646 <    </copy>
668 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
669  
670    </target>
671  
672 +  <!-- extra166y -->
673 +
674 +
675 +  <target name="extra166ycompile"
676 +          depends="init, configure-compiler, jsr166ycompile"
677 +          description="Compiles extra166y sources">
678 +
679 +    <mkdir dir="${build.extra166y.dir}"/>
680 +
681 +    <javac srcdir="${extra166ysrc.dir}"
682 +          destdir="${build.extra166y.dir}"
683 +            debug="${build.debug}"
684 +            classpath="${jsr166yproduct.jar}"
685 +       debuglevel="${build.debuglevel}"
686 +      deprecation="${build.deprecation}"
687 +           source="${build.sourcelevel}"
688 +             fork="true">
689 +
690 +      <include name="**/*.java"/>
691 +      <compilerarg line="${build.args}"/>
692 +      <compilerarg value="-XDignore.symbol.file=true"/>
693 +      <compilerarg value="${bootclasspath.args}"/>
694 +
695 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
696 +
697 +    </javac>
698 +
699 +  </target>
700 +
701 +
702 +
703 +  <target name="extra166yjar"
704 +          depends="extra166ycompile"
705 +          description="Builds library jar from compiled sources">
706 +
707 +    <mkdir dir="${build.extra166ylib.dir}"/>
708 +
709 +    <jar destfile="${extra166yproduct.jar}" index="true">
710 +      <fileset dir="${build.extra166y.dir}"/>
711 +    </jar>
712 +
713 +  </target>
714 +
715 +
716 +
717 +  <target name="extra166ydocs"
718 +          description="Builds javadocs with custom tags to build folder">
719 +
720 +    <delete dir="${build.extra166yjavadocs.dir}"/>
721 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
722 +
723 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
724 +             packagenames="extra166y"
725 +             link="http://download.oracle.com/javase/6/docs/api/"
726 +             source="${build.sourcelevel}"
727 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
728 +
729 +  </target>
730 +
731 +
732 +  <target name="extra166ydist"
733 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
734 +          description="Puts all distributable products in single hierarchy"/>
735 +
736 +
737 +
738 +  <target name="extra166yclean"
739 +          description="Removes all build products">
740 +
741 +    <delete dir="${build.extra166y.dir}"/>
742 +    <delete dir="${build.extra166ylib.dir}"/>
743 +
744 +  </target>
745 +
746 +
747 +
748 +  <target name="extra166ydist-clean"
749 +          description="Removes all build and distribution products">
750 +
751 +  </target>
752 +
753 +  <target name="extra166ydist-docs"
754 +          description="Builds javadocs without custom tags to dist folder">
755 +
756 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
757 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
758 +
759 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
760 +             packagenames="extra166y"
761 +             link="http://download.oracle.com/javase/6/docs/api/"
762 +             source="${build.sourcelevel}"
763 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
764 +
765 +  </target>
766 +
767 +  <target name="extra166ydist-jar"
768 +          depends="extra166yclean, extra166yjar">
769 +
770 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
771 +
772 +  </target>
773  
774   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines