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.53 by dl, Tue Aug 26 19:59:14 2003 UTC vs.
Revision 1.87 by jsr166, Sat May 28 02:32:19 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 +      <include name="**/*.java"/>
111 +      <compilerarg value="-XDignore.symbol.file=true"/>
112 +
113   <!--
114 <      <compilerarg    line="${gjc.args}"/>
115 <      <bootclasspath refid="compile.bootclasspath"/>
114 >      <exclude name="java/lang/**"/>
115 >      <compilerarg line="${build.args}"/>
116 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117   -->
118  
119      </javac>
# Line 112 | Line 121
121    </target>
122  
123  
115  <target name="jar"
116          depends="configure-emulation, init-jar, native-jar, emulation-jar"
117          description="Builds library jar from compiled sources"/>
118
119
120  <target name="test"
121          depends="init, configure-tests, report-tests"
122          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
123
124  
125 <  <target name="checkstyle"
126 <          depends="filter-src"
127 <          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"
130 <            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"/>
135 <    </checkstyle>
131 >    <jar destfile="${product.jar}">
132 >      <fileset dir="${build.classes.dir}"/>
133 >    </jar>
134  
135    </target>
136  
137  
140  <target name="doccheck"
141          depends="filter-doccheck"
142          description="Reports on javadoc style errors">
143
144    <delete dir="${build.doccheck.dir}"/>
145    <mkdir dir="${build.doccheck.dir}"/>
146
147    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
148         docletpath="${lib.dir}/doccheck.jar"
149            destdir="${build.doccheck.dir}">
150      <packageset dir="${build.filter.doccheck.dir}"/>
151    </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  
155  </target>
143  
144  
145    <target name="docs"
159          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/7/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.docsourcelevel}">
155 <
170 <      <tag name="revised" description="Last revised:"/>
171 <      <tag name="spec"    description="Specified by:"/>
172 <      <tag name="editor"  description="Last edited by:"/>
173 <      <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  
182  <target name="sinjdocs"
183          depends="configure-tests"
184          description="Builds javadocs with custom tags to build folder">
185
186    <delete dir="${build.sinjdocs.dir}"/>
187    <mkdir dir="${build.sinjdocs.dir}"/>
188
189    <java classname="net.cscott.sinjdoc.Main" fork="true">
190
191      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
192
193      <classpath>
194        <pathelement location="${sinjdoc.jar}"/>
195        <pathelement location="${lib.dir}/jutil.jar"/>
196        <pathelement location="${lib.dir}/cup.jar"/>
197        <path refid="test.classpath"/>
198      </classpath>
199
200
201      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
202      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
203      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
204      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
205      <!-- <arg value="-verbose"/> -->
206      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
207      <arg value="java.lang"/>
208      <arg value="java.util"/>
209      <arg value="java.util.concurrent"/>
210      <arg value="java.util.concurrent.atomic"/>
211      <arg value="java.util.concurrent.locks"/>
212
213      <!--
214      <arg value="-help"/>
215      -->
216
217    </java>
218
219  </target>
220
221
222  <target name="strip"
223          depends="init, configure-compiler"
224          description="Strip generics from java source (not working yet)">
225
226    <mkdir dir="${build.stripped.dir}"/>
227
228    <!--
229     # javac -s doesn't reliably generate compilable code. It generates
230     # bridge methods (marked as "synthetic") that can have identical
231     # signatures to existing methods except for the return value.
232     -->
233    <javac srcdir="${src.dir}"
234          destdir="${build.stripped.dir}"
235            debug="${build.debug}"
236       debuglevel="${build.debuglevel}"
237      deprecation="${build.deprecation}"
238           source="${build.sourcelevel}"
239             fork="true">
240
241    <!--
242      <compilerarg    line="${gjc.args} -s"/>
243      <bootclasspath refid="compile.bootclasspath"/>
244     -->
245
246    </javac>
247
248  </target>
249
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  
259 <!--
260    #keep build dir? - dl
261    <delete dir="${build.dir}"/>
262 -->
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 282 | Line 197
197    </target>
198  
199  
200 +
201    <target name="dist-clean"
202            description="Removes all build and distribution products">
203  
# Line 290 | Line 206
206    </target>
207  
208  
209 +
210    <target name="dist-docs"
294          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"
302 <            overview="${src.dir}/intro.html"
303 <              source="${build.docsourcelevel}">
304 <
305 <      <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/7/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 318 | 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"
334 <          unless="build.emulation.true">
254 >  <target name="compile-tests"
255 >          depends="jar">
256  
257 <    <jar destfile="${product.jar}">
337 <      <fileset dir="${build.classes.dir}"/>
338 <    </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"
344 <          depends="init, configure-compiler"
345 <          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"
367 <          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">
371 <      <fileset dir="${build.classes.dir}">
372 <        <patternset refid="atomic.exclusion"/>
373 <        <patternset refid="unsafe.exclusion"/>
374 <      </fileset>
375 <      <fileset dir="${build.emulation.dir}"/>
376 <    </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"
382 <          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 > <!--
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 +  </target>
360  
389  <target name="compile-ant-filter"
390          depends="init">
361  
362 <    <mkdir dir="${build.ant.dir}"/>
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"
403 <          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"/>
410 <      </fileset>
411 <    </copy>
390 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
391 >      <istrue value="${build.warnunchecked}"/>
392 >    </condition>
393  
394 <    <copy todir="${build.filter.src.dir}">
395 <      <fileset dir="${src.dir}">
396 <        <exclude name="**/*.html"/>
397 <        <patternset refid="unsafe.exclusion"/>
398 <      </fileset>
399 <      <filterchain>
394 >    <property name="warnunchecked.arg" value=""/>
395 >
396 >
397 >    <!-- Common options in javac invocations -->
398 >    <property name="build.args" value="${warnunchecked.arg}"/>
399 >
400 >  </target>
401 >
402 >
403 >  <target name="configure-tests"
404 >       depends="configure-compiler">
405  
406 <        <!--
407 <         # This filter gets rid of angle-bracketed type parameters
408 <         # so that javadoc can run on the result. The following
423 <         # heuristic seems to work:
424 <         #
425 <         # For all lines not starting with space(s)-asterisk-space(s),
426 <         #   replace <something> with a space, where there may be more
427 <         #   than one right angle bracket at the end, and "something"
428 <         #   must not contain parens or pipes. (This may need some
429 <         #   tweaking.)
430 <         -->
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 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
411 <                      classpath="${build.ant.dir}">
412 <          <param name="notmatching" value="^\s+\*\s.*$"/>
435 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
436 <          <param name="replacement" value=" "/>
437 <        </filterreader>
410 >    <!-- Xalan -->
411 >    <available property="xalan.available"
412 >               classname="org.apache.xalan.Version"/>
413  
414  
415 <        <!--
416 <         # This filter uncomments lines beginning with "//@" so that
417 <         # javadoc can see imports that are needed to resolve links
418 <         # but that shouldn't be in the compiled code.
444 <         -->
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 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
421 <                      classpath="${build.ant.dir}">
422 <          <param name="matching"    value="^//@.*$"/>
449 <          <param name="pattern"     value="^//@"/>
450 <          <param name="replacement" value=""/>
451 <        </filterreader>
452 <      </filterchain>
453 <    </copy>
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}">
476 <      <fileset dir="${build.filter.src.dir}">
477 <        <exclude name="**/*.html"/>
478 <      </fileset>
479 <      <filterchain>
480 <        <!--
481 <         # These two filters try to make the source look like
482 <         # something that doccheck can process. The first removes
483 <         # -source 1.4 assertions and the second adds in a bunch
484 <         # of single letter public nested marker interfaces so that
485 <         # the generic type parameters are recognized.
486 <         -->
487 <
488 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
489 <                      classpath="${build.ant.dir}">
490 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
491 <          <param name="pattern"     value="assert"/>
492 <          <param name="replacement" value="//assert"/>
493 <        </filterreader>
494 <
495 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
496 <                      classpath="${build.ant.dir}">
497 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
498 <          <param name="pattern"     value="$"/>
499 <          <param name="replacement" value=" ${generic.declarations}"/>
500 <        </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"
509 <          depends="jar">
456 >  <!-- jsr166x -->
457  
511    <mkdir dir="${build.testcases.dir}"/>
458  
459 < <!--
460 <    <echo>javac ${gjc.args}</echo>
461 <    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
516 <    <echo>classpath="${test.classpath}"</echo>
517 < -->
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 < <!--
474 <      <compilerarg    line="${gjc.args}"/>
475 < -->
530 <      <bootclasspath refid="test.compile.bootclasspath"/>
531 <      <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  
538  <target name="run-tests"
539          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"
549 <        failureProperty="junit.failed"
550 <                    dir="${build.reports.dir}"
551 <                   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  
555      <formatter type="xml"/>
495  
557      <batchtest todir="${build.reports.dir}">
558        <fileset dir="${test.src.dir}">
559          <include name="**/${testcase}Test.java"/>
560        </fileset>
561      </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/7/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  
571    <!-- Sets junit.report.format to frames if Xalan is present,
572         otherwise sets it to noframes. -->
573    <available property="junit.report.format"
574                  value="frames"
575              classname="org.apache.xalan.lib.Redirect"
576    />
577    <property name="junit.report.format" value="noframes"/>
516  
579    <junitreport todir="${build.reports.dir}">
580      <fileset dir="${build.reports.dir}">
581        <include name="TEST-*.xml"/>
582      </fileset>
583      <report styledir="${stylesheet.dir}"
584                format="${junit.report.format}"
585                 todir="${build.reports.dir}"
586      />
587    </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  
594  <target name="configure-compiler">
595 <!--
596    <property name="gjc.version"
597             value="2.2"/>
527  
528 <    <condition property="novariance.arg" value="-novariance">
529 <      <and>
601 <        <equals arg1="${gjc.version}" arg2="2.0"/>
602 <        <or>
603 <          <not><isset property="gjc.novariance"/></not>
604 <          <istrue value="${gjc.novariance}"/>
605 <        </or>
606 <      </and>
607 <    </condition>
528 >  <target name="jsr166xdist-clean"
529 >          description="Removes all build and distribution products">
530  
531 <    <property name="novariance.arg"
610 <             value=""/>
531 >  </target>
532  
612    <property name="gjc.dir"
613             value="${lib.dir}/gjc"/>
533  
615    <property name="javac.jar"
616          location="${gjc.dir}/${gjc.version}/javac.jar"/>
534  
535 <    <property name="collect.jar"
536 <          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
535 >  <target name="jsr166xdist-docs"
536 >          description="Builds javadocs without custom tags to dist folder">
537  
538 < -->
539 <    <condition property="warnunchecked.arg" value="-warnunchecked">
623 <      <istrue value="${gjc.warnunchecked}"/>
624 <    </condition>
538 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
539 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
540  
541 <    <property name="warnunchecked.arg" value=""/>
541 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
542 >             packagenames="jsr166x"
543 >             link="http://download.oracle.com/javase/7/docs/api/"
544 >             source="${build.sourcelevel}"
545 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
546  
547 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
629 <      <istrue value="${build.nothreads}"/>
630 <    </condition>
547 >  </target>
548  
549 +  <target name="jsr166xdist-jar"
550 +          depends="jsr166xclean, jsr166xjar">
551  
552 <    <!--
634 <     ! Bootclasspath munging for source compilation.
635 <     -->
552 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
553  
554 <    <path id="pre.bootclasspath">
638 <      <pathelement location="${javac.jar}"/>
639 <    </path>
640 <
641 <    <path id="compile.bootclasspath">
642 <      <pathelement location="${build.classes.dir}"/>
643 <      <pathelement location="${collect.jar}"/>
644 <      <pathelement location="${rt.jar}"/>
645 <    </path>
646 <
647 <    <!-- Flatten paths into platform-appropriate strings -->
648 <    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
649 <    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
554 >  </target>
555  
556 +  <!-- jsr166y -->
557  
558 <    <!-- Common options in javac invocations -->
559 < <!--
560 <    <property name="gjc.args"
561 <             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
562 <    />
563 < -->
558 >
559 >  <target name="jsr166ycompile"
560 >          depends="init, configure-compiler"
561 >          description="Compiles jsr166y sources">
562 >
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  
676  <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/7/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  
696    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
697    <available property="junit.available"
698               classname="junit.framework.Protectable"/>
619  
700    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
701          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 <    <path id="test.classpath">
643 <      <pathelement location="${product.jar}"/>
644 <      <pathelement location="${build.testcases.dir}"/>
645 <      <pathelement location="${junit.jar}"/>
646 <    </path>
642 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
643 >             packagenames="jsr166y"
644 >             link="http://download.oracle.com/javase/7/docs/api/"
645 >             source="${build.sourcelevel}"
646 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
647  
648 <    <path id="test.compile.bootclasspath">
716 <      <pathelement location="${javac.jar}"/>
717 <      <pathelement location="${collect.jar}"/>
718 <      <pathelement location="${rt.jar}"/>
719 <    </path>
648 >  </target>
649  
650 <    <path id="test.run.bootclasspath">
651 <      <pathelement location="${javac.jar}"/>
723 <      <path refid="test.classpath"/>
724 <    </path>
650 >  <target name="jsr166ydist-jar"
651 >          depends="jsr166yclean, jsr166yjar">
652  
653 <    <!-- Flatten test classpaths into platform-appropriate strings -->
727 <    <property name="test.classpath"             refid="test.classpath"/>
728 <    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
729 <    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
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 <  <!-- Anthill targets -->
682 >    </javac>
683  
684 <  <target name="anthill-build"
738 <          depends="jar, test, docs, dist-docs"/>
684 >  </target>
685  
740  <target name="anthill-publish">
686  
742    <copy todir="${deployDir}/docs/private">
743      <fileset dir="${build.javadocs.dir}"/>
744    </copy>
687  
688 <    <copy todir="${deployDir}/docs/public">
689 <      <fileset dir="${dist.javadocs.dir}"/>
690 <    </copy>
688 >  <target name="extra166yjar"
689 >          depends="extra166ycompile"
690 >          description="Builds library jar from compiled sources">
691  
692 <    <copy tofile="${deployDir}/index.html"
751 <          file="${basedir}/etc/anthill-index.html"/>
692 >    <mkdir dir="${build.extra166ylib.dir}"/>
693  
694 <    <copy todir="${deployDir}/notes">
695 <      <fileset dir="${basedir}/etc/notes"/>
696 <    </copy>
694 >    <jar destfile="${extra166yproduct.jar}" index="true">
695 >      <fileset dir="${build.extra166y.dir}"/>
696 >    </jar>
697  
698    </target>
699  
700  
760  <target name="ng" depends="test">
761    <java classname="SuperfluousAbstract" fork="true">
701  
702 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
702 >  <target name="extra166ydocs"
703 >          description="Builds javadocs with custom tags to build folder">
704 >
705 >    <delete dir="${build.extra166yjavadocs.dir}"/>
706 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
707 >
708 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
709 >             packagenames="extra166y"
710 >             link="http://download.oracle.com/javase/7/docs/api/"
711 >             source="${build.sourcelevel}"
712 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
713  
765    </java>
714    </target>
715  
716  
717 +  <target name="extra166ydist"
718 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
719 +          description="Puts all distributable products in single hierarchy"/>
720 +
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 +
732 +
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/7/docs/api/"
747 +             source="${build.sourcelevel}"
748 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
749 +
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