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

Comparing jsr166/build.xml (file contents):
Revision 1.53 by dl, Tue Aug 26 19:59:14 2003 UTC vs.
Revision 1.93 by jsr166, Mon Jan 14 08:58:47 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines