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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines