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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines