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.116 by jsr166, Sun Jan 20 07:24:52 2013 UTC

# Line 8 | Line 8
8  
9    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.
11 +
12 +  The repository contains all dependencies except for ant and the JDK
13 +  itself.  Because the JDK version matters and because different
14 +  targets require different JDKs, we assume that users have created a
15 +  hierarchy containing:
16 +  $HOME/jdk/jdk6
17 +  $HOME/jdk/jdk7
18 +  $HOME/jdk/jdk8
19 +  where each of the above is a JDK or a symlink to same, and
20 +  $HOME/jdk/src/jdk6
21 +  $HOME/jdk/src/jdk7
22 +  $HOME/jdk/src/jdk8
23 +  where each of the above is a complete JDK source tree
24 +  (e.g. mercurial forest) or a symlink to same.
25   ------------------------------------------------------------------------------
26    </description>
27  
# Line 21 | Line 35
35  
36  
37    <!-- Compilation options -->
38 <  <property name="build.sourcelevel"    value="1.5"/>
38 >  <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>
42  
43    <!-- Build locations -->
44 <  <property name="build.dir"            location="build"/>
45 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
46 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
47 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
48 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
49 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
50 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
51 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
52 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
53 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
54 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
55 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
56 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
44 >  <property name="build.dir"                   location="build"/>
45 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
46 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
48 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
49 >
50 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54 >
55 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59 >
60 >  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61 >  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62 >  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63 >  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64 >
65 >  <!-- JDK binary locations -->
66 >  <property name="jdks.home"  location="${user.home}/jdk"/>
67 >
68 >  <macrodef name="defjdklocations">
69 >    <attribute name="v"/>
70 >    <sequential>
71 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
72 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75 >    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
76 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
77 >    <property name="bootclasspath@{v}"
78 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
79 >    </sequential>
80 >  </macrodef>
81 >
82 >  <defjdklocations v="6"/>
83 >  <defjdklocations v="7"/>
84 >  <defjdklocations v="8"/>
85 >
86 >  <macrodef name="run-tck-tests">
87 >    <attribute name="target"/>
88 >    <attribute name="workdir"/>
89 >    <attribute name="product.jar" default="${product.jar}"/>
90 >    <attribute name="jvmflags" default=""/>
91 >    <sequential>
92 >
93 >    <mkdir dir="@{workdir}/tck-classes"/>
94 >
95 >    <javac srcdir="${tck.src.dir}"
96 >           destdir="@{workdir}/tck-classes"
97 >           debug="${build.debug}"
98 >           debuglevel="${build.debuglevel}"
99 >           deprecation="${build.deprecation}"
100 >           source="6"
101 >           classpath="${junit.jar}"
102 >           bootclasspath="@{product.jar}:${bootclasspath6}"
103 >           includeAntRuntime="false"
104 >           includeJavaRuntime="false"
105 >           executable="${javac@{target}}"
106 >           fork="true">
107 >
108 >      <include name="**/*.java"/>
109 >      <compilerarg value="-XDignore.symbol.file=true"/>
110 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111 >      <compilerarg line="${build.args}"/>
112 >    </javac>
113 >
114 >    <java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">
115 >        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
116 >        <jvmarg line="@{jvmflags}"/>
117 >        <classpath>
118 >          <pathelement location="${junit.jar}"/>
119 >          <pathelement location="@{workdir}/tck-classes"/>
120 >        </classpath>
121 >    </java>
122 >
123 >    </sequential>
124 >  </macrodef>
125  
126    <!-- Source locations -->
127    <property name="src.dir"              location="${basedir}/src/main"/>
128    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
129    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
130    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
131    <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"/>
132    <property name="lib.dir"              location="${basedir}/lib"/>
133    <property name="dist.dir"             location="${basedir}/dist"/>
134 +  <property name="topsrc.dir"           location="${basedir}/src"/>
135 +  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
136 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
137 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
138 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
139 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
140  
141    <!-- Distribution locations -->
142 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
142 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
143 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
144 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
145 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
146 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
147 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
148  
149    <!-- Jar locations -->
150 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
151 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
152 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
150 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
151 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
152 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
153 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
154 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
155 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
156 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
157  
158    <!-- Bootclasspath argument -->
159    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
160  
161 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
162 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
163 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
164 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
165 +
166 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
167 +  <!-- The below does not yet exist as of 2012-11 -->
168 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
169 +
170 +  <!-- Default jdk api doc location (latest stable release seems best) -->
171 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
172 +
173 +  <!-- Define the "jtreg" task -->
174 +  <!-- See the docs in "jtreg -onlineHelp" -->
175 +  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
176 +           classpath="${lib.dir}/jtreg.jar" />
177 +
178    <!-- Test classpath -->
179    <path id="test.classpath">
180      <pathelement location="${build.testcases.dir}"/>
# Line 75 | Line 186
186      <pathelement location="${build.loops.dir}"/>
187    </path>
188  
189 <  <!-- J1 classpath -->
190 <  <path id="j1.classpath">
191 <    <pathelement location="${build.j1.dir}"/>
192 <    <pathelement location="${junit.jar}"/>
193 <    <pathelement location="${concurrent.jar}"/>
194 <  </path>
84 <
189 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
190 >  <!-- TODO: How do we get &trade to work? -->
191 >  <!-- TODO: Why isn't @jls a "standard" tag? -->
192 >  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
193 >  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
194 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
195  
196    <!-- Main targets -->
197  
198 +  <target name="dists"
199 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
200 +          description="Builds all public jars and docs"/>
201  
202    <target name="compile"
203 <          depends="init, configure-compiler"
204 <          description="Compiles main sources to build folder">
203 >          depends="configure-compiler"
204 >          description="Compiles src/main sources to build dir">
205  
206      <mkdir dir="${build.classes.dir}"/>
207  
208      <javac srcdir="${src.dir}"
209 <          destdir="${build.classes.dir}"
210 <            debug="${build.debug}"
211 <       debuglevel="${build.debuglevel}"
212 <      deprecation="${build.deprecation}"
213 <           source="${build.sourcelevel}"
214 <             fork="true">
209 >           destdir="${build.classes.dir}"
210 >           debug="${build.debug}"
211 >           debuglevel="${build.debuglevel}"
212 >           deprecation="${build.deprecation}"
213 >           classpath=""
214 >           includeAntRuntime="false"
215 >           includeJavaRuntime="false"
216 >           executable="${javac8}"
217 >           fork="true">
218  
219        <include name="**/*.java"/>
220 +      <compilerarg line="${build.args}"/>
221 +      <compilerarg value="-XDignore.symbol.file=true"/>
222 +      <compilerarg value="-Xlint:all"/>
223 +
224 + <!--
225        <exclude name="java/lang/**"/>
226        <compilerarg line="${build.args}"/>
227 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
228 + -->
229  
230      </javac>
231  
# Line 114 | Line 237
237            depends="compile"
238            description="Builds library jar from compiled sources">
239  
117    <mkdir dir="${build.lib.dir}"/>
118
240      <jar destfile="${product.jar}">
241        <fileset dir="${build.classes.dir}"/>
242      </jar>
# Line 125 | Line 246
246  
247  
248    <target name="test"
249 <          depends="init, configure-tests, report-tests"
249 >          depends="configure-tests, report-tests"
250            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
251  
252  
253  
254    <target name="docs"
255 <          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>
255 >          description="Builds javadocs for src/main to dist dir">
256  
257 +    <delete dir="${dist.javadocs.dir}"/>
258 +    <mkdir dir="${dist.javadocs.dir}"/>
259  
260 +    <!-- the packagenames="none" hack below prevents scanning the -->
261 +    <!-- sourcepath for packages -->
262  
263 <  <target name="doccheck"
264 <          depends="filter-doccheck"
265 <          description="Reports on javadoc style errors">
266 <
267 <    <delete dir="${build.doccheck.dir}"/>
268 <    <mkdir dir="${build.doccheck.dir}"/>
269 <
270 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
271 <         docletpath="${lib.dir}/doccheck.jar"
272 <            destdir="${build.doccheck.dir}">
273 <      <packageset dir="${build.dc-filter.dir}"/>
263 >    <javadoc destdir="${dist.javadocs.dir}"
264 >             packagenames="none"
265 >             link="${jdkapi8docs.url}"
266 >             overview="${src.dir}/intro.html"
267 >             sourcepath="${src.dir}:${jdk8src.dir}"
268 >             classpath=""
269 >             executable="${javadoc8}">
270 >      <arg value="-XDignore.symbol.file=true"/>
271 >      <arg value="-tag"/>
272 >      <arg value="${javadoc.jls.option}"/>
273 >      <fileset dir="${src.dir}" defaultexcludes="yes">
274 >        <include name="**/*.java"/>
275 >      </fileset>
276      </javadoc>
277  
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
278    </target>
279  
280  
281  
282    <target name="dist"
283 <          depends="init, dist-clean, dist-jar, dist-docs"
283 >          depends="dist-clean, dist-jar, docs"
284            description="Puts all distributable products in single hierarchy"/>
285  
286  
202
287    <target name="release"
288            depends="dist"
289            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 224 | Line 308
308            description="Removes all build products">
309  
310      <delete dir="${build.dir}"/>
227    <delete dir="${build.classes.dir}"/>
228    <delete dir="${build.lib.dir}"/>
311  
312    </target>
313  
# Line 240 | Line 322
322  
323  
324  
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
325    <!-- Internal targets -->
326  
327  
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
328    <target name="dist-jar"
329            depends="clean, jar">
330  
# Line 280 | Line 333
333    </target>
334  
335  
283  <target name="compile-ant-filter"
284          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
391  </target>
392
393
336    <target name="compile-tests"
337            depends="jar">
338  
339      <mkdir dir="${build.testcases.dir}"/>
340  
341      <javac srcdir="${tck.src.dir}"
342 <          destdir="${build.testcases.dir}"
343 <            debug="${build.debug}"
344 <       debuglevel="${build.debuglevel}"
345 <      deprecation="${build.deprecation}"
346 <           source="${build.sourcelevel}"
347 <             fork="true">
342 >           destdir="${build.testcases.dir}"
343 >           debug="${build.debug}"
344 >           debuglevel="${build.debuglevel}"
345 >           deprecation="${build.deprecation}"
346 >           source="6"
347 >           classpath="${junit.jar}"
348 >           bootclasspath="${product.jar}:${bootclasspath6}"
349 >           includeAntRuntime="false"
350 >           includeJavaRuntime="false"
351 >           executable="${javac8}"
352 >           fork="true">
353  
354 <      <compilerarg value="${bootclasspath.args}"/>
354 >      <include name="**/*.java"/>
355        <compilerarg line="${build.args}"/>
356 <
357 <      <classpath refid="test.classpath"/>
356 >      <compilerarg value="-XDignore.symbol.file=true"/>
357 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
358  
359      </javac>
360  
361      <javac srcdir="${test.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=""
368 >           bootclasspath="${product.jar}:${bootclasspath6}"
369 >           includeAntRuntime="false"
370 >           includeJavaRuntime="false"
371 >           executable="${javac8}"
372 >           fork="true">
373  
374 <      <include name="jsr166/test/**"/>
374 >      <include name="jsr166/test/**/*.java"/>
375  
424      <compilerarg value="${bootclasspath.args}"/>
376        <compilerarg line="${build.args}"/>
377 <
378 <      <classpath refid="test.classpath"/>
377 >      <compilerarg value="-XDignore.symbol.file=true"/>
378 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
379  
380      </javac>
381  
# Line 439 | Line 390
390  
391        <compilerarg value="${bootclasspath.args}"/>
392        <compilerarg line="${build.args}"/>
393 <
443 <      <classpath refid="test.classpath"/>
393 >      <compilerarg value="-XDignore.symbol.file=true"/>
394  
395      </javac>
396   -->
# Line 461 | Line 411
411            errorProperty="junit.failed"
412          failureProperty="junit.failed"
413                      dir="${build.reports.dir}"
414 +                    jvm="${java8}"
415                     fork="true">
416  
417 <      <jvmarg value="${bootclasspath.args}"/>
417 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
418        <jvmarg value="-server"/>
419        <jvmarg value="-showversion"/>
420  
# Line 511 | Line 462
462        <fileset dir="${build.reports.dir}">
463          <include name="TEST-*.xml"/>
464        </fileset>
465 <      <report styledir="${stylesheet.dir}"
515 <                format="${junit.report.format}"
516 <                 todir="${build.reports.dir}"
465 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
466        />
467      </junitreport>
468  
# Line 563 | Line 512
512    </target>
513  
514  
515 +  <!-- Various demos and test programs -->
516  
567  <!-- Anthill targets -->
517  
518 <  <target name="anthill-build">
518 >  <target name="loops" depends="configure-compiler"
519 >          description="Benchmark from Doug Lea's AQS paper">
520  
521 <    <!-- Override this in user.properties -->
572 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
521 >    <mkdir dir="${build.loops.dir}"/>
522  
523 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
524 <      <arg value="-Xmx256000000"/>
525 <      <!-- classpath of new JVM -->
526 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
527 <      <!-- location of Ant home directory -->
528 <      <arg value="-Dant.home=${ant.home}"/>
529 <      <!-- 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>
588 <  </target>
589 <
590 <  <target name="do-anthill-build"
591 <          depends="jar, test, docs, dist-docs"/>
592 <
593 <  <target name="anthill-publish">
594 <
595 <    <copy todir="${deployDir}/docs/private">
596 <      <fileset dir="${build.javadocs.dir}"/>
597 <    </copy>
598 <
599 <    <copy todir="${deployDir}/docs/public">
600 <      <fileset dir="${dist.javadocs.dir}"/>
601 <    </copy>
602 <
603 <    <copy tofile="${deployDir}/index.html"
604 <          file="${basedir}/etc/anthill-index.html"/>
605 <
606 <    <copy todir="${deployDir}/notes">
607 <      <fileset dir="${basedir}/etc/notes"/>
608 <    </copy>
523 >    <javac srcdir="${loops.src.dir}"
524 >          destdir="${build.loops.dir}"
525 >            debug="${build.debug}"
526 >       debuglevel="${build.debuglevel}"
527 >      deprecation="${build.deprecation}"
528 >           source="${build.sourcelevel}"
529 >             fork="true">
530  
531 <  </target>
531 >      <compilerarg line="${build.args}"/>
532 >      <classpath refid="loops.classpath"/>
533 >      <compilerarg value="-XDignore.symbol.file=true"/>
534  
535 +    </javac>
536  
537 +    <java classname="ALoops" fork="true">
538 +      <classpath refid="loops.classpath"/>
539 +    </java>
540  
541 <  <!-- Various demos and test programs -->
541 >  </target>
542  
543  
544 <  <target name="sample" depends="init, configure-compiler"
618 <          description="Standalone demo program">
544 >  <!-- jsr166 4jdk7 -->
545  
620    <mkdir dir="${build.testcases.dir}"/>
546  
547 <    <javac srcdir="${test.src.dir}"
548 <          destdir="${build.testcases.dir}"
549 <            debug="${build.debug}"
550 <       debuglevel="${build.debuglevel}"
551 <      deprecation="${build.deprecation}"
552 <           source="${build.sourcelevel}"
553 <             fork="true">
547 >  <target name="4jdk7compile"
548 >          depends="configure-compiler"
549 >          description="Compiles src/jdk7 sources, targeting jdk7">
550 >
551 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
552 >
553 >    <javac srcdir="${4jdk7src.dir}"
554 >           destdir="${build.4jdk7.classes.dir}"
555 >           debug="${build.debug}"
556 >           debuglevel="${build.debuglevel}"
557 >           deprecation="${build.deprecation}"
558 >           source="6"
559 >           classpath=""
560 >           bootclasspath="${bootclasspath6}"
561 >           includeAntRuntime="false"
562 >           includeJavaRuntime="false"
563 >           executable="${javac7}"
564 >           fork="true">
565  
566 <      <include name="jsr166/test/Sample.java"/>
566 >      <include name="**/*.java"/>
567 >      <compilerarg line="${build.args}"/>
568 >      <compilerarg value="-XDignore.symbol.file=true"/>
569 >      <compilerarg value="-Xlint:all"/>
570  
571      </javac>
572  
573 <    <copy todir="${build.testcases.dir}">
635 <      <fileset dir="${test.src.dir}">
636 <        <include name="**/*.properties"/>
637 <      </fileset>
638 <    </copy>
573 >  </target>
574  
575 +  <target name="4jdk7-jar"
576 +          depends="4jdk7compile"
577 +          description="Builds library jar from compiled sources">
578 +
579 +    <jar destfile="${4jdk7product.jar}">
580 +      <fileset dir="${build.4jdk7.classes.dir}"/>
581 +    </jar>
582  
641    <java classname="jsr166.test.Sample" fork="true">
642      <classpath refid="test.classpath"/>
643      <!-- <jvmarg value="-ea"/> -->
644      <!-- <jvmarg value="-server"/> -->
645      <!-- <arg value="1000"/> -->
646    </java>
583    </target>
584  
585  
586 <  <target name="loops" depends="init, configure-compiler"
587 <          description="Benchmark from Doug Lea's AQS paper">
586 >  <target name="4jdk7-test-tck"
587 >          depends="4jdk7-jar"
588 >          description="Runs tck tests for jsr166-4jdk7 directly">
589  
590 <    <mkdir dir="${build.loops.dir}"/>
590 >    <run-tck-tests
591 >      target="7"
592 >      workdir="${build.4jdk7.dir}"
593 >      product.jar="${4jdk7product.jar}"/>
594 >  </target>
595  
655    <javac srcdir="${loops.src.dir}"
656          destdir="${build.loops.dir}"
657            debug="${build.debug}"
658       debuglevel="${build.debuglevel}"
659      deprecation="${build.deprecation}"
660           source="${build.sourcelevel}"
661             fork="true">
596  
597 <      <compilerarg line="${build.args}"/>
598 <      <classpath refid="loops.classpath"/>
597 >  <target name="4jdk7-test-tck-junit"
598 >          depends="4jdk7compile"
599 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
600  
601 <    </javac>
601 >    <junit printsummary="true"
602 >           showoutput="true"
603 >           errorProperty="junit.failed"
604 >           failureProperty="junit.failed"
605 >           includeantruntime="true"
606 >           jvm="${java7}"
607 >           fork="true">
608  
609 <    <java classname="ALoops" fork="true">
610 <      <classpath refid="loops.classpath"/>
611 <    </java>
609 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
610 >      <jvmarg value="-server"/>
611 >
612 >      <classpath>
613 >        <pathelement location="${junit.jar}"/>
614 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
615 >      </classpath>
616 >
617 >      <formatter type="brief"/>
618 >
619 >      <test name="JSR166TestCase" haltonfailure="no">
620 >      </test>
621  
622 +    </junit>
623    </target>
624  
625 +  <target name="4jdk7-test-jtreg"
626 +          depends="4jdk7compile"
627 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
628 +    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
629 +    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
630 +    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
631 +    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
632 +    <jtreg dir="${jtreg.src.dir}"
633 +           jdk="${jdk7.home}"
634 +           workDir="${build.4jdk7.dir}/JTwork"
635 +           reportDir="${build.4jdk7.dir}/JTreport">
636 +
637 +      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
638 +      <arg value="-agentvm"/>
639 +      <arg value="-v:nopass,fail"/>
640 +      <arg value="-vmoptions:-esa -ea"/>
641 +      <arg value="-automatic"/>
642 +      <arg value="-k:!ignore"/>
643 +    </jtreg>
644 +  </target>
645  
675  <target name="compile-j1" depends="init, configure-compiler">
646  
647 <    <mkdir dir="${build.j1.dir}"/>
647 >  <target name="4jdk7-test"
648 >          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
649 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
650 >  </target>
651  
679    <javac srcdir="${j1.src.dir}"
680          destdir="${build.j1.dir}"
681            debug="${build.debug}"
682       debuglevel="${build.debuglevel}"
683      deprecation="${build.deprecation}"
684           source="${build.sourcelevel}" >
652  
653 <      <include name="**/*.java"/>
654 <      <exclude name="**/dijkstra/**"/>
653 >  <target name="4jdk7docs"
654 >          description="Builds javadocs for src/jdk7 to dist dir">
655 >
656 >    <delete dir="${dist.4jdk7.docs.dir}"/>
657 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
658 >
659 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
660 >             packagenames="none"
661 >             link="${jdkapi7docs.url}"
662 >             overview="${4jdk7src.dir}/intro.html"
663 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
664 >             classpath=""
665 >             executable="${javadoc7}">
666 >      <arg value="-XDignore.symbol.file=true"/>
667 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
668 >        <include name="**/*.java"/>
669 >      </fileset>
670 >    </javadoc>
671 >
672 >  </target>
673 >
674 >
675 >  <target name="4jdk7dist"
676 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
677 >          description="Puts all distributable products in single hierarchy"/>
678 >
679 >
680 >
681 >  <target name="4jdk7clean"
682 >          description="Removes all 4jdk7 build products">
683 >
684 >    <delete dir="${build.4jdk7.dir}"/>
685 >
686 >  </target>
687 >
688 >
689 >
690 >  <target name="4jdk7dist-clean"
691 >          description="Removes all build and distribution products">
692 >
693 >  </target>
694 >
695 >  <target name="4jdk7dist-jar"
696 >          depends="4jdk7clean, 4jdk7compile">
697 >
698 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
699 >
700 >  </target>
701 >
702 >
703 >  <!-- jsr166x -->
704 >
705 >  <target name="jsr166xcompile"
706 >          depends="configure-compiler"
707 >          description="Compiles jsr166x sources to build dir">
708 >
709 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
710 >
711 >    <javac srcdir="${topsrc.dir}"
712 >           destdir="${build.jsr166x.classes.dir}"
713 >           debug="${build.debug}"
714 >           debuglevel="${build.debuglevel}"
715 >           deprecation="${build.deprecation}"
716 >           classpath=""
717 >           source="5"
718 >           bootclasspath="${bootclasspath6}"
719 >           includeAntRuntime="false"
720 >           includeJavaRuntime="false"
721 >           executable="${javac7}"
722 >           fork="true">
723  
724 +      <include name="jsr166x/**/*.java"/>
725        <compilerarg line="${build.args}"/>
726 <      <classpath refid="j1.classpath"/>
726 >      <compilerarg value="-XDignore.symbol.file=true"/>
727 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
728  
729      </javac>
730  
731    </target>
732  
733  
697  <target name="sw" depends="compile-j1"
698          description="Runs the SwingWorker demo">
734  
735 <    <!--
736 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
737 <      <classpath refid="j1.classpath"/>
738 <    </java>
739 <    -->
735 >  <target name="jsr166xjar"
736 >          depends="jsr166xcompile"
737 >          description="Builds library jar from compiled sources">
738 >
739 >    <jar destfile="${jsr166x.jar}">
740 >      <fileset dir="${build.jsr166x.classes.dir}"/>
741 >    </jar>
742 >
743 >  </target>
744 >
745 >
746 >
747 >  <target name="jsr166xdocs"
748 >          description="Builds javadocs to dist dir">
749  
750 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
750 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
751 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
752  
753 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
754 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
755 <    </exec>
753 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
754 >             packagenames="jsr166x.*"
755 >             link="${jdkapidocs.url}"
756 >             source="5"
757 >             bootclasspath="${bootclasspath6}"
758 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
759 >             executable="${javadoc7}"
760 >             additionalparam="-XDignore.symbol.file=true"/>
761  
762    </target>
763  
714  <target name="j1" depends="compile-j1"
715          description="Runs a standalone JavaOne program">
764  
765 <    <java classname="${j1.test}" fork="true">
766 <      <classpath refid="j1.classpath"/>
767 <      <jvmarg value="-client"/>
765 >  <target name="jsr166xdist"
766 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
767 >          description="Puts all distributable products in single hierarchy"/>
768  
721      <!-- TestPseudoRandom args -->
722      <arg value="2"/>
723      <arg value="25"/>
724      <arg value="100000"/>
769  
726      <!-- WebCrawler args -->
727      <!--
728      <arg value="jsr166.webcrawler.WebCrawler3"/>
729      <arg value="http://www.priorartisans.com"/>
730      <arg value="25"/>
731      -->
770  
771 <    </java>
771 >  <target name="jsr166xclean"
772 >          description="Removes all jsr166x build products">
773 >
774 >    <delete dir="${build.jsr166x.dir}"/>
775  
776    </target>
777  
778  
738  <target name="test-j1" depends="compile-j1"
739          description="Runs testcases from the JavaOne source directories">
779  
780 <    <junit printsummary="true"
781 <             showoutput="true"
743 <          errorProperty="junit.failed"
744 <        failureProperty="junit.failed"
745 <                    dir="${build.j1.dir}"
746 <                   fork="true">
780 >  <target name="jsr166xdist-clean"
781 >          description="Removes all build and distribution products">
782  
783 <      <!-- <jvmarg value="-server"/> -->
749 <      <classpath refid="j1.classpath"/>
750 <      <formatter type="xml"/>
783 >  </target>
784  
752      <batchtest todir="${build.j1.dir}">
753        <fileset dir="${j1.src.dir}">
754          <include name="**/*Test.java"/>
755        </fileset>
756      </batchtest>
785  
786 <    </junit>
786 >  <target name="jsr166xdist-jar"
787 >          depends="jsr166xclean, jsr166xjar">
788  
789 <    <available property="junit.report.format"
761 <                  value="frames"
762 <              classname="org.apache.xalan.lib.Redirect"/>
763 <    <property name="junit.report.format" value="noframes"/>
789 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
790  
791 <    <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>
791 >  </target>
792  
793 <    <fail message="Test Cases Failed" if="junit.failed"/>
793 >  <!-- jsr166y -->
794 >
795 >
796 >  <target name="jsr166ycompile"
797 >          depends="configure-compiler"
798 >          description="Compiles jsr166y sources">
799  
800 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
801 +
802 +    <javac srcdir="${topsrc.dir}"
803 +           destdir="${build.jsr166y.classes.dir}"
804 +           debug="${build.debug}"
805 +           debuglevel="${build.debuglevel}"
806 +           deprecation="${build.deprecation}"
807 +           source="6"
808 +           classpath=""
809 +           bootclasspath="${bootclasspath6}"
810 +           includeAntRuntime="false"
811 +           includeJavaRuntime="false"
812 +           executable="${javac7}"
813 +           fork="true">
814 +
815 +      <include name="jsr166y/**/*.java"/>
816 +      <compilerarg line="${build.args}"/>
817 +      <compilerarg value="-XDignore.symbol.file=true"/>
818 +      <compilerarg value="-Xlint:all"/>
819 +    </javac>
820    </target>
821  
822  
823 +  <target name="jsr166yjar"
824 +          depends="jsr166ycompile"
825 +          description="Builds library jar from compiled sources">
826  
827 <  <!-- C++ and JNI definitions and demos -->
827 >    <jar destfile="${jsr166y.jar}" index="true">
828 >      <fileset dir="${build.jsr166y.classes.dir}"/>
829 >    </jar>
830  
831 <  <target name="configure-cpp">
831 >  </target>
832  
785    <!-- Define tasks and types -->
833  
787    <path id="cpptasks.path">
788      <pathelement location="${lib.dir}/cpptasks.jar"/>
789    </path>
790    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
791    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
834  
835 <    <!-- Set platform property for JNI includes -->
835 >  <target name="jsr166ydocs"
836 >          description="Builds javadocs to dist dir">
837  
838 <    <condition property="platform" value="linux">
839 <      <os name="Linux"/>
840 <    </condition>
841 <    <condition property="platform" value="win32">
842 <      <os family="windows"/>
843 <    </condition>
844 <    <condition property="platform" value="solaris">
845 <      <os name="SunOS"/>
846 <    </condition>
838 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
839 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
840 >
841 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
842 >             packagenames="jsr166y.*"
843 >             link="${jdkapidocs.url}"
844 >             source="6"
845 >             bootclasspath="${bootclasspath6}"
846 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
847 >             executable="${javadoc7}"
848 >             additionalparam="-XDignore.symbol.file=true"/>
849  
850    </target>
851  
852  
853 <  <target name="cppdemo" depends="configure-cpp">
853 >  <target name="jsr166ydist"
854 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
855 >          description="Puts all distributable products in single hierarchy"/>
856 >
857  
810    <mkdir dir="${build.dir}"/>
858  
859 <    <cc multithreaded="true"
860 <                 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>
859 >  <target name="jsr166yclean"
860 >          description="Removes all jsr166y build products">
861  
862 <    <exec executable="${build.dir}/CppDemo">
821 <      <arg line="count in word frequency of word in command line count"/>
822 <    </exec>
862 >    <delete dir="${build.jsr166y.dir}"/>
863  
864    </target>
865  
866  
827  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
867  
868 <    <mkdir dir="${build.testcases.dir}"/>
868 >  <target name="jsr166ydist-clean"
869 >          description="Removes all build and distribution products">
870  
871 <    <javac srcdir="${test.src.dir}"
872 <          destdir="${build.testcases.dir}"
873 <            debug="${build.debug}"
874 <       debuglevel="${build.debuglevel}"
875 <      deprecation="${build.deprecation}"
876 <           source="${build.sourcelevel}"
877 <             fork="true">
878 <      <compilerarg value="${bootclasspath.args}"/>
871 >  </target>
872 >
873 >  <target name="jsr166ydist-jar"
874 >          depends="jsr166yclean, jsr166yjar">
875 >
876 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
877 >
878 >  </target>
879 >
880 >
881 >  <!-- extra166y -->
882 >
883 >
884 >  <target name="extra166ycompile"
885 >          depends="configure-compiler, jsr166yjar"
886 >          description="Compiles extra166y sources">
887 >
888 >    <mkdir dir="${build.extra166y.classes.dir}"/>
889 >
890 >    <javac srcdir="${topsrc.dir}"
891 >           destdir="${build.extra166y.classes.dir}"
892 >           debug="${build.debug}"
893 >           debuglevel="${build.debuglevel}"
894 >           deprecation="${build.deprecation}"
895 >           classpath=""
896 >           source="6"
897 >           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
898 >           includeAntRuntime="false"
899 >           includeJavaRuntime="false"
900 >           executable="${javac7}"
901 >           fork="true">
902 >
903 >      <include name="extra166y/**/*.java"/>
904        <compilerarg line="${build.args}"/>
905 <      <classpath refid="test.classpath"/>
906 <      <include name="JniDemo.java"/>
905 >      <compilerarg value="-XDignore.symbol.file=true"/>
906 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
907 >
908      </javac>
909  
910 <    <javah destdir="${build.testcases.dir}"
845 <      classpathref="test.classpath">
846 <      <class name="JniDemo"/>
847 <    </javah>
910 >  </target>
911  
849    <cc multithreaded="true"
850                 name="g++"
851               objdir="${build.dir}"
852              outfile="${build.dir}/JniDemo"
853              outtype="shared">
912  
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>
913  
914 <      <linker>
915 <        <linkerarg value="--add-stdcall-alias"/>
916 <      </linker>
914 >  <target name="extra166yjar"
915 >          depends="extra166ycompile"
916 >          description="Builds library jar from compiled sources">
917 >
918 >    <jar destfile="${extra166y.jar}" index="true">
919 >      <fileset dir="${build.extra166y.classes.dir}"/>
920 >    </jar>
921  
922 <      <includepath location="${build.testcases.dir}"/>
922 >  </target>
923  
870      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
924  
872      <libset libs="stdc++"/>
925  
926 <    </cc>
926 >  <target name="extra166ydocs"
927 >          description="Builds javadocs to build dir">
928  
929 <    <!-- Necessary if windows, harmless if not -->
930 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
929 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
930 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
931  
932 <    <java classname="JniDemo" fork="true">
933 <      <!-- Watch out: path separator hardwired to semicolon here! -->
934 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
935 <      <classpath refid="test.classpath"/>
936 <      <arg line="count in word frequency of word in command line count"/>
937 <    </java>
932 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
933 >             packagenames="extra166y.*"
934 >             link="${jdkapidocs.url}"
935 >             source="6"
936 >             bootclasspath="${bootclasspath6}"
937 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
938 >             executable="${javadoc7}"
939 >             additionalparam="-XDignore.symbol.file=true"/>
940  
941    </target>
942  
943  
944 +  <target name="extra166ydist"
945 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
946 +          description="Puts all distributable products in single hierarchy"/>
947  
890  <!-- Backward compatibility, work in progress (some files not checked in) -->
948  
949  
950 +  <target name="extra166yclean"
951 +          description="Removes all extra166y build products">
952  
953 <  <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"/>
953 >    <delete dir="${build.extra166y.dir}"/>
954  
955 <  <target name="defang"
900 <       depends="init"
901 <   description="Generates pre-Tiger compatible source">
955 >  </target>
956  
903    <delete dir="${pretiger.src.dir}"/>
904    <mkdir dir="${pretiger.src.dir}"/>
957  
958 <    <exec executable="perl">
959 <      <arg file="etc/defang.pl"/>
960 <      <!-- <arg value="-v"/> -->
909 <      <arg value="-s"/> <arg file="${src.dir}"/>
910 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
911 <    </exec>
958 >
959 >  <target name="extra166ydist-clean"
960 >          description="Removes all build and distribution products">
961  
962    </target>
963  
964 <  <target name="compile-pretiger"
965 <          depends="init, configure-compiler, defang"
917 <          description="Compiles pre-Tiger sources to build folder">
964 >  <target name="extra166ydist-jar"
965 >          depends="extra166yclean, extra166yjar">
966  
967 <    <mkdir dir="${build.pretiger.dir}"/>
967 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
968  
969 <    <javac srcdir="${pretiger.src.dir}"
970 <          destdir="${build.pretiger.dir}"
971 <            debug="${build.debug}"
972 <       debuglevel="${build.debuglevel}"
973 <      deprecation="${build.deprecation}"
974 <           source="${pretiger.sourcelevel}"
975 <             fork="true">
969 >  </target>
970 >
971 >  <!-- jsr166e -->
972 >
973 >  <target name="jsr166ecompile"
974 >          depends="configure-compiler"
975 >          description="Compiles jsr166e sources">
976 >
977 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
978  
979 +    <javac srcdir="${topsrc.dir}"
980 +           destdir="${build.jsr166e.classes.dir}"
981 +           debug="${build.debug}"
982 +           debuglevel="${build.debuglevel}"
983 +           deprecation="${build.deprecation}"
984 +           source="7"
985 +           classpath=""
986 +           includeAntRuntime="false"
987 +           includeJavaRuntime="false"
988 +           executable="${javac7}"
989 +           fork="true">
990 +
991 +      <include name="jsr166e/**/*.java"/>
992        <compilerarg line="${build.args}"/>
993 <      <exclude name="**/Thread.java"/>
993 >      <compilerarg value="-XDignore.symbol.file=true"/>
994 >      <compilerarg value="-Xlint:all"/>
995  
996      </javac>
997  
998    </target>
999  
936  <target name="pretiger" depends="compile-pretiger">
1000  
938    <mkdir dir="${build.lib.dir}"/>
1001  
1002 <    <jar destfile="${pretiger.jar}">
1003 <      <fileset dir="${build.pretiger.dir}">
1004 <      </fileset>
1002 >  <target name="jsr166ejar"
1003 >          depends="jsr166ecompile"
1004 >          description="Builds library jar from compiled sources">
1005 >
1006 >    <jar destfile="${jsr166e.jar}" index="true">
1007 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1008      </jar>
1009  
1010    </target>
1011  
1012 +
1013 +
1014 +  <target name="jsr166edocs"
1015 +          description="Builds javadocs to build dir">
1016 +
1017 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1018 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1019 +
1020 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1021 +             packagenames="jsr166e.*"
1022 +             link="${jdkapidocs.url}"
1023 +             source="7"
1024 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1025 +             executable="${javadoc7}"
1026 +             additionalparam="-XDignore.symbol.file=true" >
1027 +    </javadoc>
1028 +
1029 +  </target>
1030 +
1031 +
1032 +  <target name="jsr166edist"
1033 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1034 +          description="Puts all distributable products in single hierarchy"/>
1035 +
1036 +
1037 +
1038 +  <target name="jsr166eclean"
1039 +          description="Removes all jsr166e build products">
1040 +
1041 +    <delete dir="${build.jsr166e.dir}"/>
1042 +
1043 +  </target>
1044 +
1045 +
1046 +  <target name="jsr166edist-clean"
1047 +          description="Removes all build and distribution products">
1048 +
1049 +  </target>
1050 +
1051 +  <target name="jsr166edist-jar"
1052 +          depends="jsr166eclean, jsr166ejar">
1053 +
1054 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1055 +
1056 +  </target>
1057 +
1058   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines