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.78 by dl, Sat Aug 1 13:05:44 2009 UTC

# Line 22 | Line 22
22  
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
25  <property name="build.docsourcelevel" value="1.4"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
# Line 30 | Line 29
29    <!-- Build locations -->
30    <property name="build.dir"            location="build"/>
31    <property name="build.classes.dir"    location="${build.dir}/classes"/>
33  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
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"/>
36  <property name="build.ant.dir"        location="${build.dir}/ant"/>
35    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
36    <property name="build.reports.dir"    location="${build.dir}/reports"/>
37 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
38 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
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 +  <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  
62    <!-- Distribution locations -->
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"/>
74  
75 +  <!-- Bootclasspath argument -->
76 +  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
78 <
79 <  <!-- Files excluded from emulation and dist-docs -->
80 <  <patternset id="emulation.excludes">
81 <    <exclude name="java/util/Random.*"/>
82 <    <exclude name="sun/misc/Unsafe.*"/>
83 <  </patternset>
84 <
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 +
93    <target name="compile"
94 <          depends="init, configure-compiler, prepare-src"
94 >          depends="init, configure-compiler"
95            description="Compiles main sources to build folder">
96  
76    <property name="prepare.src.dir" value="${src.dir}"/>
77
97      <mkdir dir="${build.classes.dir}"/>
98  
99 <    <javac srcdir="${prepare.src.dir}"
99 >    <javac srcdir="${src.dir}"
100            destdir="${build.classes.dir}"
101              debug="${build.debug}"
102         debuglevel="${build.debuglevel}"
# Line 85 | Line 104
104             source="${build.sourcelevel}"
105               fork="true">
106  
107 <      <bootclasspath refid="javac.bootclasspath"/>
108 <      <compilerarg line="${build.javac.args}"/>
107 >      <include name="**/*.java"/>
108 >      <compilerarg value="-XDignore.symbol.file"/>
109 >
110 > <!--
111 >      <exclude name="java/lang/**"/>
112 >      <compilerarg line="${build.args}"/>
113 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
114 > -->
115  
116      </javac>
117  
118    </target>
119  
120  
96  <target name="jar"
97          depends="configure-emulation, init-jar, native-jar, emulation-jar"
98          description="Builds library jar from compiled sources"/>
99
121  
122 <  <target name="test"
123 <          depends="init, configure-tests, report-tests"
124 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104 <
105 <
106 <  <target name="checkstyle"
107 <          depends="filter-src"
108 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
122 >  <target name="jar"
123 >          depends="compile"
124 >          description="Builds library jar from compiled sources">
125  
126 <    <taskdef resource="checkstyletask.properties"
111 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
126 >    <mkdir dir="${build.lib.dir}"/>
127  
128 <    <checkstyle>
129 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
130 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
116 <    </checkstyle>
128 >    <jar destfile="${product.jar}">
129 >      <fileset dir="${build.classes.dir}"/>
130 >    </jar>
131  
132    </target>
133  
134  
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}"/>
135  
136 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
137 <         docletpath="${lib.dir}/doccheck.jar"
138 <            destdir="${build.doccheck.dir}">
131 <      <packageset dir="${build.filter.src.dir}"/>
132 <    </javadoc>
136 >  <target name="test"
137 >          depends="init, configure-tests, report-tests"
138 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
139  
134  </target>
140  
141  
142    <target name="docs"
138          depends="filter-src"
143            description="Builds javadocs with custom tags to build folder">
144  
145      <delete dir="${build.javadocs.dir}"/>
146      <mkdir dir="${build.javadocs.dir}"/>
147  
148      <javadoc destdir="${build.javadocs.dir}"
149 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
149 >                link="http://java.sun.com/javase/6/docs/api/"
150              overview="${src.dir}/intro.html"
151 <              source="${build.docsourcelevel}">
151 >            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
152 >    >          
153  
154 <      <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:"/>
153 <
154 <      <packageset dir="${build.filter.src.dir}"/>
154 >      <packageset dir="${src.dir}"/>
155  
156      </javadoc>
157  
158    </target>
159  
160  
161  <target name="strip"
162          depends="init, configure-compiler"
163          description="Strip generics from java source (not working yet)">
161  
162 <    <mkdir dir="${build.stripped.dir}"/>
162 >  <target name="dist"
163 >          depends="init, dist-clean, dist-jar, dist-docs"
164 >          description="Puts all distributable products in single hierarchy"/>
165  
167    <!--
168     # javac -s doesn't reliably generate compilable code. It generates
169     # 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">
166  
180      <bootclasspath refid="javac.bootclasspath"/>
181      <compilerarg line="${build.javac.args} -s"/>
167  
168 <    </javac>
168 >  <target name="release"
169 >          depends="dist"
170 >          description="Puts entire CVS tree, plus distribution productions, in a jar">
171 >
172 >    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
173 >
174 >    <jar basedir="${basedir}" destfile="${release.jar}">
175 >      <!-- <exclude name="build/**"/> -->
176 >      <exclude name="${release.jar}"/>
177 >      <exclude name="user.properties"/>
178 >      <exclude name="etc/notes/**"/>
179 >      <exclude name="src/emulation/**"/>
180 >      <exclude name="**/SyntaxTest.java"/>
181 >      <exclude name="**/SuperfluousAbstract.java"/>
182 >    </jar>
183  
184    </target>
185  
186  
188  <target name="dist"
189          depends="init, dist-clean, dist-jar, dist-docs"
190          description="Puts all distributable products in single hierarchy"/>
191
187  
188    <target name="clean"
189            description="Removes all build products">
# Line 200 | Line 195
195    </target>
196  
197  
198 +
199    <target name="dist-clean"
200            description="Removes all build and distribution products">
201  
# Line 208 | Line 204
204    </target>
205  
206  
207 +
208    <target name="dist-docs"
212          depends="filter-src"
209            description="Builds javadocs without custom tags to dist folder">
210  
211      <delete dir="${dist.javadocs.dir}"/>
212      <mkdir dir="${dist.javadocs.dir}"/>
213  
214      <javadoc destdir="${dist.javadocs.dir}"
215 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
215 >            link="http://java.sun.com/javase/6/docs/api/"
216              overview="${src.dir}/intro.html"
221              source="${build.docsourcelevel}">
222
223      <packageset dir="${build.filter.src.dir}"/>
217  
218 +            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
219 +     >
220 + <!--
221 +      <packageset dir="${src.dir}" defaultexcludes="yes">
222 +      <include name="java/util/concurrent"/>
223 +      <include name="java/util/concurrent/atomic"/>
224 +      <include name="java/util/concurrent/locks"/>
225 +      </packageset>
226 + -->
227 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
228 +      <include name="main/java/util/concurrent/*.java"/>
229 +      <include name="main/java/util/concurrent/atomic/*.java"/>
230 +      <include name="main/java/util/concurrent/locks/*.java"/>
231 +      <include name="main/java/util/*.java"/>
232 + <!--
233 +      <include name="main/java/util/concurrent/*.html"/>
234 +      <include name="main/java/util/concurrent/atomic/*.html"/>
235 +      <include name="main/java/util/concurrent/locks/*.html"/>
236 +      <include name="main/java/util/*.html"/>
237 + -->
238 + <!--      <include name="jsr166x/*.java"/> -->
239 +      </fileset>
240      </javadoc>
241  
242    </target>
# Line 236 | Line 251
251      <!-- Version is kept in a separate file -->
252      <loadfile property="version" srcFile="version.properties"/>
253      <echo>Building JSR-166 version ${version}</echo>
254 +    <echo>java.home is ${java.home}</echo>
255  
256    </target>
257  
258  
259 <  <target name="init-jar">
260 <
245 <    <mkdir dir="${build.lib.dir}"/>
246 <
247 <  </target>
248 <
249 <
250 <  <target name="native-jar"
251 <          depends="compile"
252 <          unless="build.emulation.true">
259 >  <target name="dist-jar"
260 >          depends="clean, jar">
261  
262 <    <jar destfile="${product.jar}">
255 <      <fileset dir="${build.classes.dir}"/>
256 <    </jar>
262 >    <copy file="${product.jar}" todir="${dist.dir}"/>
263  
264    </target>
265  
266  
267 <  <target name="compile-emulation"
268 <          depends="init, configure-compiler"
263 <          if="build.emulation.true">
267 >  <target name="compile-tests"
268 >          depends="jar">
269  
270 <    <mkdir dir="${build.emulation.dir}"/>
270 >    <mkdir dir="${build.testcases.dir}"/>
271  
272 <    <javac srcdir="${emulation.src.dir}"
273 <          destdir="${build.emulation.dir}"
272 >    <javac srcdir="${tck.src.dir}"
273 >          destdir="${build.testcases.dir}"
274              debug="${build.debug}"
275         debuglevel="${build.debuglevel}"
276        deprecation="${build.deprecation}"
277             source="${build.sourcelevel}"
278               fork="true">
279  
280 <      <bootclasspath refid="javac.bootclasspath"/>
281 <      <compilerarg line="${build.javac.args}"/>
277 <
278 <    </javac>
279 <
280 <  </target>
281 <
280 >      <compilerarg value="${bootclasspath.args}"/>
281 >      <compilerarg line="${build.args}"/>
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>
294 <
295 <  </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>
283 >      <classpath refid="test.classpath"/>
284  
285 <        <!--
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 <        -->
285 >    </javac>
286  
287 <      </filterchain>
288 <    </copy>
287 >    <javac srcdir="${test.src.dir}"
288 >          destdir="${build.testcases.dir}"
289 >            debug="${build.debug}"
290 >       debuglevel="${build.debuglevel}"
291 >      deprecation="${build.deprecation}"
292 >           source="${build.sourcelevel}"
293 >             fork="true">
294  
295 <  </target>
295 >      <include name="jsr166/test/**"/>
296  
297 +      <compilerarg value="${bootclasspath.args}"/>
298 +      <compilerarg line="${build.args}"/>
299  
300 <  <target name="compile-tests"
410 <          depends="jar">
300 >      <classpath refid="test.classpath"/>
301  
302 <    <mkdir dir="${build.testcases.dir}"/>
302 >    </javac>
303  
304 <    <javac srcdir="${test.src.dir}"
304 > <!--
305 >    <javac srcdir="${jtreg.src.dir}"
306            destdir="${build.testcases.dir}"
307              debug="${build.debug}"
308         debuglevel="${build.debuglevel}"
# Line 419 | Line 310
310             source="${build.sourcelevel}"
311               fork="true">
312  
313 +      <compilerarg value="${bootclasspath.args}"/>
314 +      <compilerarg line="${build.args}"/>
315 +
316        <classpath refid="test.classpath"/>
423      <bootclasspath refid="javac.bootclasspath"/>
424      <compilerarg line="${build.javac.args}"/>
317  
318      </javac>
319 + -->
320  
321    </target>
322  
# Line 443 | Line 336
336                      dir="${build.reports.dir}"
337                     fork="true">
338  
339 <      <jvmarg value="${test.bootclasspath.arg}"/>
339 >      <jvmarg value="${bootclasspath.args}"/>
340 >      <jvmarg value="-server"/>
341 >      <jvmarg value="-showversion"/>
342 >
343 >      <classpath refid="test.classpath"/>
344  
345        <formatter type="xml"/>
346  
347 <      <batchtest todir="${build.reports.dir}">
347 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
348 >        <fileset dir="${tck.src.dir}">
349 >          <include name="**/${testcase}Test.java"/>
350 >        </fileset>
351 >      </batchtest>
352 >
353 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
354          <fileset dir="${test.src.dir}">
355 +          <include name="jsr166/test/**/${testcase}Test.java"/>
356 +        </fileset>
357 +      </batchtest>
358 +
359 + <!--
360 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
361 +        <fileset dir="${jtreg.src.dir}">
362            <include name="**/${testcase}Test.java"/>
363          </fileset>
364        </batchtest>
365 + -->
366  
367      </junit>
368  
# Line 461 | Line 372
372    <target name="report-tests"
373            depends="run-tests">
374  
375 <    <!-- Sets junit.report.format to frames if Xalan is present,
375 >    <!-- Sets junit.report.format to frames if redirection is present,
376           otherwise sets it to noframes. -->
377      <available property="junit.report.format"
378                    value="frames"
# Line 473 | Line 384
384        <fileset dir="${build.reports.dir}">
385          <include name="TEST-*.xml"/>
386        </fileset>
387 <      <report styledir="${stylesheet.dir}"
477 <                format="${junit.report.format}"
478 <                 todir="${build.reports.dir}"
387 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
388        />
389      </junitreport>
390  
# Line 486 | Line 395
395  
396    <target name="configure-compiler">
397  
398 <    <property name="gjc.version"
490 <             value="2.0"/>
398 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
399  
400 <    <condition property="build.novariance" value="-novariance">
401 <      <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>
400 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
401 >      <istrue value="${build.warnunchecked}"/>
402      </condition>
403  
404 <    <property name="build.novariance"
503 <             value=""/>
404 >    <property name="warnunchecked.arg" value=""/>
405  
505    <property name="gjc.dir"
506             value="${lib.dir}/gjc"/>
406  
407 <    <property name="javac.jar"
408 <          location="${gjc.dir}/${gjc.version}/javac.jar"/>
407 >    <!-- Common options in javac invocations -->
408 >    <property name="build.args" value="${warnunchecked.arg}"/>
409  
410 <    <property name="collect.jar"
512 <          location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
410 >  </target>
411  
412  
413 <    <condition property="build.warnunchecked" value="-warnunchecked">
414 <      <istrue value="${gjc.warnunchecked}"/>
517 <    </condition>
413 >  <target name="configure-tests"
414 >       depends="configure-compiler">
415  
416 <    <property name="build.warnunchecked" value=""/>
416 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
417 >    <available property="junit.available"
418 >               classname="junit.framework.Protectable"/>
419  
420 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
421 <      <istrue value="${build.nothreads}"/>
422 <    </condition>
420 >    <!-- Xalan -->
421 >    <available property="xalan.available"
422 >               classname="org.apache.xalan.Version"/>
423  
424  
425 +    <!-- Ant 1.6beta and later don't need or want this check -->
426      <!--
427 <     ! Bootclasspath munging for source compilation.
428 <     -->
427 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
428 >          unless="junit.available"/>
429  
430 <    <path id="javac.bootclasspath.prefix">
431 <      <!-- <pathelement location="${src.dir}"/> -->
432 <      <pathelement location="${javac.jar}"/>
433 <    </path>
434 <
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"/>
430 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
431 >          unless="xalan.available"/>
432 >    -->
433 >
434 >  </target>
435  
553    <!-- Common options in javac invocations -->
554    <property name="build.javac.args"
555             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
436  
437 <    <echo>javac ${build.javac.args}</echo>
438 <    <echo>bootclasspath=${javac.bootclasspath}</echo>
437 >  <!-- Various demos and test programs -->
438 >
439 >
440 >  <target name="loops" depends="init, configure-compiler"
441 >          description="Benchmark from Doug Lea's AQS paper">
442 >
443 >    <mkdir dir="${build.loops.dir}"/>
444 >
445 >    <javac srcdir="${loops.src.dir}"
446 >          destdir="${build.loops.dir}"
447 >            debug="${build.debug}"
448 >       debuglevel="${build.debuglevel}"
449 >      deprecation="${build.deprecation}"
450 >           source="${build.sourcelevel}"
451 >             fork="true">
452 >
453 >      <compilerarg line="${build.args}"/>
454 >      <classpath refid="loops.classpath"/>
455 >
456 >    </javac>
457 >
458 >    <java classname="ALoops" fork="true">
459 >      <classpath refid="loops.classpath"/>
460 >    </java>
461  
462    </target>
463  
464  
465 <  <target name="prepare-src"
564 <          depends="configure-compiler"
565 <          if="prepare.src.dir">
465 >  <!-- jsr166x -->
466  
467 <    <mkdir dir="${prepare.src.dir}"/>
468 <    <copy todir="${prepare.src.dir}">
469 <      <fileset dir="${src.dir}">
470 <        <exclude name="java/lang/**"/>
471 <      </fileset>
472 <    </copy>
467 >
468 >  <target name="jsr166xcompile"
469 >          depends="init, configure-compiler"
470 >          description="Compiles jsr166x sources">
471 >
472 >    <mkdir dir="${build.jsr166x.dir}"/>
473 >
474 >    <javac srcdir="${jsr166xsrc.dir}"
475 >          destdir="${build.jsr166x.dir}"
476 >            debug="${build.debug}"
477 >       debuglevel="${build.debuglevel}"
478 >      deprecation="${build.deprecation}"
479 >           source="${build.sourcelevel}"
480 >             fork="true">
481 >
482 >      <include name="**/*.java"/>
483 >      <compilerarg line="${build.args}"/>
484 >
485 >    </javac>
486  
487    </target>
488  
489  
577  <target name="configure-emulation">
490  
491 <    <condition property="build.emulation.true">
492 <      <or>
493 <        <and>
494 <          <os family="windows"/>
495 <          <not>
496 <            <isset property="build.emulation"/>
497 <          </not>
498 <        </and>
499 <        <istrue value="${build.emulation}"/>
588 <      </or>
589 <    </condition>
491 >  <target name="jsr166xjar"
492 >          depends="jsr166xcompile"
493 >          description="Builds library jar from compiled sources">
494 >
495 >    <mkdir dir="${build.jsr166xlib.dir}"/>
496 >
497 >    <jar destfile="${jsr166xproduct.jar}">
498 >      <fileset dir="${build.jsr166x.dir}"/>
499 >    </jar>
500  
501    </target>
502  
503  
594  <target name="configure-tests">
504  
505 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
506 <    <available property="junit.available"
598 <               classname="junit.framework.Protectable"/>
505 >  <target name="jsr166xdocs"
506 >          description="Builds javadocs with custom tags to build folder">
507  
508 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
509 <          unless="junit.available"/>
508 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
509 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
510  
511 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
512 +             link="http://java.sun.com/javase/6/docs/api/"
513  
514 <    <!--
605 <     ! Bootclasspath munging for testing, so JUnit can test our local
606 <     ! modifications to java.*.
607 <     -->
514 >            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
515  
516 <    <path id="test.classpath">
517 <      <pathelement location="${product.jar}"/>
518 <      <pathelement location="${build.testcases.dir}"/>
519 <      <pathelement location="${junit.jar}"/>
613 <    </path>
516 >    >
517 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
518 >      <include name="jsr166x"/>
519 >      </packageset>
520  
615    <!-- Flatten test classpath into a platform-appropriate string -->
616    <property name="test.classpath" refid="test.classpath"/>
521  
522 <    <!-- Turn the flattened test classpath into a javac argument -->
619 <    <property name="test.bootclasspath.arg"
620 <             value='-Xbootclasspath/p:${test.classpath}'/>
522 >    </javadoc>
523  
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  
626  <!-- Anthill targets -->
531  
628  <target name="anthill-build"
629          depends="jar, test, docs, dist-docs"/>
532  
533 <  <target name="anthill-publish">
533 >  <target name="jsr166xclean"
534 >          description="Removes all build products">
535  
536 <    <copy todir="${deployDir}/docs/private">
537 <      <fileset dir="${build.javadocs.dir}"/>
635 <    </copy>
536 >    <delete dir="${build.jsr166x.dir}"/>
537 >    <delete dir="${build.jsr166xlib.dir}"/>
538  
539 <    <copy todir="${deployDir}/docs/public">
638 <      <fileset dir="${dist.javadocs.dir}"/>
639 <    </copy>
539 >  </target>
540  
641    <copy tofile="${deployDir}/index.html"
642          file="${basedir}/etc/anthill-index.html"/>
541  
542 <    <copy todir="${deployDir}/notes">
543 <      <fileset dir="${basedir}/etc/notes"/>
544 <    </copy>
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 >                link="http://java.sun.com/javase/6/docs/api/"
558 >              source="${build.sourcelevel}">
559 >
560 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
561 >      <include name="jsr166x"/>
562 >      </packageset>
563 >
564 >    </javadoc>
565 >
566 >  </target>
567 >
568 >  <target name="jsr166xdist-jar"
569 >          depends="jsr166xclean, jsr166xjar">
570 >
571 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
572  
573    </target>
574  
575 +  <!-- jsr166y -->
576 +
577 +
578 +  <target name="jsr166ycompile"
579 +          depends="init, configure-compiler"
580 +          description="Compiles jsr166y sources">
581 +
582 +    <mkdir dir="${build.jsr166y.dir}"/>
583 +
584 +    <javac srcdir="${jsr166ysrc.dir}"
585 +          destdir="${build.jsr166y.dir}"
586 +            debug="${build.debug}"
587 +       debuglevel="${build.debuglevel}"
588 +      deprecation="${build.deprecation}"
589 +           source="${build.sourcelevel}"
590 +             fork="true">
591 +
592 +      <include name="**/*.java"/>
593 +      <compilerarg line="${build.args}"/>
594 +      <compilerarg value="${bootclasspath.args}"/>
595 +
596 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597 +
598 +    </javac>
599 +
600 +  </target>
601 +
602 +
603 +
604 +  <target name="jsr166yjar"
605 +          depends="jsr166ycompile"
606 +          description="Builds library jar from compiled sources">
607 +
608 +    <mkdir dir="${build.jsr166ylib.dir}"/>
609 +
610 +    <jar destfile="${jsr166yproduct.jar}" index="true">
611 +      <fileset dir="${build.jsr166y.dir}"/>
612 +    </jar>
613 +
614 +  </target>
615 +
616 +
617 +
618 +  <target name="jsr166ydocs"
619 +          description="Builds javadocs with custom tags to build folder">
620 +
621 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
622 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
623 +
624 +    <javadoc destdir="${build.jsr166yjavadocs.dir}"
625 +                link="http://java.sun.com/javase/6/docs/api/"
626 +            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
627 +
628 +    >
629 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
630 +      <include name="jsr166y"/>
631 +      </packageset>
632 +
633 +
634 +    </javadoc>
635 +
636 +  </target>
637 +
638 +
639 +  <target name="jsr166ydist"
640 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
641 +          description="Puts all distributable products in single hierarchy"/>
642 +
643 +
644 +
645 +  <target name="jsr166yclean"
646 +          description="Removes all build products">
647 +
648 +    <delete dir="${build.jsr166y.dir}"/>
649 +    <delete dir="${build.jsr166ylib.dir}"/>
650 +
651 +  </target>
652 +
653 +
654 +
655 +  <target name="jsr166ydist-clean"
656 +          description="Removes all build and distribution products">
657 +
658 +  </target>
659 +
660 +  <target name="jsr166ydist-docs"
661 +          description="Builds javadocs without custom tags to dist folder">
662 +
663 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
664 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
665 +
666 +    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
667 +                link="http://java.sun.com/javase/6/docs/api/"
668 +              source="${build.sourcelevel}"
669 +            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
670 +            >          
671 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
672 +      <include name="jsr166y/*.java"/>
673 +            </fileset>
674 +    </javadoc>
675 +
676 +  </target>
677 +
678 +  <target name="jsr166ydist-jar"
679 +          depends="jsr166yclean, jsr166yjar">
680 +
681 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
682 +
683 +  </target>
684 +
685 +  <!-- extra166y -->
686 +
687 +
688 +  <target name="extra166ycompile"
689 +          depends="init, configure-compiler, jsr166ycompile"
690 +          description="Compiles extra166y sources">
691 +
692 +    <mkdir dir="${build.extra166y.dir}"/>
693 +
694 +    <javac srcdir="${extra166ysrc.dir}"
695 +          destdir="${build.extra166y.dir}"
696 +            debug="${build.debug}"
697 +            classpath="${jsr166yproduct.jar}"
698 +       debuglevel="${build.debuglevel}"
699 +      deprecation="${build.deprecation}"
700 +           source="${build.sourcelevel}"
701 +             fork="true">
702 +
703 +      <include name="**/*.java"/>
704 +      <compilerarg line="${build.args}"/>
705 +      <compilerarg value="${bootclasspath.args}"/>
706 +
707 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
708 +
709 +    </javac>
710 +
711 +  </target>
712 +
713 +
714 +
715 +  <target name="extra166yjar"
716 +          depends="extra166ycompile"
717 +          description="Builds library jar from compiled sources">
718 +
719 +    <mkdir dir="${build.extra166ylib.dir}"/>
720 +
721 +    <jar destfile="${extra166yproduct.jar}" index="true">
722 +      <fileset dir="${build.extra166y.dir}"/>
723 +    </jar>
724 +
725 +  </target>
726 +
727 +
728 +
729 +  <target name="extra166ydocs"
730 +          description="Builds javadocs with custom tags to build folder">
731 +
732 +    <delete dir="${build.extra166yjavadocs.dir}"/>
733 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
734 +
735 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
736 +                link="http://java.sun.com/javase/6/docs/api/"
737 +            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
738 +
739 +    >
740 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
741 +      <include name="extra166y"/>
742 +      </packageset>
743 +
744 +
745 +    </javadoc>
746 +
747 +  </target>
748 +
749 +
750 +  <target name="extra166ydist"
751 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
752 +          description="Puts all distributable products in single hierarchy"/>
753 +
754 +
755 +
756 +  <target name="extra166yclean"
757 +          description="Removes all build products">
758 +
759 +    <delete dir="${build.extra166y.dir}"/>
760 +    <delete dir="${build.extra166ylib.dir}"/>
761 +
762 +  </target>
763 +
764 +
765 +
766 +  <target name="extra166ydist-clean"
767 +          description="Removes all build and distribution products">
768 +
769 +  </target>
770 +
771 +  <target name="extra166ydist-docs"
772 +          description="Builds javadocs without custom tags to dist folder">
773 +
774 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
775 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
776 +
777 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
778 +                link="http://java.sun.com/javase/6/docs/api/"
779 +              source="${build.sourcelevel}"
780 +            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
781 +            >
782 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
783 +      <include name="extra166y/*.java"/>
784 +            </fileset>
785 +    </javadoc>
786 +
787 +  </target>
788 +
789 +  <target name="extra166ydist-jar"
790 +          depends="extra166yclean, extra166yjar">
791 +
792 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
793 +
794 +  </target>
795  
796   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines