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.42 by tim, Mon Jun 9 14:11:43 2003 UTC vs.
Revision 1.110 by jsr166, Sun Jan 20 01:09:12 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines