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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines