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.73 by dl, Tue Nov 8 00:13:41 2005 UTC vs.
Revision 1.134 by jsr166, Sun Feb 3 02:25:01 2013 UTC

# Line 8 | Line 8
8  
9    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.
11 +
12 +  The repository contains all dependencies except for ant and the JDK
13 +  itself.  Because the JDK version matters and because different
14 +  targets require different JDKs, we assume that users have created a
15 +  hierarchy containing:
16 +  $HOME/jdk/jdk6
17 +  $HOME/jdk/jdk7
18 +  $HOME/jdk/jdk8
19 +  where each of the above is a JDK or a symlink to same, and
20 +  $HOME/jdk/src/jdk6
21 +  $HOME/jdk/src/jdk7
22 +  $HOME/jdk/src/jdk8
23 +  where each of the above is a complete JDK source tree
24 +  (e.g. mercurial forest) or a symlink to same.
25 + 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"/>
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"/>
50  <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"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <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 <
120 <  <!-- Distribution locations -->
121 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
122 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
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="junit.jar"            location="${lib.dir}/junit.jar"/>
143 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
144 <
145 <  <!-- Bootclasspath argument -->
146 <  <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 77 | 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}"/>
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 <
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 < <!--
253 <      <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}"/>
117      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
118 -->
256  
257      </javac>
121
258    </target>
259  
260  
125
261    <target name="jar"
262            depends="compile"
263            description="Builds library jar from compiled sources">
264  
130    <mkdir dir="${build.lib.dir}"/>
131
265      <jar destfile="${product.jar}">
266        <fileset dir="${build.classes.dir}"/>
267      </jar>
135
268    </target>
269  
270  
139
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  
145
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/j2se/1.5.0/docs/api"
154 <            overview="${src.dir}/intro.html"
155 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
156 <    >          
282 >    <!-- the packagenames="none" hack below prevents scanning the -->
283 >    <!-- sourcepath for packages -->
284  
285 <      <packageset dir="${src.dir}"/>
286 <
287 <    </javadoc>
288 <
289 <  </target>
290 <
291 <
292 <
293 <  <target name="doccheck"
294 <          depends="filter-doccheck"
295 <          description="Reports on javadoc style errors">
296 <
297 <    <delete dir="${build.doccheck.dir}"/>
298 <    <mkdir dir="${build.doccheck.dir}"/>
172 <
173 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
174 <         docletpath="${lib.dir}/doccheck.jar"
175 <            destdir="${build.doccheck.dir}">
176 <      <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>
178
179    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
180
181  </target>
182
183
184
185  <target name="checkstyle"
186          depends="filter-src"
187          description="Reports on style errors in Java source (verbose, mostly chaff)">
188
189    <taskdef resource="checkstyletask.properties"
190            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
191
192    <mkdir dir="${build.checkstyle.dir}"/>
193
194    <checkstyle config="etc/checkstyle/sun_checks.xml"
195       failOnViolation="false">
196      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
197      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
198    </checkstyle>
199
200    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
201          out="${build.checkstyle.dir}/checkstyle-report.html"
202        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
203
300    </target>
301  
302  
207
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  
213
308    <target name="release"
309            depends="dist"
310            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 226 | Line 320
320        <exclude name="**/SyntaxTest.java"/>
321        <exclude name="**/SuperfluousAbstract.java"/>
322      </jar>
229
323    </target>
324  
325  
233
326    <target name="clean"
327            description="Removes all build products">
328  
329      <delete dir="${build.dir}"/>
238    <delete dir="${build.classes.dir}"/>
239    <delete dir="${build.lib.dir}"/>
330  
331    </target>
332  
333  
244
334    <target name="dist-clean"
335            description="Removes all build and distribution products">
336  
# Line 250 | Line 339
339    </target>
340  
341  
253
254  <target name="dist-docs"
255          description="Builds javadocs without custom tags to dist folder">
256
257    <delete dir="${dist.javadocs.dir}"/>
258    <mkdir dir="${dist.javadocs.dir}"/>
259
260    <javadoc destdir="${dist.javadocs.dir}"
261              link="http://java.sun.com/j2se/1.5.0/docs/api"
262            overview="${src.dir}/intro.html"
263
264            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
265     >
266      <packageset dir="${src.dir}" defaultexcludes="yes">
267      <include name="java/util/concurrent"/>
268      <include name="java/util/concurrent/atomic"/>
269      <include name="java/util/concurrent/locks"/>
270      </packageset>
271      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
272      <include name="main/java/util/*.java"/>
273      <include name="main/java/util/*.html"/>
274 <!--      <include name="jsr166x/*.java"/> -->
275      </fileset>
276    </javadoc>
277
278  </target>
279
280
281
342    <!-- Internal targets -->
343  
344  
285  <target name="init">
286
287    <!-- Version is kept in a separate file -->
288    <loadfile property="version" srcFile="version.properties"/>
289    <echo>Building JSR-166 version ${version}</echo>
290    <echo>java.home is ${java.home}</echo>
291
292  </target>
293
294
345    <target name="dist-jar"
346            depends="clean, jar">
297
347      <copy file="${product.jar}" todir="${dist.dir}"/>
299
348    </target>
349  
350 <
351 <  <target name="compile-ant-filter"
352 <          depends="init">
305 <
306 <    <mkdir dir="${build.ant.dir}"/>
307 <
308 <    <javac srcdir="${ant.src.dir}"
309 <          destdir="${build.ant.dir}"
310 <           source="1.4"/>
311 <
312 <  </target>
313 <
314 <
315 <  <target name="filter-src"
316 <          depends="compile-ant-filter">
317 <
318 <    <mkdir dir="${build.filter.src.dir}"/>
319 <
320 <    <copy todir="${build.filter.src.dir}">
321 <      <fileset dir="${src.dir}">
322 <        <include name="**/*.html"/>
323 <      </fileset>
324 <    </copy>
325 <
326 <    <copy todir="${build.filter.src.dir}">
327 <      <fileset dir="${src.dir}">
328 <        <exclude name="**/*.html"/>
329 <        <!-- Files excluded from dist-docs -->
330 <        <exclude name="java/util/Random.*"/>
331 <        <exclude name="sun/misc/Unsafe.*"/>
332 <      </fileset>
333 <      <!--
334 <      <filterchain>
335 <      -->
336 <
337 <        <!--
338 <         # This filter gets rid of angle-bracketed type parameters
339 <         # so that javadoc can run on the result. The following
340 <         # heuristic seems to work:
341 <         #
342 <         # For all lines not starting with space(s)-asterisk-space(s),
343 <         #   replace <something> with a space, where there may be more
344 <         #   than one right angle bracket at the end, and "something"
345 <         #   must not contain parens or pipes. (This may need some
346 <         #   tweaking.)
347 <         -->
348 <
349 <        <!--
350 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
351 <                      classpath="${build.ant.dir}">
352 <          <param name="notmatching" value="^\s+\*\s.*$"/>
353 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
354 <          <param name="replacement" value=" "/>
355 <        </filterreader>
356 <        -->
357 <
358 <      <!--
359 <      </filterchain>
360 <      -->
361 <    </copy>
362 <
363 <  </target>
364 <
365 <
366 <  <target name="filter-doccheck"
367 <          depends="filter-src">
368 <
369 <    <mkdir dir="${build.dc-filter.dir}"/>
370 <
371 <    <copy todir="${build.dc-filter.dir}">
372 <      <fileset dir="${build.filter.src.dir}">
373 <        <include name="**/*.html"/>
374 <      </fileset>
375 <    </copy>
376 <
377 <    <property name="generic.declarations"
378 <             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 {}"
379 <    />
380 <
381 <    <copy todir="${build.dc-filter.dir}">
382 <      <fileset dir="${build.filter.src.dir}">
383 <        <exclude name="**/*.html"/>
384 <      </fileset>
385 <      <filterchain>
386 <        <!--
387 <         # These two filters try to make the source look like
388 <         # something that doccheck can process. The first removes
389 <         # -source 1.4 assertions and the second adds in a bunch
390 <         # of single letter public nested marker interfaces so that
391 <         # the generic type parameters are recognized.
392 <         -->
393 <
394 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
395 <                      classpath="${build.ant.dir}">
396 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
397 <          <param name="pattern"     value="assert"/>
398 <          <param name="replacement" value="//assert"/>
399 <        </filterreader>
400 <
401 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
402 <                      classpath="${build.ant.dir}">
403 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
404 <          <param name="pattern"     value="$"/>
405 <          <param name="replacement" value=" ${generic.declarations}"/>
406 <        </filterreader>
407 <
408 <      </filterchain>
409 <    </copy>
410 <
350 >  <target name="dist-docs"
351 >          depends="clean, docs">
352 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
353    </target>
354  
355  
# Line 417 | 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  
430      <classpath refid="test.classpath"/>
431
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  
447      <classpath refid="test.classpath"/>
448
399      </javac>
400  
401   <!--
# Line 457 | 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  
463      <classpath refid="test.classpath"/>
464
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 481 | 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 531 | Line 490
490        <fileset dir="${build.reports.dir}">
491          <include name="TEST-*.xml"/>
492        </fileset>
493 <      <report styledir="${stylesheet.dir}"
535 <                format="${junit.report.format}"
536 <                 todir="${build.reports.dir}"
493 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
494        />
495      </junitreport>
496  
# Line 583 | Line 540
540    </target>
541  
542  
586
587  <!-- Anthill targets -->
588
589  <target name="anthill-build">
590
591    <!-- Override this in user.properties -->
592    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
593
594    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
595      <arg value="-Xmx256000000"/>
596      <!-- classpath of new JVM -->
597      <arg value="-classpath"/> <arg path="${java.class.path}"/>
598      <!-- location of Ant home directory -->
599      <arg value="-Dant.home=${ant.home}"/>
600      <!-- the Ant main class -->
601      <arg value="org.apache.tools.ant.Main"/>
602      <!-- The build file -->
603      <arg value="-buildfile"/>  <arg value="build.xml"/>
604      <!-- the target to build on the new Ant instance -->
605      <arg value="-DJAVA_HOME=${tiger.home}"/>
606      <arg value="do-anthill-build"/>
607    </exec>
608  </target>
609
610  <target name="do-anthill-build"
611          depends="jar, test, docs, dist-docs"/>
612
613  <target name="anthill-publish">
614
615    <copy todir="${deployDir}/docs/private">
616      <fileset dir="${build.javadocs.dir}"/>
617    </copy>
618
619    <copy todir="${deployDir}/docs/public">
620      <fileset dir="${dist.javadocs.dir}"/>
621    </copy>
622
623    <copy tofile="${deployDir}/index.html"
624          file="${basedir}/etc/anthill-index.html"/>
625
626    <copy todir="${deployDir}/notes">
627      <fileset dir="${basedir}/etc/notes"/>
628    </copy>
629
630  </target>
631
632
633
543    <!-- Various demos and test programs -->
544  
545  
546 <  <target name="sample" depends="init, configure-compiler"
638 <          description="Standalone demo program">
639 <
640 <    <mkdir dir="${build.testcases.dir}"/>
641 <
642 <    <javac srcdir="${test.src.dir}"
643 <          destdir="${build.testcases.dir}"
644 <            debug="${build.debug}"
645 <       debuglevel="${build.debuglevel}"
646 <      deprecation="${build.deprecation}"
647 <           source="${build.sourcelevel}"
648 <             fork="true">
649 <
650 <      <include name="jsr166/test/Sample.java"/>
651 <
652 <    </javac>
653 <
654 <    <copy todir="${build.testcases.dir}">
655 <      <fileset dir="${test.src.dir}">
656 <        <include name="**/*.properties"/>
657 <      </fileset>
658 <    </copy>
659 <
660 <
661 <    <java classname="jsr166.test.Sample" fork="true">
662 <      <classpath refid="test.classpath"/>
663 <      <!-- <jvmarg value="-ea"/> -->
664 <      <!-- <jvmarg value="-server"/> -->
665 <      <!-- <arg value="1000"/> -->
666 <    </java>
667 <  </target>
668 <
669 <
670 <  <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 682 | 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 692 | Line 569
569    </target>
570  
571  
572 <  <target name="compile-j1" depends="init, configure-compiler, compile">
696 <
697 <    <mkdir dir="${build.j1.dir}"/>
572 >  <!-- jsr166 4jdk7 -->
573  
574 <    <javac srcdir="${j1.src.dir}"
575 <          destdir="${build.j1.dir}"
576 <            debug="${build.debug}"
577 <       debuglevel="${build.debuglevel}"
578 <      deprecation="${build.deprecation}"
579 <           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}"/>
710      <classpath refid="j1.classpath"/>
598  
599      </javac>
600 +  </target>
601 +
602 +
603 +  <target name="4jdk7jar"
604 +          depends="4jdk7compile"
605 +          description="Builds library jar from compiled sources">
606 +
607 +    <jar destfile="${4jdk7product.jar}">
608 +      <fileset dir="${build.4jdk7.classes.dir}"/>
609 +    </jar>
610  
611    </target>
612  
613  
614 <  <target name="sw" depends="compile-j1"
615 <          description="Runs the SwingWorker demo">
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 >        <!-- JDK8+ test classes -->
624 >        <exclude name="StampedLockTest.java"/>
625 >      </javac-elements>
626 >    </run-tck-tests>
627 >  </target>
628  
720    <!--
721    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
722      <classpath refid="j1.classpath"/>
723    </java>
724    -->
629  
630 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
630 >  <target name="4jdk7-test-tck-junit"
631 >          depends="4jdk7compile"
632 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
633  
634 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
635 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
636 <    </exec>
634 >    <junit printsummary="true"
635 >           showoutput="true"
636 >           errorProperty="junit.failed"
637 >           failureProperty="junit.failed"
638 >           includeantruntime="true"
639 >           jvm="${java7}"
640 >           fork="true">
641 >
642 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
643 >      <jvmarg value="-server"/>
644 >
645 >      <classpath>
646 >        <pathelement location="${junit.jar}"/>
647 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
648 >      </classpath>
649 >
650 >      <formatter type="brief"/>
651 >
652 >      <test name="JSR166TestCase" haltonfailure="no">
653 >      </test>
654  
655 +    </junit>
656    </target>
657  
658 <  <target name="j1" depends="compile-j1"
659 <          description="Runs a standalone JavaOne program">
658 >  <target name="4jdk7-test-jtreg"
659 >          depends="4jdk7compile"
660 >          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
661 >    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
662 >    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
663 >    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
664 >    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
665 >    <jtreg dir="${jtreg.src.dir}"
666 >           jdk="${jdk7.home}"
667 >           workDir="${build.4jdk7.dir}/JTwork"
668 >           reportDir="${build.4jdk7.dir}/JTreport">
669 >
670 >      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
671 >      <arg value="-agentvm"/>
672 >      <arg value="-v:nopass,fail"/>
673 >      <arg value="-vmoptions:-esa -ea"/>
674 >      <arg value="-automatic"/>
675 >      <arg value="-k:!ignore"/>
676 >    </jtreg>
677 >  </target>
678  
737    <java classname="${j1.test}" fork="true">
738      <classpath refid="j1.classpath"/>
739      <jvmarg value="-client"/>
679  
680 <      <!-- TestPseudoRandom args -->
681 <      <arg value="2"/>
682 <      <arg value="25"/>
683 <      <arg value="100000"/>
680 >  <target name="4jdk7-test"
681 >          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
682 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
683 >  </target>
684  
746      <!-- WebCrawler args -->
747      <!--
748      <arg value="jsr166.webcrawler.WebCrawler3"/>
749      <arg value="http://www.priorartisans.com"/>
750      <arg value="25"/>
751      -->
685  
686 <    </java>
686 >  <target name="4jdk7docs"
687 >          description="Builds javadocs for src/jdk7 to dist dir">
688 >
689 >    <delete dir="${4jdk7docs.dir}"/>
690 >    <mkdir dir="${4jdk7docs.dir}"/>
691 >
692 >    <javadoc destdir="${4jdk7docs.dir}"
693 >             packagenames="none"
694 >             link="${jdkapi7docs.url}"
695 >             overview="${4jdk7src.dir}/intro.html"
696 >             access="${build.javadoc.access}"
697 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
698 >             classpath=""
699 >             executable="${javadoc7}">
700 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
701 >        <include name="**/*.java"/>
702 >      </fileset>
703 >      <arg value="-XDignore.symbol.file=true"/>
704 >    </javadoc>
705 >  </target>
706 >
707 >
708 >  <target name="4jdk7dist"
709 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
710 >          description="Puts all distributable products in single hierarchy"/>
711 >
712 >
713 >  <target name="4jdk7clean"
714 >          description="Removes all 4jdk7 build products">
715 >
716 >    <delete dir="${build.4jdk7.dir}"/>
717  
718    </target>
719  
720  
721 <  <target name="test-j1" depends="compile-j1"
722 <          description="Runs testcases from the JavaOne source directories">
721 >  <target name="4jdk7dist-clean"
722 >          description="Removes all build and distribution products">
723  
724 <    <junit printsummary="true"
762 <             showoutput="true"
763 <          errorProperty="junit.failed"
764 <        failureProperty="junit.failed"
765 <                    dir="${build.j1.dir}"
766 <                   fork="true">
724 >  </target>
725  
726 <      <!-- <jvmarg value="-server"/> -->
727 <      <classpath refid="j1.classpath"/>
728 <      <formatter type="xml"/>
726 >  <target name="4jdk7dist-jar"
727 >          depends="4jdk7clean, 4jdk7jar">
728 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
729 >  </target>
730  
772      <batchtest todir="${build.j1.dir}">
773        <fileset dir="${j1.src.dir}">
774          <include name="**/*Test.java"/>
775        </fileset>
776      </batchtest>
731  
732 <    </junit>
732 >  <target name="4jdk7dist-docs"
733 >          depends="4jdk7clean, 4jdk7docs">
734 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
735 >  </target>
736  
780    <available property="junit.report.format"
781                  value="frames"
782              classname="org.apache.xalan.lib.Redirect"/>
783    <property name="junit.report.format" value="noframes"/>
737  
738 <    <junitreport todir="${build.j1.dir}">
786 <      <fileset dir="${build.j1.dir}">
787 <        <include name="TEST-*.xml"/>
788 <      </fileset>
789 <      <report styledir="${stylesheet.dir}"
790 <                format="${junit.report.format}"
791 <                 todir="${build.j1.dir}"
792 <      />
793 <    </junitreport>
738 >  <!-- jsr166x -->
739  
740 <    <fail message="Test Cases Failed" if="junit.failed"/>
740 >  <target name="jsr166xcompile"
741 >          depends="configure-compiler"
742 >          description="Compiles jsr166x sources to build dir">
743 >
744 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
745  
746 +    <javac srcdir="${topsrc.dir}"
747 +           destdir="${build.jsr166x.classes.dir}"
748 +           debug="${build.debug}"
749 +           debuglevel="${build.debuglevel}"
750 +           deprecation="${build.deprecation}"
751 +           classpath=""
752 +           bootclasspath="${bootclasspath6}"
753 +           source="5"
754 +           includeAntRuntime="false"
755 +           includeJavaRuntime="false"
756 +           executable="${javac7}"
757 +           fork="true">
758 +
759 +      <include name="jsr166x/**/*.java"/>
760 +      <compilerarg value="-XDignore.symbol.file=true"/>
761 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
762 +      <compilerarg line="${build.args}"/>
763 +
764 +    </javac>
765    </target>
766  
767  
768 +  <target name="jsr166xjar"
769 +          depends="jsr166xcompile"
770 +          description="Builds library jar from compiled sources">
771  
772 <  <!-- C++ and JNI definitions and demos -->
772 >    <jar destfile="${jsr166x.jar}">
773 >      <fileset dir="${build.jsr166x.classes.dir}"/>
774 >    </jar>
775  
776 <  <target name="configure-cpp">
776 >  </target>
777  
805    <!-- Define tasks and types -->
778  
779 <    <path id="cpptasks.path">
780 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
809 <    </path>
810 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
811 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
779 >  <target name="jsr166xdocs"
780 >          description="Builds javadocs to dist dir">
781  
782 <    <!-- Set platform property for JNI includes -->
782 >    <delete dir="${jsr166xdocs.dir}"/>
783 >    <mkdir dir="${jsr166xdocs.dir}"/>
784  
785 <    <condition property="platform" value="linux">
786 <      <os name="Linux"/>
787 <    </condition>
788 <    <condition property="platform" value="win32">
789 <      <os family="windows"/>
790 <    </condition>
791 <    <condition property="platform" value="solaris">
792 <      <os name="SunOS"/>
793 <    </condition>
785 >    <javadoc destdir="${jsr166xdocs.dir}"
786 >             packagenames="jsr166x.*"
787 >             link="${jdkapidocs.url}"
788 >             access="${build.javadoc.access}"
789 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
790 >             bootclasspath="${bootclasspath6}"
791 >             source="5"
792 >             executable="${javadoc7}">
793 >      <arg value="-XDignore.symbol.file=true"/>
794  
795 +    </javadoc>
796    </target>
797  
798  
799 <  <target name="cppdemo" depends="configure-cpp">
799 >  <target name="jsr166xdist"
800 >          depends="jsr166xdist-jar, jsr166xdist-docs"
801 >          description="Puts all distributable products in single hierarchy"/>
802  
830    <mkdir dir="${build.dir}"/>
803  
804 <    <cc multithreaded="true"
805 <                 name="g++"
834 <               objdir="${build.dir}"
835 <              outfile="${build.dir}/CppDemo">
836 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
837 <      <libset libs="stdc++"/>
838 <    </cc>
804 >  <target name="jsr166xclean"
805 >          description="Removes all jsr166x build products">
806  
807 <    <exec executable="${build.dir}/CppDemo">
841 <      <arg line="count in word frequency of word in command line count"/>
842 <    </exec>
807 >    <delete dir="${build.jsr166x.dir}"/>
808  
809    </target>
810  
811  
812 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
812 >  <target name="jsr166xdist-clean"
813 >          description="Removes all build and distribution products">
814  
815 <    <mkdir dir="${build.testcases.dir}"/>
815 >  </target>
816  
851    <javac srcdir="${test.src.dir}"
852          destdir="${build.testcases.dir}"
853            debug="${build.debug}"
854       debuglevel="${build.debuglevel}"
855      deprecation="${build.deprecation}"
856           source="${build.sourcelevel}"
857             fork="true">
858      <compilerarg value="${bootclasspath.args}"/>
859      <compilerarg line="${build.args}"/>
860      <classpath refid="test.classpath"/>
861      <include name="JniDemo.java"/>
862    </javac>
817  
818 <    <javah destdir="${build.testcases.dir}"
819 <      classpathref="test.classpath">
820 <      <class name="JniDemo"/>
821 <    </javah>
868 <
869 <    <cc multithreaded="true"
870 <                 name="g++"
871 <               objdir="${build.dir}"
872 <              outfile="${build.dir}/JniDemo"
873 <              outtype="shared">
874 <
875 <      <compiler>
876 <        <defineset>
877 <          <define name="__int64" value="long long"/>
878 <        </defineset>
879 <        <includepath location="${java.home}/../include"/>
880 <        <includepath location="${java.home}/../include/${platform}"/>
881 <        <compilerarg value="-mno-cygwin"/>
882 <      </compiler>
883 <
884 <      <linker>
885 <        <linkerarg value="--add-stdcall-alias"/>
886 <      </linker>
887 <
888 <      <includepath location="${build.testcases.dir}"/>
889 <
890 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
891 <
892 <      <libset libs="stdc++"/>
893 <
894 <    </cc>
895 <
896 <    <!-- Necessary if windows, harmless if not -->
897 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
898 <
899 <    <java classname="JniDemo" fork="true">
900 <      <!-- Watch out: path separator hardwired to semicolon here! -->
901 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
902 <      <classpath refid="test.classpath"/>
903 <      <arg line="count in word frequency of word in command line count"/>
904 <    </java>
818 >  <target name="jsr166xdist-jar"
819 >          depends="jsr166xclean, jsr166xjar">
820 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
821 >  </target>
822  
823 +  <target name="jsr166xdist-docs"
824 +          depends="jsr166xclean, jsr166xdocs">
825 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
826    </target>
827  
828 +  <!-- jsr166y -->
829 +
830 +
831 +  <target name="jsr166ycompile"
832 +          depends="configure-compiler"
833 +          description="Compiles jsr166y sources">
834 +
835 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
836 +
837 +    <javac srcdir="${topsrc.dir}"
838 +           destdir="${build.jsr166y.classes.dir}"
839 +           debug="${build.debug}"
840 +           debuglevel="${build.debuglevel}"
841 +           deprecation="${build.deprecation}"
842 +           source="6"
843 +           classpath=""
844 +           bootclasspath="${bootclasspath6}"
845 +           includeAntRuntime="false"
846 +           includeJavaRuntime="false"
847 +           executable="${javac7}"
848 +           fork="true">
849 +
850 +      <include name="jsr166y/**/*.java"/>
851 +      <compilerarg value="-XDignore.symbol.file=true"/>
852 +      <compilerarg value="-Xlint:all"/>
853 +      <compilerarg line="${build.args}"/>
854 +
855 +    </javac>
856 +  </target>
857  
858  
859 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
859 >  <target name="jsr166yjar"
860 >          depends="jsr166ycompile"
861 >          description="Builds library jar from compiled sources">
862  
863 +    <jar destfile="${jsr166y.jar}" index="true">
864 +      <fileset dir="${build.jsr166y.classes.dir}"/>
865 +    </jar>
866  
867 +  </target>
868  
914  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
915  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
916  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
917  <property name="pretiger.sourcelevel" value="1.4"/>
869  
870 <  <target name="defang"
871 <       depends="init"
921 <   description="Generates pre-Tiger compatible source">
870 >  <target name="jsr166ydocs"
871 >          description="Builds javadocs to dist dir">
872  
873 <    <delete dir="${pretiger.src.dir}"/>
874 <    <mkdir dir="${pretiger.src.dir}"/>
873 >    <delete dir="${jsr166ydocs.dir}"/>
874 >    <mkdir dir="${jsr166ydocs.dir}"/>
875  
876 <    <exec executable="perl">
877 <      <arg file="etc/defang.pl"/>
878 <      <!-- <arg value="-v"/> -->
879 <      <arg value="-s"/> <arg file="${src.dir}"/>
880 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
881 <    </exec>
876 >    <javadoc destdir="${jsr166ydocs.dir}"
877 >             packagenames="jsr166y.*"
878 >             link="${jdkapidocs.url}"
879 >             access="${build.javadoc.access}"
880 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
881 >             bootclasspath="${bootclasspath6}"
882 >             source="6"
883 >             executable="${javadoc7}">
884 >      <arg value="-XDignore.symbol.file=true"/>
885  
886 +    </javadoc>
887    </target>
888  
935  <target name="compile-pretiger"
936          depends="init, configure-compiler, defang"
937          description="Compiles pre-Tiger sources to build folder">
889  
890 <    <mkdir dir="${build.pretiger.dir}"/>
890 >  <target name="jsr166ydist"
891 >          depends="jsr166ydist-jar, jsr166ydist-docs"
892 >          description="Puts all distributable products in single hierarchy"/>
893  
941    <javac srcdir="${pretiger.src.dir}"
942          destdir="${build.pretiger.dir}"
943            debug="${build.debug}"
944       debuglevel="${build.debuglevel}"
945      deprecation="${build.deprecation}"
946           source="${pretiger.sourcelevel}"
947             fork="true">
894  
895 <      <compilerarg line="${build.args}"/>
896 <      <exclude name="**/Thread.java"/>
895 >  <target name="jsr166yclean"
896 >          description="Removes all jsr166y build products">
897  
898 <    </javac>
898 >    <delete dir="${build.jsr166y.dir}"/>
899  
900    </target>
901  
956  <target name="pretiger" depends="compile-pretiger">
902  
903 <    <mkdir dir="${build.lib.dir}"/>
903 >  <target name="jsr166ydist-clean"
904 >          description="Removes all build and distribution products">
905  
906 <    <jar destfile="${pretiger.jar}">
961 <      <fileset dir="${build.pretiger.dir}">
962 <      </fileset>
963 <    </jar>
906 >  </target>
907  
908 +  <target name="jsr166ydist-jar"
909 +          depends="jsr166yclean, jsr166yjar">
910 +    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
911    </target>
912  
913 <  <!-- jsr166x -->
913 >  <target name="jsr166ydist-docs"
914 >          depends="jsr166yclean, jsr166ydocs">
915 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
916 >  </target>
917  
918  
919 <  <target name="jsr166xcompile"
971 <          depends="init, configure-compiler"
972 <          description="Compiles jsr166x sources">
919 >  <!-- extra166y -->
920  
974    <mkdir dir="${build.jsr166x.dir}"/>
921  
922 <    <javac srcdir="${jsr166xsrc.dir}"
923 <          destdir="${build.jsr166x.dir}"
924 <            debug="${build.debug}"
979 <       debuglevel="${build.debuglevel}"
980 <      deprecation="${build.deprecation}"
981 <           source="${build.sourcelevel}"
982 <             fork="true">
922 >  <target name="extra166ycompile"
923 >          depends="configure-compiler, jsr166yjar"
924 >          description="Compiles extra166y sources">
925  
926 <      <include name="**/*.java"/>
926 >    <mkdir dir="${build.extra166y.classes.dir}"/>
927 >
928 >    <javac srcdir="${topsrc.dir}"
929 >           destdir="${build.extra166y.classes.dir}"
930 >           debug="${build.debug}"
931 >           debuglevel="${build.debuglevel}"
932 >           deprecation="${build.deprecation}"
933 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
934 >           classpath=""
935 >           source="6"
936 >           includeAntRuntime="false"
937 >           includeJavaRuntime="false"
938 >           executable="${javac7}"
939 >           fork="true">
940 >
941 >      <include name="extra166y/**/*.java"/>
942 >      <compilerarg value="-XDignore.symbol.file=true"/>
943 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
944        <compilerarg line="${build.args}"/>
945  
946      </javac>
988
947    </target>
948  
949  
950 <
951 <  <target name="jsr166xjar"
994 <          depends="jsr166xcompile"
950 >  <target name="extra166yjar"
951 >          depends="extra166ycompile"
952            description="Builds library jar from compiled sources">
953  
954 <    <mkdir dir="${build.jsr166xlib.dir}"/>
955 <
999 <    <jar destfile="${jsr166xproduct.jar}">
1000 <      <fileset dir="${build.jsr166x.dir}"/>
954 >    <jar destfile="${extra166y.jar}" index="true">
955 >      <fileset dir="${build.extra166y.classes.dir}"/>
956      </jar>
957  
958    </target>
959  
960  
961 +  <target name="extra166ydocs"
962 +          description="Builds javadocs to build dir">
963  
964 <  <target name="jsr166xdocs"
965 <          description="Builds javadocs with custom tags to build folder">
964 >    <delete dir="${extra166ydocs.dir}"/>
965 >    <mkdir dir="${extra166ydocs.dir}"/>
966 >
967 >    <javadoc destdir="${extra166ydocs.dir}"
968 >             packagenames="extra166y.*"
969 >             link="${jdkapidocs.url}"
970 >             access="${build.javadoc.access}"
971 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
972 >             bootclasspath="${bootclasspath6}"
973 >             source="6"
974 >             executable="${javadoc7}">
975 >      <arg value="-XDignore.symbol.file=true"/>
976  
977 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
978 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
977 >    </javadoc>
978 >  </target>
979  
1013    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1014                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1015            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1016
1017    >
1018      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1019      <include name="jsr166x"/>
1020      </packageset>
980  
981 +  <target name="extra166ydist"
982 +          depends="extra166ydist-jar, extra166ydist-docs"
983 +          description="Puts all distributable products in single hierarchy"/>
984  
985 <    </javadoc>
985 >
986 >  <target name="extra166yclean"
987 >          description="Removes all extra166y build products">
988 >
989 >    <delete dir="${build.extra166y.dir}"/>
990  
991    </target>
992  
993  
994 <  <target name="jsr166xdist"
995 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1030 <          description="Puts all distributable products in single hierarchy"/>
994 >  <target name="extra166ydist-clean"
995 >          description="Removes all build and distribution products">
996  
997 +  </target>
998  
999 +  <target name="extra166ydist-jar"
1000 +          depends="extra166yclean, extra166yjar">
1001 +    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1002 +  </target>
1003 +
1004 +  <target name="extra166ydist-docs"
1005 +          depends="extra166yclean, extra166ydocs">
1006 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1007 +  </target>
1008 +
1009 +  <!-- jsr166e -->
1010 +
1011 +  <target name="jsr166ecompile"
1012 +          depends="configure-compiler"
1013 +          description="Compiles jsr166e sources">
1014 +
1015 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1016 +
1017 +    <javac srcdir="${topsrc.dir}"
1018 +           destdir="${build.jsr166e.classes.dir}"
1019 +           debug="${build.debug}"
1020 +           debuglevel="${build.debuglevel}"
1021 +           deprecation="${build.deprecation}"
1022 +           source="7"
1023 +           classpath=""
1024 +           includeAntRuntime="false"
1025 +           includeJavaRuntime="false"
1026 +           executable="${javac7}"
1027 +           fork="true">
1028 +
1029 +      <include name="jsr166e/**/*.java"/>
1030 +      <compilerarg value="-XDignore.symbol.file=true"/>
1031 +      <compilerarg value="-Xlint:all"/>
1032 +      <compilerarg line="${build.args}"/>
1033  
1034 <  <target name="jsr166xclean"
1035 <          description="Removes all build products">
1034 >    </javac>
1035 >  </target>
1036  
1037 <    <delete dir="${build.jsr166x.dir}"/>
1038 <    <delete dir="${build.jsr166xlib.dir}"/>
1037 >
1038 >  <target name="jsr166ejar"
1039 >          depends="jsr166ecompile"
1040 >          description="Builds library jar from compiled sources">
1041 >
1042 >    <jar destfile="${jsr166e.jar}" index="true">
1043 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1044 >    </jar>
1045  
1046    </target>
1047  
1048  
1049 +  <target name="jsr166edocs"
1050 +          description="Builds javadocs to build dir">
1051  
1052 <  <target name="jsr166xdist-clean"
1053 <          description="Removes all build and distribution products">
1052 >    <delete dir="${jsr166edocs.dir}"/>
1053 >    <mkdir dir="${jsr166edocs.dir}"/>
1054  
1055 +    <javadoc destdir="${jsr166edocs.dir}"
1056 +             packagenames="jsr166e.*"
1057 +             link="${jdkapidocs.url}"
1058 +             access="${build.javadoc.access}"
1059 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1060 +             source="7"
1061 +             executable="${javadoc7}">
1062 +      <arg value="-XDignore.symbol.file=true"/>
1063 +
1064 +    </javadoc>
1065    </target>
1066  
1067  
1068 +  <target name="jsr166e-test-tck"
1069 +          depends="jsr166ejar"
1070 +          description="Runs tck tests for jsr166e">
1071  
1072 <  <target name="jsr166xdist-docs"
1073 <          description="Builds javadocs without custom tags to dist folder">
1072 >    <run-tck-tests
1073 >      tck.src.dir="${test.src.dir}/tck-jsr166e"
1074 >      source="7"
1075 >      target="8"
1076 >      workdir="${build.jsr166e.dir}"
1077 >      classes="${jsr166e.jar}"/>
1078 >  </target>
1079  
1054    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1055    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1080  
1081 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1082 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1083 <              source="${build.sourcelevel}">
1060 <
1061 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1062 <      <include name="jsr166x"/>
1063 <      </packageset>
1081 >  <target name="jsr166edist"
1082 >          depends="jsr166edist-jar, jsr166edist-docs"
1083 >          description="Puts all distributable products in single hierarchy"/>
1084  
1065    </javadoc>
1085  
1086 +  <target name="jsr166eclean"
1087 +          description="Removes all jsr166e build products">
1088 +    <delete dir="${build.jsr166e.dir}"/>
1089    </target>
1090  
1069  <target name="jsr166xdist-jar"
1070          depends="jsr166xclean, jsr166xjar">
1091  
1092 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1092 >  <target name="jsr166edist-clean"
1093 >          description="Removes all build and distribution products">
1094 >
1095 >  </target>
1096 >
1097 >  <target name="jsr166edist-jar"
1098 >          depends="jsr166eclean, jsr166ejar">
1099 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1100 >  </target>
1101  
1102 +  <target name="jsr166edist-docs"
1103 +          depends="jsr166eclean, jsr166edocs">
1104 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1105    </target>
1106  
1107 +
1108 + <!-- Find buglets that can be detected by static build tools -->
1109 +
1110 +  <target name="lint">
1111 +    <antcall target="dists">
1112 +      <param name="build.javadoc.access" value="private"/>
1113 +    </antcall>
1114 +  </target>
1115 +
1116 +
1117   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines