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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines