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.52 by tim, Tue Aug 19 15:10:45 2003 UTC vs.
Revision 1.88 by jsr166, Sun May 29 16:00:20 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines