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.47 by tim, Fri Aug 1 19:34:05 2003 UTC vs.
Revision 1.102 by jsr166, Sat Jan 19 20:53:34 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"/>
25 <  <property name="build.docsourcelevel" value="1.4"/>
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.emulation.dir"  location="${build.dir}/emulation"/>
47 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
48 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
49 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
50 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
51 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
52 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
53 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
54 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
55 <  <property name="build.filter.doccheck.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.lib.dir"               location="${build.dir}/lib"/>
49 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
51 >
52 >  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53 >  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54 >  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55 >  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56 >  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57 >
58 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61 >
62 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65 >
66 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68 >  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69 >
70 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73 >
74 >  <!-- JDK binary locations -->
75 >  <property name="jdks.home"  location="${user.home}/jdk"/>
76 >
77 >  <macrodef name="defjdklocations">
78 >    <attribute name="v"/>
79 >    <sequential>
80 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84 >    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86 >    <property name="bootclasspath@{v}"
87 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88 >    </sequential>
89 >  </macrodef>
90 >
91 >  <defjdklocations v="6"/>
92 >  <defjdklocations v="7"/>
93 >  <defjdklocations v="8"/>
94 >
95 >  <macrodef name="run-tck-tests">
96 >    <attribute name="jvm"/>
97 >    <attribute name="tck.classes"/>
98 >    <attribute name="product.jar" default="${product.jar}"/>
99 >    <attribute name="jvmflags" default=""/>
100 >    <sequential>
101 >    <java classname="JSR166TestCase"
102 >          jvm="@{jvm}" fork="true">
103 >        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104 >        <jvmarg line="@{jvmflags}"/>
105 >        <classpath>
106 >          <pathelement location="${junit.jar}"/>
107 >          <pathelement location="@{tck.classes}"/>
108 >        </classpath>
109 >    </java>
110 >    </sequential>
111 >  </macrodef>
112  
113    <!-- Source locations -->
114    <property name="src.dir"              location="${basedir}/src/main"/>
46  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
115    <property name="test.src.dir"         location="${basedir}/src/test"/>
116 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
117 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
116 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
117 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
118 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
119    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>
121 +  <property name="topsrc.dir"           location="${basedir}/src"/>
122 +  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128  
129    <!-- Distribution locations -->
130 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
130 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131 >  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136  
137    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139 +  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
59  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
60
61
62
63  <!-- Files excluded from dist-docs and emulation jar -->
64  <patternset id="unsafe.exclusion">
65    <exclude name="java/util/Random.*"/>
66    <exclude name="sun/misc/Unsafe.*"/>
67  </patternset>
68
69  <!-- Files excludes from emulation jar -->
70  <patternset id="atomic.exclusion">
71    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
72    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
73    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
74    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
75  </patternset>
145  
146 +  <!-- Bootclasspath argument -->
147 +  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148  
149 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153 +
154 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155 +  <!-- The below does not yet exist as of 2012-11 -->
156 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158 +
159 +  <!-- Test classpath -->
160 +  <path id="test.classpath">
161 +    <pathelement location="${build.testcases.dir}"/>
162 +    <pathelement location="${junit.jar}"/>
163 +  </path>
164 +
165 +  <!-- ALoops classpath -->
166 +  <path id="loops.classpath">
167 +    <pathelement location="${build.loops.dir}"/>
168 +  </path>
169 +
170 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
171 +  <!-- TODO: How do we get &trade to work? -->
172 +  <!-- TODO: Why isn't @jls a "standard" tag? -->
173 +  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174 +  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176  
177    <!-- Main targets -->
178  
179 <  <target name="compile"
180 <          depends="init, configure-compiler, prepare-src"
181 <          description="Compiles main sources to build folder">
179 >  <target name="dists"
180 >          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
181 >          description="Builds all public jars and docs"/>
182  
183 <    <property name="prepare.src.dir" value="${src.dir}"/>
183 >  <target name="compile"
184 >          depends="configure-compiler"
185 >          description="Compiles src/main sources to build dir">
186  
187      <mkdir dir="${build.classes.dir}"/>
188  
189 +    <javac srcdir="${src.dir}"
190 +           destdir="${build.classes.dir}"
191 +           debug="${build.debug}"
192 +           debuglevel="${build.debuglevel}"
193 +           deprecation="${build.deprecation}"
194 +           classpath=""
195 +           includeAntRuntime="false"
196 +           includeJavaRuntime="false"
197 +           executable="${javac8}"
198 +           fork="true">
199 +
200 +      <include name="**/*.java"/>
201 +      <compilerarg line="${build.args}"/>
202 +      <compilerarg value="-XDignore.symbol.file=true"/>
203 +      <compilerarg value="-Xlint:all"/>
204 +
205   <!--
206 <    <echo>javac ${gjc.args}</echo>
207 <    <echo>bootclasspath=${compile.bootclasspath}</echo>
206 >      <exclude name="java/lang/**"/>
207 >      <compilerarg line="${build.args}"/>
208 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
209   -->
210  
94    <javac srcdir="${prepare.src.dir}"
95          destdir="${build.classes.dir}"
96            debug="${build.debug}"
97       debuglevel="${build.debuglevel}"
98      deprecation="${build.deprecation}"
99           source="${build.sourcelevel}"
100             fork="true">
101
102      <compilerarg    line="${gjc.args}"/>
103      <bootclasspath refid="compile.bootclasspath"/>
104
211      </javac>
212  
213    </target>
214  
215  
110  <target name="jar"
111          depends="configure-emulation, init-jar, native-jar, emulation-jar"
112          description="Builds library jar from compiled sources"/>
216  
217 +  <target name="jar"
218 +          depends="compile"
219 +          description="Builds library jar from compiled sources">
220  
221 <  <target name="test"
116 <          depends="init, configure-tests, report-tests"
117 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
118 <
119 <
120 <  <target name="checkstyle"
121 <          depends="filter-src"
122 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
123 <
124 <    <taskdef resource="checkstyletask.properties"
125 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
221 >    <mkdir dir="${build.lib.dir}"/>
222  
223 <    <checkstyle>
224 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
225 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
130 <    </checkstyle>
223 >    <jar destfile="${product.jar}">
224 >      <fileset dir="${build.classes.dir}"/>
225 >    </jar>
226  
227    </target>
228  
229  
135  <target name="doccheck"
136          depends="filter-doccheck"
137          description="Reports on javadoc style errors">
138
139    <delete dir="${build.doccheck.dir}"/>
140    <mkdir dir="${build.doccheck.dir}"/>
230  
231 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
232 <         docletpath="${lib.dir}/doccheck.jar"
233 <            destdir="${build.doccheck.dir}">
145 <      <packageset dir="${build.filter.doccheck.dir}"/>
146 <    </javadoc>
231 >  <target name="test"
232 >          depends="init, configure-tests, report-tests"
233 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234  
148  </target>
235  
236  
237    <target name="docs"
238 <          depends="filter-src"
153 <          description="Builds javadocs with custom tags to build folder">
238 >          description="Builds javadocs for src/main to dist dir">
239  
240 <    <delete dir="${build.javadocs.dir}"/>
241 <    <mkdir dir="${build.javadocs.dir}"/>
157 <
158 <    <javadoc destdir="${build.javadocs.dir}"
159 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
160 <            overview="${src.dir}/intro.html"
161 <              source="${build.docsourcelevel}">
162 <
163 <      <tag name="revised" description="Last revised:"/>
164 <      <tag name="spec"    description="Specified by:"/>
165 <      <tag name="editor"  description="Last edited by:"/>
166 <      <tag name="fixme"   description="FIX ME:"/>
240 >    <delete dir="${dist.javadocs.dir}"/>
241 >    <mkdir dir="${dist.javadocs.dir}"/>
242  
243 <      <packageset dir="${build.filter.src.dir}"/>
243 >    <!-- the packagenames="none" hack below prevents scanning the -->
244 >    <!-- sourcepath for packages -->
245  
246 +    <javadoc destdir="${dist.javadocs.dir}"
247 +             packagenames="none"
248 +             link="${jdkapi8docs.url}"
249 +             overview="${src.dir}/intro.html"
250 +             sourcepath="${src.dir}:${jdk8src.dir}"
251 +             classpath=""
252 +             executable="${javadoc8}">
253 +      <arg value="-XDignore.symbol.file=true"/>
254 +      <arg value="-tag"/>
255 +      <arg value="${javadoc.jls.option}"/>
256 +      <fileset dir="${src.dir}" defaultexcludes="yes">
257 +        <include name="**/*.java"/>
258 +      </fileset>
259      </javadoc>
260  
261    </target>
262  
263  
175  <target name="strip"
176          depends="init, configure-compiler"
177          description="Strip generics from java source (not working yet)">
178
179    <mkdir dir="${build.stripped.dir}"/>
180
181    <!--
182     # javac -s doesn't reliably generate compilable code. It generates
183     # bridge methods (marked as "synthetic") that can have identical
184     # signatures to existing methods except for the return value.
185     -->
186    <javac srcdir="${src.dir}"
187          destdir="${build.stripped.dir}"
188            debug="${build.debug}"
189       debuglevel="${build.debuglevel}"
190      deprecation="${build.deprecation}"
191           source="${build.sourcelevel}"
192             fork="true">
193
194      <compilerarg    line="${gjc.args} -s"/>
195      <bootclasspath refid="compile.bootclasspath"/>
196
197    </javac>
198
199  </target>
200
264  
265    <target name="dist"
266 <          depends="init, dist-clean, dist-jar, dist-docs"
266 >          depends="init, dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>
268  
269 +
270    <target name="release"
271            depends="dist"
272            description="Puts entire CVS tree, plus distribution productions, in a jar">
273  
210 <!--
211    #keep build dir? - dl
212    <delete dir="${build.dir}"/>
213 -->
274      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
275  
276      <jar basedir="${basedir}" destfile="${release.jar}">
277 +      <!-- <exclude name="build/**"/> -->
278        <exclude name="${release.jar}"/>
279        <exclude name="user.properties"/>
280        <exclude name="etc/notes/**"/>
281 <      <exclude name="lib/gjc/2.1/**"/>
281 >      <exclude name="src/emulation/**"/>
282        <exclude name="**/SyntaxTest.java"/>
283 +      <exclude name="**/SuperfluousAbstract.java"/>
284      </jar>
285  
286    </target>
287  
288 +
289 +
290    <target name="clean"
291            description="Removes all build products">
292  
# Line 233 | Line 297
297    </target>
298  
299  
300 +
301    <target name="dist-clean"
302            description="Removes all build and distribution products">
303  
# Line 241 | Line 306
306    </target>
307  
308  
244  <target name="dist-docs"
245          depends="filter-src"
246          description="Builds javadocs without custom tags to dist folder">
309  
310 <    <delete dir="${dist.javadocs.dir}"/>
249 <    <mkdir dir="${dist.javadocs.dir}"/>
310 >  <!-- Internal targets -->
311  
251    <javadoc destdir="${dist.javadocs.dir}"
252                link="http://java.sun.com/j2se/1.4.1/docs/api"
253            overview="${src.dir}/intro.html"
254              source="${build.docsourcelevel}">
312  
313 <      <packageset dir="${build.filter.src.dir}"/>
313 >  <target name="init">
314  
315 <    </javadoc>
315 >    <!-- Version is kept in a separate file -->
316 >    <loadfile property="version" srcFile="version.properties"/>
317 >    <echo>Building JSR-166 version ${version}</echo>
318 >    <echo>java.home is ${java.home}</echo>
319  
320    </target>
321  
322  
323 +  <target name="dist-jar"
324 +          depends="clean, jar">
325  
326 <  <!-- Internal targets -->
326 >    <copy file="${product.jar}" todir="${dist.dir}"/>
327  
328 +  </target>
329  
267  <target name="init">
330  
331 <    <!-- Version is kept in a separate file -->
332 <    <loadfile property="version" srcFile="version.properties"/>
333 <    <echo>Building JSR-166 version ${version}</echo>
331 >  <target name="compile-tests"
332 >          depends="jar">
333 >
334 >    <mkdir dir="${build.testcases.dir}"/>
335 >
336 >    <javac srcdir="${tck.src.dir}"
337 >          destdir="${build.testcases.dir}"
338 >            debug="${build.debug}"
339 >       debuglevel="${build.debuglevel}"
340 >      deprecation="${build.deprecation}"
341 >           source="${build.sourcelevel}"
342 >             fork="true">
343 >
344 >      <compilerarg value="${bootclasspath.args}"/>
345 >      <compilerarg line="${build.args}"/>
346 >      <compilerarg value="-XDignore.symbol.file=true"/>
347 >
348 >      <classpath refid="test.classpath"/>
349 >
350 >    </javac>
351 >
352 >    <javac srcdir="${test.src.dir}"
353 >          destdir="${build.testcases.dir}"
354 >            debug="${build.debug}"
355 >       debuglevel="${build.debuglevel}"
356 >      deprecation="${build.deprecation}"
357 >           source="${build.sourcelevel}"
358 >             fork="true">
359 >
360 >      <include name="jsr166/test/**"/>
361 >
362 >      <compilerarg value="${bootclasspath.args}"/>
363 >      <compilerarg line="${build.args}"/>
364 >      <compilerarg value="-XDignore.symbol.file=true"/>
365 >
366 >      <classpath refid="test.classpath"/>
367 >
368 >    </javac>
369 >
370 > <!--
371 >    <javac srcdir="${jtreg.src.dir}"
372 >          destdir="${build.testcases.dir}"
373 >            debug="${build.debug}"
374 >       debuglevel="${build.debuglevel}"
375 >      deprecation="${build.deprecation}"
376 >           source="${build.sourcelevel}"
377 >             fork="true">
378 >
379 >      <compilerarg value="${bootclasspath.args}"/>
380 >      <compilerarg line="${build.args}"/>
381 >      <compilerarg value="-XDignore.symbol.file=true"/>
382 >
383 >      <classpath refid="test.classpath"/>
384 >
385 >    </javac>
386 > -->
387  
388    </target>
389  
390  
391 <  <target name="init-jar">
391 >  <target name="run-tests"
392 >          depends="compile-tests">
393  
394 <    <mkdir dir="${build.lib.dir}"/>
394 >    <!-- May be overridden by user.properties -->
395 >    <property name="testcase" value="*"/>
396 >
397 >    <mkdir dir="${build.reports.dir}"/>
398 >
399 >    <junit printsummary="true"
400 >             showoutput="true"
401 >          errorProperty="junit.failed"
402 >        failureProperty="junit.failed"
403 >                    dir="${build.reports.dir}"
404 >                   fork="true">
405 >
406 >      <jvmarg value="${bootclasspath.args}"/>
407 >      <jvmarg value="-server"/>
408 >      <jvmarg value="-showversion"/>
409 >
410 >      <classpath refid="test.classpath"/>
411 >
412 >      <formatter type="xml"/>
413 >
414 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
415 >        <fileset dir="${tck.src.dir}">
416 >          <include name="**/${testcase}Test.java"/>
417 >        </fileset>
418 >      </batchtest>
419 >
420 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
421 >        <fileset dir="${test.src.dir}">
422 >          <include name="jsr166/test/**/${testcase}Test.java"/>
423 >        </fileset>
424 >      </batchtest>
425 >
426 > <!--
427 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
428 >        <fileset dir="${jtreg.src.dir}">
429 >          <include name="**/${testcase}Test.java"/>
430 >        </fileset>
431 >      </batchtest>
432 > -->
433 >
434 >    </junit>
435  
436    </target>
437  
438  
439 <  <target name="native-jar"
440 <          depends="compile"
285 <          unless="build.emulation.true">
439 >  <target name="report-tests"
440 >          depends="run-tests">
441  
442 <    <jar destfile="${product.jar}">
443 <      <fileset dir="${build.classes.dir}"/>
444 <    </jar>
442 >    <!-- Sets junit.report.format to frames if redirection is present,
443 >         otherwise sets it to noframes. -->
444 >    <available property="junit.report.format"
445 >                  value="frames"
446 >              classname="org.apache.xalan.lib.Redirect"
447 >    />
448 >    <property name="junit.report.format" value="noframes"/>
449 >
450 >    <junitreport todir="${build.reports.dir}">
451 >      <fileset dir="${build.reports.dir}">
452 >        <include name="TEST-*.xml"/>
453 >      </fileset>
454 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
455 >      />
456 >    </junitreport>
457 >
458 >    <fail message="Test Cases Failed" if="junit.failed"/>
459  
460    </target>
461  
462  
463 <  <target name="compile-emulation"
464 <          depends="init, configure-compiler"
465 <          if="build.emulation.true">
463 >  <target name="configure-compiler">
464 >
465 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
466 >
467 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
468 >      <istrue value="${build.warnunchecked}"/>
469 >    </condition>
470 >
471 >    <property name="warnunchecked.arg" value=""/>
472 >
473 >
474 >    <!-- Common options in javac invocations -->
475 >    <property name="build.args" value="${warnunchecked.arg}"/>
476 >
477 >  </target>
478 >
479 >
480 >  <target name="configure-tests"
481 >       depends="configure-compiler">
482 >
483 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
484 >    <available property="junit.available"
485 >               classname="junit.framework.Protectable"/>
486 >
487 >    <!-- Xalan -->
488 >    <available property="xalan.available"
489 >               classname="org.apache.xalan.Version"/>
490 >
491  
492 <    <mkdir dir="${build.emulation.dir}"/>
492 >    <!-- Ant 1.6beta and later don't need or want this check -->
493 >    <!--
494 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
495 >          unless="junit.available"/>
496  
497 <    <javac srcdir="${emulation.src.dir}"
498 <          destdir="${build.emulation.dir}"
497 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
498 >          unless="xalan.available"/>
499 >    -->
500 >
501 >  </target>
502 >
503 >
504 >  <!-- Various demos and test programs -->
505 >
506 >
507 >  <target name="loops" depends="init, configure-compiler"
508 >          description="Benchmark from Doug Lea's AQS paper">
509 >
510 >    <mkdir dir="${build.loops.dir}"/>
511 >
512 >    <javac srcdir="${loops.src.dir}"
513 >          destdir="${build.loops.dir}"
514              debug="${build.debug}"
515         debuglevel="${build.debuglevel}"
516        deprecation="${build.deprecation}"
517             source="${build.sourcelevel}"
518               fork="true">
519  
520 <      <compilerarg    line="${gjc.args}"/>
521 <      <bootclasspath refid="compile.bootclasspath"/>
520 >      <compilerarg line="${build.args}"/>
521 >      <classpath refid="loops.classpath"/>
522 >      <compilerarg value="-XDignore.symbol.file=true"/>
523  
524      </javac>
525  
526 +    <java classname="ALoops" fork="true">
527 +      <classpath refid="loops.classpath"/>
528 +    </java>
529 +
530    </target>
531  
532  
533 <  <target name="emulation-jar"
317 <          depends="compile-emulation"
318 <          if="build.emulation.true">
533 >  <!-- jsr166 4jdk7 -->
534  
535  
536 <    <jar destfile="${product.jar}" duplicate="add">
537 <      <fileset dir="${build.classes.dir}">
538 <        <patternset refid="atomic.exclusion"/>
539 <        <patternset refid="unsafe.exclusion"/>
540 <      </fileset>
541 <      <fileset dir="${build.emulation.dir}"/>
536 >  <target name="4jdk7compile"
537 >          depends="configure-compiler"
538 >          description="Compiles src/jdk7 sources, targeting jdk7">
539 >
540 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
541 >
542 >    <javac srcdir="${4jdk7src.dir}"
543 >           destdir="${build.4jdk7.classes.dir}"
544 >           debug="${build.debug}"
545 >           debuglevel="${build.debuglevel}"
546 >           deprecation="${build.deprecation}"
547 >           source="1.6"
548 >           classpath=""
549 >           bootclasspath="${bootclasspath6}"
550 >           includeAntRuntime="false"
551 >           includeJavaRuntime="false"
552 >           executable="${javac7}"
553 >           fork="true">
554 >
555 >      <include name="**/*.java"/>
556 >      <compilerarg line="${build.args}"/>
557 >      <compilerarg value="-XDignore.symbol.file=true"/>
558 >      <compilerarg value="-Xlint:all"/>
559 >
560 >    </javac>
561 >
562 >    <mkdir dir="${build.4jdk7.lib.dir}"/>
563 >
564 >    <jar destfile="${4jdk7product.jar}" index="true">
565 >      <fileset dir="${build.4jdk7.classes.dir}"/>
566      </jar>
567  
568 <  </target>
568 >    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
569  
570 +    <javac srcdir="${tck.src.dir}"
571 +           destdir="${build.4jdk7.tck.classes.dir}"
572 +           debug="${build.debug}"
573 +           debuglevel="${build.debuglevel}"
574 +           deprecation="${build.deprecation}"
575 +           source="1.6"
576 +           classpath="${junit.jar}"
577 +           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
578 +           includeAntRuntime="false"
579 +           includeJavaRuntime="false"
580 +           executable="${javac7}"
581 +           fork="true">
582 +
583 +      <include name="**/*.java"/>
584 +      <compilerarg line="${build.args}"/>
585 +      <compilerarg value="-XDignore.symbol.file=true"/>
586 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
587  
588 <  <target name="dist-jar"
333 <          depends="clean, jar">
588 >    </javac>
589  
590 <    <copy file="${product.jar}" todir="${dist.dir}"/>
590 >  </target>
591  
592 +
593 +  <target name="4jdk7-test-tck"
594 +          depends="4jdk7compile"
595 +          description="Runs tck tests for jsr166-4jdk7 directly">
596 +    <run-tck-tests
597 +      jvm="${java7}"
598 +      tck.classes="${build.4jdk7.tck.classes.dir}"
599 +      product.jar="${4jdk7product.jar}"/>
600    </target>
601  
602  
603 <  <target name="compile-ant-filter"
604 <          depends="init">
603 >  <target name="4jdk7-test-tck-junit"
604 >          depends="4jdk7compile"
605 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
606  
607 <    <mkdir dir="${build.ant.dir}"/>
607 >    <junit printsummary="true"
608 >           showoutput="true"
609 >           errorProperty="junit.failed"
610 >           failureProperty="junit.failed"
611 >           includeantruntime="true"
612 >           jvm="${java7}"
613 >           fork="true">
614 >
615 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
616 >      <jvmarg value="-server"/>
617 >
618 >      <classpath>
619 >        <pathelement location="${junit.jar}"/>
620 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
621 >      </classpath>
622  
623 <    <javac srcdir="${ant.src.dir}"
346 <          destdir="${build.ant.dir}"
347 <           source="1.4"
348 <    />
623 >      <formatter type="brief"/>
624  
625 +      <test name="JSR166TestCase" haltonfailure="no">
626 +      </test>
627 +
628 +    </junit>
629    </target>
630  
631  
632 <  <target name="filter-src"
633 <          depends="compile-ant-filter">
632 >  <target name="4jdk7docs"
633 >          description="Builds javadocs for src/jdk7 to dist dir">
634  
635 <    <mkdir dir="${build.filter.src.dir}"/>
635 >    <delete dir="${dist.4jdk7.docs.dir}"/>
636 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
637  
638 <    <copy todir="${build.filter.src.dir}">
639 <      <fileset dir="${src.dir}">
640 <        <include name="**/*.html"/>
638 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
639 >             packagenames="none"
640 >             link="${jdkapi7docs.url}"
641 >             overview="${4jdk7src.dir}/intro.html"
642 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
643 >             classpath=""
644 >             executable="${javadoc7}">
645 >      <arg value="-XDignore.symbol.file=true"/>
646 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
647 >        <include name="**/*.java"/>
648        </fileset>
649 <    </copy>
649 >    </javadoc>
650  
651 <    <copy todir="${build.filter.src.dir}">
365 <      <fileset dir="${src.dir}">
366 <        <exclude name="**/*.html"/>
367 <        <patternset refid="unsafe.exclusion"/>
368 <      </fileset>
369 <      <filterchain>
651 >  </target>
652  
371        <!--
372         # This filter gets rid of angle-bracketed type parameters
373         # so that javadoc can run on the result. The following
374         # heuristic seems to work:
375         #
376         # For all lines not starting with space(s)-asterisk-space(s),
377         #   replace <something> with a space, where there may be more
378         #   than one right angle bracket at the end, and "something"
379         #   must not contain parens or pipes. (This may need some
380         #   tweaking.)
381         -->
653  
654 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
655 <                      classpath="${build.ant.dir}">
656 <          <param name="notmatching" value="^\s+\*\s.*$"/>
386 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
387 <          <param name="replacement" value=" "/>
388 <        </filterreader>
654 >  <target name="4jdk7dist"
655 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
656 >          description="Puts all distributable products in single hierarchy"/>
657  
658  
391        <!--
392         # This filter uncomments lines beginning with "//@" so that
393         # javadoc can see imports that are needed to resolve links
394         # but that shouldn't be in the compiled code.
395         -->
659  
660 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
661 <                      classpath="${build.ant.dir}">
662 <          <param name="matching"    value="^//@.*$"/>
663 <          <param name="pattern"     value="^//@"/>
401 <          <param name="replacement" value=""/>
402 <        </filterreader>
403 <      </filterchain>
404 <    </copy>
660 >  <target name="4jdk7clean"
661 >          description="Removes all build products">
662 >
663 >    <delete dir="${build.4jdk7.dir}"/>
664  
665    </target>
666  
667  
668  
669 +  <target name="4jdk7dist-clean"
670 +          description="Removes all build and distribution products">
671  
672 <  <target name="filter-doccheck"
412 <          depends="filter-src">
672 >  </target>
673  
674 <    <mkdir dir="${build.filter.doccheck.dir}"/>
674 >  <target name="4jdk7dist-jar"
675 >          depends="4jdk7clean, 4jdk7compile">
676  
677 <    <copy todir="${build.filter.doccheck.dir}">
417 <      <fileset dir="${build.filter.src.dir}">
418 <        <include name="**/*.html"/>
419 <      </fileset>
420 <    </copy>
677 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
678  
679 <    <property name="generic.declarations"
423 <             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 {}"
424 <    />
679 >  </target>
680  
681 <    <copy todir="${build.filter.doccheck.dir}">
682 <      <fileset dir="${build.filter.src.dir}">
683 <        <exclude name="**/*.html"/>
684 <      </fileset>
685 <      <filterchain>
686 <        <!--
687 <         # These two filters try to make the source look like
688 <         # something that doccheck can process. The first removes
689 <         # -source 1.4 assertions and the second adds in a bunch
690 <         # of single letter public nested marker interfaces so that
691 <         # the generic type parameters are recognized.
692 <         -->
693 <
694 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
695 <                      classpath="${build.ant.dir}">
696 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
442 <          <param name="pattern"     value="assert"/>
443 <          <param name="replacement" value="//assert"/>
444 <        </filterreader>
445 <
446 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
447 <                      classpath="${build.ant.dir}">
448 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
449 <          <param name="pattern"     value="$"/>
450 <          <param name="replacement" value=" ${generic.declarations}"/>
451 <        </filterreader>
681 >  <!-- jsr166x -->
682 >
683 >
684 >  <target name="jsr166xcompile"
685 >          depends="init, configure-compiler"
686 >          description="Compiles jsr166x sources">
687 >
688 >    <mkdir dir="${build.jsr166x.dir}"/>
689 >
690 >    <javac srcdir="${jsr166xsrc.dir}"
691 >          destdir="${build.jsr166x.dir}"
692 >            debug="${build.debug}"
693 >       debuglevel="${build.debuglevel}"
694 >      deprecation="${build.deprecation}"
695 >           source="${build.sourcelevel}"
696 >             fork="true">
697  
698 <      </filterchain>
699 <    </copy>
698 >      <include name="**/*.java"/>
699 >      <compilerarg line="${build.args}"/>
700 >      <compilerarg value="-XDignore.symbol.file=true"/>
701 >
702 >    </javac>
703  
704    </target>
705  
706  
459  <target name="compile-tests"
460          depends="jar">
707  
708 <    <mkdir dir="${build.testcases.dir}"/>
708 >  <target name="jsr166xjar"
709 >          depends="jsr166xcompile"
710 >          description="Builds library jar from compiled sources">
711  
712 < <!--
465 <    <echo>javac ${gjc.args}</echo>
466 <    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
467 <    <echo>classpath="${test.classpath}"</echo>
468 < -->
712 >    <mkdir dir="${build.jsr166xlib.dir}"/>
713  
714 <    <javac srcdir="${test.src.dir}"
715 <          destdir="${build.testcases.dir}"
714 >    <jar destfile="${jsr166xproduct.jar}">
715 >      <fileset dir="${build.jsr166x.dir}"/>
716 >    </jar>
717 >
718 >  </target>
719 >
720 >
721 >
722 >  <target name="jsr166xdocs"
723 >          description="Builds javadocs to dist dir">
724 >
725 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
726 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
727 >
728 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
729 >             packagenames="jsr166x"
730 >             link="${jdkapidocs.url}"
731 >             source="${build.sourcelevel}"
732 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
733 >             additionalparam="-XDignore.symbol.file=true" />
734 >
735 >  </target>
736 >
737 >
738 >  <target name="jsr166xdist"
739 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
740 >          description="Puts all distributable products in single hierarchy"/>
741 >
742 >
743 >
744 >  <target name="jsr166xclean"
745 >          description="Removes all build products">
746 >
747 >    <delete dir="${build.jsr166x.dir}"/>
748 >    <delete dir="${build.jsr166xlib.dir}"/>
749 >
750 >  </target>
751 >
752 >
753 >
754 >  <target name="jsr166xdist-clean"
755 >          description="Removes all build and distribution products">
756 >
757 >  </target>
758 >
759 >
760 >
761 >  <target name="jsr166xdist-docs"
762 >          description="Builds javadocs to dist dir">
763 >
764 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
765 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766 >
767 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
768 >             packagenames="jsr166x"
769 >             link="${jdkapidocs.url}"
770 >             source="${build.sourcelevel}"
771 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
772 >             additionalparam="-XDignore.symbol.file=true" />
773 >
774 >  </target>
775 >
776 >  <target name="jsr166xdist-jar"
777 >          depends="jsr166xclean, jsr166xjar">
778 >
779 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
780 >
781 >  </target>
782 >
783 >  <!-- jsr166y -->
784 >
785 >
786 >  <target name="jsr166ycompile"
787 >          depends="init, configure-compiler"
788 >          description="Compiles jsr166y sources">
789 >
790 >    <mkdir dir="${build.jsr166y.dir}"/>
791 >
792 >    <javac srcdir="${jsr166ysrc.dir}"
793 >          destdir="${build.jsr166y.dir}"
794              debug="${build.debug}"
795         debuglevel="${build.debuglevel}"
796        deprecation="${build.deprecation}"
797             source="${build.sourcelevel}"
798               fork="true">
799  
800 <      <compilerarg    line="${gjc.args}"/>
801 <      <bootclasspath refid="test.compile.bootclasspath"/>
802 <      <classpath     refid="test.classpath"/>
800 >      <include name="**/*.java"/>
801 >      <compilerarg line="${build.args}"/>
802 >      <compilerarg value="-XDignore.symbol.file=true"/>
803 >      <compilerarg value="${bootclasspath.args}"/>
804 >
805 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
806  
807      </javac>
808  
809    </target>
810  
811  
487  <target name="run-tests"
488          depends="compile-tests">
812  
813 <    <!-- May be overridden by user.properties -->
814 <    <property name="testcase" value="*"/>
813 >  <target name="jsr166yjar"
814 >          depends="jsr166ycompile"
815 >          description="Builds library jar from compiled sources">
816  
817 <    <mkdir dir="${build.reports.dir}"/>
817 >    <mkdir dir="${build.jsr166ylib.dir}"/>
818  
819 <    <junit printsummary="true"
820 <             showoutput="true"
821 <          errorProperty="junit.failed"
498 <        failureProperty="junit.failed"
499 <                    dir="${build.reports.dir}"
500 <                   fork="true">
819 >    <jar destfile="${jsr166yproduct.jar}" index="true">
820 >      <fileset dir="${build.jsr166y.dir}"/>
821 >    </jar>
822  
823 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
823 >  </target>
824  
504      <formatter type="xml"/>
825  
506      <batchtest todir="${build.reports.dir}">
507        <fileset dir="${test.src.dir}">
508          <include name="**/${testcase}Test.java"/>
509        </fileset>
510      </batchtest>
826  
827 <    </junit>
827 >  <target name="jsr166ydocs"
828 >          description="Builds javadocs to dist dir">
829 >
830 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
831 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
832 >
833 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
834 >             packagenames="jsr166y"
835 >             link="${jdkapidocs.url}"
836 >             source="${build.sourcelevel}"
837 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
838 >             additionalparam="-XDignore.symbol.file=true" />
839  
840    </target>
841  
842  
843 <  <target name="report-tests"
844 <          depends="run-tests">
843 >  <target name="jsr166ydist"
844 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
845 >          description="Puts all distributable products in single hierarchy"/>
846  
520    <!-- Sets junit.report.format to frames if Xalan is present,
521         otherwise sets it to noframes. -->
522    <available property="junit.report.format"
523                  value="frames"
524              classname="org.apache.xalan.lib.Redirect"
525    />
526    <property name="junit.report.format" value="noframes"/>
847  
528    <junitreport todir="${build.reports.dir}">
529      <fileset dir="${build.reports.dir}">
530        <include name="TEST-*.xml"/>
531      </fileset>
532      <report styledir="${stylesheet.dir}"
533                format="${junit.report.format}"
534                 todir="${build.reports.dir}"
535      />
536    </junitreport>
848  
849 <    <fail message="Test Cases Failed" if="junit.failed"/>
849 >  <target name="jsr166yclean"
850 >          description="Removes all build products">
851 >
852 >    <delete dir="${build.jsr166y.dir}"/>
853 >    <delete dir="${build.jsr166ylib.dir}"/>
854  
855    </target>
856  
857  
543  <target name="configure-compiler">
858  
859 <    <property name="gjc.version"
860 <             value="2.2"/>
859 >  <target name="jsr166ydist-clean"
860 >          description="Removes all build and distribution products">
861 >
862 >  </target>
863  
864 <    <condition property="novariance.arg" value="-novariance">
865 <      <and>
550 <        <equals arg1="${gjc.version}" arg2="2.0"/>
551 <        <or>
552 <          <not><isset property="gjc.novariance"/></not>
553 <          <istrue value="${gjc.novariance}"/>
554 <        </or>
555 <      </and>
556 <    </condition>
864 >  <target name="jsr166ydist-docs"
865 >          description="Builds javadocs to dist dir">
866  
867 <    <property name="novariance.arg"
868 <             value=""/>
867 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
868 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
869  
870 <    <property name="gjc.dir"
871 <             value="${lib.dir}/gjc"/>
870 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
871 >             packagenames="jsr166y"
872 >             link="${jdkapidocs.url}"
873 >             source="${build.sourcelevel}"
874 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
875 >             additionalparam="-XDignore.symbol.file=true" />
876  
877 <    <property name="javac.jar"
565 <          location="${gjc.dir}/${gjc.version}/javac.jar"/>
877 >  </target>
878  
879 <    <property name="collect.jar"
880 <          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
879 >  <target name="jsr166ydist-jar"
880 >          depends="jsr166yclean, jsr166yjar">
881  
882 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
883  
884 <    <condition property="warnunchecked.arg" value="-warnunchecked">
572 <      <istrue value="${gjc.warnunchecked}"/>
573 <    </condition>
884 >  </target>
885  
575    <property name="warnunchecked.arg" value=""/>
886  
887 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
578 <      <istrue value="${build.nothreads}"/>
579 <    </condition>
887 >  <!-- extra166y -->
888  
889  
890 <    <!--
891 <     ! Bootclasspath munging for source compilation.
892 <     -->
890 >  <target name="extra166ycompile"
891 >          depends="init, configure-compiler, jsr166ycompile"
892 >          description="Compiles extra166y sources">
893 >
894 >    <mkdir dir="${build.extra166y.dir}"/>
895  
896 <    <path id="pre.bootclasspath">
897 <      <pathelement location="${javac.jar}"/>
898 <    </path>
899 <
900 <    <path id="compile.bootclasspath">
901 <      <pathelement location="${build.classes.dir}"/>
902 <      <pathelement location="${collect.jar}"/>
903 <      <pathelement location="${rt.jar}"/>
594 <    </path>
595 <
596 <    <!-- Flatten paths into platform-appropriate strings -->
597 <    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
598 <    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
896 >    <javac srcdir="${extra166ysrc.dir}"
897 >          destdir="${build.extra166y.dir}"
898 >            debug="${build.debug}"
899 >            classpath="${jsr166yproduct.jar}"
900 >       debuglevel="${build.debuglevel}"
901 >      deprecation="${build.deprecation}"
902 >           source="${build.sourcelevel}"
903 >             fork="true">
904  
905 +      <include name="**/*.java"/>
906 +      <compilerarg line="${build.args}"/>
907 +      <compilerarg value="-XDignore.symbol.file=true"/>
908 +      <compilerarg value="${bootclasspath.args}"/>
909  
910 <    <!-- Common options in javac invocations -->
911 <    <property name="gjc.args"
912 <             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
604 <    />
910 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
911 >
912 >    </javac>
913  
914    </target>
915  
916  
609  <target name="prepare-src"
610          depends="configure-compiler"
611          if="prepare.src.dir">
917  
918 <    <mkdir dir="${prepare.src.dir}"/>
919 <    <copy todir="${prepare.src.dir}">
920 <      <fileset dir="${src.dir}">
921 <        <exclude name="java/lang/**"/>
922 <      </fileset>
923 <    </copy>
918 >  <target name="extra166yjar"
919 >          depends="extra166ycompile"
920 >          description="Builds library jar from compiled sources">
921 >
922 >    <mkdir dir="${build.extra166ylib.dir}"/>
923 >
924 >    <jar destfile="${extra166yproduct.jar}" index="true">
925 >      <fileset dir="${build.extra166y.dir}"/>
926 >    </jar>
927  
928    </target>
929  
930  
623  <target name="configure-emulation">
931  
932 <    <condition property="build.emulation.true">
933 <      <or>
934 <        <and>
935 <          <os family="windows"/>
936 <          <not>
937 <            <isset property="build.emulation"/>
938 <          </not>
939 <        </and>
940 <        <istrue value="${build.emulation}"/>
941 <      </or>
942 <    </condition>
932 >  <target name="extra166ydocs"
933 >          description="Builds javadocs with custom tags to build dir">
934 >
935 >    <delete dir="${build.extra166yjavadocs.dir}"/>
936 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
937 >
938 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
939 >             packagenames="extra166y"
940 >             link="${jdkapidocs.url}"
941 >             source="${build.sourcelevel}"
942 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
943 >             additionalparam="-XDignore.symbol.file=true" />
944  
945    </target>
946  
947  
948 <  <target name="configure-tests"
949 <       depends="configure-compiler">
948 >  <target name="extra166ydist"
949 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
950 >          description="Puts all distributable products in single hierarchy"/>
951  
643    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
644    <available property="junit.available"
645               classname="junit.framework.Protectable"/>
952  
647    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
648          unless="junit.available"/>
953  
954 +  <target name="extra166yclean"
955 +          description="Removes all build products">
956  
957 <    <!--
958 <     ! Bootclasspath munging for testing, so JUnit can test our local
653 <     ! modifications to java.*.
654 <     -->
957 >    <delete dir="${build.extra166y.dir}"/>
958 >    <delete dir="${build.extra166ylib.dir}"/>
959  
960 <    <path id="test.classpath">
657 <      <pathelement location="${product.jar}"/>
658 <      <pathelement location="${build.testcases.dir}"/>
659 <      <pathelement location="${junit.jar}"/>
660 <    </path>
960 >  </target>
961  
662    <path id="test.compile.bootclasspath">
663      <pathelement location="${javac.jar}"/>
664      <pathelement location="${collect.jar}"/>
665      <pathelement location="${rt.jar}"/>
666    </path>
962  
668    <path id="test.run.bootclasspath">
669      <pathelement location="${javac.jar}"/>
670      <path refid="test.classpath"/>
671    </path>
963  
964 <    <!-- Flatten test classpaths into platform-appropriate strings -->
965 <    <property name="test.classpath"             refid="test.classpath"/>
675 <    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
676 <    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
964 >  <target name="extra166ydist-clean"
965 >          description="Removes all build and distribution products">
966  
967    </target>
968  
969 +  <target name="extra166ydist-docs"
970 +          description="Builds javadocs to dist dir">
971  
972 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
973 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
974  
975 <  <!-- Anthill targets -->
975 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
976 >             packagenames="extra166y"
977 >             link="${jdkapidocs.url}"
978 >             source="${build.sourcelevel}"
979 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
980 >             additionalparam="-XDignore.symbol.file=true" />
981  
982 <  <target name="anthill-build"
685 <          depends="jar, test, docs, dist-docs"/>
982 >  </target>
983  
984 <  <target name="anthill-publish">
984 >  <target name="extra166ydist-jar"
985 >          depends="extra166yclean, extra166yjar">
986  
987 <    <copy todir="${deployDir}/docs/private">
690 <      <fileset dir="${build.javadocs.dir}"/>
691 <    </copy>
987 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
988  
989 <    <copy todir="${deployDir}/docs/public">
990 <      <fileset dir="${dist.javadocs.dir}"/>
991 <    </copy>
989 >  </target>
990 >
991 >  <!-- jsr166e -->
992 >
993 >  <target name="jsr166ecompile"
994 >          depends="configure-compiler"
995 >          description="Compiles jsr166e sources">
996  
997 <    <copy tofile="${deployDir}/index.html"
698 <          file="${basedir}/etc/anthill-index.html"/>
997 >    <mkdir dir="${build.jsr166e.dir}"/>
998  
999 <    <copy todir="${deployDir}/notes">
1000 <      <fileset dir="${basedir}/etc/notes"/>
1001 <    </copy>
999 >    <javac srcdir="${topsrc.dir}"
1000 >           destdir="${build.jsr166e.dir}"
1001 >           debug="${build.debug}"
1002 >           debuglevel="${build.debuglevel}"
1003 >           deprecation="${build.deprecation}"
1004 >           source="1.7"
1005 >           classpath=""
1006 >           includeAntRuntime="false"
1007 >           includeJavaRuntime="false"
1008 >           executable="${javac7}"
1009 >           fork="true">
1010 >
1011 >      <include name="jsr166e/**/*.java"/>
1012 >      <compilerarg line="${build.args}"/>
1013 >      <compilerarg value="-XDignore.symbol.file=true"/>
1014 >      <compilerarg value="-Xlint:all"/>
1015 >
1016 >    </javac>
1017  
1018    </target>
1019  
1020  
707  <target name="ng" depends="test">
708    <java classname="SuperfluousAbstract" fork="true">
1021  
1022 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
1022 >  <target name="jsr166ejar"
1023 >          depends="jsr166ecompile"
1024 >          description="Builds library jar from compiled sources">
1025 >
1026 >    <mkdir dir="${build.jsr166elib.dir}"/>
1027 >
1028 >    <jar destfile="${jsr166eproduct.jar}" index="true">
1029 >      <fileset dir="${build.jsr166e.dir}"/>
1030 >    </jar>
1031  
712    </java>
1032    </target>
1033  
1034  
1035 +
1036 +  <target name="jsr166edocs"
1037 +          description="Builds javadocs with custom tags to build dir">
1038 +
1039 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
1040 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1041 +
1042 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
1043 +             packagenames="jsr166e,jsr166e.extra"
1044 +             link="${jdkapi7docs.url}"
1045 +             source="1.7"
1046 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1047 +             executable="${javadoc7}"
1048 +             additionalparam="-XDignore.symbol.file=true" >
1049 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1050 +        <include name="jsr166e/**/*.java"/>
1051 +      </fileset>
1052 +    </javadoc>
1053 +
1054 +  </target>
1055 +
1056 +
1057 +  <target name="jsr166edist"
1058 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1059 +          description="Puts all distributable products in single hierarchy"/>
1060 +
1061 +
1062 +
1063 +  <target name="jsr166eclean"
1064 +          description="Removes all build products">
1065 +
1066 +    <delete dir="${build.jsr166e.dir}"/>
1067 +    <delete dir="${build.jsr166elib.dir}"/>
1068 +
1069 +  </target>
1070 +
1071 +
1072 +
1073 +  <target name="jsr166edist-clean"
1074 +          description="Removes all build and distribution products">
1075 +
1076 +  </target>
1077 +
1078 +  <target name="jsr166edist-docs"
1079 +          description="Builds javadocs to dist dir">
1080 +
1081 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1082 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1083 +
1084 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1085 +             packagenames="jsr166e,jsr166e.extra"
1086 +             link="${jdkapidocs.url}"
1087 +             source="1.7"
1088 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1089 +             additionalparam="-XDignore.symbol.file=true" />
1090 +
1091 +  </target>
1092 +
1093 +  <target name="jsr166edist-jar"
1094 +          depends="jsr166eclean, jsr166ejar">
1095 +
1096 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1097 +
1098 +  </target>
1099 +
1100   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines