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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines