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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines