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.27 by tim, Wed May 28 00:33:17 2003 UTC vs.
Revision 1.79 by jsr166, Sat Aug 1 17:23:51 2009 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage">
2  
3    <description>
4 <    Build file for JSR-166
4 > ------------------------------------------------------------------------------
5 >  Build file for JSR-166
6  
7 <    JUnit 3.8 or better must be in ${ant.home}/lib for the test target to work.
7 <  </description>
7 >  Usage: ant [target]
8  
9 +  User-specific settings are read from user.properties.
10 +  See user.properties.sample for an explanation of some useful settings.
11 + ------------------------------------------------------------------------------
12 +  </description>
13  
14 <  <target name="usage" description="Prints this message">
15 <    <echo>
12 < ant [target], where target is one of:
13 <
14 < usage       (default) Prints this message
15 < compile     Compiles all sources to build folder
16 < jar         Builds library jar from compiled sources
17 < test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18 < docs        Builds javadocs with custom tags to build folder
19 < dist-docs   Builds javadocs without custom tags to dist folder
20 < dist        Puts all distributable products in single hierarchy
21 <
22 < clean       Removes all build products
23 < dist-clean  Removes all build and distribution products
24 <
25 < checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26 < doccheck    Reports on javadoc style errors (not working yet)
27 <    </echo>
14 >  <target name="usage" description="Advises user to run with -projecthelp">
15 >    <echo>Run "ant -projecthelp" for full usage information.</echo>
16    </target>
17  
18 +
19    <!-- User-specific settings -->
20    <property file="user.properties"/>
21  
33  <!-- Set build.warnings in user.properties to turn on -warnunchecked -->
34  <!-- <property name="build.warnings" value=""/> -->
35
22  
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
39  <property name="build.docsourcelevel" value="1.4"/>
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"/>
59  <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"/>
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="javac.jar"            location="${lib.dir}/javac.jar"/>
71 <  <property name="collect.jar"          location="${lib.dir}/collect.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"/>
74  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
75
76
77  <!--
78   ! Bootclasspath munging for source compilation.
79   -->
80
81  <path id="javac.bootclasspath.prepend">
82    <!-- <pathelement location="${src.dir}"/> -->
83    <pathelement location="${javac.jar}"/>
84  </path>
85
86  <path id="javac.bootclasspath">
87    <!-- <pathelement location="${src.dir}"/> -->
88    <pathelement location="${collect.jar}"/>
89    <pathelement location="${rt.jar}"/>
90  </path>
91
92  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
93  <property name="javac.bootclasspath.prepend" refid="javac.bootclasspath.prepend"/>
74  
75 <  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
76 <  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prepend}'/>
97 <
98 <
99 <  <!--
100 <   ! Bootclasspath munging for testing, so JUnit can test our local
101 <   ! modifications to java.*.
102 <   -->
75 >  <!-- Bootclasspath argument -->
76 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
78 +  <!-- Test classpath -->
79    <path id="test.classpath">
105    <pathelement location="${product.jar}"/>
80      <pathelement location="${build.testcases.dir}"/>
81      <pathelement location="${junit.jar}"/>
82    </path>
83  
84 <  <!-- Flatten test classpath into a platform-appropriate string -->
85 <  <property name="test.classpath" refid="test.classpath"/>
86 <
87 <  <!-- Turn the flattened test classpath into a javac argument -->
114 <  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
115 <
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="compile" depends="init"
92 >
93 >  <target name="compile"
94 >          depends="init, configure-compiler"
95            description="Compiles main sources to build folder">
96  
97      <mkdir dir="${build.classes.dir}"/>
# Line 130 | Line 104 | ant [target], where target is one of:
104             source="${build.sourcelevel}"
105               fork="true">
106  
107 <      <bootclasspath refid="javac.bootclasspath"/>
108 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
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  
141  <target name="jar" depends="native-jar, emulation-jar"/>
142
143
144  <target name="test" depends="init, check-junit, report-tests"
145          description="Runs all tests (requires JUnit 3.8+ in ${ant.home}/lib)"
146  />
121  
122 +  <target name="jar"
123 +          depends="compile"
124 +          description="Builds library jar from compiled sources">
125  
126 <  <target name="checkstyle" depends="filter-src"
150 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
151 <
152 <    <taskdef resource="checkstyletask.properties"
153 <            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"/>
158 <    </checkstyle>
128 >    <jar destfile="${product.jar}">
129 >      <fileset dir="${build.classes.dir}"/>
130 >    </jar>
131  
132    </target>
133  
134  
163  <target name="doccheck" depends="filter-src"
164          description="Reports on javadoc style errors (not working yet)">
135  
136 <    <delete dir="${build.doccheck.dir}"/>
137 <    <mkdir dir="${build.doccheck.dir}"/>
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  
169    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
170         docletpath="${lib.dir}/doccheck.jar"
171            destdir="${build.doccheck.dir}">
172      <packageset dir="${build.filter.src.dir}"/>
173    </javadoc>
140  
175  </target>
141  
142 <
178 <  <target name="docs" depends="filter-src"
142 >  <target name="docs"
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:"/>
190 <      <tag name="spec" description="Specified by:"/>
191 <      <tag name="editor" description="Last edited by:"/>
192 <      <tag name="fixme" description="FIX ME:"/>
193 <      <packageset dir="${build.filter.src.dir}"/>
154 >      <packageset dir="${src.dir}"/>
155  
156      </javadoc>
157  
158    </target>
159  
160  
200  <!--
201   # javac -s doesn't reliably generate compilable code. It generates
202   # bridge methods (marked as "synthetic") that can have identical
203   # signatures to existing methods except for the return value.
204   -->
205  <target name="strip" depends="init">
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  
209    <javac srcdir="${src.dir}"
210          destdir="${build.stripped.dir}"
211            debug="${build.debug}"
212       debuglevel="${build.debuglevel}"
213      deprecation="${build.deprecation}"
214           source="${build.sourcelevel}"
215             fork="true">
166  
217      <bootclasspath refid="javac.bootclasspath"/>
218      <compilerarg line="${javac.args} ${build.warnings.option} -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  
225  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
226          description="Puts all distributable products in single hierarchy"/>
227
187  
188    <target name="clean"
189            description="Removes all build products">
# Line 236 | Line 195 | ant [target], where target is one of:
195    </target>
196  
197  
198 +
199    <target name="dist-clean"
200            description="Removes all build and distribution products">
201  
# Line 244 | Line 204 | ant [target], where target is one of:
204    </target>
205  
206  
247  <!-- Anthill targets -->
207  
208 <  <!-- Should really run the tests instead of just the jar target -->
209 <  <target name="anthill-build" depends="jar, test, docs, dist-docs"/>
208 >  <target name="dist-docs"
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/javase/6/docs/api/"
216 >            overview="${src.dir}/intro.html"
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  
252  <target name="anthill-publish">
253    <copy todir="${deployDir}/docs/private">
254      <fileset dir="${build.javadocs.dir}"/>
255    </copy>
256    <copy todir="${deployDir}/docs/public">
257      <fileset dir="${dist.javadocs.dir}"/>
258    </copy>
259    <copy tofile="${deployDir}/index.html"
260          file="${basedir}/etc/anthill-index.html"/>
261    <copy todir="${deployDir}/notes">
262      <fileset dir="${basedir}/etc/notes"/>
263    </copy>
242    </target>
243  
244  
245 +
246    <!-- Internal targets -->
247  
269  <target name="set-warnings-if" if="build.warnings">
248  
249 <    <property name="build.warnings.option" value="-warnunchecked"/>
249 >  <target name="init">
250 >
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="set-warnings-unless" unless="build.warnings">
259 >  <target name="dist-jar"
260 >          depends="clean, jar">
261  
262 <    <property name="build.warnings.option" value=""/>
262 >    <copy file="${product.jar}" todir="${dist.dir}"/>
263  
264    </target>
265  
266  
267 <  <target name="init" depends="set-warnings-if, set-warnings-unless">
267 >  <target name="compile-tests"
268 >          depends="jar">
269  
270 <    <!-- Version is kept in a separate file -->
271 <    <loadfile property="version" srcFile="version.properties"/>
272 <    <echo>Building JSR-166 version ${version}</echo>
270 >    <mkdir dir="${build.testcases.dir}"/>
271 >
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 >      <compilerarg value="${bootclasspath.args}"/>
281 >      <compilerarg line="${build.args}"/>
282 >
283 >      <classpath refid="test.classpath"/>
284 >
285 >    </javac>
286 >
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 >      <include name="jsr166/test/**"/>
296 >
297 >      <compilerarg value="${bootclasspath.args}"/>
298 >      <compilerarg line="${build.args}"/>
299 >
300 >      <classpath refid="test.classpath"/>
301 >
302 >    </javac>
303 >
304 > <!--
305 >    <javac srcdir="${jtreg.src.dir}"
306 >          destdir="${build.testcases.dir}"
307 >            debug="${build.debug}"
308 >       debuglevel="${build.debuglevel}"
309 >      deprecation="${build.deprecation}"
310 >           source="${build.sourcelevel}"
311 >             fork="true">
312 >
313 >      <compilerarg value="${bootclasspath.args}"/>
314 >      <compilerarg line="${build.args}"/>
315 >
316 >      <classpath refid="test.classpath"/>
317 >
318 >    </javac>
319 > -->
320  
321    </target>
322  
323  
324 <  <target name="native-jar" depends="compile"
325 <          description="Builds library jar from compiled sources">
324 >  <target name="run-tests"
325 >          depends="compile-tests">
326  
327 <    <mkdir dir="${build.lib.dir}"/>
327 >    <!-- May be overridden by user.properties -->
328 >    <property name="testcase" value="*"/>
329  
330 <    <jar destfile="${product.jar}">
331 <      <fileset dir="${build.classes.dir}"/>
332 <    </jar>
330 >    <mkdir dir="${build.reports.dir}"/>
331 >
332 >    <junit printsummary="true"
333 >             showoutput="true"
334 >          errorProperty="junit.failed"
335 >        failureProperty="junit.failed"
336 >                    dir="${build.reports.dir}"
337 >                   fork="true">
338 >
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}" 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 >
369 >  </target>
370 >
371 >
372 >  <target name="report-tests"
373 >          depends="run-tests">
374 >
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"
379 >              classname="org.apache.xalan.lib.Redirect"
380 >    />
381 >    <property name="junit.report.format" value="noframes"/>
382 >
383 >    <junitreport todir="${build.reports.dir}">
384 >      <fileset dir="${build.reports.dir}">
385 >        <include name="TEST-*.xml"/>
386 >      </fileset>
387 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
388 >      />
389 >    </junitreport>
390 >
391 >    <fail message="Test Cases Failed" if="junit.failed"/>
392 >
393 >  </target>
394 >
395 >
396 >  <target name="configure-compiler">
397 >
398 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
399 >
400 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
401 >      <istrue value="${build.warnunchecked}"/>
402 >    </condition>
403 >
404 >    <property name="warnunchecked.arg" value=""/>
405 >
406 >
407 >    <!-- Common options in javac invocations -->
408 >    <property name="build.args" value="${warnunchecked.arg}"/>
409 >
410 >  </target>
411 >
412 >
413 >  <target name="configure-tests"
414 >       depends="configure-compiler">
415 >
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 >    <!-- 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 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
428 >          unless="junit.available"/>
429 >
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 >
436 >
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="compile-emulation" depends="init"
466 <          if="build.emulation"
467 <          description="Compiles emulation sources to build folder">
465 >  <!-- jsr166x -->
466 >
467 >
468 >  <target name="jsr166xcompile"
469 >          depends="init, configure-compiler"
470 >          description="Compiles jsr166x sources">
471  
472 <    <mkdir dir="${build.emulation.dir}"/>
472 >    <mkdir dir="${build.jsr166x.dir}"/>
473  
474 <    <javac srcdir="${emulation.src.dir}"
475 <          destdir="${build.emulation.dir}"
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 <      <bootclasspath refid="javac.bootclasspath"/>
483 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
482 >      <include name="**/*.java"/>
483 >      <compilerarg line="${build.args}"/>
484  
485      </javac>
486  
487    </target>
488  
489  
326  <target name="emulation-jar" depends="native-jar, compile-emulation"
327          if="build.emulation">
490  
491 <    <jar destfile="${product.jar}" update="true" duplicate="add">
492 <      <fileset dir="${build.emulation.dir}"/>
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  
336  <target name="dist-jar" depends="clean, jar">
504  
505 <    <copy file="${product.jar}" todir="${dist.dir}"/>
505 >  <target name="jsr166xdocs"
506 >          description="Builds javadocs with custom tags to build folder">
507 >
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 >            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
515 >
516 >    >
517 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
518 >      <include name="jsr166x"/>
519 >      </packageset>
520 >
521 >
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 >
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 <  <target name="dist-docs" depends="filter-src"
549 >
550 >  <target name="jsr166xdist-docs"
551            description="Builds javadocs without custom tags to dist folder">
552  
553 <    <delete dir="${dist.javadocs.dir}"/>
554 <    <mkdir dir="${dist.javadocs.dir}"/>
553 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
554 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555  
556 <    <javadoc destdir="${dist.javadocs.dir}"
557 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
558 <            overview="${src.dir}/intro.html"
559 <              source="${build.docsourcelevel}">
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  
354      <packageset dir="${build.filter.src.dir}"/>
633  
634      </javadoc>
635  
636    </target>
637  
638  
639 <  <target name="compile-ant-filter" depends="init">
639 >  <target name="jsr166ydist"
640 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
641 >          description="Puts all distributable products in single hierarchy"/>
642  
363    <mkdir dir="${build.ant.dir}"/>
643  
644 <    <javac srcdir="${ant.src.dir}"
645 <          destdir="${build.ant.dir}"
646 <           source="1.4"
647 <    />
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  
373  <target name="filter-src" depends="compile-ant-filter">
654  
655 <    <mkdir dir="${build.filter.src.dir}"/>
655 >  <target name="jsr166ydist-clean"
656 >          description="Removes all build and distribution products">
657  
658 <    <copy todir="${build.filter.src.dir}">
659 <      <fileset dir="${src.dir}">
660 <        <include name="**/*.java"/>
661 <        <exclude name="**/Random.java"/>
662 <        <exclude name="**/Unsafe.java"/>
663 <      </fileset>
664 <      <filterchain>
665 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
666 <                      classpath="${build.ant.dir}">
667 <          <!--
668 <           # These arguments are to get rid of angle-bracketed type
669 <           # parameters so that javadoc can run on the result. The
670 <           # following heuristic that seems to work:
671 <           #
672 <           # For all lines not starting with space(s)-asterisk-space(s),
673 <           #   replace <something> with a space, where there may be more
674 <           #   than one right angle bracket at the end, and "something"
394 <           #   must not contain parens or pipes. (This may need some
395 <           #   tweaking.)
396 <           -->
397 <          <param name="notmatching" value="^\s+\*\s.*$"/>
398 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
399 <          <param name="replacement" value=" "/>
400 <        </filterreader>
401 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
402 <                      classpath="${build.ant.dir}">
403 <          <!--
404 <           # These arguments are to uncomment lines beginning with
405 <           # "//@" so that javadoc can see imports that are needed
406 <           # to resolve links but that shouldn't be in the compiled
407 <           # code.
408 <           -->
409 <          <param name="matching" value="^//@.*$"/>
410 <          <param name="pattern" value="^//@"/>
411 <          <param name="replacement" value=""/>
412 <        </filterreader>
413 <      </filterchain>
414 <    </copy>
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 <  <target name="compile-tests" depends="jar">
681 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
682  
683 <    <mkdir dir="${build.testcases.dir}"/>
683 >  </target>
684  
685 <    <javac srcdir="${test.src.dir}"
686 <          destdir="${build.testcases.dir}"
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 <      <bootclasspath refid="javac.bootclasspath"/>
704 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
705 <      <classpath refid="test.classpath"/>
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  
440  <target name="run-tests" depends="compile-tests">
714  
715 <    <!-- May be overridden by user.properties -->
716 <    <property name="testcase" value="*"/>
715 >  <target name="extra166yjar"
716 >          depends="extra166ycompile"
717 >          description="Builds library jar from compiled sources">
718  
719 <    <mkdir dir="${build.reports.dir}"/>
719 >    <mkdir dir="${build.extra166ylib.dir}"/>
720  
721 <    <junit printsummary="true"
722 <             showoutput="true"
723 <          errorProperty="junit.failed"
450 <        failureProperty="junit.failed"
451 <                    dir="${build.reports.dir}"
452 <                   fork="true">
721 >    <jar destfile="${extra166yproduct.jar}" index="true">
722 >      <fileset dir="${build.extra166y.dir}"/>
723 >    </jar>
724  
725 <      <jvmarg value="${test.javac.args}"/>
725 >  </target>
726  
456      <formatter type="xml"/>
727  
458      <batchtest todir="${build.reports.dir}">
459        <fileset dir="${test.src.dir}">
460          <include name="**/${testcase}Test.java"/>
461        </fileset>
462      </batchtest>
728  
729 <    </junit>
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="report-tests" depends="run-tests">
751 <    <!-- Sets junit.report.format to frames if Xalan is present,
752 <         otherwise sets it to noframes. -->
472 <    <available property="junit.report.format"
473 <                  value="frames"
474 <              classname="org.apache.xalan.lib.Redirect"
475 <    />
476 <    <property name="junit.report.format" value="noframes"/>
750 >  <target name="extra166ydist"
751 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
752 >          description="Puts all distributable products in single hierarchy"/>
753  
478    <junitreport todir="${build.reports.dir}">
479      <fileset dir="${build.reports.dir}">
480        <include name="TEST-*.xml"/>
481      </fileset>
482      <report styledir="${stylesheet.dir}"
483                format="${junit.report.format}"
484                 todir="${build.reports.dir}"
485      />
486    </junitreport>
754  
755 <    <fail message="Test Cases Failed" if="junit.failed"/>
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 <  <target name="check-junit">
766 <    <!-- FIXME: this test isn't specific enough -->
767 <    <available property="junit.available"
768 <               classname="junit.framework.TestCase"/>
496 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
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