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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines