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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines