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.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.105 by jsr166, Sat Jan 19 21:54:53 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"/>
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.testcases.dir"  location="${build.dir}/testcases"/>
47 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
48 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
49 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
50 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
51 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
52 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
53 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
54 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
55 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
56 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
57 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
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.lib.dir"               location="${build.dir}/lib"/>
49 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
51 >
52 >  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53 >  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54 >  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55 >  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56 >  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57 >
58 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61  
62 +  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63 +  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64 +  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65 +
66 +  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67 +  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68 +  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69 +
70 +  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71 +  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72 +  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73 +
74 +  <!-- JDK binary locations -->
75 +  <property name="jdks.home"  location="${user.home}/jdk"/>
76 +
77 +  <macrodef name="defjdklocations">
78 +    <attribute name="v"/>
79 +    <sequential>
80 +    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81 +    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82 +    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83 +    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84 +    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85 +    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86 +    <property name="bootclasspath@{v}"
87 +     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88 +    </sequential>
89 +  </macrodef>
90 +
91 +  <defjdklocations v="6"/>
92 +  <defjdklocations v="7"/>
93 +  <defjdklocations v="8"/>
94 +
95 +  <macrodef name="run-tck-tests">
96 +    <attribute name="jvm"/>
97 +    <attribute name="tck.classes"/>
98 +    <attribute name="product.jar" default="${product.jar}"/>
99 +    <attribute name="jvmflags" default=""/>
100 +    <sequential>
101 +    <java classname="JSR166TestCase"
102 +          jvm="@{jvm}" fork="true">
103 +        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104 +        <jvmarg line="@{jvmflags}"/>
105 +        <classpath>
106 +          <pathelement location="${junit.jar}"/>
107 +          <pathelement location="@{tck.classes}"/>
108 +        </classpath>
109 +    </java>
110 +    </sequential>
111 +  </macrodef>
112 +
113    <!-- Source locations -->
114    <property name="src.dir"              location="${basedir}/src/main"/>
115    <property name="test.src.dir"         location="${basedir}/src/test"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
116    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
117    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
118    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
119    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>
121    <property name="topsrc.dir"           location="${basedir}/src"/>
122 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
122 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128  
129    <!-- Distribution locations -->
130 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
130 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131 >  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133 +  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134 +  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135 +  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136  
137    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139 +  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
69  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
145  
146    <!-- Bootclasspath argument -->
147    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148  
149 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153 +
154 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155 +  <!-- The below does not yet exist as of 2012-11 -->
156 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158 +
159    <!-- Test classpath -->
160    <path id="test.classpath">
161      <pathelement location="${build.testcases.dir}"/>
# Line 82 | Line 167
167      <pathelement location="${build.loops.dir}"/>
168    </path>
169  
170 <  <!-- J1 classpath -->
171 <  <path id="j1.classpath">
172 <    <pathelement location="${build.j1.dir}"/>
173 <    <pathelement location="${junit.jar}"/>
174 <    <pathelement location="${concurrent.jar}"/>
175 <  </path>
91 <
170 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
171 >  <!-- TODO: How do we get &trade to work? -->
172 >  <!-- TODO: Why isn't @jls a "standard" tag? -->
173 >  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174 >  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176  
177    <!-- Main targets -->
178  
179 +  <target name="dists"
180 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
181 +          description="Builds all public jars and docs"/>
182  
183    <target name="compile"
184 <          depends="init, configure-compiler"
185 <          description="Compiles main sources to build folder">
184 >          depends="configure-compiler"
185 >          description="Compiles src/main sources to build dir">
186  
187      <mkdir dir="${build.classes.dir}"/>
188  
189      <javac srcdir="${src.dir}"
190 <          destdir="${build.classes.dir}"
191 <            debug="${build.debug}"
192 <       debuglevel="${build.debuglevel}"
193 <      deprecation="${build.deprecation}"
194 <           source="${build.sourcelevel}"
195 <             fork="true">
190 >           destdir="${build.classes.dir}"
191 >           debug="${build.debug}"
192 >           debuglevel="${build.debuglevel}"
193 >           deprecation="${build.deprecation}"
194 >           classpath=""
195 >           includeAntRuntime="false"
196 >           includeJavaRuntime="false"
197 >           executable="${javac8}"
198 >           fork="true">
199  
200        <include name="**/*.java"/>
201 +      <compilerarg line="${build.args}"/>
202 +      <compilerarg value="-XDignore.symbol.file=true"/>
203 +      <compilerarg value="-Xlint:all"/>
204 +
205 + <!--
206        <exclude name="java/lang/**"/>
207        <compilerarg line="${build.args}"/>
208 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
209 + -->
210  
211      </javac>
212  
# Line 132 | Line 229
229  
230  
231    <target name="test"
232 <          depends="init, configure-tests, report-tests"
232 >          depends="configure-tests, report-tests"
233            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234  
235  
236  
237    <target name="docs"
238 <          description="Builds javadocs with custom tags to build folder">
142 <
143 <    <delete dir="${build.javadocs.dir}"/>
144 <    <mkdir dir="${build.javadocs.dir}"/>
145 <
146 <    <javadoc destdir="${build.javadocs.dir}"
147 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
148 <            overview="${src.dir}/intro.html"
149 <              source="${build.sourcelevel}">
150 <
151 <      <tag name="revised" description="Last revised:"/>
152 <      <tag name="spec"    description="Specified by:"/>
153 <
154 <      <packageset dir="${src.dir}"/>
155 <
156 <    </javadoc>
157 <
158 <  </target>
238 >          description="Builds javadocs for src/main to dist dir">
239  
240 +    <delete dir="${dist.javadocs.dir}"/>
241 +    <mkdir dir="${dist.javadocs.dir}"/>
242  
243 +    <!-- the packagenames="none" hack below prevents scanning the -->
244 +    <!-- sourcepath for packages -->
245  
246 <  <target name="doccheck"
247 <          depends="filter-doccheck"
248 <          description="Reports on javadoc style errors">
249 <
250 <    <delete dir="${build.doccheck.dir}"/>
251 <    <mkdir dir="${build.doccheck.dir}"/>
252 <
253 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
254 <         docletpath="${lib.dir}/doccheck.jar"
255 <            destdir="${build.doccheck.dir}">
256 <      <packageset dir="${build.dc-filter.dir}"/>
246 >    <javadoc destdir="${dist.javadocs.dir}"
247 >             packagenames="none"
248 >             link="${jdkapi8docs.url}"
249 >             overview="${src.dir}/intro.html"
250 >             sourcepath="${src.dir}:${jdk8src.dir}"
251 >             classpath=""
252 >             executable="${javadoc8}">
253 >      <arg value="-XDignore.symbol.file=true"/>
254 >      <arg value="-tag"/>
255 >      <arg value="${javadoc.jls.option}"/>
256 >      <fileset dir="${src.dir}" defaultexcludes="yes">
257 >        <include name="**/*.java"/>
258 >      </fileset>
259      </javadoc>
260  
175    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
176
177  </target>
178
179
180
181  <target name="checkstyle"
182          depends="filter-src"
183          description="Reports on style errors in Java source (verbose, mostly chaff)">
184
185    <taskdef resource="checkstyletask.properties"
186            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187
188    <mkdir dir="${build.checkstyle.dir}"/>
189
190    <checkstyle config="etc/checkstyle/sun_checks.xml"
191       failOnViolation="false">
192      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194    </checkstyle>
195
196    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
197          out="${build.checkstyle.dir}/checkstyle-report.html"
198        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199
261    </target>
262  
263  
264  
265    <target name="dist"
266 <          depends="init, dist-clean, dist-jar, dist-docs"
266 >          depends="dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>
268  
269  
209
270    <target name="release"
271            depends="dist"
272            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 247 | Line 307
307  
308  
309  
250  <target name="dist-docs"
251          description="Builds javadocs without custom tags to dist folder">
252
253    <delete dir="${dist.javadocs.dir}"/>
254    <mkdir dir="${dist.javadocs.dir}"/>
255
256    <javadoc destdir="${dist.javadocs.dir}"
257                link="http://java.sun.com/j2se/1.4.2/docs/api"
258            overview="${src.dir}/intro.html"
259              source="${build.sourcelevel}">
260
261      <packageset dir="${src.dir}"/>
262
263    </javadoc>
264
265  </target>
266
267
268
310    <!-- Internal targets -->
311  
312  
272  <target name="init">
273
274    <!-- Version is kept in a separate file -->
275    <loadfile property="version" srcFile="version.properties"/>
276    <echo>Building JSR-166 version ${version}</echo>
277    <echo>java.home is ${java.home}</echo>
278
279  </target>
280
281
313    <target name="dist-jar"
314            depends="clean, jar">
315  
# Line 287 | Line 318
318    </target>
319  
320  
290  <target name="compile-ant-filter"
291          depends="init">
292
293    <mkdir dir="${build.ant.dir}"/>
294
295    <javac srcdir="${ant.src.dir}"
296          destdir="${build.ant.dir}"
297           source="1.4"/>
298
299  </target>
300
301
302  <target name="filter-src"
303          depends="compile-ant-filter">
304
305    <mkdir dir="${build.filter.src.dir}"/>
306
307    <copy todir="${build.filter.src.dir}">
308      <fileset dir="${src.dir}">
309        <include name="**/*.html"/>
310      </fileset>
311    </copy>
312
313    <copy todir="${build.filter.src.dir}">
314      <fileset dir="${src.dir}">
315        <exclude name="**/*.html"/>
316        <!-- Files excluded from dist-docs -->
317        <exclude name="java/util/Random.*"/>
318        <exclude name="sun/misc/Unsafe.*"/>
319      </fileset>
320      <!--
321      <filterchain>
322      -->
323
324        <!--
325         # This filter gets rid of angle-bracketed type parameters
326         # so that javadoc can run on the result. The following
327         # heuristic seems to work:
328         #
329         # For all lines not starting with space(s)-asterisk-space(s),
330         #   replace <something> with a space, where there may be more
331         #   than one right angle bracket at the end, and "something"
332         #   must not contain parens or pipes. (This may need some
333         #   tweaking.)
334         -->
335
336        <!--
337        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
338                      classpath="${build.ant.dir}">
339          <param name="notmatching" value="^\s+\*\s.*$"/>
340          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
341          <param name="replacement" value=" "/>
342        </filterreader>
343        -->
344
345      <!--
346      </filterchain>
347      -->
348    </copy>
349
350  </target>
351
352
353  <target name="filter-doccheck"
354          depends="filter-src">
355
356    <mkdir dir="${build.dc-filter.dir}"/>
357
358    <copy todir="${build.dc-filter.dir}">
359      <fileset dir="${build.filter.src.dir}">
360        <include name="**/*.html"/>
361      </fileset>
362    </copy>
363
364    <property name="generic.declarations"
365             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 {}"
366    />
367
368    <copy todir="${build.dc-filter.dir}">
369      <fileset dir="${build.filter.src.dir}">
370        <exclude name="**/*.html"/>
371      </fileset>
372      <filterchain>
373        <!--
374         # These two filters try to make the source look like
375         # something that doccheck can process. The first removes
376         # -source 1.4 assertions and the second adds in a bunch
377         # of single letter public nested marker interfaces so that
378         # the generic type parameters are recognized.
379         -->
380
381        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
382                      classpath="${build.ant.dir}">
383          <param name="matching"    value="^\s*assert[\s ].*$"/>
384          <param name="pattern"     value="assert"/>
385          <param name="replacement" value="//assert"/>
386        </filterreader>
387
388        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389                      classpath="${build.ant.dir}">
390          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
391          <param name="pattern"     value="$"/>
392          <param name="replacement" value=" ${generic.declarations}"/>
393        </filterreader>
394
395      </filterchain>
396    </copy>
397
398  </target>
399
400
321    <target name="compile-tests"
322            depends="jar">
323  
# Line 413 | Line 333
333  
334        <compilerarg value="${bootclasspath.args}"/>
335        <compilerarg line="${build.args}"/>
336 +      <compilerarg value="-XDignore.symbol.file=true"/>
337  
338        <classpath refid="test.classpath"/>
339  
# Line 430 | Line 351
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  
# Line 446 | Line 368
368  
369        <compilerarg value="${bootclasspath.args}"/>
370        <compilerarg line="${build.args}"/>
371 +      <compilerarg value="-XDignore.symbol.file=true"/>
372  
373        <classpath refid="test.classpath"/>
374  
# Line 518 | Line 441
441        <fileset dir="${build.reports.dir}">
442          <include name="TEST-*.xml"/>
443        </fileset>
444 <      <report styledir="${stylesheet.dir}"
522 <                format="${junit.report.format}"
523 <                 todir="${build.reports.dir}"
444 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
445        />
446      </junitreport>
447  
# Line 570 | Line 491
491    </target>
492  
493  
494 +  <!-- Various demos and test programs -->
495  
574  <!-- Anthill targets -->
496  
497 <  <target name="anthill-build">
497 >  <target name="loops" depends="configure-compiler"
498 >          description="Benchmark from Doug Lea's AQS paper">
499  
500 <    <!-- Override this in user.properties -->
579 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
500 >    <mkdir dir="${build.loops.dir}"/>
501  
502 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
503 <      <arg value="-Xmx256000000"/>
504 <      <!-- classpath of new JVM -->
505 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
506 <      <!-- location of Ant home directory -->
507 <      <arg value="-Dant.home=${ant.home}"/>
508 <      <!-- the Ant main class -->
509 <      <arg value="org.apache.tools.ant.Main"/>
510 <      <!-- The build file -->
511 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
512 <      <!-- the target to build on the new Ant instance -->
513 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
514 <      <arg value="do-anthill-build"/>
515 <    </exec>
516 <  </target>
517 <
518 <  <target name="do-anthill-build"
598 <          depends="jar, test, docs, dist-docs"/>
599 <
600 <  <target name="anthill-publish">
601 <
602 <    <copy todir="${deployDir}/docs/private">
603 <      <fileset dir="${build.javadocs.dir}"/>
604 <    </copy>
605 <
606 <    <copy todir="${deployDir}/docs/public">
607 <      <fileset dir="${dist.javadocs.dir}"/>
608 <    </copy>
609 <
610 <    <copy tofile="${deployDir}/index.html"
611 <          file="${basedir}/etc/anthill-index.html"/>
612 <
613 <    <copy todir="${deployDir}/notes">
614 <      <fileset dir="${basedir}/etc/notes"/>
615 <    </copy>
502 >    <javac srcdir="${loops.src.dir}"
503 >          destdir="${build.loops.dir}"
504 >            debug="${build.debug}"
505 >       debuglevel="${build.debuglevel}"
506 >      deprecation="${build.deprecation}"
507 >           source="${build.sourcelevel}"
508 >             fork="true">
509 >
510 >      <compilerarg line="${build.args}"/>
511 >      <classpath refid="loops.classpath"/>
512 >      <compilerarg value="-XDignore.symbol.file=true"/>
513 >
514 >    </javac>
515 >
516 >    <java classname="ALoops" fork="true">
517 >      <classpath refid="loops.classpath"/>
518 >    </java>
519  
520    </target>
521  
522  
523 +  <!-- jsr166 4jdk7 -->
524  
621  <!-- Various demos and test programs -->
525  
526 +  <target name="4jdk7compile"
527 +          depends="configure-compiler"
528 +          description="Compiles src/jdk7 sources, targeting jdk7">
529 +
530 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
531 +
532 +    <javac srcdir="${4jdk7src.dir}"
533 +           destdir="${build.4jdk7.classes.dir}"
534 +           debug="${build.debug}"
535 +           debuglevel="${build.debuglevel}"
536 +           deprecation="${build.deprecation}"
537 +           source="1.6"
538 +           classpath=""
539 +           bootclasspath="${bootclasspath6}"
540 +           includeAntRuntime="false"
541 +           includeJavaRuntime="false"
542 +           executable="${javac7}"
543 +           fork="true">
544  
545 <  <target name="sample" depends="init, configure-compiler"
546 <          description="Standalone demo program">
545 >      <include name="**/*.java"/>
546 >      <compilerarg line="${build.args}"/>
547 >      <compilerarg value="-XDignore.symbol.file=true"/>
548 >      <compilerarg value="-Xlint:all"/>
549  
550 <    <mkdir dir="${build.testcases.dir}"/>
550 >    </javac>
551  
552 <    <javac srcdir="${test.src.dir}"
553 <          destdir="${build.testcases.dir}"
554 <            debug="${build.debug}"
555 <       debuglevel="${build.debuglevel}"
556 <      deprecation="${build.deprecation}"
634 <           source="${build.sourcelevel}"
635 <             fork="true">
552 >    <mkdir dir="${build.4jdk7.lib.dir}"/>
553 >
554 >    <jar destfile="${4jdk7product.jar}" index="true">
555 >      <fileset dir="${build.4jdk7.classes.dir}"/>
556 >    </jar>
557  
558 <      <include name="jsr166/test/Sample.java"/>
558 >    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
559 >
560 >    <javac srcdir="${tck.src.dir}"
561 >           destdir="${build.4jdk7.tck.classes.dir}"
562 >           debug="${build.debug}"
563 >           debuglevel="${build.debuglevel}"
564 >           deprecation="${build.deprecation}"
565 >           source="1.6"
566 >           classpath="${junit.jar}"
567 >           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
568 >           includeAntRuntime="false"
569 >           includeJavaRuntime="false"
570 >           executable="${javac7}"
571 >           fork="true">
572 >
573 >      <include name="**/*.java"/>
574 >      <compilerarg line="${build.args}"/>
575 >      <compilerarg value="-XDignore.symbol.file=true"/>
576 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577  
578      </javac>
579  
580 <    <copy todir="${build.testcases.dir}">
642 <      <fileset dir="${test.src.dir}">
643 <        <include name="**/*.properties"/>
644 <      </fileset>
645 <    </copy>
580 >  </target>
581  
582  
583 <    <java classname="jsr166.test.Sample" fork="true">
584 <      <classpath refid="test.classpath"/>
585 <      <!-- <jvmarg value="-ea"/> -->
586 <      <!-- <jvmarg value="-server"/> -->
587 <      <!-- <arg value="1000"/> -->
588 <    </java>
583 >  <target name="4jdk7-test-tck"
584 >          depends="4jdk7compile"
585 >          description="Runs tck tests for jsr166-4jdk7 directly">
586 >    <run-tck-tests
587 >      jvm="${java7}"
588 >      tck.classes="${build.4jdk7.tck.classes.dir}"
589 >      product.jar="${4jdk7product.jar}"/>
590    </target>
591  
592  
593 <  <target name="loops" depends="init, configure-compiler"
594 <          description="Benchmark from Doug Lea's AQS paper">
593 >  <target name="4jdk7-test-tck-junit"
594 >          depends="4jdk7compile"
595 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
596  
597 <    <mkdir dir="${build.loops.dir}"/>
597 >    <junit printsummary="true"
598 >           showoutput="true"
599 >           errorProperty="junit.failed"
600 >           failureProperty="junit.failed"
601 >           includeantruntime="true"
602 >           jvm="${java7}"
603 >           fork="true">
604  
605 <    <javac srcdir="${loops.src.dir}"
606 <          destdir="${build.loops.dir}"
664 <            debug="${build.debug}"
665 <       debuglevel="${build.debuglevel}"
666 <      deprecation="${build.deprecation}"
667 <           source="${build.sourcelevel}"
668 <             fork="true">
605 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
606 >      <jvmarg value="-server"/>
607  
608 <      <compilerarg line="${build.args}"/>
609 <      <classpath refid="loops.classpath"/>
608 >      <classpath>
609 >        <pathelement location="${junit.jar}"/>
610 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
611 >      </classpath>
612  
613 <    </javac>
613 >      <formatter type="brief"/>
614  
615 <    <java classname="ALoops" fork="true">
616 <      <classpath refid="loops.classpath"/>
677 <    </java>
615 >      <test name="JSR166TestCase" haltonfailure="no">
616 >      </test>
617  
618 +    </junit>
619    </target>
620  
621  
622 <  <target name="compile-j1" depends="init, configure-compiler">
622 >  <target name="4jdk7docs"
623 >          description="Builds javadocs for src/jdk7 to dist dir">
624  
625 <    <mkdir dir="${build.j1.dir}"/>
625 >    <delete dir="${dist.4jdk7.docs.dir}"/>
626 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
627  
628 <    <javac srcdir="${j1.src.dir}"
629 <          destdir="${build.j1.dir}"
630 <            debug="${build.debug}"
631 <       debuglevel="${build.debuglevel}"
632 <      deprecation="${build.deprecation}"
633 <           source="${build.sourcelevel}" >
628 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
629 >             packagenames="none"
630 >             link="${jdkapi7docs.url}"
631 >             overview="${4jdk7src.dir}/intro.html"
632 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
633 >             classpath=""
634 >             executable="${javadoc7}">
635 >      <arg value="-XDignore.symbol.file=true"/>
636 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
637 >        <include name="**/*.java"/>
638 >      </fileset>
639 >    </javadoc>
640  
641 <      <include name="**/*.java"/>
694 <      <exclude name="**/dijkstra/**"/>
641 >  </target>
642  
696      <compilerarg line="${build.args}"/>
697      <classpath refid="j1.classpath"/>
643  
644 <    </javac>
644 >  <target name="4jdk7dist"
645 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
646 >          description="Puts all distributable products in single hierarchy"/>
647 >
648 >
649 >
650 >  <target name="4jdk7clean"
651 >          description="Removes all build products">
652 >
653 >    <delete dir="${build.4jdk7.dir}"/>
654  
655    </target>
656  
657  
704  <target name="sw" depends="compile-j1"
705          description="Runs the SwingWorker demo">
658  
659 <    <!--
660 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
709 <      <classpath refid="j1.classpath"/>
710 <    </java>
711 <    -->
659 >  <target name="4jdk7dist-clean"
660 >          description="Removes all build and distribution products">
661  
662 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
662 >  </target>
663  
664 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
665 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
666 <    </exec>
664 >  <target name="4jdk7dist-jar"
665 >          depends="4jdk7clean, 4jdk7compile">
666 >
667 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
668  
669    </target>
670  
671 <  <target name="j1" depends="compile-j1"
722 <          description="Runs a standalone JavaOne program">
671 >  <!-- jsr166x -->
672  
724    <java classname="${j1.test}" fork="true">
725      <classpath refid="j1.classpath"/>
726      <jvmarg value="-client"/>
673  
674 <      <!-- TestPseudoRandom args -->
675 <      <arg value="2"/>
676 <      <arg value="25"/>
731 <      <arg value="100000"/>
674 >  <target name="jsr166xcompile"
675 >          depends="configure-compiler"
676 >          description="Compiles jsr166x sources to build dir">
677  
678 <      <!-- WebCrawler args -->
734 <      <!--
735 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
736 <      <arg value="http://www.priorartisans.com"/>
737 <      <arg value="25"/>
738 <      -->
678 >    <mkdir dir="${build.jsr166x.dir}"/>
679  
680 <    </java>
680 >    <javac srcdir="${topsrc.dir}"
681 >           destdir="${build.jsr166x.dir}"
682 >           debug="${build.debug}"
683 >           debuglevel="${build.debuglevel}"
684 >           deprecation="${build.deprecation}"
685 >           classpath=""
686 >           source="1.5"
687 >           bootclasspath="${bootclasspath6}"
688 >           includeAntRuntime="false"
689 >           includeJavaRuntime="false"
690 >           executable="${javac7}"
691 >           fork="true">
692 >
693 >      <include name="jsr166x/**/*.java"/>
694 >      <compilerarg line="${build.args}"/>
695 >      <compilerarg value="-XDignore.symbol.file=true"/>
696 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
697 >
698 >    </javac>
699  
700    </target>
701  
702  
745  <target name="test-j1" depends="compile-j1"
746          description="Runs testcases from the JavaOne source directories">
703  
704 <    <junit printsummary="true"
705 <             showoutput="true"
706 <          errorProperty="junit.failed"
751 <        failureProperty="junit.failed"
752 <                    dir="${build.j1.dir}"
753 <                   fork="true">
704 >  <target name="jsr166xjar"
705 >          depends="jsr166xcompile"
706 >          description="Builds library jar from compiled sources">
707  
708 <      <!-- <jvmarg value="-server"/> -->
756 <      <classpath refid="j1.classpath"/>
757 <      <formatter type="xml"/>
708 >    <mkdir dir="${build.jsr166xlib.dir}"/>
709  
710 <      <batchtest todir="${build.j1.dir}">
711 <        <fileset dir="${j1.src.dir}">
712 <          <include name="**/*Test.java"/>
762 <        </fileset>
763 <      </batchtest>
710 >    <jar destfile="${jsr166xproduct.jar}">
711 >      <fileset dir="${build.jsr166x.dir}"/>
712 >    </jar>
713  
714 <    </junit>
714 >  </target>
715  
767    <available property="junit.report.format"
768                  value="frames"
769              classname="org.apache.xalan.lib.Redirect"/>
770    <property name="junit.report.format" value="noframes"/>
716  
772    <junitreport todir="${build.j1.dir}">
773      <fileset dir="${build.j1.dir}">
774        <include name="TEST-*.xml"/>
775      </fileset>
776      <report styledir="${stylesheet.dir}"
777                format="${junit.report.format}"
778                 todir="${build.j1.dir}"
779      />
780    </junitreport>
717  
718 <    <fail message="Test Cases Failed" if="junit.failed"/>
718 >  <target name="jsr166xdocs"
719 >          description="Builds javadocs to dist dir">
720 >
721 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
722 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
723 >
724 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
725 >             packagenames="jsr166x"
726 >             link="${jdkapidocs.url}"
727 >             source="${build.sourcelevel}"
728 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
729 >             additionalparam="-XDignore.symbol.file=true" />
730  
731    </target>
732  
733  
734 +  <target name="jsr166xdist"
735 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
736 +          description="Puts all distributable products in single hierarchy"/>
737 +
738 +
739  
740 <  <!-- C++ and JNI definitions and demos -->
740 >  <target name="jsr166xclean"
741 >          description="Removes all build products">
742  
743 <  <target name="configure-cpp">
743 >    <delete dir="${build.jsr166x.dir}"/>
744 >    <delete dir="${build.jsr166xlib.dir}"/>
745  
746 <    <!-- Define tasks and types -->
746 >  </target>
747  
794    <path id="cpptasks.path">
795      <pathelement location="${lib.dir}/cpptasks.jar"/>
796    </path>
797    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
748  
800    <!-- Set platform property for JNI includes -->
749  
750 <    <condition property="platform" value="linux">
751 <      <os name="Linux"/>
804 <    </condition>
805 <    <condition property="platform" value="win32">
806 <      <os family="windows"/>
807 <    </condition>
808 <    <condition property="platform" value="solaris">
809 <      <os name="SunOS"/>
810 <    </condition>
750 >  <target name="jsr166xdist-clean"
751 >          description="Removes all build and distribution products">
752  
753    </target>
754  
755  
815  <target name="cppdemo" depends="configure-cpp">
756  
757 <    <mkdir dir="${build.dir}"/>
757 >  <target name="jsr166xdist-docs"
758 >          description="Builds javadocs to dist dir">
759 >
760 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
761 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
762  
763 <    <cc multithreaded="true"
764 <                 name="g++"
765 <               objdir="${build.dir}"
766 <              outfile="${build.dir}/CppDemo">
767 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
768 <      <libset libs="stdc++"/>
825 <    </cc>
763 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
764 >             packagenames="jsr166x"
765 >             link="${jdkapidocs.url}"
766 >             source="${build.sourcelevel}"
767 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
768 >             additionalparam="-XDignore.symbol.file=true" />
769  
770 <    <exec executable="${build.dir}/CppDemo">
771 <      <arg line="count in word frequency of word in command line count"/>
772 <    </exec>
770 >  </target>
771 >
772 >  <target name="jsr166xdist-jar"
773 >          depends="jsr166xclean, jsr166xjar">
774 >
775 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
776  
777    </target>
778  
779 +  <!-- jsr166y -->
780  
834  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
781  
782 <    <mkdir dir="${build.testcases.dir}"/>
782 >  <target name="jsr166ycompile"
783 >          depends="configure-compiler"
784 >          description="Compiles jsr166y sources">
785 >
786 >    <mkdir dir="${build.jsr166y.dir}"/>
787 >
788 >    <javac srcdir="${topsrc.dir}"
789 >           destdir="${build.jsr166y.dir}"
790 >           debug="${build.debug}"
791 >           debuglevel="${build.debuglevel}"
792 >           deprecation="${build.deprecation}"
793 >           source="1.6"
794 >           classpath=""
795 >           bootclasspath="${bootclasspath6}"
796 >           includeAntRuntime="false"
797 >           includeJavaRuntime="false"
798 >           executable="${javac7}"
799 >           fork="true">
800  
801 <    <javac srcdir="${test.src.dir}"
839 <          destdir="${build.testcases.dir}"
840 <            debug="${build.debug}"
841 <       debuglevel="${build.debuglevel}"
842 <      deprecation="${build.deprecation}"
843 <           source="${build.sourcelevel}"
844 <             fork="true">
845 <      <compilerarg value="${bootclasspath.args}"/>
801 >      <include name="jsr166y/**/*.java"/>
802        <compilerarg line="${build.args}"/>
803 <      <classpath refid="test.classpath"/>
804 <      <include name="JniDemo.java"/>
803 >      <compilerarg value="-XDignore.symbol.file=true"/>
804 >      <compilerarg value="-Xlint:all"/>
805      </javac>
806 +  </target>
807  
808 <    <javah destdir="${build.testcases.dir}"
809 <      classpathref="test.classpath">
810 <      <class name="JniDemo"/>
811 <    </javah>
812 <
813 <    <cc multithreaded="true"
814 <                 name="g++"
815 <               objdir="${build.dir}"
816 <              outfile="${build.dir}/JniDemo"
817 <              outtype="shared">
861 <
862 <      <compiler>
863 <        <defineset>
864 <          <define name="__int64" value="long long"/>
865 <        </defineset>
866 <        <includepath location="${java.home}/../include"/>
867 <        <includepath location="${java.home}/../include/${platform}"/>
868 <        <compilerarg value="-mno-cygwin"/>
869 <      </compiler>
870 <
871 <      <linker>
872 <        <linkerarg value="--add-stdcall-alias"/>
873 <      </linker>
874 <
875 <      <includepath location="${build.testcases.dir}"/>
876 <
877 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878 <
879 <      <libset libs="stdc++"/>
880 <
881 <    </cc>
882 <
883 <    <!-- Necessary if windows, harmless if not -->
884 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885 <
886 <    <java classname="JniDemo" fork="true">
887 <      <!-- Watch out: path separator hardwired to semicolon here! -->
888 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889 <      <classpath refid="test.classpath"/>
890 <      <arg line="count in word frequency of word in command line count"/>
891 <    </java>
808 >
809 >  <target name="jsr166yjar"
810 >          depends="jsr166ycompile"
811 >          description="Builds library jar from compiled sources">
812 >
813 >    <mkdir dir="${build.jsr166ylib.dir}"/>
814 >
815 >    <jar destfile="${jsr166yproduct.jar}" index="true">
816 >      <fileset dir="${build.jsr166y.dir}"/>
817 >    </jar>
818  
819    </target>
820  
821  
822  
823 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
823 >  <target name="jsr166ydocs"
824 >          description="Builds javadocs to dist dir">
825  
826 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
827 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
828  
829 +    <javadoc destdir="${build.jsr166yjavadocs.dir}"
830 +             packagenames="jsr166y"
831 +             link="${jdkapidocs.url}"
832 +             source="${build.sourcelevel}"
833 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
834 +             additionalparam="-XDignore.symbol.file=true" />
835  
836 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
902 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
903 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
904 <  <property name="pretiger.sourcelevel" value="1.4"/>
836 >  </target>
837  
906  <target name="defang"
907       depends="init"
908   description="Generates pre-Tiger compatible source">
838  
839 <    <delete dir="${pretiger.src.dir}"/>
840 <    <mkdir dir="${pretiger.src.dir}"/>
839 >  <target name="jsr166ydist"
840 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
841 >          description="Puts all distributable products in single hierarchy"/>
842  
913    <exec executable="perl">
914      <arg file="etc/defang.pl"/>
915      <!-- <arg value="-v"/> -->
916      <arg value="-s"/> <arg file="${src.dir}"/>
917      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
918    </exec>
843  
920  </target>
844  
845 <  <target name="compile-pretiger"
846 <          depends="init, configure-compiler, defang"
924 <          description="Compiles pre-Tiger sources to build folder">
845 >  <target name="jsr166yclean"
846 >          description="Removes all build products">
847  
848 <    <mkdir dir="${build.pretiger.dir}"/>
848 >    <delete dir="${build.jsr166y.dir}"/>
849 >    <delete dir="${build.jsr166ylib.dir}"/>
850  
851 <    <javac srcdir="${pretiger.src.dir}"
929 <          destdir="${build.pretiger.dir}"
930 <            debug="${build.debug}"
931 <       debuglevel="${build.debuglevel}"
932 <      deprecation="${build.deprecation}"
933 <           source="${pretiger.sourcelevel}"
934 <             fork="true">
851 >  </target>
852  
936      <compilerarg line="${build.args}"/>
937      <exclude name="**/Thread.java"/>
853  
854 <    </javac>
854 >
855 >  <target name="jsr166ydist-clean"
856 >          description="Removes all build and distribution products">
857  
858    </target>
859  
860 <  <target name="pretiger" depends="compile-pretiger">
860 >  <target name="jsr166ydist-docs"
861 >          description="Builds javadocs to dist dir">
862  
863 <    <mkdir dir="${build.lib.dir}"/>
863 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
864 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
865  
866 <    <jar destfile="${pretiger.jar}">
867 <      <fileset dir="${build.pretiger.dir}">
868 <      </fileset>
869 <    </jar>
866 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
867 >             packagenames="jsr166y"
868 >             link="${jdkapidocs.url}"
869 >             source="${build.sourcelevel}"
870 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
871 >             additionalparam="-XDignore.symbol.file=true" />
872  
873    </target>
874  
875 <  <!-- jsr166x -->
875 >  <target name="jsr166ydist-jar"
876 >          depends="jsr166yclean, jsr166yjar">
877  
878 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
879  
880 <  <target name="jsr166xcompile"
958 <          depends="init, configure-compiler"
959 <          description="Compiles jsr166x sources">
880 >  </target>
881  
961    <mkdir dir="${build.jsr166x.dir}"/>
882  
883 <    <javac srcdir="${jsr166xsrc.dir}"
964 <          destdir="${build.jsr166x.dir}"
965 <            debug="${build.debug}"
966 <       debuglevel="${build.debuglevel}"
967 <      deprecation="${build.deprecation}"
968 <           source="${build.sourcelevel}"
969 <             fork="true">
883 >  <!-- extra166y -->
884  
885 <      <include name="**/*.java"/>
885 >
886 >  <target name="extra166ycompile"
887 >          depends="configure-compiler, jsr166yjar"
888 >          description="Compiles extra166y sources">
889 >
890 >    <mkdir dir="${build.extra166y.dir}"/>
891 >
892 >    <javac srcdir="${topsrc.dir}"
893 >           destdir="${build.extra166y.dir}"
894 >           debug="${build.debug}"
895 >           debuglevel="${build.debuglevel}"
896 >           deprecation="${build.deprecation}"
897 >           classpath=""
898 >           source="1.6"
899 >           bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
900 >           includeAntRuntime="false"
901 >           includeJavaRuntime="false"
902 >           executable="${javac7}"
903 >           fork="true">
904 >
905 >      <include name="extra166y/**/*.java"/>
906        <compilerarg line="${build.args}"/>
907 +      <compilerarg value="-XDignore.symbol.file=true"/>
908 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
909  
910      </javac>
911  
# Line 977 | Line 913
913  
914  
915  
916 <  <target name="jsr166xjar"
917 <          depends="jsr166xcompile"
916 >  <target name="extra166yjar"
917 >          depends="extra166ycompile"
918            description="Builds library jar from compiled sources">
919  
920 <    <mkdir dir="${build.jsr166xlib.dir}"/>
920 >    <mkdir dir="${build.extra166ylib.dir}"/>
921  
922 <    <jar destfile="${jsr166xproduct.jar}">
923 <      <fileset dir="${build.jsr166x.dir}"/>
922 >    <jar destfile="${extra166yproduct.jar}" index="true">
923 >      <fileset dir="${build.extra166y.dir}"/>
924      </jar>
925  
926    </target>
927  
928  
929  
930 <  <target name="jsr166xdocs"
931 <          description="Builds javadocs with custom tags to build folder">
996 <
997 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
998 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
999 <
1000 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1001 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1002 <    >
1003 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1004 <      <include name="jsr166x"/>
1005 <      </packageset>
930 >  <target name="extra166ydocs"
931 >          description="Builds javadocs with custom tags to build dir">
932  
933 +    <delete dir="${build.extra166yjavadocs.dir}"/>
934 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
935  
936 <    </javadoc>
936 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
937 >             packagenames="extra166y"
938 >             link="${jdkapidocs.url}"
939 >             source="${build.sourcelevel}"
940 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
941 >             additionalparam="-XDignore.symbol.file=true" />
942  
943    </target>
944  
945  
946 <  <target name="jsr166xdist"
947 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
946 >  <target name="extra166ydist"
947 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
948            description="Puts all distributable products in single hierarchy"/>
949  
950  
951  
952 <  <target name="jsr166xclean"
952 >  <target name="extra166yclean"
953            description="Removes all build products">
954  
955 <    <delete dir="${build.jsr166x.dir}"/>
956 <    <delete dir="${build.jsr166xlib.dir}"/>
955 >    <delete dir="${build.extra166y.dir}"/>
956 >    <delete dir="${build.extra166ylib.dir}"/>
957  
958    </target>
959  
960  
961  
962 <  <target name="jsr166xdist-clean"
962 >  <target name="extra166ydist-clean"
963            description="Removes all build and distribution products">
964  
965    </target>
966  
967 +  <target name="extra166ydist-docs"
968 +          description="Builds javadocs to dist dir">
969  
970 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
971 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
972  
973 <  <target name="jsr166xdist-docs"
974 <          description="Builds javadocs without custom tags to dist folder">
973 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
974 >             packagenames="extra166y"
975 >             link="${jdkapidocs.url}"
976 >             source="${build.sourcelevel}"
977 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
978 >             additionalparam="-XDignore.symbol.file=true" />
979  
980 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1040 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
980 >  </target>
981  
982 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
983 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
984 <              source="${build.sourcelevel}">
982 >  <target name="extra166ydist-jar"
983 >          depends="extra166yclean, extra166yjar">
984 >
985 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
986  
987 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1047 <      <include name="jsr166x"/>
1048 <      </packageset>
987 >  </target>
988  
989 +  <!-- jsr166e -->
990 +
991 +  <target name="jsr166ecompile"
992 +          depends="configure-compiler"
993 +          description="Compiles jsr166e sources">
994 +
995 +    <mkdir dir="${build.jsr166e.dir}"/>
996 +
997 +    <javac srcdir="${topsrc.dir}"
998 +           destdir="${build.jsr166e.dir}"
999 +           debug="${build.debug}"
1000 +           debuglevel="${build.debuglevel}"
1001 +           deprecation="${build.deprecation}"
1002 +           source="1.7"
1003 +           classpath=""
1004 +           includeAntRuntime="false"
1005 +           includeJavaRuntime="false"
1006 +           executable="${javac7}"
1007 +           fork="true">
1008 +
1009 +      <include name="jsr166e/**/*.java"/>
1010 +      <compilerarg line="${build.args}"/>
1011 +      <compilerarg value="-XDignore.symbol.file=true"/>
1012 +      <compilerarg value="-Xlint:all"/>
1013 +
1014 +    </javac>
1015 +
1016 +  </target>
1017 +
1018 +
1019 +
1020 +  <target name="jsr166ejar"
1021 +          depends="jsr166ecompile"
1022 +          description="Builds library jar from compiled sources">
1023 +
1024 +    <mkdir dir="${build.jsr166elib.dir}"/>
1025 +
1026 +    <jar destfile="${jsr166eproduct.jar}" index="true">
1027 +      <fileset dir="${build.jsr166e.dir}"/>
1028 +    </jar>
1029 +
1030 +  </target>
1031 +
1032 +
1033 +
1034 +  <target name="jsr166edocs"
1035 +          description="Builds javadocs with custom tags to build dir">
1036 +
1037 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
1038 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1039 +
1040 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
1041 +             packagenames="jsr166e,jsr166e.extra"
1042 +             link="${jdkapi7docs.url}"
1043 +             source="1.7"
1044 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1045 +             executable="${javadoc7}"
1046 +             additionalparam="-XDignore.symbol.file=true" >
1047 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1048 +        <include name="jsr166e/**/*.java"/>
1049 +      </fileset>
1050      </javadoc>
1051  
1052    </target>
1053  
1054  <target name="jsr166xdist-jar"
1055          depends="jsr166xclean, jsr166xjar">
1054  
1055 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1055 >  <target name="jsr166edist"
1056 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1057 >          description="Puts all distributable products in single hierarchy"/>
1058 >
1059 >
1060 >
1061 >  <target name="jsr166eclean"
1062 >          description="Removes all build products">
1063 >
1064 >    <delete dir="${build.jsr166e.dir}"/>
1065 >    <delete dir="${build.jsr166elib.dir}"/>
1066 >
1067 >  </target>
1068 >
1069 >
1070 >
1071 >  <target name="jsr166edist-clean"
1072 >          description="Removes all build and distribution products">
1073 >
1074 >  </target>
1075 >
1076 >  <target name="jsr166edist-docs"
1077 >          description="Builds javadocs to dist dir">
1078 >
1079 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1080 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1081 >
1082 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1083 >             packagenames="jsr166e,jsr166e.extra"
1084 >             link="${jdkapidocs.url}"
1085 >             source="1.7"
1086 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1087 >             additionalparam="-XDignore.symbol.file=true" />
1088 >
1089 >  </target>
1090 >
1091 >  <target name="jsr166edist-jar"
1092 >          depends="jsr166eclean, jsr166ejar">
1093 >
1094 >    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1095  
1096    </target>
1097  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines