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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines