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.62 by tim, Wed Dec 10 01:51:11 2003 UTC vs.
Revision 1.111 by jsr166, Sun Jan 20 03:34:23 2013 UTC

# Line 8 | Line 8
8  
9    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.
11 +
12 +  The repository contains all dependencies except for ant and the JDK
13 +  itself.  Because the JDK version matters and because different
14 +  targets require different JDKs, we assume that users have created a
15 +  hierarchy containing:
16 +  $HOME/jdk/jdk6
17 +  $HOME/jdk/jdk7
18 +  $HOME/jdk/jdk8
19 +  where each of the above is a JDK or a symlink to same, and
20 +  $HOME/jdk/src/jdk6
21 +  $HOME/jdk/src/jdk7
22 +  $HOME/jdk/src/jdk8
23 +  where each of the above is a complete JDK source tree
24 +  (e.g. mercurial forest) or a symlink to same.
25   ------------------------------------------------------------------------------
26    </description>
27  
# Line 21 | Line 35
35  
36  
37    <!-- Compilation options -->
38 <  <property name="build.sourcelevel"    value="1.5"/>
38 >  <property name="build.sourcelevel"    value="1.6"/>
39    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>
42  
43    <!-- Build locations -->
44 <  <property name="build.dir"            location="build"/>
45 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
46 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
47 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
48 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
49 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
50 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
51 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
52 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
53 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
54 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
44 >  <property name="build.dir"                   location="build"/>
45 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
46 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
48 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
49 >
50 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
53 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54 >
55 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59 >
60 >  <!-- JDK binary locations -->
61 >  <property name="jdks.home"  location="${user.home}/jdk"/>
62 >
63 >  <macrodef name="defjdklocations">
64 >    <attribute name="v"/>
65 >    <sequential>
66 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
67 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
68 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
69 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
70 >    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
71 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
72 >    <property name="bootclasspath@{v}"
73 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
74 >    </sequential>
75 >  </macrodef>
76 >
77 >  <defjdklocations v="6"/>
78 >  <defjdklocations v="7"/>
79 >  <defjdklocations v="8"/>
80 >
81 >  <macrodef name="run-tck-tests">
82 >    <attribute name="jvm"/>
83 >    <attribute name="tck.classes"/>
84 >    <attribute name="product.jar" default="${product.jar}"/>
85 >    <attribute name="jvmflags" default=""/>
86 >    <sequential>
87 >    <java classname="JSR166TestCase"
88 >          jvm="@{jvm}" fork="true">
89 >        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
90 >        <jvmarg line="@{jvmflags}"/>
91 >        <classpath>
92 >          <pathelement location="${junit.jar}"/>
93 >          <pathelement location="@{tck.classes}"/>
94 >        </classpath>
95 >    </java>
96 >    </sequential>
97 >  </macrodef>
98  
99    <!-- Source locations -->
100    <property name="src.dir"              location="${basedir}/src/main"/>
101    <property name="test.src.dir"         location="${basedir}/src/test"/>
102 +  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
103    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
104    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
47  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
105    <property name="lib.dir"              location="${basedir}/lib"/>
106    <property name="dist.dir"             location="${basedir}/dist"/>
107 +  <property name="topsrc.dir"           location="${basedir}/src"/>
108 +  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
109 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
110 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113  
114    <!-- Distribution locations -->
115 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
115 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121  
122    <!-- Jar locations -->
123 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
125 <  
123 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130 >
131    <!-- Bootclasspath argument -->
132    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133  
134 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138 +
139 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140 +  <!-- The below does not yet exist as of 2012-11 -->
141 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142 +
143 +  <!-- Default jdk api doc location (latest stable release seems best) -->
144 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145 +
146    <!-- Test classpath -->
147    <path id="test.classpath">
148      <pathelement location="${build.testcases.dir}"/>
149      <pathelement location="${junit.jar}"/>
150    </path>
151  
152 +  <!-- ALoops classpath -->
153 +  <path id="loops.classpath">
154 +    <pathelement location="${build.loops.dir}"/>
155 +  </path>
156  
157 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
158 +  <!-- TODO: How do we get &trade to work? -->
159 +  <!-- TODO: Why isn't @jls a "standard" tag? -->
160 +  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161 +  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
162 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
163  
164    <!-- Main targets -->
165  
166 +  <target name="dists"
167 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168 +          description="Builds all public jars and docs"/>
169  
170    <target name="compile"
171 <          depends="init, configure-compiler"
172 <          description="Compiles main sources to build folder">
171 >          depends="configure-compiler"
172 >          description="Compiles src/main sources to build dir">
173  
174      <mkdir dir="${build.classes.dir}"/>
175  
176      <javac srcdir="${src.dir}"
177 <          destdir="${build.classes.dir}"
178 <            debug="${build.debug}"
179 <       debuglevel="${build.debuglevel}"
180 <      deprecation="${build.deprecation}"
181 <           source="${build.sourcelevel}"
182 <             fork="true">
177 >           destdir="${build.classes.dir}"
178 >           debug="${build.debug}"
179 >           debuglevel="${build.debuglevel}"
180 >           deprecation="${build.deprecation}"
181 >           classpath=""
182 >           includeAntRuntime="false"
183 >           includeJavaRuntime="false"
184 >           executable="${javac8}"
185 >           fork="true">
186  
187 +      <include name="**/*.java"/>
188        <compilerarg line="${build.args}"/>
189 +      <compilerarg value="-XDignore.symbol.file=true"/>
190 +      <compilerarg value="-Xlint:all"/>
191 +
192 + <!--
193 +      <exclude name="java/lang/**"/>
194 +      <compilerarg line="${build.args}"/>
195 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
196 + -->
197  
198      </javac>
199  
# Line 96 | Line 205
205            depends="compile"
206            description="Builds library jar from compiled sources">
207  
99    <mkdir dir="${build.lib.dir}"/>
100
208      <jar destfile="${product.jar}">
209        <fileset dir="${build.classes.dir}"/>
210      </jar>
# Line 107 | Line 214
214  
215  
216    <target name="test"
217 <          depends="init, configure-tests, report-tests"
217 >          depends="configure-tests, report-tests"
218            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219  
220  
221  
222    <target name="docs"
223 <          description="Builds javadocs with custom tags to build folder">
117 <
118 <    <delete dir="${build.javadocs.dir}"/>
119 <    <mkdir dir="${build.javadocs.dir}"/>
120 <
121 <    <javadoc destdir="${build.javadocs.dir}"
122 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
123 <            overview="${src.dir}/intro.html"
124 <              source="${build.sourcelevel}">
125 <
126 <      <tag name="revised" description="Last revised:"/>
127 <      <tag name="spec"    description="Specified by:"/>
128 <
129 <      <packageset dir="${src.dir}"/>
130 <
131 <    </javadoc>
132 <
133 <  </target>
223 >          description="Builds javadocs for src/main to dist dir">
224  
225 +    <delete dir="${dist.javadocs.dir}"/>
226 +    <mkdir dir="${dist.javadocs.dir}"/>
227  
228 +    <!-- the packagenames="none" hack below prevents scanning the -->
229 +    <!-- sourcepath for packages -->
230  
231 <  <target name="doccheck"
232 <          depends="filter-doccheck"
233 <          description="Reports on javadoc style errors">
234 <
235 <    <delete dir="${build.doccheck.dir}"/>
236 <    <mkdir dir="${build.doccheck.dir}"/>
237 <
238 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
239 <         docletpath="${lib.dir}/doccheck.jar"
240 <            destdir="${build.doccheck.dir}">
241 <      <packageset dir="${build.dc-filter.dir}"/>
231 >    <javadoc destdir="${dist.javadocs.dir}"
232 >             packagenames="none"
233 >             link="${jdkapi8docs.url}"
234 >             overview="${src.dir}/intro.html"
235 >             sourcepath="${src.dir}:${jdk8src.dir}"
236 >             classpath=""
237 >             executable="${javadoc8}">
238 >      <arg value="-XDignore.symbol.file=true"/>
239 >      <arg value="-tag"/>
240 >      <arg value="${javadoc.jls.option}"/>
241 >      <fileset dir="${src.dir}" defaultexcludes="yes">
242 >        <include name="**/*.java"/>
243 >      </fileset>
244      </javadoc>
245  
150    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
151
246    </target>
247  
248  
249  
156  <target name="checkstyle"
157          depends="filter-src"
158          description="Reports on style errors in Java source (verbose, mostly chaff)">
159
160    <taskdef resource="checkstyletask.properties"
161            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
162
163    <mkdir dir="${build.checkstyle.dir}"/>
164    
165    <checkstyle config="etc/checkstyle/sun_checks.xml"
166       failOnViolation="false">
167      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
168      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
169    </checkstyle>
170    
171    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
172          out="${build.checkstyle.dir}/checkstyle-report.html"
173        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
174
175  </target>
176
177  
178
250    <target name="dist"
251 <          depends="init, dist-clean, dist-jar, dist-docs"
251 >          depends="dist-clean, dist-jar, docs"
252            description="Puts all distributable products in single hierarchy"/>
253  
254  
184
255    <target name="release"
256            depends="dist"
257            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 206 | Line 276
276            description="Removes all build products">
277  
278      <delete dir="${build.dir}"/>
209    <delete dir="${build.classes.dir}"/>
210    <delete dir="${build.lib.dir}"/>
279  
280    </target>
281  
# Line 222 | Line 290
290  
291  
292  
225  <target name="dist-docs"
226          description="Builds javadocs without custom tags to dist folder">
227
228    <delete dir="${dist.javadocs.dir}"/>
229    <mkdir dir="${dist.javadocs.dir}"/>
230
231    <javadoc destdir="${dist.javadocs.dir}"
232                link="http://java.sun.com/j2se/1.4.2/docs/api"
233            overview="${src.dir}/intro.html"
234              source="${build.sourcelevel}">
235
236      <packageset dir="${src.dir}"/>
237
238    </javadoc>
239
240  </target>
241
242
243
293    <!-- Internal targets -->
294  
295  
247  <target name="init">
248
249    <!-- Version is kept in a separate file -->
250    <loadfile property="version" srcFile="version.properties"/>
251    <echo>Building JSR-166 version ${version}</echo>
252    <echo>java.home is ${java.home}</echo>
253
254  </target>
255  
256  
296    <target name="dist-jar"
297            depends="clean, jar">
298  
# Line 262 | Line 301
301    </target>
302  
303  
265  <target name="compile-ant-filter"
266          depends="init">
267
268    <mkdir dir="${build.ant.dir}"/>
269
270    <javac srcdir="${ant.src.dir}"
271          destdir="${build.ant.dir}"
272           source="1.4"
273    />
274
275  </target>
276
277
278  <target name="filter-src"
279          depends="compile-ant-filter">
280
281    <mkdir dir="${build.filter.src.dir}"/>
282
283    <copy todir="${build.filter.src.dir}">
284      <fileset dir="${src.dir}">
285        <include name="**/*.html"/>
286      </fileset>
287    </copy>
288
289    <copy todir="${build.filter.src.dir}">
290      <fileset dir="${src.dir}">
291        <exclude name="**/*.html"/>
292        <!-- Files excluded from dist-docs -->
293        <exclude name="java/util/Random.*"/>
294        <exclude name="sun/misc/Unsafe.*"/>
295      </fileset>
296      <!--
297      <filterchain>
298      -->
299
300        <!--
301         # This filter gets rid of angle-bracketed type parameters
302         # so that javadoc can run on the result. The following
303         # heuristic seems to work:
304         #
305         # For all lines not starting with space(s)-asterisk-space(s),
306         #   replace <something> with a space, where there may be more
307         #   than one right angle bracket at the end, and "something"
308         #   must not contain parens or pipes. (This may need some
309         #   tweaking.)
310         -->
311
312        <!--
313        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
314                      classpath="${build.ant.dir}">
315          <param name="notmatching" value="^\s+\*\s.*$"/>
316          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
317          <param name="replacement" value=" "/>
318        </filterreader>
319        -->
320
321      <!--
322      </filterchain>
323      -->
324    </copy>
325
326  </target>
327
328
329  <target name="filter-doccheck"
330          depends="filter-src">
331
332    <mkdir dir="${build.dc-filter.dir}"/>
333
334    <copy todir="${build.dc-filter.dir}">
335      <fileset dir="${build.filter.src.dir}">
336        <include name="**/*.html"/>
337      </fileset>
338    </copy>
339
340    <property name="generic.declarations"
341             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 {}"
342    />
343
344    <copy todir="${build.dc-filter.dir}">
345      <fileset dir="${build.filter.src.dir}">
346        <exclude name="**/*.html"/>
347      </fileset>
348      <filterchain>
349        <!--
350         # These two filters try to make the source look like
351         # something that doccheck can process. The first removes
352         # -source 1.4 assertions and the second adds in a bunch
353         # of single letter public nested marker interfaces so that
354         # the generic type parameters are recognized.
355         -->
356
357        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
358                      classpath="${build.ant.dir}">
359          <param name="matching"    value="^\s*assert[\s ].*$"/>
360          <param name="pattern"     value="assert"/>
361          <param name="replacement" value="//assert"/>
362        </filterreader>
363
364        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
365                      classpath="${build.ant.dir}">
366          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
367          <param name="pattern"     value="$"/>
368          <param name="replacement" value=" ${generic.declarations}"/>
369        </filterreader>
370
371      </filterchain>
372    </copy>
373
374  </target>
375
376
304    <target name="compile-tests"
305            depends="jar">
306  
307      <mkdir dir="${build.testcases.dir}"/>
308  
309      <javac srcdir="${tck.src.dir}"
310 <          destdir="${build.testcases.dir}"
311 <            debug="${build.debug}"
312 <       debuglevel="${build.debuglevel}"
313 <      deprecation="${build.deprecation}"
314 <           source="${build.sourcelevel}"
315 <             fork="true">
310 >           destdir="${build.testcases.dir}"
311 >           debug="${build.debug}"
312 >           debuglevel="${build.debuglevel}"
313 >           deprecation="${build.deprecation}"
314 >           source="6"
315 >           classpath="${junit.jar}"
316 >           bootclasspath="${product.jar}:${bootclasspath6}"
317 >           includeAntRuntime="false"
318 >           includeJavaRuntime="false"
319 >           executable="${javac8}"
320 >           fork="true">
321  
322 <      <compilerarg value="${bootclasspath.args}"/>
322 >      <include name="**/*.java"/>
323        <compilerarg line="${build.args}"/>
324 <      
324 >      <compilerarg value="-XDignore.symbol.file=true"/>
325 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326 >
327        <classpath refid="test.classpath"/>
328  
329      </javac>
330  
331      <javac srcdir="${test.src.dir}"
332 <          destdir="${build.testcases.dir}"
333 <            debug="${build.debug}"
334 <       debuglevel="${build.debuglevel}"
335 <      deprecation="${build.deprecation}"
336 <           source="${build.sourcelevel}"
337 <             fork="true">
332 >           destdir="${build.testcases.dir}"
333 >           debug="${build.debug}"
334 >           debuglevel="${build.debuglevel}"
335 >           deprecation="${build.deprecation}"
336 >           source="6"
337 >           classpath="${junit.jar}"
338 >           bootclasspath="${product.jar}:${bootclasspath6}"
339 >           includeAntRuntime="false"
340 >           includeJavaRuntime="false"
341 >           executable="${javac8}"
342 >           fork="true">
343 >
344 >      <include name="jsr166/test/**/*.java"/>
345  
405      <include name="jsr166/test/**"/>
406      
407      <compilerarg value="${bootclasspath.args}"/>
346        <compilerarg line="${build.args}"/>
347 <      
347 >      <compilerarg value="-XDignore.symbol.file=true"/>
348 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
349 >
350        <classpath refid="test.classpath"/>
351  
352      </javac>
# Line 422 | Line 362
362  
363        <compilerarg value="${bootclasspath.args}"/>
364        <compilerarg line="${build.args}"/>
365 <      
365 >      <compilerarg value="-XDignore.symbol.file=true"/>
366 >
367        <classpath refid="test.classpath"/>
368  
369      </javac>
# Line 444 | Line 385
385            errorProperty="junit.failed"
386          failureProperty="junit.failed"
387                      dir="${build.reports.dir}"
388 +                    jvm="${java8}"
389                     fork="true">
390  
391 <      <jvmarg value="${bootclasspath.args}"/>
392 <      
391 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
392 >      <jvmarg value="-server"/>
393 >      <jvmarg value="-showversion"/>
394 >
395        <classpath refid="test.classpath"/>
396  
397        <formatter type="xml"/>
# Line 457 | Line 401
401            <include name="**/${testcase}Test.java"/>
402          </fileset>
403        </batchtest>
404 <      
404 >
405        <batchtest todir="${build.reports.dir}" if="do.test.old">
406          <fileset dir="${test.src.dir}">
407            <include name="jsr166/test/**/${testcase}Test.java"/>
408          </fileset>
409        </batchtest>
410  
411 < <!--      
411 > <!--
412        <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
413          <fileset dir="${jtreg.src.dir}">
414            <include name="**/${testcase}Test.java"/>
# Line 492 | Line 436
436        <fileset dir="${build.reports.dir}">
437          <include name="TEST-*.xml"/>
438        </fileset>
439 <      <report styledir="${stylesheet.dir}"
496 <                format="${junit.report.format}"
497 <                 todir="${build.reports.dir}"
439 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
440        />
441      </junitreport>
442  
# Line 531 | Line 473
473      <available property="xalan.available"
474                 classname="org.apache.xalan.Version"/>
475  
476 <              
476 >
477      <!-- Ant 1.6beta and later don't need or want this check -->
478 <    <!--    
478 >    <!--
479      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
480            unless="junit.available"/>
481  
# Line 544 | Line 486
486    </target>
487  
488  
489 +  <!-- Various demos and test programs -->
490  
548  <!-- Anthill targets -->
491  
492 <  <target name="anthill-build">
493 <  
552 <    <!-- Override this in user.properties -->
553 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
554 <    
555 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
556 <      <arg value="-Xmx256000000"/>
557 <      <!-- classpath of new JVM -->
558 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
559 <      <!-- location of Ant home directory -->
560 <      <arg value="-Dant.home=${ant.home}"/>
561 <      <!-- the Ant main class -->
562 <      <arg value="org.apache.tools.ant.Main"/>
563 <      <!-- The build file -->
564 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
565 <      <!-- the target to build on the new Ant instance -->
566 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
567 <      <arg value="do-anthill-build"/>
568 <    </exec>
569 <  </target>
570 <  
571 <  <target name="do-anthill-build"
572 <          depends="jar, test, docs, dist-docs"/>
573 <
574 <  <target name="anthill-publish">
575 <
576 <    <copy todir="${deployDir}/docs/private">
577 <      <fileset dir="${build.javadocs.dir}"/>
578 <    </copy>
579 <
580 <    <copy todir="${deployDir}/docs/public">
581 <      <fileset dir="${dist.javadocs.dir}"/>
582 <    </copy>
583 <
584 <    <copy tofile="${deployDir}/index.html"
585 <          file="${basedir}/etc/anthill-index.html"/>
586 <
587 <    <copy todir="${deployDir}/notes">
588 <      <fileset dir="${basedir}/etc/notes"/>
589 <    </copy>
590 <
591 <  </target>
492 >  <target name="loops" depends="configure-compiler"
493 >          description="Benchmark from Doug Lea's AQS paper">
494  
495 +    <mkdir dir="${build.loops.dir}"/>
496  
497 <  <!-- Standalone sample program -->
498 <  
596 <  <target name="sample" depends="jar">
597 <  
598 <    <mkdir dir="${build.testcases.dir}"/>
599 <    
600 <    <javac srcdir="${test.src.dir}"
601 <          destdir="${build.testcases.dir}"
497 >    <javac srcdir="${loops.src.dir}"
498 >          destdir="${build.loops.dir}"
499              debug="${build.debug}"
500         debuglevel="${build.debuglevel}"
501        deprecation="${build.deprecation}"
502             source="${build.sourcelevel}"
503               fork="true">
504 <            
608 <      <compilerarg value="${bootclasspath.args}"/>
504 >
505        <compilerarg line="${build.args}"/>
506 <      
507 <      <classpath refid="test.classpath"/>
508 <      
509 <      <include name="jsr166/test/Sample.java"/>
510 <      
511 <    </javac>
512 <    
617 <            
618 <    <java classname="jsr166.test.Sample" fork="true">
619 <      <jvmarg value="${bootclasspath.args}"/>
620 <      <classpath refid="test.classpath"/>
506 >      <classpath refid="loops.classpath"/>
507 >      <compilerarg value="-XDignore.symbol.file=true"/>
508 >
509 >    </javac>
510 >
511 >    <java classname="ALoops" fork="true">
512 >      <classpath refid="loops.classpath"/>
513      </java>
514 +
515    </target>
516  
517  
518 +  <!-- jsr166 4jdk7 -->
519  
626  <!-- Backward compatibility, work in progress (some files not checked in) -->
520  
521 +  <target name="4jdk7compile"
522 +          depends="configure-compiler"
523 +          description="Compiles src/jdk7 sources, targeting jdk7">
524 +
525 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
526 +
527 +    <javac srcdir="${4jdk7src.dir}"
528 +           destdir="${build.4jdk7.classes.dir}"
529 +           debug="${build.debug}"
530 +           debuglevel="${build.debuglevel}"
531 +           deprecation="${build.deprecation}"
532 +           source="6"
533 +           classpath=""
534 +           bootclasspath="${bootclasspath6}"
535 +           includeAntRuntime="false"
536 +           includeJavaRuntime="false"
537 +           executable="${javac7}"
538 +           fork="true">
539  
540 +      <include name="**/*.java"/>
541 +      <compilerarg line="${build.args}"/>
542 +      <compilerarg value="-XDignore.symbol.file=true"/>
543 +      <compilerarg value="-Xlint:all"/>
544  
545 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
631 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
632 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
633 <  <property name="pretiger.sourcelevel" value="1.4"/>
634 <  
635 <  <target name="defang"
636 <       depends="init"
637 <   description="Generates pre-Tiger compatible source">
638 <  
639 <    <delete dir="${pretiger.src.dir}"/>
640 <    <mkdir dir="${pretiger.src.dir}"/>
641 <  
642 <    <exec executable="perl">
643 <      <arg file="etc/defang.pl"/>
644 <      <!-- <arg value="-v"/> -->
645 <      <arg value="-s"/> <arg file="${src.dir}"/>
646 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
647 <    </exec>
648 <    
649 <  </target>
650 <
651 <  <target name="compile-pretiger"
652 <          depends="init, configure-compiler, defang"
653 <          description="Compiles pre-Tiger sources to build folder">
545 >    </javac>
546  
547 <    <mkdir dir="${build.pretiger.dir}"/>
547 >    <jar destfile="${4jdk7product.jar}" index="true">
548 >      <fileset dir="${build.4jdk7.classes.dir}"/>
549 >    </jar>
550  
551 <    <javac srcdir="${pretiger.src.dir}"
552 <          destdir="${build.pretiger.dir}"
553 <            debug="${build.debug}"
554 <       debuglevel="${build.debuglevel}"
555 <      deprecation="${build.deprecation}"
556 <           source="${pretiger.sourcelevel}"
557 <             fork="true">
551 >    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
552 >
553 >    <javac srcdir="${tck.src.dir}"
554 >           destdir="${build.4jdk7.tck.classes.dir}"
555 >           debug="${build.debug}"
556 >           debuglevel="${build.debuglevel}"
557 >           deprecation="${build.deprecation}"
558 >           source="6"
559 >           classpath="${junit.jar}"
560 >           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
561 >           includeAntRuntime="false"
562 >           includeJavaRuntime="false"
563 >           executable="${javac7}"
564 >           fork="true">
565  
566 +      <include name="**/*.java"/>
567        <compilerarg line="${build.args}"/>
568 <      <exclude name="**/Thread.java"/>
568 >      <compilerarg value="-XDignore.symbol.file=true"/>
569 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
570  
571      </javac>
572  
573    </target>
671  
672  <target name="pretiger" depends="compile-pretiger">
574  
575 <    <mkdir dir="${build.lib.dir}"/>
576 <    
577 <    <jar destfile="${pretiger.jar}">
578 <      <fileset dir="${build.pretiger.dir}">
575 >
576 >  <target name="4jdk7-test-tck"
577 >          depends="4jdk7compile"
578 >          description="Runs tck tests for jsr166-4jdk7 directly">
579 >    <run-tck-tests
580 >      jvm="${java7}"
581 >      tck.classes="${build.4jdk7.tck.classes.dir}"
582 >      product.jar="${4jdk7product.jar}"/>
583 >  </target>
584 >
585 >
586 >  <target name="4jdk7-test-tck-junit"
587 >          depends="4jdk7compile"
588 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
589 >
590 >    <junit printsummary="true"
591 >           showoutput="true"
592 >           errorProperty="junit.failed"
593 >           failureProperty="junit.failed"
594 >           includeantruntime="true"
595 >           jvm="${java7}"
596 >           fork="true">
597 >
598 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
599 >      <jvmarg value="-server"/>
600 >
601 >      <classpath>
602 >        <pathelement location="${junit.jar}"/>
603 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
604 >      </classpath>
605 >
606 >      <formatter type="brief"/>
607 >
608 >      <test name="JSR166TestCase" haltonfailure="no">
609 >      </test>
610 >
611 >    </junit>
612 >  </target>
613 >
614 >
615 >  <target name="4jdk7docs"
616 >          description="Builds javadocs for src/jdk7 to dist dir">
617 >
618 >    <delete dir="${dist.4jdk7.docs.dir}"/>
619 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
620 >
621 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
622 >             packagenames="none"
623 >             link="${jdkapi7docs.url}"
624 >             overview="${4jdk7src.dir}/intro.html"
625 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
626 >             classpath=""
627 >             executable="${javadoc7}">
628 >      <arg value="-XDignore.symbol.file=true"/>
629 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
630 >        <include name="**/*.java"/>
631        </fileset>
632 +    </javadoc>
633 +
634 +  </target>
635 +
636 +
637 +  <target name="4jdk7dist"
638 +          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
639 +          description="Puts all distributable products in single hierarchy"/>
640 +
641 +
642 +
643 +  <target name="4jdk7clean"
644 +          description="Removes all 4jdk7 build products">
645 +
646 +    <delete dir="${build.4jdk7.dir}"/>
647 +
648 +  </target>
649 +
650 +
651 +
652 +  <target name="4jdk7dist-clean"
653 +          description="Removes all build and distribution products">
654 +
655 +  </target>
656 +
657 +  <target name="4jdk7dist-jar"
658 +          depends="4jdk7clean, 4jdk7compile">
659 +
660 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
661 +
662 +  </target>
663 +
664 +
665 +  <!-- jsr166x -->
666 +
667 +  <target name="jsr166xcompile"
668 +          depends="configure-compiler"
669 +          description="Compiles jsr166x sources to build dir">
670 +
671 +    <mkdir dir="${build.jsr166x.dir}"/>
672 +
673 +    <javac srcdir="${topsrc.dir}"
674 +           destdir="${build.jsr166x.dir}"
675 +           debug="${build.debug}"
676 +           debuglevel="${build.debuglevel}"
677 +           deprecation="${build.deprecation}"
678 +           classpath=""
679 +           source="5"
680 +           bootclasspath="${bootclasspath6}"
681 +           includeAntRuntime="false"
682 +           includeJavaRuntime="false"
683 +           executable="${javac7}"
684 +           fork="true">
685 +
686 +      <include name="jsr166x/**/*.java"/>
687 +      <compilerarg line="${build.args}"/>
688 +      <compilerarg value="-XDignore.symbol.file=true"/>
689 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
690 +
691 +    </javac>
692 +
693 +  </target>
694 +
695 +
696 +
697 +  <target name="jsr166xjar"
698 +          depends="jsr166xcompile"
699 +          description="Builds library jar from compiled sources">
700 +
701 +    <jar destfile="${jsr166x.jar}">
702 +      <fileset dir="${build.jsr166x.dir}"/>
703 +    </jar>
704 +
705 +  </target>
706 +
707 +
708 +
709 +  <target name="jsr166xdocs"
710 +          description="Builds javadocs to dist dir">
711 +
712 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
713 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
714 +
715 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
716 +             packagenames="jsr166x.*"
717 +             link="${jdkapidocs.url}"
718 +             source="5"
719 +             bootclasspath="${bootclasspath6}"
720 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
721 +             executable="${javadoc7}"
722 +             additionalparam="-XDignore.symbol.file=true" />
723 +
724 +  </target>
725 +
726 +
727 +  <target name="jsr166xdist"
728 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
729 +          description="Puts all distributable products in single hierarchy"/>
730 +
731 +
732 +
733 +  <target name="jsr166xclean"
734 +          description="Removes all jsr166x build products">
735 +
736 +    <delete dir="${build.jsr166x.dir}"/>
737 +
738 +  </target>
739 +
740 +
741 +
742 +  <target name="jsr166xdist-clean"
743 +          description="Removes all build and distribution products">
744 +
745 +  </target>
746 +
747 +
748 +  <target name="jsr166xdist-jar"
749 +          depends="jsr166xclean, jsr166xjar">
750 +
751 +    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
752 +
753 +  </target>
754 +
755 +  <!-- jsr166y -->
756 +
757 +
758 +  <target name="jsr166ycompile"
759 +          depends="configure-compiler"
760 +          description="Compiles jsr166y sources">
761 +
762 +    <mkdir dir="${build.jsr166y.dir}"/>
763 +
764 +    <javac srcdir="${topsrc.dir}"
765 +           destdir="${build.jsr166y.dir}"
766 +           debug="${build.debug}"
767 +           debuglevel="${build.debuglevel}"
768 +           deprecation="${build.deprecation}"
769 +           source="6"
770 +           classpath=""
771 +           bootclasspath="${bootclasspath6}"
772 +           includeAntRuntime="false"
773 +           includeJavaRuntime="false"
774 +           executable="${javac7}"
775 +           fork="true">
776 +
777 +      <include name="jsr166y/**/*.java"/>
778 +      <compilerarg line="${build.args}"/>
779 +      <compilerarg value="-XDignore.symbol.file=true"/>
780 +      <compilerarg value="-Xlint:all"/>
781 +    </javac>
782 +  </target>
783 +
784 +
785 +  <target name="jsr166yjar"
786 +          depends="jsr166ycompile"
787 +          description="Builds library jar from compiled sources">
788 +
789 +    <jar destfile="${jsr166y.jar}" index="true">
790 +      <fileset dir="${build.jsr166y.dir}"/>
791      </jar>
792 <    
792 >
793 >  </target>
794 >
795 >
796 >
797 >  <target name="jsr166ydocs"
798 >          description="Builds javadocs to dist dir">
799 >
800 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
801 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
802 >
803 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
804 >             packagenames="jsr166y.*"
805 >             link="${jdkapidocs.url}"
806 >             source="6"
807 >             bootclasspath="${bootclasspath6}"
808 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
809 >             executable="${javadoc7}"
810 >             additionalparam="-XDignore.symbol.file=true" />
811 >
812 >  </target>
813 >
814 >
815 >  <target name="jsr166ydist"
816 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
817 >          description="Puts all distributable products in single hierarchy"/>
818 >
819 >
820 >
821 >  <target name="jsr166yclean"
822 >          description="Removes all jsr166y build products">
823 >
824 >    <delete dir="${build.jsr166y.dir}"/>
825 >
826 >  </target>
827 >
828 >
829 >
830 >  <target name="jsr166ydist-clean"
831 >          description="Removes all build and distribution products">
832 >
833 >  </target>
834 >
835 >  <target name="jsr166ydist-jar"
836 >          depends="jsr166yclean, jsr166yjar">
837 >
838 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
839 >
840 >  </target>
841 >
842 >
843 >  <!-- extra166y -->
844 >
845 >
846 >  <target name="extra166ycompile"
847 >          depends="configure-compiler, jsr166yjar"
848 >          description="Compiles extra166y sources">
849 >
850 >    <mkdir dir="${build.extra166y.dir}"/>
851 >
852 >    <javac srcdir="${topsrc.dir}"
853 >           destdir="${build.extra166y.dir}"
854 >           debug="${build.debug}"
855 >           debuglevel="${build.debuglevel}"
856 >           deprecation="${build.deprecation}"
857 >           classpath=""
858 >           source="6"
859 >           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
860 >           includeAntRuntime="false"
861 >           includeJavaRuntime="false"
862 >           executable="${javac7}"
863 >           fork="true">
864 >
865 >      <include name="extra166y/**/*.java"/>
866 >      <compilerarg line="${build.args}"/>
867 >      <compilerarg value="-XDignore.symbol.file=true"/>
868 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
869 >
870 >    </javac>
871 >
872 >  </target>
873 >
874 >
875 >
876 >  <target name="extra166yjar"
877 >          depends="extra166ycompile"
878 >          description="Builds library jar from compiled sources">
879 >
880 >    <jar destfile="${extra166y.jar}" index="true">
881 >      <fileset dir="${build.extra166y.dir}"/>
882 >    </jar>
883 >
884 >  </target>
885 >
886 >
887 >
888 >  <target name="extra166ydocs"
889 >          description="Builds javadocs to build dir">
890 >
891 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
892 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
893 >
894 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
895 >             packagenames="extra166y.*"
896 >             link="${jdkapidocs.url}"
897 >             source="6"
898 >             bootclasspath="${bootclasspath6}"
899 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
900 >             executable="${javadoc7}"
901 >             additionalparam="-XDignore.symbol.file=true" />
902 >
903 >  </target>
904 >
905 >
906 >  <target name="extra166ydist"
907 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
908 >          description="Puts all distributable products in single hierarchy"/>
909 >
910 >
911 >
912 >  <target name="extra166yclean"
913 >          description="Removes all extra166y build products">
914 >
915 >    <delete dir="${build.extra166y.dir}"/>
916 >
917 >  </target>
918 >
919 >
920 >
921 >  <target name="extra166ydist-clean"
922 >          description="Removes all build and distribution products">
923 >
924 >  </target>
925 >
926 >  <target name="extra166ydist-jar"
927 >          depends="extra166yclean, extra166yjar">
928 >
929 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
930 >
931 >  </target>
932 >
933 >  <!-- jsr166e -->
934 >
935 >  <target name="jsr166ecompile"
936 >          depends="configure-compiler"
937 >          description="Compiles jsr166e sources">
938 >
939 >    <mkdir dir="${build.jsr166e.dir}"/>
940 >
941 >    <javac srcdir="${topsrc.dir}"
942 >           destdir="${build.jsr166e.dir}"
943 >           debug="${build.debug}"
944 >           debuglevel="${build.debuglevel}"
945 >           deprecation="${build.deprecation}"
946 >           source="7"
947 >           classpath=""
948 >           includeAntRuntime="false"
949 >           includeJavaRuntime="false"
950 >           executable="${javac7}"
951 >           fork="true">
952 >
953 >      <include name="jsr166e/**/*.java"/>
954 >      <compilerarg line="${build.args}"/>
955 >      <compilerarg value="-XDignore.symbol.file=true"/>
956 >      <compilerarg value="-Xlint:all"/>
957 >
958 >    </javac>
959 >
960 >  </target>
961 >
962 >
963 >
964 >  <target name="jsr166ejar"
965 >          depends="jsr166ecompile"
966 >          description="Builds library jar from compiled sources">
967 >
968 >    <jar destfile="${jsr166e.jar}" index="true">
969 >      <fileset dir="${build.jsr166e.dir}"/>
970 >    </jar>
971 >
972 >  </target>
973 >
974 >
975 >
976 >  <target name="jsr166edocs"
977 >          description="Builds javadocs to build dir">
978 >
979 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
980 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
981 >
982 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
983 >             packagenames="jsr166e.*"
984 >             link="${jdkapidocs.url}"
985 >             source="7"
986 >             sourcepath="${topsrc.dir}:${jdk7src.dir}"
987 >             executable="${javadoc7}"
988 >             additionalparam="-XDignore.symbol.file=true" >
989 >    </javadoc>
990 >
991 >  </target>
992 >
993 >
994 >  <target name="jsr166edist"
995 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
996 >          description="Puts all distributable products in single hierarchy"/>
997 >
998 >
999 >
1000 >  <target name="jsr166eclean"
1001 >          description="Removes all jsr166e build products">
1002 >
1003 >    <delete dir="${build.jsr166e.dir}"/>
1004 >
1005 >  </target>
1006 >
1007 >
1008 >  <target name="jsr166edist-clean"
1009 >          description="Removes all build and distribution products">
1010 >
1011 >  </target>
1012 >
1013 >  <target name="jsr166edist-jar"
1014 >          depends="jsr166eclean, jsr166ejar">
1015 >
1016 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1017 >
1018    </target>
1019  
1020   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines