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.43 by tim, Thu Jun 26 11:54:26 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.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"/>
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"/>
45  <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"/>
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="dists"
199 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
200 +          description="Builds all public jars and docs"/>
201  
202 <  <!-- Files excluded from dist-docs and emulation jar -->
203 <  <patternset id="unsafe.exclusion">
204 <    <exclude name="java/util/Random.*"/>
65 <    <exclude name="sun/misc/Unsafe.*"/>
66 <  </patternset>
67 <
68 <  <!-- Files excludes from emulation jar -->
69 <  <patternset id="atomic.exclusion">
70 <    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
71 <    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
72 <    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
73 <    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
74 <  </patternset>
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 +    <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  
224 <  <!-- Main targets -->
224 > <!--
225 >      <exclude name="java/lang/**"/>
226 >      <compilerarg line="${build.args}"/>
227 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
228 > -->
229  
230 <  <target name="compile"
81 <          depends="init, configure-compiler, prepare-src"
82 <          description="Compiles main sources to build folder">
230 >    </javac>
231  
232 <    <property name="prepare.src.dir" value="${src.dir}"/>
232 >  </target>
233  
86    <mkdir dir="${build.classes.dir}"/>
234  
88 <!--
89    <echo>javac ${gjc.args}</echo>
90    <echo>bootclasspath=${compile.bootclasspath}</echo>
91 -->
235  
236 <    <javac srcdir="${prepare.src.dir}"
237 <          destdir="${build.classes.dir}"
236 >  <target name="jar"
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="configure-tests, report-tests"
250 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
251 >
252 >
253 >
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 >    <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 >
281 >
282 >  <target name="dist"
283 >          depends="dist-clean, dist-jar, docs"
284 >          description="Puts all distributable products in single hierarchy"/>
285 >
286 >
287 >  <target name="release"
288 >          depends="dist"
289 >          description="Puts entire CVS tree, plus distribution productions, in a jar">
290 >
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>
304 >
305 >
306 >
307 >  <target name="clean"
308 >          description="Removes all build products">
309 >
310 >    <delete dir="${build.dir}"/>
311 >
312 >  </target>
313 >
314 >
315 >
316 >  <target name="dist-clean"
317 >          description="Removes all build and distribution products">
318 >
319 >    <delete dir="${dist.dir}"/>
320 >
321 >  </target>
322 >
323 >
324 >
325 >  <!-- Internal targets -->
326 >
327 >
328 >  <target name="dist-jar"
329 >          depends="clean, jar">
330 >
331 >    <copy file="${product.jar}" todir="${dist.dir}"/>
332 >
333 >  </target>
334 >
335 >
336 >  <target name="compile-tests"
337 >          depends="jar">
338 >
339 >    <mkdir dir="${build.testcases.dir}"/>
340 >
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}"/>
392 <      <bootclasspath refid="compile.bootclasspath"/>
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="jar"
402 <          depends="configure-emulation, init-jar, native-jar, emulation-jar"
111 <          description="Builds library jar from compiled sources"/>
401 >  <target name="run-tests"
402 >          depends="compile-tests">
403  
404 +    <!-- May be overridden by user.properties -->
405 +    <property name="testcase" value="*"/>
406  
407 <  <target name="test"
115 <          depends="init, configure-tests, report-tests"
116 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
407 >    <mkdir dir="${build.reports.dir}"/>
408  
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 +      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
418 +      <jvmarg value="-server"/>
419 +      <jvmarg value="-showversion"/>
420  
421 <  <target name="checkstyle"
120 <          depends="filter-src"
121 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
421 >      <classpath refid="test.classpath"/>
422  
423 <    <taskdef resource="checkstyletask.properties"
124 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
423 >      <formatter type="xml"/>
424  
425 <    <checkstyle>
426 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
427 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
428 <    </checkstyle>
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 > <!--
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 >    </junit>
446  
447    </target>
448  
449  
450 <  <target name="doccheck"
451 <          depends="filter-src"
136 <          description="Reports on javadoc style errors (not working yet)">
450 >  <target name="report-tests"
451 >          depends="run-tests">
452  
453 <    <delete dir="${build.doccheck.dir}"/>
454 <    <mkdir dir="${build.doccheck.dir}"/>
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 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
462 <         docletpath="${lib.dir}/doccheck.jar"
463 <            destdir="${build.doccheck.dir}">
464 <      <packageset dir="${build.filter.src.dir}"/>
465 <    </javadoc>
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 >    <fail message="Test Cases Failed" if="junit.failed"/>
470  
471    </target>
472  
473  
474 <  <target name="docs"
151 <          depends="filter-src"
152 <          description="Builds javadocs with custom tags to build folder">
474 >  <target name="configure-compiler">
475  
476 <    <delete dir="${build.javadocs.dir}"/>
155 <    <mkdir dir="${build.javadocs.dir}"/>
476 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
477  
478 <    <javadoc destdir="${build.javadocs.dir}"
479 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
480 <            overview="${src.dir}/intro.html"
160 <              source="${build.docsourcelevel}">
161 <
162 <      <tag name="revised" description="Last revised:"/>
163 <      <tag name="spec"    description="Specified by:"/>
164 <      <tag name="editor"  description="Last edited by:"/>
165 <      <tag name="fixme"   description="FIX ME:"/>
478 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
479 >      <istrue value="${build.warnunchecked}"/>
480 >    </condition>
481  
482 <      <packageset dir="${build.filter.src.dir}"/>
482 >    <property name="warnunchecked.arg" value=""/>
483  
484 <    </javadoc>
484 >
485 >    <!-- Common options in javac invocations -->
486 >    <property name="build.args" value="${warnunchecked.arg}"/>
487  
488    </target>
489  
490  
491 <  <target name="strip"
492 <          depends="init, configure-compiler"
493 <          description="Strip generics from java source (not working yet)">
491 >  <target name="configure-tests"
492 >       depends="configure-compiler">
493 >
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 >    <!-- Xalan -->
499 >    <available property="xalan.available"
500 >               classname="org.apache.xalan.Version"/>
501  
178    <mkdir dir="${build.stripped.dir}"/>
502  
503 +    <!-- Ant 1.6beta and later don't need or want this check -->
504      <!--
505 <     # javac -s doesn't reliably generate compilable code. It generates
506 <     # bridge methods (marked as "synthetic") that can have identical
507 <     # signatures to existing methods except for the return value.
508 <     -->
509 <    <javac srcdir="${src.dir}"
510 <          destdir="${build.stripped.dir}"
505 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
506 >          unless="junit.available"/>
507 >
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 >  <!-- 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.loops.dir}"/>
522 >
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} -s"/>
532 <      <bootclasspath refid="compile.bootclasspath"/>
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="dist"
202 <          depends="init, dist-clean, dist-jar, dist-docs"
203 <          description="Puts all distributable products in single hierarchy"/>
544 >  <!-- jsr166 4jdk7 -->
545  
205  <target name="release"
206          depends="dist"
207          description="Puts entire CVS tree, plus distribution productions, in a jar">
546  
547 <    <delete dir="${build.dir}"/>
547 >  <target name="4jdk7compile"
548 >          depends="configure-compiler"
549 >          description="Compiles src/jdk7 sources, targeting jdk7">
550  
551 <    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
551 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
552  
553 <    <jar basedir="${basedir}" destfile="${release.jar}">
554 <      <exclude name="${release.jar}"/>
555 <      <exclude name="user.properties"/>
556 <      <exclude name="etc/notes/**"/>
557 <      <exclude name="lib/gjc/2.1/**"/>
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 >    <jar destfile="${4jdk7product.jar}">
580 >      <fileset dir="${build.4jdk7.classes.dir}"/>
581      </jar>
582  
583    </target>
584  
222  <target name="clean"
223          description="Removes all build products">
585  
586 <    <delete dir="${build.dir}"/>
587 <    <delete dir="${build.classes.dir}"/>
588 <    <delete dir="${build.lib.dir}"/>
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="dist-clean"
598 <          description="Removes all build and distribution products">
597 >  <target name="4jdk7-test-tck-junit"
598 >          depends="4jdk7compile"
599 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
600  
601 <    <delete dir="${dist.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 >      <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 <  </target>
617 >      <formatter type="brief"/>
618  
619 +      <test name="JSR166TestCase" haltonfailure="no">
620 +      </test>
621  
622 <  <target name="dist-docs"
623 <          depends="filter-src"
242 <          description="Builds javadocs without custom tags to dist folder">
622 >    </junit>
623 >  </target>
624  
625 <    <delete dir="${dist.javadocs.dir}"/>
626 <    <mkdir dir="${dist.javadocs.dir}"/>
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  
247    <javadoc destdir="${dist.javadocs.dir}"
248                link="http://java.sun.com/j2se/1.4.1/docs/api"
249            overview="${src.dir}/intro.html"
250              source="${build.docsourcelevel}">
646  
647 <      <packageset 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  
652 +
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      </javadoc>
671  
672    </target>
673  
674  
675 +  <target name="4jdk7dist"
676 +          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
677 +          description="Puts all distributable products in single hierarchy"/>
678  
260  <!-- Internal targets -->
679  
680  
681 <  <target name="init">
681 >  <target name="4jdk7clean"
682 >          description="Removes all 4jdk7 build products">
683  
684 <    <!-- Version is kept in a separate file -->
266 <    <loadfile property="version" srcFile="version.properties"/>
267 <    <echo>Building JSR-166 version ${version}</echo>
684 >    <delete dir="${build.4jdk7.dir}"/>
685  
686    </target>
687  
688  
272  <target name="init-jar">
689  
690 <    <mkdir dir="${build.lib.dir}"/>
690 >  <target name="4jdk7dist-clean"
691 >          description="Removes all build and distribution products">
692  
693    </target>
694  
695 +  <target name="4jdk7dist-jar"
696 +          depends="4jdk7clean, 4jdk7compile">
697  
698 <  <target name="native-jar"
280 <          depends="compile"
281 <          unless="build.emulation.true">
282 <
283 <    <jar destfile="${product.jar}">
284 <      <fileset dir="${build.classes.dir}"/>
285 <    </jar>
698 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
699  
700    </target>
701  
702  
703 <  <target name="compile-emulation"
291 <          depends="init, configure-compiler"
292 <          if="build.emulation.true">
703 >  <!-- jsr166x -->
704  
705 <    <mkdir dir="${build.emulation.dir}"/>
705 >  <target name="jsr166xcompile"
706 >          depends="configure-compiler"
707 >          description="Compiles jsr166x sources to build dir">
708  
709 <    <javac srcdir="${emulation.src.dir}"
297 <          destdir="${build.emulation.dir}"
298 <            debug="${build.debug}"
299 <       debuglevel="${build.debuglevel}"
300 <      deprecation="${build.deprecation}"
301 <           source="${build.sourcelevel}"
302 <             fork="true">
709 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
710  
711 <      <compilerarg    line="${gjc.args}"/>
712 <      <bootclasspath refid="compile.bootclasspath"/>
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  
312  <target name="emulation-jar"
313          depends="compile-emulation"
314          if="build.emulation.true">
734  
735 +  <target name="jsr166xjar"
736 +          depends="jsr166xcompile"
737 +          description="Builds library jar from compiled sources">
738  
739 <    <jar destfile="${product.jar}" duplicate="add">
740 <      <fileset dir="${build.classes.dir}">
319 <        <patternset refid="atomic.exclusion"/>
320 <        <patternset refid="unsafe.exclusion"/>
321 <      </fileset>
322 <      <fileset dir="${build.emulation.dir}"/>
739 >    <jar destfile="${jsr166x.jar}">
740 >      <fileset dir="${build.jsr166x.classes.dir}"/>
741      </jar>
742  
743    </target>
744  
745  
328  <target name="dist-jar"
329          depends="clean, jar">
746  
747 <    <copy file="${product.jar}" todir="${dist.dir}"/>
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="compile-ant-filter"
766 <          depends="init">
765 >  <target name="jsr166xdist"
766 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
767 >          description="Puts all distributable products in single hierarchy"/>
768  
339    <mkdir dir="${build.ant.dir}"/>
769  
341    <javac srcdir="${ant.src.dir}"
342          destdir="${build.ant.dir}"
343           source="1.4"
344    />
770  
771 <  </target>
771 >  <target name="jsr166xclean"
772 >          description="Removes all jsr166x build products">
773  
774 +    <delete dir="${build.jsr166x.dir}"/>
775  
776 <  <target name="filter-src"
350 <          depends="compile-ant-filter">
776 >  </target>
777  
352    <mkdir dir="${build.filter.src.dir}"/>
778  
354    <copy todir="${build.filter.src.dir}">
355      <fileset dir="${src.dir}">
356        <include name="**/*.html"/>
357      </fileset>
358    </copy>
779  
780 <    <!-- Not needed now, used for doccheck filtering:
781 <    <property name="generic.declarations"
782 <             value="public interface E {} public interface T {} public interface K {} public interface V {}"
783 <    />
364 <    -->
780 >  <target name="jsr166xdist-clean"
781 >          description="Removes all build and distribution products">
782 >
783 >  </target>
784  
366    <copy todir="${build.filter.src.dir}">
367      <fileset dir="${src.dir}">
368        <exclude name="**/*.html"/>
369        <patternset refid="unsafe.exclusion"/>
370      </fileset>
371      <filterchain>
785  
786 <        <!--
787 <         # This filter gets rid of angle-bracketed type parameters
375 <         # so that javadoc can run on the result. The following
376 <         # heuristic seems to work:
377 <         #
378 <         # For all lines not starting with space(s)-asterisk-space(s),
379 <         #   replace <something> with a space, where there may be more
380 <         #   than one right angle bracket at the end, and "something"
381 <         #   must not contain parens or pipes. (This may need some
382 <         #   tweaking.)
383 <         -->
384 <
385 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
386 <                      classpath="${build.ant.dir}">
387 <          <param name="notmatching" value="^\s+\*\s.*$"/>
388 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
389 <          <param name="replacement" value=" "/>
390 <        </filterreader>
391 <
392 <
393 <        <!--
394 <         # This filter uncomments lines beginning with "//@" so that
395 <         # javadoc can see imports that are needed to resolve links
396 <         # but that shouldn't be in the compiled code.
397 <         -->
398 <
399 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
400 <                      classpath="${build.ant.dir}">
401 <          <param name="matching"    value="^//@.*$"/>
402 <          <param name="pattern"     value="^//@"/>
403 <          <param name="replacement" value=""/>
404 <        </filterreader>
405 <
406 <
407 <        <!--
408 <         # The next two filters try to make the source look like
409 <         # something that doccheck can process. The first removes
410 <         # -source 1.4 assertions and the second adds in a bunch
411 <         # of single letter public nested marker interfaces so that
412 <         # the generic type parameters are recognized.
413 <         #
414 <         # Currently commented out because doccheck doesn't work. :-(
415 <         -->
416 <
417 <        <!--
418 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
419 <                      classpath="${build.ant.dir}">
420 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
421 <          <param name="pattern"     value="assert"/>
422 <          <param name="replacement" value="//assert"/>
423 <        </filterreader>
424 <
425 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
426 <                      classpath="${build.ant.dir}">
427 <          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
428 <          <param name="pattern"     value="$"/>
429 <          <param name="replacement" value=" ${generic.declarations}"/>
430 <        </filterreader>
431 <        -->
786 >  <target name="jsr166xdist-jar"
787 >          depends="jsr166xclean, jsr166xjar">
788  
789 <      </filterchain>
434 <    </copy>
789 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
790  
791    </target>
792  
793 +  <!-- jsr166y -->
794  
439  <target name="compile-tests"
440          depends="jar">
795  
796 <    <mkdir dir="${build.testcases.dir}"/>
796 >  <target name="jsr166ycompile"
797 >          depends="configure-compiler"
798 >          description="Compiles jsr166y sources">
799  
800 < <!--
445 <    <echo>javac ${gjc.args}</echo>
446 <    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
447 <    <echo>classpath="${test.classpath}"</echo>
448 < -->
800 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
801  
802 <    <javac srcdir="${test.src.dir}"
803 <          destdir="${build.testcases.dir}"
804 <            debug="${build.debug}"
805 <       debuglevel="${build.debuglevel}"
806 <      deprecation="${build.deprecation}"
807 <           source="${build.sourcelevel}"
808 <             fork="true">
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  
458      <compilerarg    line="${gjc.args}"/>
459      <bootclasspath refid="test.compile.bootclasspath"/>
460      <classpath     refid="test.classpath"/>
822  
823 <    </javac>
823 >  <target name="jsr166yjar"
824 >          depends="jsr166ycompile"
825 >          description="Builds library jar from compiled sources">
826 >
827 >    <jar destfile="${jsr166y.jar}" index="true">
828 >      <fileset dir="${build.jsr166y.classes.dir}"/>
829 >    </jar>
830  
831    </target>
832  
833  
467  <target name="run-tests"
468          depends="compile-tests">
834  
835 <    <!-- May be overridden by user.properties -->
836 <    <property name="testcase" value="*"/>
835 >  <target name="jsr166ydocs"
836 >          description="Builds javadocs to dist dir">
837  
838 <    <mkdir dir="${build.reports.dir}"/>
838 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
839 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
840  
841 <    <junit printsummary="true"
842 <             showoutput="true"
843 <          errorProperty="junit.failed"
844 <        failureProperty="junit.failed"
845 <                    dir="${build.reports.dir}"
846 <                   fork="true">
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 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
850 >  </target>
851  
484      <formatter type="xml"/>
852  
853 <      <batchtest todir="${build.reports.dir}">
854 <        <fileset dir="${test.src.dir}">
855 <          <include name="**/${testcase}Test.java"/>
489 <        </fileset>
490 <      </batchtest>
853 >  <target name="jsr166ydist"
854 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
855 >          description="Puts all distributable products in single hierarchy"/>
856  
857 <    </junit>
857 >
858 >
859 >  <target name="jsr166yclean"
860 >          description="Removes all jsr166y build products">
861 >
862 >    <delete dir="${build.jsr166y.dir}"/>
863  
864    </target>
865  
866  
497  <target name="report-tests"
498          depends="run-tests">
867  
868 <    <!-- Sets junit.report.format to frames if Xalan is present,
869 <         otherwise sets it to noframes. -->
502 <    <available property="junit.report.format"
503 <                  value="frames"
504 <              classname="org.apache.xalan.lib.Redirect"
505 <    />
506 <    <property name="junit.report.format" value="noframes"/>
868 >  <target name="jsr166ydist-clean"
869 >          description="Removes all build and distribution products">
870  
871 <    <junitreport todir="${build.reports.dir}">
509 <      <fileset dir="${build.reports.dir}">
510 <        <include name="TEST-*.xml"/>
511 <      </fileset>
512 <      <report styledir="${stylesheet.dir}"
513 <                format="${junit.report.format}"
514 <                 todir="${build.reports.dir}"
515 <      />
516 <    </junitreport>
871 >  </target>
872  
873 <    <fail message="Test Cases Failed" if="junit.failed"/>
873 >  <target name="jsr166ydist-jar"
874 >          depends="jsr166yclean, jsr166yjar">
875 >
876 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
877  
878    </target>
879  
880  
881 <  <target name="configure-compiler">
881 >  <!-- extra166y -->
882  
525    <property name="gjc.version"
526             value="2.0"/>
883  
884 <    <condition property="novariance.arg" value="-novariance">
885 <      <and>
886 <        <equals arg1="${gjc.version}" arg2="2.0"/>
531 <        <or>
532 <          <not><isset property="gjc.novariance"/></not>
533 <          <istrue value="${gjc.novariance}"/>
534 <        </or>
535 <      </and>
536 <    </condition>
884 >  <target name="extra166ycompile"
885 >          depends="configure-compiler, jsr166yjar"
886 >          description="Compiles extra166y sources">
887  
888 <    <property name="novariance.arg"
539 <             value=""/>
888 >    <mkdir dir="${build.extra166y.classes.dir}"/>
889  
890 <    <property name="gjc.dir"
891 <             value="${lib.dir}/gjc"/>
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 <    <property name="javac.jar"
904 <          location="${gjc.dir}/${gjc.version}/javac.jar"/>
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 <    <property name="collect.jar"
548 <          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
908 >    </javac>
909  
910 +  </target>
911  
551    <condition property="warnunchecked.arg" value="-warnunchecked">
552      <istrue value="${gjc.warnunchecked}"/>
553    </condition>
912  
555    <property name="warnunchecked.arg" value=""/>
913  
914 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
915 <      <istrue value="${build.nothreads}"/>
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 <    <!--
563 <     ! Bootclasspath munging for source compilation.
564 <     -->
922 >  </target>
923  
566    <path id="pre.bootclasspath">
567      <pathelement location="${javac.jar}"/>
568    </path>
569
570    <path id="compile.bootclasspath">
571      <pathelement location="${build.classes.dir}"/>
572      <pathelement location="${collect.jar}"/>
573      <pathelement location="${rt.jar}"/>
574    </path>
575
576    <!-- Flatten paths into platform-appropriate strings -->
577    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
578    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
924  
925  
926 <    <!-- Common options in javac invocations -->
927 <    <property name="gjc.args"
928 <             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
929 <    />
926 >  <target name="extra166ydocs"
927 >          description="Builds javadocs to build dir">
928 >
929 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
930 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
931 >
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    </target>
942  
943  
944 <  <target name="prepare-src"
945 <          depends="configure-compiler"
946 <          if="prepare.src.dir">
944 >  <target name="extra166ydist"
945 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
946 >          description="Puts all distributable products in single hierarchy"/>
947  
948 <    <mkdir dir="${prepare.src.dir}"/>
949 <    <copy todir="${prepare.src.dir}">
950 <      <fileset dir="${src.dir}">
951 <        <exclude name="java/lang/**"/>
952 <      </fileset>
953 <    </copy>
948 >
949 >
950 >  <target name="extra166yclean"
951 >          description="Removes all extra166y build products">
952 >
953 >    <delete dir="${build.extra166y.dir}"/>
954  
955    </target>
956  
957  
603  <target name="configure-emulation">
958  
959 <    <condition property="build.emulation.true">
960 <      <or>
607 <        <and>
608 <          <os family="windows"/>
609 <          <not>
610 <            <isset property="build.emulation"/>
611 <          </not>
612 <        </and>
613 <        <istrue value="${build.emulation}"/>
614 <      </or>
615 <    </condition>
959 >  <target name="extra166ydist-clean"
960 >          description="Removes all build and distribution products">
961  
962    </target>
963  
964 +  <target name="extra166ydist-jar"
965 +          depends="extra166yclean, extra166yjar">
966  
967 <  <target name="configure-tests"
621 <       depends="configure-compiler">
967 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
968  
969 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
624 <    <available property="junit.available"
625 <               classname="junit.framework.Protectable"/>
969 >  </target>
970  
971 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
628 <          unless="junit.available"/>
971 >  <!-- jsr166e -->
972  
973 +  <target name="jsr166ecompile"
974 +          depends="configure-compiler"
975 +          description="Compiles jsr166e sources">
976  
977 <    <!--
632 <     ! Bootclasspath munging for testing, so JUnit can test our local
633 <     ! modifications to java.*.
634 <     -->
977 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
978  
979 <    <path id="test.classpath">
980 <      <pathelement location="${product.jar}"/>
981 <      <pathelement location="${build.testcases.dir}"/>
982 <      <pathelement location="${junit.jar}"/>
983 <    </path>
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 <    <path id="test.compile.bootclasspath">
643 <      <pathelement location="${javac.jar}"/>
644 <      <pathelement location="${collect.jar}"/>
645 <      <pathelement location="${rt.jar}"/>
646 <    </path>
996 >    </javac>
997  
998 <    <path id="test.run.bootclasspath">
649 <      <pathelement location="${javac.jar}"/>
650 <      <path refid="test.classpath"/>
651 <    </path>
998 >  </target>
999  
1000 <    <!-- Flatten test classpaths into platform-appropriate strings -->
1001 <    <property name="test.classpath"             refid="test.classpath"/>
1002 <    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
1003 <    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
1000 >
1001 >
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 <  <!-- Anthill targets -->
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 <  <target name="anthill-build"
1021 <          depends="jar, test, docs, dist-docs"/>
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  
1029 <  <target name="anthill-publish">
1029 >  </target>
1030  
669    <copy todir="${deployDir}/docs/private">
670      <fileset dir="${build.javadocs.dir}"/>
671    </copy>
1031  
1032 <    <copy todir="${deployDir}/docs/public">
1033 <      <fileset dir="${dist.javadocs.dir}"/>
1034 <    </copy>
1032 >  <target name="jsr166edist"
1033 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1034 >          description="Puts all distributable products in single hierarchy"/>
1035  
677    <copy tofile="${deployDir}/index.html"
678          file="${basedir}/etc/anthill-index.html"/>
1036  
680    <copy todir="${deployDir}/notes">
681      <fileset dir="${basedir}/etc/notes"/>
682    </copy>
1037  
1038 <  </target>
1038 >  <target name="jsr166eclean"
1039 >          description="Removes all jsr166e build products">
1040  
1041 +    <delete dir="${build.jsr166e.dir}"/>
1042  
1043 <  <target name="ng" depends="test">
688 <    <java classname="SuperfluousAbstract" fork="true">
1043 >  </target>
1044  
690      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
1045  
1046 <    </java>
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