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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines