ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.27 by tim, Wed May 28 00:33:17 2003 UTC vs.
Revision 1.88 by jsr166, Sun May 29 16:00:20 2011 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage">
2  
3    <description>
4 <    Build file for JSR-166
4 > ------------------------------------------------------------------------------
5 >  Build file for JSR-166
6  
7 <    JUnit 3.8 or better must be in ${ant.home}/lib for the test target to work.
7 <  </description>
7 >  Usage: ant [target]
8  
9 +  User-specific settings are read from user.properties.
10 +  See user.properties.sample for an explanation of some useful settings.
11 + ------------------------------------------------------------------------------
12 +  </description>
13  
14 <  <target name="usage" description="Prints this message">
15 <    <echo>
12 < ant [target], where target is one of:
13 <
14 < usage       (default) Prints this message
15 < compile     Compiles all sources to build folder
16 < jar         Builds library jar from compiled sources
17 < test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18 < docs        Builds javadocs with custom tags to build folder
19 < dist-docs   Builds javadocs without custom tags to dist folder
20 < dist        Puts all distributable products in single hierarchy
21 <
22 < clean       Removes all build products
23 < dist-clean  Removes all build and distribution products
24 <
25 < checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26 < doccheck    Reports on javadoc style errors (not working yet)
27 <    </echo>
14 >  <target name="usage" description="Advises user to run with -projecthelp">
15 >    <echo>Run "ant -projecthelp" for full usage information.</echo>
16    </target>
17  
18 +
19    <!-- User-specific settings -->
20    <property file="user.properties"/>
21  
33  <!-- Set build.warnings in user.properties to turn on -warnunchecked -->
34  <!-- <property name="build.warnings" value=""/> -->
35
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
39 <  <property name="build.docsourcelevel" value="1.4"/>
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"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40 >
41 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44 >
45 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48  
49    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>
59  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
51    <property name="test.src.dir"         location="${basedir}/src/test"/>
52 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
53 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
52 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
55    <property name="lib.dir"              location="${basedir}/lib"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>
57 <
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="javac.jar"            location="${lib.dir}/javac.jar"/>
71 <  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
70 >  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71 >  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72 >  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
74  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
75
76
77  <!--
78   ! Bootclasspath munging for source compilation.
79   -->
80
81  <path id="javac.bootclasspath.prepend">
82    <!-- <pathelement location="${src.dir}"/> -->
83    <pathelement location="${javac.jar}"/>
84  </path>
85
86  <path id="javac.bootclasspath">
87    <!-- <pathelement location="${src.dir}"/> -->
88    <pathelement location="${collect.jar}"/>
89    <pathelement location="${rt.jar}"/>
90  </path>
74  
75 <  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
76 <  <property name="javac.bootclasspath.prepend" refid="javac.bootclasspath.prepend"/>
94 <
95 <  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
96 <  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prepend}'/>
97 <
98 <
99 <  <!--
100 <   ! Bootclasspath munging for testing, so JUnit can test our local
101 <   ! modifications to java.*.
102 <   -->
75 >  <!-- Bootclasspath argument -->
76 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
78 +  <!-- Test classpath -->
79    <path id="test.classpath">
105    <pathelement location="${product.jar}"/>
80      <pathelement location="${build.testcases.dir}"/>
81      <pathelement location="${junit.jar}"/>
82    </path>
83  
84 <  <!-- Flatten test classpath into a platform-appropriate string -->
85 <  <property name="test.classpath" refid="test.classpath"/>
86 <
87 <  <!-- Turn the flattened test classpath into a javac argument -->
114 <  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
115 <
84 >  <!-- ALoops classpath -->
85 >  <path id="loops.classpath">
86 >    <pathelement location="${build.loops.dir}"/>
87 >  </path>
88  
89  
90    <!-- Main targets -->
91  
92 <  <target name="compile" depends="init"
92 >  <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"
98            description="Compiles main sources to build folder">
99  
100      <mkdir dir="${build.classes.dir}"/>
# Line 130 | Line 107 | ant [target], where target is one of:
107             source="${build.sourcelevel}"
108               fork="true">
109  
110 <      <bootclasspath refid="javac.bootclasspath"/>
111 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
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  
141  <target name="jar" depends="native-jar, emulation-jar"/>
124  
125 +  <target name="jar"
126 +          depends="compile"
127 +          description="Builds library jar from compiled sources">
128 +
129 +    <mkdir dir="${build.lib.dir}"/>
130 +
131 +    <jar destfile="${product.jar}">
132 +      <fileset dir="${build.classes.dir}"/>
133 +    </jar>
134  
135 <  <target name="test" depends="init, check-junit, report-tests"
145 <          description="Runs all tests (requires JUnit 3.8+ in ${ant.home}/lib)"
146 <  />
135 >  </target>
136  
137  
149  <target name="checkstyle" depends="filter-src"
150          description="Reports on style errors in Java source (verbose, mostly chaff)">
138  
139 <    <taskdef resource="checkstyletask.properties"
140 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
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    <checkstyle>
156      <formatter type="plain"/>  <!-- also available: type="xml" -->
157      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
158    </checkstyle>
143  
160  </target>
144  
145 +  <target name="docs"
146 +          description="Builds javadocs with custom tags to build folder">
147  
148 <  <target name="doccheck" depends="filter-src"
149 <          description="Reports on javadoc style errors (not working yet)">
148 >    <delete dir="${build.javadocs.dir}"/>
149 >    <mkdir dir="${build.javadocs.dir}"/>
150  
151 <    <delete dir="${build.doccheck.dir}"/>
152 <    <mkdir dir="${build.doccheck.dir}"/>
151 >    <!-- the packagenames="none" hack below prevents scanning the -->
152 >    <!-- sourcepath for packages -->
153  
154 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
155 <         docletpath="${lib.dir}/doccheck.jar"
156 <            destdir="${build.doccheck.dir}">
157 <      <packageset dir="${build.filter.src.dir}"/>
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  
178  <target name="docs" depends="filter-src"
179          description="Builds javadocs with custom tags to build folder">
167  
168 <    <delete dir="${build.javadocs.dir}"/>
169 <    <mkdir dir="${build.javadocs.dir}"/>
168 >  <target name="dist"
169 >          depends="init, dist-clean, dist-jar, dist-docs"
170 >          description="Puts all distributable products in single hierarchy"/>
171  
184    <javadoc destdir="${build.javadocs.dir}"
185                link="http://java.sun.com/j2se/1.4.1/docs/api"
186            overview="${src.dir}/intro.html"
187              source="${build.docsourcelevel}">
188
189      <tag name="revised" description="Last revised:"/>
190      <tag name="spec" description="Specified by:"/>
191      <tag name="editor" description="Last edited by:"/>
192      <tag name="fixme" description="FIX ME:"/>
193      <packageset dir="${build.filter.src.dir}"/>
172  
173 +  <target name="release"
174 +          depends="dist"
175 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
176 +
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="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 +
196 +    <delete dir="${build.dir}"/>
197 +    <delete dir="${build.classes.dir}"/>
198 +    <delete dir="${build.lib.dir}"/>
199 +
200 +  </target>
201 +
202 +
203 +
204 +  <target name="dist-clean"
205 +          description="Removes all build and distribution products">
206 +
207 +    <delete dir="${dist.dir}"/>
208 +
209 +  </target>
210 +
211 +
212 +
213 +  <target name="dist-docs"
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 +    <!-- 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>
233  
234  
200  <!--
201   # javac -s doesn't reliably generate compilable code. It generates
202   # bridge methods (marked as "synthetic") that can have identical
203   # signatures to existing methods except for the return value.
204   -->
205  <target name="strip" depends="init">
235  
236 <    <mkdir dir="${build.stripped.dir}"/>
236 >  <!-- Internal targets -->
237 >
238  
239 <    <javac srcdir="${src.dir}"
240 <          destdir="${build.stripped.dir}"
239 >  <target name="init">
240 >
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="dist-jar"
250 >          depends="clean, jar">
251 >
252 >    <copy file="${product.jar}" todir="${dist.dir}"/>
253 >
254 >  </target>
255 >
256 >
257 >  <target name="compile-tests"
258 >          depends="jar">
259 >
260 >    <mkdir dir="${build.testcases.dir}"/>
261 >
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 <      <bootclasspath refid="javac.bootclasspath"/>
271 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
270 >      <compilerarg value="${bootclasspath.args}"/>
271 >      <compilerarg line="${build.args}"/>
272 >      <compilerarg value="-XDignore.symbol.file=true"/>
273 >
274 >      <classpath refid="test.classpath"/>
275  
276      </javac>
277  
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 +      <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="dist" depends="init, dist-clean, dist-jar, dist-docs"
318 <          description="Puts all distributable products in single hierarchy"/>
317 >  <target name="run-tests"
318 >          depends="compile-tests">
319 >
320 >    <!-- May be overridden by user.properties -->
321 >    <property name="testcase" value="*"/>
322  
323 +    <mkdir dir="${build.reports.dir}"/>
324  
325 <  <target name="clean"
326 <          description="Removes all build products">
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 <    <delete dir="${build.dir}"/>
333 <    <delete dir="${build.classes.dir}"/>
334 <    <delete dir="${build.lib.dir}"/>
332 >      <jvmarg value="${bootclasspath.args}"/>
333 >      <jvmarg value="-server"/>
334 >      <jvmarg value="-showversion"/>
335 >
336 >      <classpath refid="test.classpath"/>
337 >
338 >      <formatter type="xml"/>
339 >
340 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
341 >        <fileset dir="${tck.src.dir}">
342 >          <include name="**/${testcase}Test.java"/>
343 >        </fileset>
344 >      </batchtest>
345 >
346 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
347 >        <fileset dir="${test.src.dir}">
348 >          <include name="jsr166/test/**/${testcase}Test.java"/>
349 >        </fileset>
350 >      </batchtest>
351 >
352 > <!--
353 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
354 >        <fileset dir="${jtreg.src.dir}">
355 >          <include name="**/${testcase}Test.java"/>
356 >        </fileset>
357 >      </batchtest>
358 > -->
359 >
360 >    </junit>
361  
362    </target>
363  
364  
365 <  <target name="dist-clean"
366 <          description="Removes all build and distribution products">
365 >  <target name="report-tests"
366 >          depends="run-tests">
367  
368 <    <delete dir="${dist.dir}"/>
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 <  <!-- Anthill targets -->
389 >  <target name="configure-compiler">
390 >
391 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
392 >
393 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
394 >      <istrue value="${build.warnunchecked}"/>
395 >    </condition>
396 >
397 >    <property name="warnunchecked.arg" value=""/>
398  
249  <!-- Should really run the tests instead of just the jar target -->
250  <target name="anthill-build" depends="jar, test, docs, dist-docs"/>
399  
400 <  <target name="anthill-publish">
401 <    <copy todir="${deployDir}/docs/private">
402 <      <fileset dir="${build.javadocs.dir}"/>
255 <    </copy>
256 <    <copy todir="${deployDir}/docs/public">
257 <      <fileset dir="${dist.javadocs.dir}"/>
258 <    </copy>
259 <    <copy tofile="${deployDir}/index.html"
260 <          file="${basedir}/etc/anthill-index.html"/>
261 <    <copy todir="${deployDir}/notes">
262 <      <fileset dir="${basedir}/etc/notes"/>
263 <    </copy>
400 >    <!-- Common options in javac invocations -->
401 >    <property name="build.args" value="${warnunchecked.arg}"/>
402 >
403    </target>
404  
405  
406 <  <!-- Internal targets -->
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  
269  <target name="set-warnings-if" if="build.warnings">
417  
418 <    <property name="build.warnings.option" value="-warnunchecked"/>
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 <  <target name="set-warnings-unless" unless="build.warnings">
430 >  <!-- Various demos and test programs -->
431 >
432 >
433 >  <target name="loops" depends="init, configure-compiler"
434 >          description="Benchmark from Doug Lea's AQS paper">
435 >
436 >    <mkdir dir="${build.loops.dir}"/>
437 >
438 >    <javac srcdir="${loops.src.dir}"
439 >          destdir="${build.loops.dir}"
440 >            debug="${build.debug}"
441 >       debuglevel="${build.debuglevel}"
442 >      deprecation="${build.deprecation}"
443 >           source="${build.sourcelevel}"
444 >             fork="true">
445  
446 <    <property name="build.warnings.option" value=""/>
446 >      <compilerarg line="${build.args}"/>
447 >      <classpath refid="loops.classpath"/>
448 >      <compilerarg value="-XDignore.symbol.file=true"/>
449 >
450 >    </javac>
451 >
452 >    <java classname="ALoops" fork="true">
453 >      <classpath refid="loops.classpath"/>
454 >    </java>
455  
456    </target>
457  
458  
459 <  <target name="init" depends="set-warnings-if, set-warnings-unless">
459 >  <!-- jsr166x -->
460  
461 <    <!-- Version is kept in a separate file -->
462 <    <loadfile property="version" srcFile="version.properties"/>
463 <    <echo>Building JSR-166 version ${version}</echo>
461 >
462 >  <target name="jsr166xcompile"
463 >          depends="init, configure-compiler"
464 >          description="Compiles jsr166x sources">
465 >
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 >      <include name="**/*.java"/>
477 >      <compilerarg line="${build.args}"/>
478 >      <compilerarg value="-XDignore.symbol.file=true"/>
479 >
480 >    </javac>
481  
482    </target>
483  
484  
485 <  <target name="native-jar" depends="compile"
485 >
486 >  <target name="jsr166xjar"
487 >          depends="jsr166xcompile"
488            description="Builds library jar from compiled sources">
489  
490 <    <mkdir dir="${build.lib.dir}"/>
490 >    <mkdir dir="${build.jsr166xlib.dir}"/>
491  
492 <    <jar destfile="${product.jar}">
493 <      <fileset dir="${build.classes.dir}"/>
492 >    <jar destfile="${jsr166xproduct.jar}">
493 >      <fileset dir="${build.jsr166x.dir}"/>
494      </jar>
495  
496    </target>
497  
498  
304  <target name="compile-emulation" depends="init"
305          if="build.emulation"
306          description="Compiles emulation sources to build folder">
499  
500 <    <mkdir dir="${build.emulation.dir}"/>
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="jsr166xdist"
516 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
517 >          description="Puts all distributable products in single hierarchy"/>
518 >
519 >
520 >
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 >
530 >
531 >  <target name="jsr166xdist-clean"
532 >          description="Removes all build and distribution products">
533 >
534 >  </target>
535 >
536 >
537 >
538 >  <target name="jsr166xdist-docs"
539 >          description="Builds javadocs without custom tags to dist folder">
540 >
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 >  </target>
551 >
552 >  <target name="jsr166xdist-jar"
553 >          depends="jsr166xclean, jsr166xjar">
554 >
555 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
556 >
557 >  </target>
558 >
559 >  <!-- jsr166y -->
560 >
561 >
562 >  <target name="jsr166ycompile"
563 >          depends="init, configure-compiler"
564 >          description="Compiles jsr166y sources">
565  
566 <    <javac srcdir="${emulation.src.dir}"
567 <          destdir="${build.emulation.dir}"
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 <      <bootclasspath refid="javac.bootclasspath"/>
577 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
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  
326  <target name="emulation-jar" depends="native-jar, compile-emulation"
327          if="build.emulation">
588  
589 <    <jar destfile="${product.jar}" update="true" duplicate="add">
590 <      <fileset dir="${build.emulation.dir}"/>
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  
336  <target name="dist-jar" depends="clean, jar">
602  
603 <    <copy file="${product.jar}" todir="${dist.dir}"/>
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="dist-docs" depends="filter-src"
619 <          description="Builds javadocs without custom tags to dist folder">
618 >  <target name="jsr166ydist"
619 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
620 >          description="Puts all distributable products in single hierarchy"/>
621  
346    <delete dir="${dist.javadocs.dir}"/>
347    <mkdir dir="${dist.javadocs.dir}"/>
622  
349    <javadoc destdir="${dist.javadocs.dir}"
350                link="http://java.sun.com/j2se/1.4.1/docs/api"
351            overview="${src.dir}/intro.html"
352              source="${build.docsourcelevel}">
623  
624 <      <packageset dir="${build.filter.src.dir}"/>
624 >  <target name="jsr166yclean"
625 >          description="Removes all build products">
626  
627 <    </javadoc>
627 >    <delete dir="${build.jsr166y.dir}"/>
628 >    <delete dir="${build.jsr166ylib.dir}"/>
629  
630    </target>
631  
632  
361  <target name="compile-ant-filter" depends="init">
633  
634 <    <mkdir dir="${build.ant.dir}"/>
635 <
365 <    <javac srcdir="${ant.src.dir}"
366 <          destdir="${build.ant.dir}"
367 <           source="1.4"
368 <    />
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 <  <target name="filter-src" depends="compile-ant-filter">
642 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
643 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
644  
645 <    <mkdir dir="${build.filter.src.dir}"/>
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 <    <copy todir="${build.filter.src.dir}">
652 <      <fileset dir="${src.dir}">
653 <        <include name="**/*.java"/>
654 <        <exclude name="**/Random.java"/>
655 <        <exclude name="**/Unsafe.java"/>
656 <      </fileset>
383 <      <filterchain>
384 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
385 <                      classpath="${build.ant.dir}">
386 <          <!--
387 <           # These arguments are to get rid of angle-bracketed type
388 <           # parameters so that javadoc can run on the result. The
389 <           # following heuristic that seems to work:
390 <           #
391 <           # For all lines not starting with space(s)-asterisk-space(s),
392 <           #   replace <something> with a space, where there may be more
393 <           #   than one right angle bracket at the end, and "something"
394 <           #   must not contain parens or pipes. (This may need some
395 <           #   tweaking.)
396 <           -->
397 <          <param name="notmatching" value="^\s+\*\s.*$"/>
398 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
399 <          <param name="replacement" value=" "/>
400 <        </filterreader>
401 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
402 <                      classpath="${build.ant.dir}">
403 <          <!--
404 <           # These arguments are to uncomment lines beginning with
405 <           # "//@" so that javadoc can see imports that are needed
406 <           # to resolve links but that shouldn't be in the compiled
407 <           # code.
408 <           -->
409 <          <param name="matching" value="^//@.*$"/>
410 <          <param name="pattern" value="^//@"/>
411 <          <param name="replacement" value=""/>
412 <        </filterreader>
413 <      </filterchain>
414 <    </copy>
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  
419  <target name="compile-tests" depends="jar">
662  
663 <    <mkdir dir="${build.testcases.dir}"/>
663 >  <target name="extra166ycompile"
664 >          depends="init, configure-compiler, jsr166ycompile"
665 >          description="Compiles extra166y sources">
666  
667 <    <javac srcdir="${test.src.dir}"
668 <          destdir="${build.testcases.dir}"
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 <      <bootclasspath refid="javac.bootclasspath"/>
679 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
680 <      <classpath refid="test.classpath"/>
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  
689  
440  <target name="run-tests" depends="compile-tests">
690  
691 <    <!-- May be overridden by user.properties -->
692 <    <property name="testcase" value="*"/>
691 >  <target name="extra166yjar"
692 >          depends="extra166ycompile"
693 >          description="Builds library jar from compiled sources">
694  
695 <    <mkdir dir="${build.reports.dir}"/>
695 >    <mkdir dir="${build.extra166ylib.dir}"/>
696  
697 <    <junit printsummary="true"
698 <             showoutput="true"
699 <          errorProperty="junit.failed"
450 <        failureProperty="junit.failed"
451 <                    dir="${build.reports.dir}"
452 <                   fork="true">
697 >    <jar destfile="${extra166yproduct.jar}" index="true">
698 >      <fileset dir="${build.extra166y.dir}"/>
699 >    </jar>
700  
701 <      <jvmarg value="${test.javac.args}"/>
701 >  </target>
702  
456      <formatter type="xml"/>
703  
458      <batchtest todir="${build.reports.dir}">
459        <fileset dir="${test.src.dir}">
460          <include name="**/${testcase}Test.java"/>
461        </fileset>
462      </batchtest>
704  
705 <    </junit>
705 >  <target name="extra166ydocs"
706 >          description="Builds javadocs with custom tags to build folder">
707 >
708 >    <delete dir="${build.extra166yjavadocs.dir}"/>
709 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
710 >
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    </target>
718  
719  
720 <  <target name="report-tests" depends="run-tests">
721 <    <!-- Sets junit.report.format to frames if Xalan is present,
722 <         otherwise sets it to noframes. -->
472 <    <available property="junit.report.format"
473 <                  value="frames"
474 <              classname="org.apache.xalan.lib.Redirect"
475 <    />
476 <    <property name="junit.report.format" value="noframes"/>
720 >  <target name="extra166ydist"
721 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
722 >          description="Puts all distributable products in single hierarchy"/>
723  
478    <junitreport todir="${build.reports.dir}">
479      <fileset dir="${build.reports.dir}">
480        <include name="TEST-*.xml"/>
481      </fileset>
482      <report styledir="${stylesheet.dir}"
483                format="${junit.report.format}"
484                 todir="${build.reports.dir}"
485      />
486    </junitreport>
724  
725 <    <fail message="Test Cases Failed" if="junit.failed"/>
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  
735 <  <target name="check-junit">
736 <    <!-- FIXME: this test isn't specific enough -->
737 <    <available property="junit.available"
738 <               classname="junit.framework.TestCase"/>
739 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
735 >
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 >
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