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.74 by dl, Thu Sep 13 11:19:25 2007 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.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"/>
58 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
59 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
60 <
61 <  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
62 <  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
63 <  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
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"/>
54  <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"/>
58  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
59  <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="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
103 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
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"/>
110 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
111 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
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="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
119 <  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
120 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
121 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
122 <
123 <  <!-- Bootclasspath argument -->
124 <  <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 84 | Line 145
145      <pathelement location="${junit.jar}"/>
146    </path>
147  
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 <  <!-- J1 classpath -->
199 <  <path id="j1.classpath">
200 <    <pathelement location="${build.classes.dir}"/>
201 <    <pathelement location="${build.j1.dir}"/>
202 <    <pathelement location="${junit.jar}"/>
203 <
98 <    <!-- Include dl.u.c for BoundedBuffer comparison -->
99 <    <pathelement location="${concurrent.jar}"/>
100 <  </path>
101 <
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">
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"/>
230 <
123 < <!--
124 <      <exclude name="java/lang/**"/>
229 >      <compilerarg value="-XDignore.symbol.file=true"/>
230 >      <compilerarg value="-Xlint:all"/>
231        <compilerarg line="${build.args}"/>
126      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
127 -->
232  
233      </javac>
130
234    </target>
235  
236  
134
237    <target name="jar"
238            depends="compile"
239            description="Builds library jar from compiled sources">
240  
139    <mkdir dir="${build.lib.dir}"/>
140
241      <jar destfile="${product.jar}">
242        <fileset dir="${build.classes.dir}"/>
243      </jar>
144
244    </target>
245  
246  
148
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  
154
252    <target name="docs"
253 <          description="Builds javadocs with custom tags to build folder">
157 <
158 <    <delete dir="${build.javadocs.dir}"/>
159 <    <mkdir dir="${build.javadocs.dir}"/>
253 >          description="Builds javadocs for src/main to dist dir">
254  
255 <    <javadoc destdir="${build.javadocs.dir}"
256 <                link="http://java.sun.com/javase/6/docs/api/"
163 <            overview="${src.dir}/intro.html"
164 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
165 <    >          
255 >    <delete dir="${dist.javadocs.dir}"/>
256 >    <mkdir dir="${dist.javadocs.dir}"/>
257  
258 <      <packageset dir="${src.dir}"/>
258 >    <!-- the packagenames="none" hack below prevents scanning the -->
259 >    <!-- sourcepath for packages -->
260  
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>
170
276    </target>
277  
278  
174
175  <target name="doccheck"
176          depends="filter-doccheck"
177          description="Reports on javadoc style errors">
178
179    <delete dir="${build.doccheck.dir}"/>
180    <mkdir dir="${build.doccheck.dir}"/>
181
182    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
183         docletpath="${lib.dir}/doccheck.jar"
184            destdir="${build.doccheck.dir}">
185      <packageset dir="${build.dc-filter.dir}"/>
186    </javadoc>
187
188    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
189
190  </target>
191
192
193
194  <target name="checkstyle"
195          depends="filter-src"
196          description="Reports on style errors in Java source (verbose, mostly chaff)">
197
198    <taskdef resource="checkstyletask.properties"
199            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
200
201    <mkdir dir="${build.checkstyle.dir}"/>
202
203    <checkstyle config="etc/checkstyle/sun_checks.xml"
204       failOnViolation="false">
205      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
206      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
207    </checkstyle>
208
209    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
210          out="${build.checkstyle.dir}/checkstyle-report.html"
211        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
212
213  </target>
214
215
216
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  
222
284    <target name="release"
285            depends="dist"
286            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 235 | Line 296
296        <exclude name="**/SyntaxTest.java"/>
297        <exclude name="**/SuperfluousAbstract.java"/>
298      </jar>
238
299    </target>
300  
301  
242
302    <target name="clean"
303            description="Removes all build products">
304  
305      <delete dir="${build.dir}"/>
247    <delete dir="${build.classes.dir}"/>
248    <delete dir="${build.lib.dir}"/>
306  
307    </target>
308  
309  
253
310    <target name="dist-clean"
311            description="Removes all build and distribution products">
312  
# Line 259 | Line 315
315    </target>
316  
317  
262
263  <target name="dist-docs"
264          description="Builds javadocs without custom tags to dist folder">
265
266    <delete dir="${dist.javadocs.dir}"/>
267    <mkdir dir="${dist.javadocs.dir}"/>
268
269    <javadoc destdir="${dist.javadocs.dir}"
270            link="http://java.sun.com/javase/6/docs/api/"
271            overview="${src.dir}/intro.html"
272
273            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
274     >
275 <!--
276      <packageset dir="${src.dir}" defaultexcludes="yes">
277      <include name="java/util/concurrent"/>
278      <include name="java/util/concurrent/atomic"/>
279      <include name="java/util/concurrent/locks"/>
280      </packageset>
281 -->
282      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
283      <include name="main/java/util/concurrent/*.java"/>
284      <include name="main/java/util/concurrent/atomic/*.java"/>
285      <include name="main/java/util/concurrent/locks/*.java"/>
286      <include name="main/java/util/*.java"/>
287 <!--
288      <include name="main/java/util/concurrent/*.html"/>
289      <include name="main/java/util/concurrent/atomic/*.html"/>
290      <include name="main/java/util/concurrent/locks/*.html"/>
291      <include name="main/java/util/*.html"/>
292 -->
293 <!--      <include name="jsr166x/*.java"/> -->
294      </fileset>
295    </javadoc>
296
297  </target>
298
299
300
318    <!-- Internal targets -->
319  
320  
304  <target name="init">
305
306    <!-- Version is kept in a separate file -->
307    <loadfile property="version" srcFile="version.properties"/>
308    <echo>Building JSR-166 version ${version}</echo>
309    <echo>java.home is ${java.home}</echo>
310
311  </target>
312
313
321    <target name="dist-jar"
322            depends="clean, jar">
323  
# Line 319 | Line 326
326    </target>
327  
328  
322  <target name="compile-ant-filter"
323          depends="init">
324
325    <mkdir dir="${build.ant.dir}"/>
326
327    <javac srcdir="${ant.src.dir}"
328          destdir="${build.ant.dir}"
329           source="1.4"/>
330
331  </target>
332
333
334  <target name="filter-src"
335          depends="compile-ant-filter">
336
337    <mkdir dir="${build.filter.src.dir}"/>
338
339    <copy todir="${build.filter.src.dir}">
340      <fileset dir="${src.dir}">
341        <include name="**/*.html"/>
342      </fileset>
343    </copy>
344
345    <copy todir="${build.filter.src.dir}">
346      <fileset dir="${src.dir}">
347        <exclude name="**/*.html"/>
348        <!-- Files excluded from dist-docs -->
349        <exclude name="java/util/Random.*"/>
350        <exclude name="sun/misc/Unsafe.*"/>
351      </fileset>
352      <!--
353      <filterchain>
354      -->
355
356        <!--
357         # This filter gets rid of angle-bracketed type parameters
358         # so that javadoc can run on the result. The following
359         # heuristic seems to work:
360         #
361         # For all lines not starting with space(s)-asterisk-space(s),
362         #   replace <something> with a space, where there may be more
363         #   than one right angle bracket at the end, and "something"
364         #   must not contain parens or pipes. (This may need some
365         #   tweaking.)
366         -->
367
368        <!--
369        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                      classpath="${build.ant.dir}">
371          <param name="notmatching" value="^\s+\*\s.*$"/>
372          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
373          <param name="replacement" value=" "/>
374        </filterreader>
375        -->
376
377      <!--
378      </filterchain>
379      -->
380    </copy>
381
382  </target>
383
384
385  <target name="filter-doccheck"
386          depends="filter-src">
387
388    <mkdir dir="${build.dc-filter.dir}"/>
389
390    <copy todir="${build.dc-filter.dir}">
391      <fileset dir="${build.filter.src.dir}">
392        <include name="**/*.html"/>
393      </fileset>
394    </copy>
395
396    <property name="generic.declarations"
397             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 {}"
398    />
399
400    <copy todir="${build.dc-filter.dir}">
401      <fileset dir="${build.filter.src.dir}">
402        <exclude name="**/*.html"/>
403      </fileset>
404      <filterchain>
405        <!--
406         # These two filters try to make the source look like
407         # something that doccheck can process. The first removes
408         # -source 1.4 assertions and the second adds in a bunch
409         # of single letter public nested marker interfaces so that
410         # the generic type parameters are recognized.
411         -->
412
413        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
414                      classpath="${build.ant.dir}">
415          <param name="matching"    value="^\s*assert[\s ].*$"/>
416          <param name="pattern"     value="assert"/>
417          <param name="replacement" value="//assert"/>
418        </filterreader>
419
420        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
421                      classpath="${build.ant.dir}">
422          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
423          <param name="pattern"     value="$"/>
424          <param name="replacement" value=" ${generic.declarations}"/>
425        </filterreader>
426
427      </filterchain>
428    </copy>
429
430  </target>
431
432
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">
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 <      <compilerarg value="${bootclasspath.args}"/>
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}"/>
352  
449      <classpath refid="test.classpath"/>
450
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}"/>
373  
466      <classpath refid="test.classpath"/>
467
374      </javac>
375  
376   <!--
# Line 476 | 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}"/>
388  
482      <classpath refid="test.classpath"/>
483
389      </javac>
390   -->
391  
# Line 500 | 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  
# Line 550 | Line 456
456        <fileset dir="${build.reports.dir}">
457          <include name="TEST-*.xml"/>
458        </fileset>
459 <      <report styledir="${stylesheet.dir}"
554 <                format="${junit.report.format}"
555 <                 todir="${build.reports.dir}"
459 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
460        />
461      </junitreport>
462  
# Line 602 | Line 506
506    </target>
507  
508  
605
606  <!-- Anthill targets -->
607
608  <target name="anthill-build">
609
610    <!-- Override this in user.properties -->
611    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
612
613    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
614      <arg value="-Xmx256000000"/>
615      <!-- classpath of new JVM -->
616      <arg value="-classpath"/> <arg path="${java.class.path}"/>
617      <!-- location of Ant home directory -->
618      <arg value="-Dant.home=${ant.home}"/>
619      <!-- the Ant main class -->
620      <arg value="org.apache.tools.ant.Main"/>
621      <!-- The build file -->
622      <arg value="-buildfile"/>  <arg value="build.xml"/>
623      <!-- the target to build on the new Ant instance -->
624      <arg value="-DJAVA_HOME=${tiger.home}"/>
625      <arg value="do-anthill-build"/>
626    </exec>
627  </target>
628
629  <target name="do-anthill-build"
630          depends="jar, test, docs, dist-docs"/>
631
632  <target name="anthill-publish">
633
634    <copy todir="${deployDir}/docs/private">
635      <fileset dir="${build.javadocs.dir}"/>
636    </copy>
637
638    <copy todir="${deployDir}/docs/public">
639      <fileset dir="${dist.javadocs.dir}"/>
640    </copy>
641
642    <copy tofile="${deployDir}/index.html"
643          file="${basedir}/etc/anthill-index.html"/>
644
645    <copy todir="${deployDir}/notes">
646      <fileset dir="${basedir}/etc/notes"/>
647    </copy>
648
649  </target>
650
651
652
509    <!-- Various demos and test programs -->
510  
511  
512 <  <target name="sample" depends="init, configure-compiler"
657 <          description="Standalone demo program">
658 <
659 <    <mkdir dir="${build.testcases.dir}"/>
660 <
661 <    <javac srcdir="${test.src.dir}"
662 <          destdir="${build.testcases.dir}"
663 <            debug="${build.debug}"
664 <       debuglevel="${build.debuglevel}"
665 <      deprecation="${build.deprecation}"
666 <           source="${build.sourcelevel}"
667 <             fork="true">
668 <
669 <      <include name="jsr166/test/Sample.java"/>
670 <
671 <    </javac>
672 <
673 <    <copy todir="${build.testcases.dir}">
674 <      <fileset dir="${test.src.dir}">
675 <        <include name="**/*.properties"/>
676 <      </fileset>
677 <    </copy>
678 <
679 <
680 <    <java classname="jsr166.test.Sample" fork="true">
681 <      <classpath refid="test.classpath"/>
682 <      <!-- <jvmarg value="-ea"/> -->
683 <      <!-- <jvmarg value="-server"/> -->
684 <      <!-- <arg value="1000"/> -->
685 <    </java>
686 <  </target>
687 <
688 <
689 <  <target name="loops" depends="init, configure-compiler"
512 >  <target name="loops" depends="configure-compiler"
513            description="Benchmark from Doug Lea's AQS paper">
514  
515      <mkdir dir="${build.loops.dir}"/>
# Line 701 | Line 524
524  
525        <compilerarg line="${build.args}"/>
526        <classpath refid="loops.classpath"/>
527 +      <compilerarg value="-XDignore.symbol.file=true"/>
528  
529      </javac>
530  
# Line 711 | Line 535
535    </target>
536  
537  
538 <  <target name="compile-j1" depends="init, configure-compiler, compile">
538 >  <!-- jsr166 4jdk7 -->
539  
540 <    <mkdir dir="${build.j1.dir}"/>
541 <
542 <    <javac srcdir="${j1.src.dir}"
543 <          destdir="${build.j1.dir}"
544 <            debug="${build.debug}"
545 <       debuglevel="${build.debuglevel}"
546 <      deprecation="${build.deprecation}"
547 <           source="${build.sourcelevel}" >
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 <      <exclude name="**/dijkstra/**"/>
560 <
559 >      <bootclasspath path="${bootclasspath6}"/>
560 >      <compilerarg value="-XDignore.symbol.file=true"/>
561 >      <compilerarg value="-Xlint:all"/>
562        <compilerarg line="${build.args}"/>
729      <classpath refid="j1.classpath"/>
563  
564      </javac>
732
565    </target>
566  
567  
568 <  <target name="sw" depends="compile-j1"
569 <          description="Runs the SwingWorker demo">
570 <
739 <    <!--
740 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
741 <      <classpath refid="j1.classpath"/>
742 <    </java>
743 <    -->
744 <
745 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
568 >  <target name="4jdk7-jar"
569 >          depends="4jdk7compile"
570 >          description="Builds library jar from compiled sources">
571  
572 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
573 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
574 <    </exec>
572 >    <jar destfile="${4jdk7product.jar}">
573 >      <fileset dir="${build.4jdk7.classes.dir}"/>
574 >    </jar>
575  
576    </target>
577  
753  <target name="j1" depends="compile-j1"
754          description="Runs a standalone JavaOne program">
755
756    <java classname="${j1.test}" fork="true">
757      <classpath refid="j1.classpath"/>
758      <jvmarg value="-client"/>
759
760      <!-- TestPseudoRandom args -->
761      <arg value="2"/>
762      <arg value="25"/>
763      <arg value="100000"/>
578  
579 <      <!-- WebCrawler args -->
580 <      <!--
581 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
768 <      <arg value="http://www.priorartisans.com"/>
769 <      <arg value="25"/>
770 <      -->
771 <
772 <    </java>
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="test-j1" depends="compile-j1"
591 <          description="Runs testcases from the JavaOne source directories">
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="-server"/> -->
603 <      <classpath refid="j1.classpath"/>
789 <      <formatter type="xml"/>
602 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
603 >      <jvmarg value="-server"/>
604  
605 <      <batchtest todir="${build.j1.dir}">
606 <        <fileset dir="${j1.src.dir}">
607 <          <include name="**/*Test.java"/>
608 <        </fileset>
795 <      </batchtest>
605 >      <classpath>
606 >        <pathelement location="${junit.jar}"/>
607 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
608 >      </classpath>
609  
610 <    </junit>
610 >      <formatter type="brief"/>
611  
612 <    <available property="junit.report.format"
613 <                  value="frames"
801 <              classname="org.apache.xalan.lib.Redirect"/>
802 <    <property name="junit.report.format" value="noframes"/>
612 >      <test name="JSR166TestCase" haltonfailure="no">
613 >      </test>
614  
615 <    <junitreport todir="${build.j1.dir}">
616 <      <fileset dir="${build.j1.dir}">
806 <        <include name="TEST-*.xml"/>
807 <      </fileset>
808 <      <report styledir="${stylesheet.dir}"
809 <                format="${junit.report.format}"
810 <                 todir="${build.j1.dir}"
811 <      />
812 <    </junitreport>
813 <
814 <    <fail message="Test Cases Failed" if="junit.failed"/>
615 >    </junit>
616 >  </target>
617  
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  
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  
820  <!-- C++ and JNI definitions and demos -->
645  
646 <  <target name="configure-cpp">
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 >    </javadoc>
665 >  </target>
666  
824    <!-- Define tasks and types -->
667  
668 <    <path id="cpptasks.path">
669 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
670 <    </path>
829 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
830 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
668 >  <target name="4jdk7dist"
669 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
670 >          description="Puts all distributable products in single hierarchy"/>
671  
832    <!-- Set platform property for JNI includes -->
672  
673 <    <condition property="platform" value="linux">
674 <      <os name="Linux"/>
675 <    </condition>
676 <    <condition property="platform" value="win32">
838 <      <os family="windows"/>
839 <    </condition>
840 <    <condition property="platform" value="solaris">
841 <      <os name="SunOS"/>
842 <    </condition>
673 >  <target name="4jdk7clean"
674 >          description="Removes all 4jdk7 build products">
675 >
676 >    <delete dir="${build.4jdk7.dir}"/>
677  
678    </target>
679  
680  
681 <  <target name="cppdemo" depends="configure-cpp">
681 >  <target name="4jdk7dist-clean"
682 >          description="Removes all build and distribution products">
683  
684 <    <mkdir dir="${build.dir}"/>
684 >  </target>
685  
686 <    <cc multithreaded="true"
687 <                 name="g++"
853 <               objdir="${build.dir}"
854 <              outfile="${build.dir}/CppDemo">
855 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
856 <      <libset libs="stdc++"/>
857 <    </cc>
686 >  <target name="4jdk7dist-jar"
687 >          depends="4jdk7clean, 4jdk7-jar">
688  
689 <    <exec executable="${build.dir}/CppDemo">
860 <      <arg line="count in word frequency of word in command line count"/>
861 <    </exec>
689 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
690  
691    </target>
692  
693  
694 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
694 >  <!-- jsr166x -->
695  
696 <    <mkdir dir="${build.testcases.dir}"/>
696 >  <target name="jsr166xcompile"
697 >          depends="configure-compiler"
698 >          description="Compiles jsr166x sources to build dir">
699  
700 <    <javac srcdir="${test.src.dir}"
701 <          destdir="${build.testcases.dir}"
702 <            debug="${build.debug}"
703 <       debuglevel="${build.debuglevel}"
704 <      deprecation="${build.deprecation}"
705 <           source="${build.sourcelevel}"
706 <             fork="true">
707 <      <compilerarg value="${bootclasspath.args}"/>
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"/>
880 <      <include name="JniDemo.java"/>
719 >
720      </javac>
721 +  </target>
722  
883    <javah destdir="${build.testcases.dir}"
884      classpathref="test.classpath">
885      <class name="JniDemo"/>
886    </javah>
887
888    <cc multithreaded="true"
889                 name="g++"
890               objdir="${build.dir}"
891              outfile="${build.dir}/JniDemo"
892              outtype="shared">
893
894      <compiler>
895        <defineset>
896          <define name="__int64" value="long long"/>
897        </defineset>
898        <includepath location="${java.home}/../include"/>
899        <includepath location="${java.home}/../include/${platform}"/>
900        <compilerarg value="-mno-cygwin"/>
901      </compiler>
902
903      <linker>
904        <linkerarg value="--add-stdcall-alias"/>
905      </linker>
906
907      <includepath location="${build.testcases.dir}"/>
908
909      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
910
911      <libset libs="stdc++"/>
912
913    </cc>
914
915    <!-- Necessary if windows, harmless if not -->
916    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
917
918    <java classname="JniDemo" fork="true">
919      <!-- Watch out: path separator hardwired to semicolon here! -->
920      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
921      <classpath refid="test.classpath"/>
922      <arg line="count in word frequency of word in command line count"/>
923    </java>
723  
724 <  </target>
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 +  </target>
733  
929  <!-- Backward compatibility, work in progress (some files not checked in) -->
734  
735 +  <target name="jsr166xdocs"
736 +          description="Builds javadocs to dist dir">
737  
738 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
739 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
740  
741 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
742 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
743 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
744 <  <property name="pretiger.sourcelevel" value="1.4"/>
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 <  <target name="defang"
752 <       depends="init"
940 <   description="Generates pre-Tiger compatible source">
751 >    </javadoc>
752 >  </target>
753  
942    <delete dir="${pretiger.src.dir}"/>
943    <mkdir dir="${pretiger.src.dir}"/>
754  
755 <    <exec executable="perl">
756 <      <arg file="etc/defang.pl"/>
757 <      <!-- <arg value="-v"/> -->
948 <      <arg value="-s"/> <arg file="${src.dir}"/>
949 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
950 <    </exec>
755 >  <target name="jsr166xdist"
756 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
757 >          description="Puts all distributable products in single hierarchy"/>
758  
952  </target>
759  
760 <  <target name="compile-pretiger"
761 <          depends="init, configure-compiler, defang"
956 <          description="Compiles pre-Tiger sources to build folder">
760 >  <target name="jsr166xclean"
761 >          description="Removes all jsr166x build products">
762  
763 <    <mkdir dir="${build.pretiger.dir}"/>
763 >    <delete dir="${build.jsr166x.dir}"/>
764  
765 <    <javac srcdir="${pretiger.src.dir}"
961 <          destdir="${build.pretiger.dir}"
962 <            debug="${build.debug}"
963 <       debuglevel="${build.debuglevel}"
964 <      deprecation="${build.deprecation}"
965 <           source="${pretiger.sourcelevel}"
966 <             fork="true">
765 >  </target>
766  
968      <compilerarg line="${build.args}"/>
969      <exclude name="**/Thread.java"/>
767  
768 <    </javac>
768 >  <target name="jsr166xdist-clean"
769 >          description="Removes all build and distribution products">
770  
771    </target>
772  
975  <target name="pretiger" depends="compile-pretiger">
773  
774 <    <mkdir dir="${build.lib.dir}"/>
774 >  <target name="jsr166xdist-jar"
775 >          depends="jsr166xclean, jsr166x-jar">
776  
777 <    <jar destfile="${pretiger.jar}">
980 <      <fileset dir="${build.pretiger.dir}">
981 <      </fileset>
982 <    </jar>
777 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
778  
779    </target>
780  
781 <  <!-- jsr166x -->
987 <
781 >  <!-- jsr166y -->
782  
989  <target name="jsr166xcompile"
990          depends="init, configure-compiler"
991          description="Compiles jsr166x sources">
783  
784 <    <mkdir dir="${build.jsr166x.dir}"/>
784 >  <target name="jsr166ycompile"
785 >          depends="configure-compiler"
786 >          description="Compiles jsr166y sources">
787  
788 <    <javac srcdir="${jsr166xsrc.dir}"
996 <          destdir="${build.jsr166x.dir}"
997 <            debug="${build.debug}"
998 <       debuglevel="${build.debuglevel}"
999 <      deprecation="${build.deprecation}"
1000 <           source="${build.sourcelevel}"
1001 <             fork="true">
788 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
789  
790 <      <include name="**/*.java"/>
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}"/>
807  
808      </javac>
1007
809    </target>
810  
811  
812 <
813 <  <target name="jsr166xjar"
1013 <          depends="jsr166xcompile"
812 >  <target name="jsr166y-jar"
813 >          depends="jsr166ycompile"
814            description="Builds library jar from compiled sources">
815  
816 <    <mkdir dir="${build.jsr166xlib.dir}"/>
817 <
1018 <    <jar destfile="${jsr166xproduct.jar}">
1019 <      <fileset dir="${build.jsr166x.dir}"/>
816 >    <jar destfile="${jsr166y.jar}" index="true">
817 >      <fileset dir="${build.jsr166y.classes.dir}"/>
818      </jar>
819  
820    </target>
821  
822  
823 +  <target name="jsr166ydocs"
824 +          description="Builds javadocs to dist dir">
825  
826 <  <target name="jsr166xdocs"
827 <          description="Builds javadocs with custom tags to build folder">
1028 <
1029 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
1030 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1031 <
1032 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1033 <             link="http://java.sun.com/javase/6/docs/api/"
1034 <
1035 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1036 <
1037 <    >
1038 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039 <      <include name="jsr166x"/>
1040 <      </packageset>
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>
1044
840    </target>
841  
842  
843 <  <target name="jsr166xdist"
844 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
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 <  <target name="jsr166xclean"
1055 <          description="Removes all build products">
1056 <
1057 <    <delete dir="${build.jsr166x.dir}"/>
1058 <    <delete dir="${build.jsr166xlib.dir}"/>
851 >    <delete dir="${build.jsr166y.dir}"/>
852  
853    </target>
854  
855  
856 <
1064 <  <target name="jsr166xdist-clean"
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 name="jsr166xdist-docs"
1072 <          description="Builds javadocs without custom tags to dist folder">
866 >  </target>
867  
1074    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1075    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
868  
869 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1078 <                link="http://java.sun.com/javase/6/docs/api/"
1079 <              source="${build.sourcelevel}">
869 >  <!-- extra166y -->
870  
1081      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1082      <include name="jsr166x"/>
1083      </packageset>
871  
872 <    </javadoc>
872 >  <target name="extra166ycompile"
873 >          depends="configure-compiler, jsr166y-jar"
874 >          description="Compiles extra166y sources">
875  
876 <  </target>
876 >    <mkdir dir="${build.extra166y.classes.dir}"/>
877  
878 <  <target name="jsr166xdist-jar"
879 <          depends="jsr166xclean, jsr166xjar">
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 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
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  
1096  <!-- jsr166y -->
900  
901 +  <target name="extra166y-jar"
902 +          depends="extra166ycompile"
903 +          description="Builds library jar from compiled sources">
904  
905 <  <target name="jsr166ycompile"
906 <          depends="init, configure-compiler"
907 <          description="Compiles jsr166y sources">
905 >    <jar destfile="${extra166y.jar}" index="true">
906 >      <fileset dir="${build.extra166y.classes.dir}"/>
907 >    </jar>
908  
909 <    <mkdir dir="${build.jsr166y.dir}"/>
909 >  </target>
910  
1105    <javac srcdir="${jsr166ysrc.dir}"
1106          destdir="${build.jsr166y.dir}"
1107            debug="${build.debug}"
1108       debuglevel="${build.debuglevel}"
1109      deprecation="${build.deprecation}"
1110           source="${build.sourcelevel}"
1111             fork="true">
911  
912 <      <include name="**/*.java"/>
913 <      <compilerarg line="${build.args}"/>
1115 <      <compilerarg value="${bootclasspath.args}"/>
912 >  <target name="extra166ydocs"
913 >          description="Builds javadocs to build dir">
914  
915 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
915 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
916 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
917  
918 <    </javac>
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  
1125  <target name="jsr166yjar"
1126          depends="jsr166ycompile"
1127          description="Builds library jar from compiled sources">
936  
937 <    <mkdir dir="${build.jsr166ylib.dir}"/>
937 >  <target name="extra166yclean"
938 >          description="Removes all extra166y build products">
939  
940 <    <jar destfile="${jsr166yproduct.jar}">
1132 <      <fileset dir="${build.jsr166y.dir}"/>
1133 <    </jar>
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 name="jsr166ydocs"
1140 <          description="Builds javadocs with custom tags to build folder">
948 >  </target>
949  
950 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
951 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
950 >  <target name="extra166ydist-jar"
951 >          depends="extra166yclean, extra166y-jar">
952  
953 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
1146 <                link="http://java.sun.com/javase/6/docs/api/"
1147 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1148 <
1149 <    >
1150 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
1151 <      <include name="jsr166y"/>
1152 <      </packageset>
953 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
954  
955 +  </target>
956  
957 <    </javadoc>
957 >  <!-- jsr166e -->
958  
959 <  </target>
959 >  <target name="jsr166ecompile"
960 >          depends="configure-compiler"
961 >          description="Compiles jsr166e sources">
962  
963 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
964  
965 <  <target name="jsr166ydist"
966 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
967 <          description="Puts all distributable products in single hierarchy"/>
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  
1166  <target name="jsr166yclean"
1167          description="Removes all build products">
985  
986 <    <delete dir="${build.jsr166y.dir}"/>
987 <    <delete dir="${build.jsr166ylib.dir}"/>
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  
994    </target>
995  
996  
997 +  <target name="jsr166edocs"
998 +          description="Builds javadocs to build dir">
999  
1000 <  <target name="jsr166ydist-clean"
1001 <          description="Removes all build and distribution products">
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  
1181  <target name="jsr166ydist-docs"
1182          description="Builds javadocs without custom tags to dist folder">
1015  
1016 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
1017 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
1016 >  <target name="jsr166edist"
1017 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1018 >          description="Puts all distributable products in single hierarchy"/>
1019  
1020 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
1021 <                link="http://java.sun.com/javase/6/docs/api/"
1022 <              source="${build.sourcelevel}">
1023 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1024 <      <include name="jsr166y/*.java"/>
1192 <      <include name="jsr166y/forkjoin/*.java"/>
1193 <            </fileset>
1194 <    </javadoc>
1020 >
1021 >  <target name="jsr166eclean"
1022 >          description="Removes all jsr166e build products">
1023 >
1024 >    <delete dir="${build.jsr166e.dir}"/>
1025  
1026    </target>
1027  
1198  <target name="jsr166ydist-jar"
1199          depends="jsr166yclean, jsr166yjar">
1028  
1029 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
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  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines