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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines