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.133 by jsr166, Sun Feb 3 02:16:08 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 + As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26   ------------------------------------------------------------------------------
27    </description>
28  
29 <  <target name="usage" description="Advises user to run with -projecthelp">
30 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
29 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30 >    <java classname="org.apache.tools.ant.Main">
31 >      <arg value="-projecthelp" />
32 >    </java>
33    </target>
34  
35  
# Line 21 | Line 38
38  
39  
40    <!-- Compilation options -->
41 <  <property name="build.sourcelevel"    value="1.5"/>
41 >  <property name="build.sourcelevel"    value="6"/>
42    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>
45 +  <property name="build.javadoc.access" value="protected"/>
46  
47    <!-- Build locations -->
48 <  <property name="build.dir"            location="build"/>
49 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
50 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
51 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
52 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
53 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
54 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
55 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
56 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
57 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
58 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
59 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
60 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
61 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
62 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
63 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
64 <
65 <  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
66 <  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
67 <  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
48 >  <property name="build.dir"                   location="build"/>
49 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
50 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
51 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
52 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
53 >
54 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
55 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
56 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
57 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
58 >
59 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
60 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
63 >
64 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68 >
69 >  <!-- JDK locations -->
70 >  <property name="jdks.home"  location="${user.home}/jdk"/>
71 >
72 >  <macrodef name="defjdklocations">
73 >    <attribute name="v"/>
74 >    <sequential>
75 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
76 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
77 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
78 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
79 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
80 >    <local name="boot.jar.dir"/>
81 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
82 >    <path id="bootclasspath@{v}">
83 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
84 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
85 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
86 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
87 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
88 >    </path>
89 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
90 >    </sequential>
91 >  </macrodef>
92 >
93 >  <macrodef name="mirror-dir">
94 >    <attribute name="src"/>
95 >    <attribute name="dst"/>
96 >    <sequential>
97 >    <delete dir="@{dst}"/>
98 >    <mkdir dir="@{dst}"/>
99 >    <copy todir="@{dst}" preservelastmodified="true">
100 >      <fileset dir="@{src}"/>
101 >    </copy>
102 >    </sequential>
103 >  </macrodef>
104 >
105 >  <defjdklocations v="6"/>
106 >  <defjdklocations v="7"/>
107 >  <defjdklocations v="8"/>
108  
109    <!-- Source locations -->
110    <property name="src.dir"              location="${basedir}/src/main"/>
111    <property name="test.src.dir"         location="${basedir}/src/test"/>
54  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
112    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
113    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
114    <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"/>
115    <property name="lib.dir"              location="${basedir}/lib"/>
116    <property name="dist.dir"             location="${basedir}/dist"/>
117    <property name="topsrc.dir"           location="${basedir}/src"/>
118 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
119 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
120 <
121 <  <!-- Distribution locations -->
122 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
123 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
124 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
118 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
119 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
120 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
121 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
123 >
124 >  <!-- Javadoc locations -->
125 >  <property name="docs.dir"          location="${build.dir}/docs"/>
126 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131 >
132 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138  
139    <!-- Jar locations -->
140 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
141 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
142 <  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
143 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
144 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
145 <
146 <  <!-- Bootclasspath argument -->
147 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
140 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
141 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
142 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
143 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
144 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
145 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
146 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
147 >
148 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
149 >  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
150 >  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
151 >  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
152 >
153 >  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154 >  <!-- The below does not yet exist as of 2013-01 -->
155 >  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
156 >
157 >  <!-- Default jdk api doc location (latest stable release seems best) -->
158 >  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
159 >
160 >  <!-- Define the "jtreg" task -->
161 >  <!-- See the docs in "jtreg -onlineHelp" -->
162 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
163 >           classpath="${lib.dir}/jtreg.jar" />
164  
165    <!-- Test classpath -->
166    <path id="test.classpath">
# Line 84 | Line 168
168      <pathelement location="${junit.jar}"/>
169    </path>
170  
171 +  <macrodef name="run-tck-tests">
172 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173 +    <attribute name="source" default="6"/>
174 +    <attribute name="target"/>
175 +    <attribute name="workdir"/>
176 +    <attribute name="classes"/>
177 +    <attribute name="jvmflags" default=""/>
178 +    <element name="javac-elements" optional="true"/>
179 +    <sequential>
180 +
181 +    <mkdir dir="@{workdir}/tck-classes"/>
182 +
183 +    <javac srcdir="@{tck.src.dir}"
184 +           destdir="@{workdir}/tck-classes"
185 +           debug="${build.debug}"
186 +           debuglevel="${build.debuglevel}"
187 +           deprecation="${build.deprecation}"
188 +           source="@{source}"
189 +           classpath="${junit.jar}"
190 +           bootclasspath="@{classes}:${bootclasspath@{source}}"
191 +           includeAntRuntime="false"
192 +           includeJavaRuntime="false"
193 +           executable="${javac@{target}}"
194 +           fork="true">
195 +
196 +      <include name="*.java"/>
197 +      <compilerarg value="-XDignore.symbol.file=true"/>
198 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199 +      <compilerarg line="${build.args}"/>
200 +      <javac-elements/>
201 +
202 +    </javac>
203 +
204 +    <java classname="JSR166TestCase"
205 +          failonerror="true"
206 +          jvm="${java@{target}}"
207 +          fork="true">
208 +        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
209 +        <jvmarg line="@{jvmflags}"/>
210 +        <classpath>
211 +          <pathelement location="${junit.jar}"/>
212 +          <pathelement location="@{workdir}/tck-classes"/>
213 +        </classpath>
214 +    </java>
215 +
216 +    </sequential>
217 +  </macrodef>
218 +
219    <!-- ALoops classpath -->
220    <path id="loops.classpath">
221      <pathelement location="${build.loops.dir}"/>
222    </path>
223  
224 <  <!-- J1 classpath -->
225 <  <path id="j1.classpath">
226 <    <pathelement location="${build.classes.dir}"/>
95 <    <pathelement location="${build.j1.dir}"/>
96 <    <pathelement location="${junit.jar}"/>
97 <
98 <    <!-- Include dl.u.c for BoundedBuffer comparison -->
99 <    <pathelement location="${concurrent.jar}"/>
100 <  </path>
101 <
224 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
225 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
226 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
227  
228    <!-- Main targets -->
229  
230 +  <target name="dists"
231 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
232 +          description="Builds all public jars and docs"/>
233  
234    <target name="compile"
235 <          depends="init, configure-compiler"
236 <          description="Compiles main sources to build folder">
235 >          depends="configure-compiler"
236 >          description="Compiles src/main sources to build dir">
237  
238      <mkdir dir="${build.classes.dir}"/>
239  
240      <javac srcdir="${src.dir}"
241 <          destdir="${build.classes.dir}"
242 <            debug="${build.debug}"
243 <       debuglevel="${build.debuglevel}"
244 <      deprecation="${build.deprecation}"
245 <           source="${build.sourcelevel}"
246 <             fork="true">
241 >           destdir="${build.classes.dir}"
242 >           debug="${build.debug}"
243 >           debuglevel="${build.debuglevel}"
244 >           deprecation="${build.deprecation}"
245 >           classpath=""
246 >           includeAntRuntime="false"
247 >           includeJavaRuntime="false"
248 >           executable="${javac8}"
249 >           fork="true">
250  
251        <include name="**/*.java"/>
252 <      <compilerarg value="-XDignore.symbol.file"/>
253 <
254 < <!--
124 <      <exclude name="java/lang/**"/>
252 >      <compilerarg value="-Xprefer:source"/>
253 >      <compilerarg value="-XDignore.symbol.file=true"/>
254 >      <compilerarg value="-Xlint:all"/>
255        <compilerarg line="${build.args}"/>
126      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
127 -->
256  
257      </javac>
130
258    </target>
259  
260  
134
261    <target name="jar"
262            depends="compile"
263            description="Builds library jar from compiled sources">
264  
139    <mkdir dir="${build.lib.dir}"/>
140
265      <jar destfile="${product.jar}">
266        <fileset dir="${build.classes.dir}"/>
267      </jar>
144
268    </target>
269  
270  
148
271    <target name="test"
272 <          depends="init, configure-tests, report-tests"
272 >          depends="configure-tests, report-tests"
273            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
274  
275  
154
276    <target name="docs"
277 <          description="Builds javadocs with custom tags to build folder">
277 >          description="Builds javadocs for src/main to dist dir">
278  
279 <    <delete dir="${build.javadocs.dir}"/>
280 <    <mkdir dir="${build.javadocs.dir}"/>
279 >    <delete dir="${docs.dir}"/>
280 >    <mkdir dir="${docs.dir}"/>
281  
282 <    <javadoc destdir="${build.javadocs.dir}"
283 <                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 <    >          
166 <
167 <      <packageset dir="${src.dir}"/>
168 <
169 <    </javadoc>
282 >    <!-- the packagenames="none" hack below prevents scanning the -->
283 >    <!-- sourcepath for packages -->
284  
285 <  </target>
286 <
287 <
288 <
289 <  <target name="doccheck"
290 <          depends="filter-doccheck"
291 <          description="Reports on javadoc style errors">
292 <
293 <    <delete dir="${build.doccheck.dir}"/>
294 <    <mkdir dir="${build.doccheck.dir}"/>
295 <
296 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
297 <         docletpath="${lib.dir}/doccheck.jar"
298 <            destdir="${build.doccheck.dir}">
185 <      <packageset dir="${build.dc-filter.dir}"/>
285 >    <javadoc destdir="${docs.dir}"
286 >             packagenames="none"
287 >             link="${jdkapi8docs.url}"
288 >             overview="${src.dir}/intro.html"
289 >             access="${build.javadoc.access}"
290 >             sourcepath="${src.dir}:${jdk8src.dir}"
291 >             classpath=""
292 >             executable="${javadoc8}">
293 >      <fileset dir="${src.dir}" defaultexcludes="yes">
294 >        <include name="**/*.java"/>
295 >      </fileset>
296 >      <arg value="-XDignore.symbol.file=true"/>
297 >      <arg value="-tag"/>
298 >      <arg value="${javadoc.jls.option}"/>
299      </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
300    </target>
301  
302  
216
303    <target name="dist"
304 <          depends="init, dist-clean, dist-jar, dist-docs"
304 >          depends="dist-clean, dist-jar, dist-docs"
305            description="Puts all distributable products in single hierarchy"/>
306  
307  
222
308    <target name="release"
309            depends="dist"
310            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 235 | Line 320
320        <exclude name="**/SyntaxTest.java"/>
321        <exclude name="**/SuperfluousAbstract.java"/>
322      </jar>
238
323    </target>
324  
325  
242
326    <target name="clean"
327            description="Removes all build products">
328  
329      <delete dir="${build.dir}"/>
247    <delete dir="${build.classes.dir}"/>
248    <delete dir="${build.lib.dir}"/>
330  
331    </target>
332  
333  
253
334    <target name="dist-clean"
335            description="Removes all build and distribution products">
336  
# Line 259 | Line 339
339    </target>
340  
341  
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
342    <!-- Internal targets -->
343  
344  
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
345    <target name="dist-jar"
346            depends="clean, jar">
316
347      <copy file="${product.jar}" todir="${dist.dir}"/>
318
319  </target>
320
321
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
348    </target>
349  
350 <
351 <  <target name="filter-doccheck"
352 <          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 <
350 >  <target name="dist-docs"
351 >          depends="clean, docs">
352 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
353    </target>
354  
355  
# Line 436 | Line 359
359      <mkdir dir="${build.testcases.dir}"/>
360  
361      <javac srcdir="${tck.src.dir}"
362 <          destdir="${build.testcases.dir}"
363 <            debug="${build.debug}"
364 <       debuglevel="${build.debuglevel}"
365 <      deprecation="${build.deprecation}"
366 <           source="${build.sourcelevel}"
367 <             fork="true">
362 >           destdir="${build.testcases.dir}"
363 >           debug="${build.debug}"
364 >           debuglevel="${build.debuglevel}"
365 >           deprecation="${build.deprecation}"
366 >           source="6"
367 >           classpath="${junit.jar}"
368 >           bootclasspath="@{product.jar}:${bootclasspath6}"
369 >           includeAntRuntime="false"
370 >           includeJavaRuntime="false"
371 >           executable="${javac8}"
372 >           fork="true">
373  
374 <      <compilerarg value="${bootclasspath.args}"/>
374 >      <include name="**/*.java"/>
375 >      <compilerarg value="-XDignore.symbol.file=true"/>
376 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
377        <compilerarg line="${build.args}"/>
378  
449      <classpath refid="test.classpath"/>
450
379      </javac>
380  
381      <javac srcdir="${test.src.dir}"
382 <          destdir="${build.testcases.dir}"
383 <            debug="${build.debug}"
384 <       debuglevel="${build.debuglevel}"
385 <      deprecation="${build.deprecation}"
386 <           source="${build.sourcelevel}"
387 <             fork="true">
388 <
389 <      <include name="jsr166/test/**"/>
390 <
391 <      <compilerarg value="${bootclasspath.args}"/>
382 >           destdir="${build.testcases.dir}"
383 >           debug="${build.debug}"
384 >           debuglevel="${build.debuglevel}"
385 >           deprecation="${build.deprecation}"
386 >           source="6"
387 >           classpath=""
388 >           bootclasspath="@{product.jar}:${bootclasspath6}"
389 >           includeAntRuntime="false"
390 >           includeJavaRuntime="false"
391 >           executable="${javac8}"
392 >           fork="true">
393 >
394 >      <include name="jsr166/test/**/*.java"/>
395 >      <compilerarg value="-XDignore.symbol.file=true"/>
396 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
397        <compilerarg line="${build.args}"/>
398  
466      <classpath refid="test.classpath"/>
467
399      </javac>
400  
401   <!--
# Line 476 | Line 407
407             source="${build.sourcelevel}"
408               fork="true">
409  
410 <      <compilerarg value="${bootclasspath.args}"/>
410 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
411 >      <compilerarg value="-XDignore.symbol.file=true"/>
412        <compilerarg line="${build.args}"/>
413  
482      <classpath refid="test.classpath"/>
483
414      </javac>
415   -->
416  
417    </target>
418  
419 +  <target name="test-tck"
420 +          depends="jar"
421 +          description="Runs tck tests for main directly">
422 +
423 +    <run-tck-tests
424 +      target="8"
425 +      workdir="${build.dir}"
426 +      classes="${product.jar}"/>
427 +  </target>
428  
429    <target name="run-tests"
430            depends="compile-tests">
# Line 500 | Line 439
439            errorProperty="junit.failed"
440          failureProperty="junit.failed"
441                      dir="${build.reports.dir}"
442 +                    jvm="${java8}"
443                     fork="true">
444  
445 <      <jvmarg value="${bootclasspath.args}"/>
445 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
446        <jvmarg value="-server"/>
447        <jvmarg value="-showversion"/>
448  
# Line 550 | Line 490
490        <fileset dir="${build.reports.dir}">
491          <include name="TEST-*.xml"/>
492        </fileset>
493 <      <report styledir="${stylesheet.dir}"
554 <                format="${junit.report.format}"
555 <                 todir="${build.reports.dir}"
493 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
494        />
495      </junitreport>
496  
# Line 602 | Line 540
540    </target>
541  
542  
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
543    <!-- Various demos and test programs -->
544  
545  
546 <  <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"
546 >  <target name="loops" depends="configure-compiler"
547            description="Benchmark from Doug Lea's AQS paper">
548  
549      <mkdir dir="${build.loops.dir}"/>
# Line 701 | Line 558
558  
559        <compilerarg line="${build.args}"/>
560        <classpath refid="loops.classpath"/>
561 +      <compilerarg value="-XDignore.symbol.file=true"/>
562  
563      </javac>
564  
# Line 711 | Line 569
569    </target>
570  
571  
572 <  <target name="compile-j1" depends="init, configure-compiler, compile">
572 >  <!-- jsr166 4jdk7 -->
573  
574 <    <mkdir dir="${build.j1.dir}"/>
575 <
576 <    <javac srcdir="${j1.src.dir}"
577 <          destdir="${build.j1.dir}"
578 <            debug="${build.debug}"
579 <       debuglevel="${build.debuglevel}"
580 <      deprecation="${build.deprecation}"
581 <           source="${build.sourcelevel}" >
574 >  <target name="4jdk7compile"
575 >          depends="configure-compiler"
576 >          description="Compiles src/jdk7 sources, targeting jdk7">
577 >
578 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
579 >
580 >    <javac srcdir="${4jdk7src.dir}"
581 >           destdir="${build.4jdk7.classes.dir}"
582 >           debug="${build.debug}"
583 >           debuglevel="${build.debuglevel}"
584 >           deprecation="${build.deprecation}"
585 >           source="6"
586 >           classpath=""
587 >           bootclasspath="${bootclasspath6}"
588 >           includeAntRuntime="false"
589 >           includeJavaRuntime="false"
590 >           executable="${javac7}"
591 >           fork="true">
592  
593        <include name="**/*.java"/>
594 <      <exclude name="**/dijkstra/**"/>
595 <
594 >      <compilerarg value="-Xprefer:source"/>
595 >      <compilerarg value="-XDignore.symbol.file=true"/>
596 >      <compilerarg value="-Xlint:all"/>
597        <compilerarg line="${build.args}"/>
729      <classpath refid="j1.classpath"/>
598  
599      </javac>
732
600    </target>
601  
602  
603 <  <target name="sw" depends="compile-j1"
604 <          description="Runs the SwingWorker demo">
605 <
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"/>
603 >  <target name="4jdk7jar"
604 >          depends="4jdk7compile"
605 >          description="Builds library jar from compiled sources">
606  
607 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
608 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
609 <    </exec>
607 >    <jar destfile="${4jdk7product.jar}">
608 >      <fileset dir="${build.4jdk7.classes.dir}"/>
609 >    </jar>
610  
611    </target>
612  
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"/>
764
765      <!-- WebCrawler args -->
766      <!--
767      <arg value="jsr166.webcrawler.WebCrawler3"/>
768      <arg value="http://www.priorartisans.com"/>
769      <arg value="25"/>
770      -->
771
772    </java>
613  
614 +  <target name="4jdk7-test-tck"
615 +          depends="4jdk7jar"
616 +          description="Runs tck tests for jsr166-4jdk7 directly">
617 +
618 +    <run-tck-tests
619 +      target="7"
620 +      workdir="${build.4jdk7.dir}"
621 +      classes="${4jdk7product.jar}">
622 +      <javac-elements>
623 +        <exclude name="StampedLockTest.java"/>
624 +      </javac-elements>
625 +    </run-tck-tests>
626    </target>
627  
628  
629 <  <target name="test-j1" depends="compile-j1"
630 <          description="Runs testcases from the JavaOne source directories">
629 >  <target name="4jdk7-test-tck-junit"
630 >          depends="4jdk7compile"
631 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
632  
633      <junit printsummary="true"
634 <             showoutput="true"
635 <          errorProperty="junit.failed"
636 <        failureProperty="junit.failed"
637 <                    dir="${build.j1.dir}"
638 <                   fork="true">
634 >           showoutput="true"
635 >           errorProperty="junit.failed"
636 >           failureProperty="junit.failed"
637 >           includeantruntime="true"
638 >           jvm="${java7}"
639 >           fork="true">
640  
641 <      <!-- <jvmarg value="-server"/> -->
642 <      <classpath refid="j1.classpath"/>
789 <      <formatter type="xml"/>
641 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
642 >      <jvmarg value="-server"/>
643  
644 <      <batchtest todir="${build.j1.dir}">
645 <        <fileset dir="${j1.src.dir}">
646 <          <include name="**/*Test.java"/>
647 <        </fileset>
795 <      </batchtest>
644 >      <classpath>
645 >        <pathelement location="${junit.jar}"/>
646 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
647 >      </classpath>
648  
649 <    </junit>
649 >      <formatter type="brief"/>
650  
651 <    <available property="junit.report.format"
652 <                  value="frames"
801 <              classname="org.apache.xalan.lib.Redirect"/>
802 <    <property name="junit.report.format" value="noframes"/>
803 <
804 <    <junitreport todir="${build.j1.dir}">
805 <      <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>
651 >      <test name="JSR166TestCase" haltonfailure="no">
652 >      </test>
653  
654 <    <fail message="Test Cases Failed" if="junit.failed"/>
654 >    </junit>
655 >  </target>
656  
657 +  <target name="4jdk7-test-jtreg"
658 +          depends="4jdk7compile"
659 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
660 +    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
661 +    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
662 +    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
663 +    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
664 +    <jtreg dir="${jtreg.src.dir}"
665 +           jdk="${jdk7.home}"
666 +           workDir="${build.4jdk7.dir}/JTwork"
667 +           reportDir="${build.4jdk7.dir}/JTreport">
668 +
669 +      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
670 +      <arg value="-agentvm"/>
671 +      <arg value="-v:nopass,fail"/>
672 +      <arg value="-vmoptions:-esa -ea"/>
673 +      <arg value="-automatic"/>
674 +      <arg value="-k:!ignore"/>
675 +    </jtreg>
676    </target>
677  
678  
679 +  <target name="4jdk7-test"
680 +          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
681 +          description="Runs tck and jtreg tests for jsr166-4jdk7">
682 +  </target>
683  
820  <!-- C++ and JNI definitions and demos -->
684  
685 <  <target name="configure-cpp">
685 >  <target name="4jdk7docs"
686 >          description="Builds javadocs for src/jdk7 to dist dir">
687 >
688 >    <delete dir="${4jdk7docs.dir}"/>
689 >    <mkdir dir="${4jdk7docs.dir}"/>
690 >
691 >    <javadoc destdir="${4jdk7docs.dir}"
692 >             packagenames="none"
693 >             link="${jdkapi7docs.url}"
694 >             overview="${4jdk7src.dir}/intro.html"
695 >             access="${build.javadoc.access}"
696 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
697 >             classpath=""
698 >             executable="${javadoc7}">
699 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
700 >        <include name="**/*.java"/>
701 >      </fileset>
702 >      <arg value="-XDignore.symbol.file=true"/>
703 >    </javadoc>
704 >  </target>
705  
824    <!-- Define tasks and types -->
706  
707 <    <path id="cpptasks.path">
708 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
709 <    </path>
829 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
830 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
707 >  <target name="4jdk7dist"
708 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
709 >          description="Puts all distributable products in single hierarchy"/>
710  
832    <!-- Set platform property for JNI includes -->
711  
712 <    <condition property="platform" value="linux">
713 <      <os name="Linux"/>
714 <    </condition>
715 <    <condition property="platform" value="win32">
838 <      <os family="windows"/>
839 <    </condition>
840 <    <condition property="platform" value="solaris">
841 <      <os name="SunOS"/>
842 <    </condition>
712 >  <target name="4jdk7clean"
713 >          description="Removes all 4jdk7 build products">
714 >
715 >    <delete dir="${build.4jdk7.dir}"/>
716  
717    </target>
718  
719  
720 <  <target name="cppdemo" depends="configure-cpp">
720 >  <target name="4jdk7dist-clean"
721 >          description="Removes all build and distribution products">
722  
723 <    <mkdir dir="${build.dir}"/>
723 >  </target>
724  
725 <    <cc multithreaded="true"
726 <                 name="g++"
727 <               objdir="${build.dir}"
728 <              outfile="${build.dir}/CppDemo">
855 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
856 <      <libset libs="stdc++"/>
857 <    </cc>
725 >  <target name="4jdk7dist-jar"
726 >          depends="4jdk7clean, 4jdk7jar">
727 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
728 >  </target>
729  
859    <exec executable="${build.dir}/CppDemo">
860      <arg line="count in word frequency of word in command line count"/>
861    </exec>
730  
731 +  <target name="4jdk7dist-docs"
732 +          depends="4jdk7clean, 4jdk7docs">
733 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
734    </target>
735  
736  
737 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
737 >  <!-- jsr166x -->
738  
739 <    <mkdir dir="${build.testcases.dir}"/>
739 >  <target name="jsr166xcompile"
740 >          depends="configure-compiler"
741 >          description="Compiles jsr166x sources to build dir">
742  
743 <    <javac srcdir="${test.src.dir}"
871 <          destdir="${build.testcases.dir}"
872 <            debug="${build.debug}"
873 <       debuglevel="${build.debuglevel}"
874 <      deprecation="${build.deprecation}"
875 <           source="${build.sourcelevel}"
876 <             fork="true">
877 <      <compilerarg value="${bootclasspath.args}"/>
878 <      <compilerarg line="${build.args}"/>
879 <      <classpath refid="test.classpath"/>
880 <      <include name="JniDemo.java"/>
881 <    </javac>
743 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
744  
745 <    <javah destdir="${build.testcases.dir}"
746 <      classpathref="test.classpath">
747 <      <class name="JniDemo"/>
748 <    </javah>
749 <
750 <    <cc multithreaded="true"
751 <                 name="g++"
752 <               objdir="${build.dir}"
753 <              outfile="${build.dir}/JniDemo"
754 <              outtype="shared">
755 <
756 <      <compiler>
757 <        <defineset>
758 <          <define name="__int64" value="long long"/>
759 <        </defineset>
760 <        <includepath location="${java.home}/../include"/>
761 <        <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>
745 >    <javac srcdir="${topsrc.dir}"
746 >           destdir="${build.jsr166x.classes.dir}"
747 >           debug="${build.debug}"
748 >           debuglevel="${build.debuglevel}"
749 >           deprecation="${build.deprecation}"
750 >           classpath=""
751 >           bootclasspath="${bootclasspath6}"
752 >           source="5"
753 >           includeAntRuntime="false"
754 >           includeJavaRuntime="false"
755 >           executable="${javac7}"
756 >           fork="true">
757 >
758 >      <include name="jsr166x/**/*.java"/>
759 >      <compilerarg value="-XDignore.symbol.file=true"/>
760 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
761 >      <compilerarg line="${build.args}"/>
762  
763 +    </javac>
764    </target>
765  
766  
767 +  <target name="jsr166xjar"
768 +          depends="jsr166xcompile"
769 +          description="Builds library jar from compiled sources">
770  
771 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
772 <
771 >    <jar destfile="${jsr166x.jar}">
772 >      <fileset dir="${build.jsr166x.classes.dir}"/>
773 >    </jar>
774  
775 +  </target>
776  
933  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
934  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
935  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
936  <property name="pretiger.sourcelevel" value="1.4"/>
777  
778 <  <target name="defang"
779 <       depends="init"
940 <   description="Generates pre-Tiger compatible source">
778 >  <target name="jsr166xdocs"
779 >          description="Builds javadocs to dist dir">
780  
781 <    <delete dir="${pretiger.src.dir}"/>
782 <    <mkdir dir="${pretiger.src.dir}"/>
781 >    <delete dir="${jsr166xdocs.dir}"/>
782 >    <mkdir dir="${jsr166xdocs.dir}"/>
783  
784 <    <exec executable="perl">
785 <      <arg file="etc/defang.pl"/>
786 <      <!-- <arg value="-v"/> -->
787 <      <arg value="-s"/> <arg file="${src.dir}"/>
788 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
789 <    </exec>
784 >    <javadoc destdir="${jsr166xdocs.dir}"
785 >             packagenames="jsr166x.*"
786 >             link="${jdkapidocs.url}"
787 >             access="${build.javadoc.access}"
788 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
789 >             bootclasspath="${bootclasspath6}"
790 >             source="5"
791 >             executable="${javadoc7}">
792 >      <arg value="-XDignore.symbol.file=true"/>
793  
794 +    </javadoc>
795    </target>
796  
954  <target name="compile-pretiger"
955          depends="init, configure-compiler, defang"
956          description="Compiles pre-Tiger sources to build folder">
797  
798 <    <mkdir dir="${build.pretiger.dir}"/>
798 >  <target name="jsr166xdist"
799 >          depends="jsr166xdist-jar, jsr166xdist-docs"
800 >          description="Puts all distributable products in single hierarchy"/>
801  
960    <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">
802  
803 <      <compilerarg line="${build.args}"/>
804 <      <exclude name="**/Thread.java"/>
803 >  <target name="jsr166xclean"
804 >          description="Removes all jsr166x build products">
805  
806 <    </javac>
806 >    <delete dir="${build.jsr166x.dir}"/>
807  
808    </target>
809  
975  <target name="pretiger" depends="compile-pretiger">
810  
811 <    <mkdir dir="${build.lib.dir}"/>
811 >  <target name="jsr166xdist-clean"
812 >          description="Removes all build and distribution products">
813 >
814 >  </target>
815  
979    <jar destfile="${pretiger.jar}">
980      <fileset dir="${build.pretiger.dir}">
981      </fileset>
982    </jar>
816  
817 +  <target name="jsr166xdist-jar"
818 +          depends="jsr166xclean, jsr166xjar">
819 +    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
820    </target>
821  
822 <  <!-- jsr166x -->
822 >  <target name="jsr166xdist-docs"
823 >          depends="jsr166xclean, jsr166xdocs">
824 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
825 >  </target>
826  
827 +  <!-- jsr166y -->
828  
989  <target name="jsr166xcompile"
990          depends="init, configure-compiler"
991          description="Compiles jsr166x sources">
829  
830 <    <mkdir dir="${build.jsr166x.dir}"/>
830 >  <target name="jsr166ycompile"
831 >          depends="configure-compiler"
832 >          description="Compiles jsr166y sources">
833  
834 <    <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">
834 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
835  
836 <      <include name="**/*.java"/>
836 >    <javac srcdir="${topsrc.dir}"
837 >           destdir="${build.jsr166y.classes.dir}"
838 >           debug="${build.debug}"
839 >           debuglevel="${build.debuglevel}"
840 >           deprecation="${build.deprecation}"
841 >           source="6"
842 >           classpath=""
843 >           bootclasspath="${bootclasspath6}"
844 >           includeAntRuntime="false"
845 >           includeJavaRuntime="false"
846 >           executable="${javac7}"
847 >           fork="true">
848 >
849 >      <include name="jsr166y/**/*.java"/>
850 >      <compilerarg value="-XDignore.symbol.file=true"/>
851 >      <compilerarg value="-Xlint:all"/>
852        <compilerarg line="${build.args}"/>
853  
854      </javac>
1007
855    </target>
856  
857  
858 <
859 <  <target name="jsr166xjar"
1013 <          depends="jsr166xcompile"
858 >  <target name="jsr166yjar"
859 >          depends="jsr166ycompile"
860            description="Builds library jar from compiled sources">
861  
862 <    <mkdir dir="${build.jsr166xlib.dir}"/>
863 <
1018 <    <jar destfile="${jsr166xproduct.jar}">
1019 <      <fileset dir="${build.jsr166x.dir}"/>
862 >    <jar destfile="${jsr166y.jar}" index="true">
863 >      <fileset dir="${build.jsr166y.classes.dir}"/>
864      </jar>
865  
866    </target>
867  
868  
869 +  <target name="jsr166ydocs"
870 +          description="Builds javadocs to dist dir">
871  
872 <  <target name="jsr166xdocs"
873 <          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>
872 >    <delete dir="${jsr166ydocs.dir}"/>
873 >    <mkdir dir="${jsr166ydocs.dir}"/>
874  
875 +    <javadoc destdir="${jsr166ydocs.dir}"
876 +             packagenames="jsr166y.*"
877 +             link="${jdkapidocs.url}"
878 +             access="${build.javadoc.access}"
879 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
880 +             bootclasspath="${bootclasspath6}"
881 +             source="6"
882 +             executable="${javadoc7}">
883 +      <arg value="-XDignore.symbol.file=true"/>
884  
885      </javadoc>
1044
886    </target>
887  
888  
889 <  <target name="jsr166xdist"
890 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
889 >  <target name="jsr166ydist"
890 >          depends="jsr166ydist-jar, jsr166ydist-docs"
891            description="Puts all distributable products in single hierarchy"/>
892  
893  
894 +  <target name="jsr166yclean"
895 +          description="Removes all jsr166y build products">
896  
897 <  <target name="jsr166xclean"
1055 <          description="Removes all build products">
1056 <
1057 <    <delete dir="${build.jsr166x.dir}"/>
1058 <    <delete dir="${build.jsr166xlib.dir}"/>
897 >    <delete dir="${build.jsr166y.dir}"/>
898  
899    </target>
900  
901  
902 <
1064 <  <target name="jsr166xdist-clean"
902 >  <target name="jsr166ydist-clean"
903            description="Removes all build and distribution products">
904  
905    </target>
906  
907 +  <target name="jsr166ydist-jar"
908 +          depends="jsr166yclean, jsr166yjar">
909 +    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
910 +  </target>
911  
912 +  <target name="jsr166ydist-docs"
913 +          depends="jsr166yclean, jsr166ydocs">
914 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
915 +  </target>
916  
1071  <target name="jsr166xdist-docs"
1072          description="Builds javadocs without custom tags to dist folder">
917  
918 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1075 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
918 >  <!-- extra166y -->
919  
1077    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1078                link="http://java.sun.com/javase/6/docs/api/"
1079              source="${build.sourcelevel}">
1080
1081      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1082      <include name="jsr166x"/>
1083      </packageset>
920  
921 <    </javadoc>
921 >  <target name="extra166ycompile"
922 >          depends="configure-compiler, jsr166yjar"
923 >          description="Compiles extra166y sources">
924  
925 <  </target>
925 >    <mkdir dir="${build.extra166y.classes.dir}"/>
926  
927 <  <target name="jsr166xdist-jar"
928 <          depends="jsr166xclean, jsr166xjar">
927 >    <javac srcdir="${topsrc.dir}"
928 >           destdir="${build.extra166y.classes.dir}"
929 >           debug="${build.debug}"
930 >           debuglevel="${build.debuglevel}"
931 >           deprecation="${build.deprecation}"
932 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
933 >           classpath=""
934 >           source="6"
935 >           includeAntRuntime="false"
936 >           includeJavaRuntime="false"
937 >           executable="${javac7}"
938 >           fork="true">
939  
940 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
940 >      <include name="extra166y/**/*.java"/>
941 >      <compilerarg value="-XDignore.symbol.file=true"/>
942 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
943 >      <compilerarg line="${build.args}"/>
944  
945 +    </javac>
946    </target>
947  
1096  <!-- jsr166y -->
948  
949 +  <target name="extra166yjar"
950 +          depends="extra166ycompile"
951 +          description="Builds library jar from compiled sources">
952  
953 <  <target name="jsr166ycompile"
954 <          depends="init, configure-compiler"
955 <          description="Compiles jsr166y sources">
953 >    <jar destfile="${extra166y.jar}" index="true">
954 >      <fileset dir="${build.extra166y.classes.dir}"/>
955 >    </jar>
956  
957 <    <mkdir dir="${build.jsr166y.dir}"/>
957 >  </target>
958  
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">
959  
960 <      <include name="**/*.java"/>
961 <      <compilerarg line="${build.args}"/>
1115 <      <compilerarg value="${bootclasspath.args}"/>
960 >  <target name="extra166ydocs"
961 >          description="Builds javadocs to build dir">
962  
963 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
963 >    <delete dir="${extra166ydocs.dir}"/>
964 >    <mkdir dir="${extra166ydocs.dir}"/>
965  
966 <    </javac>
966 >    <javadoc destdir="${extra166ydocs.dir}"
967 >             packagenames="extra166y.*"
968 >             link="${jdkapidocs.url}"
969 >             access="${build.javadoc.access}"
970 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
971 >             bootclasspath="${bootclasspath6}"
972 >             source="6"
973 >             executable="${javadoc7}">
974 >      <arg value="-XDignore.symbol.file=true"/>
975  
976 +    </javadoc>
977    </target>
978  
979  
980 +  <target name="extra166ydist"
981 +          depends="extra166ydist-jar, extra166ydist-docs"
982 +          description="Puts all distributable products in single hierarchy"/>
983  
1125  <target name="jsr166yjar"
1126          depends="jsr166ycompile"
1127          description="Builds library jar from compiled sources">
984  
985 <    <mkdir dir="${build.jsr166ylib.dir}"/>
985 >  <target name="extra166yclean"
986 >          description="Removes all extra166y build products">
987  
988 <    <jar destfile="${jsr166yproduct.jar}">
1132 <      <fileset dir="${build.jsr166y.dir}"/>
1133 <    </jar>
988 >    <delete dir="${build.extra166y.dir}"/>
989  
990    </target>
991  
992  
993 +  <target name="extra166ydist-clean"
994 +          description="Removes all build and distribution products">
995  
996 <  <target name="jsr166ydocs"
1140 <          description="Builds javadocs with custom tags to build folder">
996 >  </target>
997  
998 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
999 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
998 >  <target name="extra166ydist-jar"
999 >          depends="extra166yclean, extra166yjar">
1000 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1001 >  </target>
1002 >
1003 >  <target name="extra166ydist-docs"
1004 >          depends="extra166yclean, extra166ydocs">
1005 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1006 >  </target>
1007 >
1008 >  <!-- jsr166e -->
1009 >
1010 >  <target name="jsr166ecompile"
1011 >          depends="configure-compiler"
1012 >          description="Compiles jsr166e sources">
1013 >
1014 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1015 >
1016 >    <javac srcdir="${topsrc.dir}"
1017 >           destdir="${build.jsr166e.classes.dir}"
1018 >           debug="${build.debug}"
1019 >           debuglevel="${build.debuglevel}"
1020 >           deprecation="${build.deprecation}"
1021 >           source="7"
1022 >           classpath=""
1023 >           includeAntRuntime="false"
1024 >           includeJavaRuntime="false"
1025 >           executable="${javac7}"
1026 >           fork="true">
1027 >
1028 >      <include name="jsr166e/**/*.java"/>
1029 >      <compilerarg value="-XDignore.symbol.file=true"/>
1030 >      <compilerarg value="-Xlint:all"/>
1031 >      <compilerarg line="${build.args}"/>
1032  
1033 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
1034 <                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>
1033 >    </javac>
1034 >  </target>
1035  
1036  
1037 <    </javadoc>
1037 >  <target name="jsr166ejar"
1038 >          depends="jsr166ecompile"
1039 >          description="Builds library jar from compiled sources">
1040 >
1041 >    <jar destfile="${jsr166e.jar}" index="true">
1042 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1043 >    </jar>
1044  
1045    </target>
1046  
1047  
1048 <  <target name="jsr166ydist"
1049 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
1162 <          description="Puts all distributable products in single hierarchy"/>
1048 >  <target name="jsr166edocs"
1049 >          description="Builds javadocs to build dir">
1050  
1051 +    <delete dir="${jsr166edocs.dir}"/>
1052 +    <mkdir dir="${jsr166edocs.dir}"/>
1053  
1054 +    <javadoc destdir="${jsr166edocs.dir}"
1055 +             packagenames="jsr166e.*"
1056 +             link="${jdkapidocs.url}"
1057 +             access="${build.javadoc.access}"
1058 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1059 +             source="7"
1060 +             executable="${javadoc7}">
1061 +      <arg value="-XDignore.symbol.file=true"/>
1062  
1063 <  <target name="jsr166yclean"
1064 <          description="Removes all build products">
1063 >    </javadoc>
1064 >  </target>
1065  
1169    <delete dir="${build.jsr166y.dir}"/>
1170    <delete dir="${build.jsr166ylib.dir}"/>
1066  
1067 +  <target name="jsr166e-test-tck"
1068 +          depends="jsr166ejar"
1069 +          description="Runs tck tests for jsr166e">
1070 +
1071 +    <run-tck-tests
1072 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1073 +      source="7"
1074 +      target="8"
1075 +      workdir="${build.jsr166e.dir}"
1076 +      classes="${jsr166e.jar}"/>
1077    </target>
1078  
1079  
1080 +  <target name="jsr166edist"
1081 +          depends="jsr166edist-jar, jsr166edist-docs"
1082 +          description="Puts all distributable products in single hierarchy"/>
1083  
1176  <target name="jsr166ydist-clean"
1177          description="Removes all build and distribution products">
1084  
1085 +  <target name="jsr166eclean"
1086 +          description="Removes all jsr166e build products">
1087 +    <delete dir="${build.jsr166e.dir}"/>
1088    </target>
1089  
1181  <target name="jsr166ydist-docs"
1182          description="Builds javadocs without custom tags to dist folder">
1090  
1091 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
1092 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
1091 >  <target name="jsr166edist-clean"
1092 >          description="Removes all build and distribution products">
1093  
1094 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
1188 <                link="http://java.sun.com/javase/6/docs/api/"
1189 <              source="${build.sourcelevel}">
1190 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1191 <      <include name="jsr166y/*.java"/>
1192 <      <include name="jsr166y/forkjoin/*.java"/>
1193 <            </fileset>
1194 <    </javadoc>
1094 >  </target>
1095  
1096 +  <target name="jsr166edist-jar"
1097 +          depends="jsr166eclean, jsr166ejar">
1098 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1099    </target>
1100  
1101 <  <target name="jsr166ydist-jar"
1102 <          depends="jsr166yclean, jsr166yjar">
1101 >  <target name="jsr166edist-docs"
1102 >          depends="jsr166eclean, jsr166edocs">
1103 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1104 >  </target>
1105  
1201    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
1106  
1107 + <!-- Find buglets that can be detected by static build tools -->
1108 +
1109 +  <target name="lint">
1110 +    <antcall target="dists">
1111 +      <param name="build.javadoc.access" value="private"/>
1112 +    </antcall>
1113    </target>
1114  
1115 +
1116   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines