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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines