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.66 by jsr166, Sun Apr 11 01:37:41 2004 UTC vs.
Revision 1.108 by jsr166, Sat Jan 19 23:58:12 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="1.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.lib.dir"               location="${build.dir}/lib"/>
49 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
50 >
51 >  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
52 >  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
53 >  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
54 >  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
55 >  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
56 >
57 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
58 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
59 >
60 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
62 >
63 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
64 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
65 >
66 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
67 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
68 >
69 >  <!-- JDK binary locations -->
70 >  <property name="jdks.home"  location="${user.home}/jdk"/>
71 >
72 >  <macrodef name="defjdklocations">
73 >    <attribute name="v"/>
74 >    <sequential>
75 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
76 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
77 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
78 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
79 >    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
80 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
81 >    <property name="bootclasspath@{v}"
82 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
83 >    </sequential>
84 >  </macrodef>
85 >
86 >  <defjdklocations v="6"/>
87 >  <defjdklocations v="7"/>
88 >  <defjdklocations v="8"/>
89 >
90 >  <macrodef name="run-tck-tests">
91 >    <attribute name="jvm"/>
92 >    <attribute name="tck.classes"/>
93 >    <attribute name="product.jar" default="${product.jar}"/>
94 >    <attribute name="jvmflags" default=""/>
95 >    <sequential>
96 >    <java classname="JSR166TestCase"
97 >          jvm="@{jvm}" fork="true">
98 >        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
99 >        <jvmarg line="@{jvmflags}"/>
100 >        <classpath>
101 >          <pathelement location="${junit.jar}"/>
102 >          <pathelement location="@{tck.classes}"/>
103 >        </classpath>
104 >    </java>
105 >    </sequential>
106 >  </macrodef>
107  
108    <!-- Source locations -->
109    <property name="src.dir"              location="${basedir}/src/main"/>
110    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
111    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
112    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
113    <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"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116 +  <property name="topsrc.dir"           location="${basedir}/src"/>
117 +  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
118 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
119 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
120 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
121 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
122 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
123  
124    <!-- Distribution locations -->
125 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
125 >  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
126 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
127 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
128 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
129 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
130 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
131  
132    <!-- Jar locations -->
133 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
134 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
135 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
133 >  <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
134 >  <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
135 >  <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
136 >  <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
137 >  <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
138 >  <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
139 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
140  
141    <!-- Bootclasspath argument -->
142    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
143  
144 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
146 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
147 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
148 +
149 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
150 +  <!-- The below does not yet exist as of 2012-11 -->
151 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
152 +
153 +  <!-- Default jdk api doc location (latest stable release seems best) -->
154 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
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 123 | Line 226
226  
227  
228    <target name="test"
229 <          depends="init, configure-tests, report-tests"
229 >          depends="configure-tests, report-tests"
230            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
231  
232  
233  
234    <target name="docs"
235 <          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>
235 >          description="Builds javadocs for src/main to dist dir">
236  
237 +    <delete dir="${dist.javadocs.dir}"/>
238 +    <mkdir dir="${dist.javadocs.dir}"/>
239  
240 +    <!-- the packagenames="none" hack below prevents scanning the -->
241 +    <!-- sourcepath for packages -->
242  
243 <  <target name="doccheck"
244 <          depends="filter-doccheck"
245 <          description="Reports on javadoc style errors">
246 <
247 <    <delete dir="${build.doccheck.dir}"/>
248 <    <mkdir dir="${build.doccheck.dir}"/>
249 <
250 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
251 <         docletpath="${lib.dir}/doccheck.jar"
252 <            destdir="${build.doccheck.dir}">
253 <      <packageset dir="${build.dc-filter.dir}"/>
243 >    <javadoc destdir="${dist.javadocs.dir}"
244 >             packagenames="none"
245 >             link="${jdkapi8docs.url}"
246 >             overview="${src.dir}/intro.html"
247 >             sourcepath="${src.dir}:${jdk8src.dir}"
248 >             classpath=""
249 >             executable="${javadoc8}">
250 >      <arg value="-XDignore.symbol.file=true"/>
251 >      <arg value="-tag"/>
252 >      <arg value="${javadoc.jls.option}"/>
253 >      <fileset dir="${src.dir}" defaultexcludes="yes">
254 >        <include name="**/*.java"/>
255 >      </fileset>
256      </javadoc>
257  
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
258    </target>
259  
260  
261  
262    <target name="dist"
263 <          depends="init, dist-clean, dist-jar, dist-docs"
263 >          depends="dist-clean, dist-jar, docs"
264            description="Puts all distributable products in single hierarchy"/>
265  
266  
200
267    <target name="release"
268            depends="dist"
269            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 238 | Line 304
304  
305  
306  
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
307    <!-- Internal targets -->
308  
309  
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
310    <target name="dist-jar"
311            depends="clean, jar">
312  
# Line 278 | Line 315
315    </target>
316  
317  
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
318    <target name="compile-tests"
319            depends="jar">
320  
# Line 404 | Line 330
330  
331        <compilerarg value="${bootclasspath.args}"/>
332        <compilerarg line="${build.args}"/>
333 +      <compilerarg value="-XDignore.symbol.file=true"/>
334  
335        <classpath refid="test.classpath"/>
336  
# Line 421 | Line 348
348  
349        <compilerarg value="${bootclasspath.args}"/>
350        <compilerarg line="${build.args}"/>
351 +      <compilerarg value="-XDignore.symbol.file=true"/>
352  
353        <classpath refid="test.classpath"/>
354  
# Line 437 | Line 365
365  
366        <compilerarg value="${bootclasspath.args}"/>
367        <compilerarg line="${build.args}"/>
368 +      <compilerarg value="-XDignore.symbol.file=true"/>
369  
370        <classpath refid="test.classpath"/>
371  
# Line 509 | Line 438
438        <fileset dir="${build.reports.dir}">
439          <include name="TEST-*.xml"/>
440        </fileset>
441 <      <report styledir="${stylesheet.dir}"
513 <                format="${junit.report.format}"
514 <                 todir="${build.reports.dir}"
441 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
442        />
443      </junitreport>
444  
# Line 561 | Line 488
488    </target>
489  
490  
491 +  <!-- Various demos and test programs -->
492 +
493  
494 <  <!-- Anthill targets -->
494 >  <target name="loops" depends="configure-compiler"
495 >          description="Benchmark from Doug Lea's AQS paper">
496 >
497 >    <mkdir dir="${build.loops.dir}"/>
498  
499 <  <target name="anthill-build">
499 >    <javac srcdir="${loops.src.dir}"
500 >          destdir="${build.loops.dir}"
501 >            debug="${build.debug}"
502 >       debuglevel="${build.debuglevel}"
503 >      deprecation="${build.deprecation}"
504 >           source="${build.sourcelevel}"
505 >             fork="true">
506  
507 <    <!-- Override this in user.properties -->
508 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
507 >      <compilerarg line="${build.args}"/>
508 >      <classpath refid="loops.classpath"/>
509 >      <compilerarg value="-XDignore.symbol.file=true"/>
510  
511 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
512 <      <arg value="-Xmx256000000"/>
513 <      <!-- classpath of new JVM -->
514 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
515 <      <!-- 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>
511 >    </javac>
512 >
513 >    <java classname="ALoops" fork="true">
514 >      <classpath refid="loops.classpath"/>
515 >    </java>
516  
517    </target>
518  
519  
520 +  <!-- jsr166 4jdk7 -->
521  
612  <!-- Various demos and test programs -->
522  
523 +  <target name="4jdk7compile"
524 +          depends="configure-compiler"
525 +          description="Compiles src/jdk7 sources, targeting jdk7">
526 +
527 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
528 +
529 +    <javac srcdir="${4jdk7src.dir}"
530 +           destdir="${build.4jdk7.classes.dir}"
531 +           debug="${build.debug}"
532 +           debuglevel="${build.debuglevel}"
533 +           deprecation="${build.deprecation}"
534 +           source="6"
535 +           classpath=""
536 +           bootclasspath="${bootclasspath6}"
537 +           includeAntRuntime="false"
538 +           includeJavaRuntime="false"
539 +           executable="${javac7}"
540 +           fork="true">
541  
542 <  <target name="sample" depends="init, configure-compiler"
543 <          description="Standalone demo program">
542 >      <include name="**/*.java"/>
543 >      <compilerarg line="${build.args}"/>
544 >      <compilerarg value="-XDignore.symbol.file=true"/>
545 >      <compilerarg value="-Xlint:all"/>
546  
547 <    <mkdir dir="${build.testcases.dir}"/>
547 >    </javac>
548  
549 <    <javac srcdir="${test.src.dir}"
550 <          destdir="${build.testcases.dir}"
551 <            debug="${build.debug}"
552 <       debuglevel="${build.debuglevel}"
553 <      deprecation="${build.deprecation}"
625 <           source="${build.sourcelevel}"
626 <             fork="true">
549 >    <mkdir dir="${build.4jdk7.lib.dir}"/>
550 >
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  
619 <  <target name="compile-j1" depends="init, configure-compiler">
619 >  <target name="4jdk7docs"
620 >          description="Builds javadocs for src/jdk7 to dist dir">
621  
622 <    <mkdir dir="${build.j1.dir}"/>
622 >    <delete dir="${dist.4jdk7.docs.dir}"/>
623 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
624 >
625 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
626 >             packagenames="none"
627 >             link="${jdkapi7docs.url}"
628 >             overview="${4jdk7src.dir}/intro.html"
629 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
630 >             classpath=""
631 >             executable="${javadoc7}">
632 >      <arg value="-XDignore.symbol.file=true"/>
633 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
634 >        <include name="**/*.java"/>
635 >      </fileset>
636 >    </javadoc>
637 >
638 >  </target>
639 >
640 >
641 >  <target name="4jdk7dist"
642 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
643 >          description="Puts all distributable products in single hierarchy"/>
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  
684      <include name="**/*.java"/>
685      <exclude name="**/dijkstra/**"/>
646  
647 +  <target name="4jdk7clean"
648 +          description="Removes all build products">
649 +
650 +    <delete dir="${build.4jdk7.dir}"/>
651 +
652 +  </target>
653 +
654 +
655 +
656 +  <target name="4jdk7dist-clean"
657 +          description="Removes all build and distribution products">
658 +
659 +  </target>
660 +
661 +  <target name="4jdk7dist-jar"
662 +          depends="4jdk7clean, 4jdk7compile">
663 +
664 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
665 +
666 +  </target>
667 +
668 +  <!-- jsr166x -->
669 +
670 +
671 +  <target name="jsr166xcompile"
672 +          depends="configure-compiler"
673 +          description="Compiles jsr166x sources to build dir">
674 +
675 +    <mkdir dir="${build.jsr166x.dir}"/>
676 +
677 +    <javac srcdir="${topsrc.dir}"
678 +           destdir="${build.jsr166x.dir}"
679 +           debug="${build.debug}"
680 +           debuglevel="${build.debuglevel}"
681 +           deprecation="${build.deprecation}"
682 +           classpath=""
683 +           source="5"
684 +           bootclasspath="${bootclasspath6}"
685 +           includeAntRuntime="false"
686 +           includeJavaRuntime="false"
687 +           executable="${javac7}"
688 +           fork="true">
689 +
690 +      <include name="jsr166x/**/*.java"/>
691        <compilerarg line="${build.args}"/>
692 <      <classpath refid="j1.classpath"/>
692 >      <compilerarg value="-XDignore.symbol.file=true"/>
693 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
694  
695      </javac>
696  
697    </target>
698  
699  
695  <target name="sw" depends="compile-j1"
696          description="Runs the SwingWorker demo">
700  
701 <    <!--
702 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
703 <      <classpath refid="j1.classpath"/>
701 <    </java>
702 <    -->
701 >  <target name="jsr166xjar"
702 >          depends="jsr166xcompile"
703 >          description="Builds library jar from compiled sources">
704  
705 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
705 >    <mkdir dir="${build.jsr166xlib.dir}"/>
706  
707 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
708 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
709 <    </exec>
707 >    <jar destfile="${jsr166x.jar}">
708 >      <fileset dir="${build.jsr166x.dir}"/>
709 >    </jar>
710  
711    </target>
712  
712  <target name="j1" depends="compile-j1"
713          description="Runs a standalone JavaOne program">
713  
714 <    <java classname="jsr166.bbuf.BoundedBufferDemo" fork="true">
715 <      <classpath refid="j1.classpath"/>
716 <      <jvmarg value="-server"/>
717 <      <arg value="http://www.perl.com/"/>
718 <      <arg value="1"/>
719 <    </java>
714 >
715 >  <target name="jsr166xdocs"
716 >          description="Builds javadocs to dist dir">
717 >
718 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
719 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
720 >
721 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
722 >             packagenames="jsr166x.*"
723 >             link="${jdkapidocs.url}"
724 >             source="5"
725 >             bootclasspath="${bootclasspath6}"
726 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
727 >             executable="${javadoc7}"
728 >             additionalparam="-XDignore.symbol.file=true" />
729  
730    </target>
731  
732  
733 <  <target name="test-j1" depends="compile-j1"
734 <          description="Runs testcases from the JavaOne source directories">
733 >  <target name="jsr166xdist"
734 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
735 >          description="Puts all distributable products in single hierarchy"/>
736  
728    <junit printsummary="true"
729             showoutput="true"
730          errorProperty="junit.failed"
731        failureProperty="junit.failed"
732                    dir="${build.j1.dir}"
733                   fork="true">
737  
735      <!-- <jvmarg value="-server"/> -->
736      <classpath refid="j1.classpath"/>
737      <formatter type="xml"/>
738  
739 <      <batchtest todir="${build.j1.dir}">
740 <        <fileset dir="${j1.src.dir}">
741 <          <include name="**/*Test.java"/>
742 <        </fileset>
743 <      </batchtest>
739 >  <target name="jsr166xclean"
740 >          description="Removes all build products">
741  
742 <    </junit>
742 >    <delete dir="${build.jsr166x.dir}"/>
743 >    <delete dir="${build.jsr166xlib.dir}"/>
744  
745 <    <available property="junit.report.format"
748 <                  value="frames"
749 <              classname="org.apache.xalan.lib.Redirect"/>
750 <    <property name="junit.report.format" value="noframes"/>
745 >  </target>
746  
752    <junitreport todir="${build.j1.dir}">
753      <fileset dir="${build.j1.dir}">
754        <include name="TEST-*.xml"/>
755      </fileset>
756      <report styledir="${stylesheet.dir}"
757                format="${junit.report.format}"
758                 todir="${build.j1.dir}"
759      />
760    </junitreport>
747  
748 <    <fail message="Test Cases Failed" if="junit.failed"/>
748 >
749 >  <target name="jsr166xdist-clean"
750 >          description="Removes all build and distribution products">
751  
752    </target>
753  
754  
755 +  <target name="jsr166xdist-jar"
756 +          depends="jsr166xclean, jsr166xjar">
757  
758 <  <!-- C++ and JNI definitions and demos -->
758 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
759  
760 <  <target name="configure-cpp">
760 >  </target>
761  
762 <    <!-- Define tasks and types -->
762 >  <!-- jsr166y -->
763  
774    <path id="cpptasks.path">
775      <pathelement location="${lib.dir}/cpptasks.jar"/>
776    </path>
777    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
778    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
764  
765 <    <!-- Set platform property for JNI includes -->
765 >  <target name="jsr166ycompile"
766 >          depends="configure-compiler"
767 >          description="Compiles jsr166y sources">
768  
769 <    <condition property="platform" value="linux">
770 <      <os name="Linux"/>
771 <    </condition>
772 <    <condition property="platform" value="win32">
773 <      <os family="windows"/>
774 <    </condition>
775 <    <condition property="platform" value="solaris">
776 <      <os name="SunOS"/>
777 <    </condition>
769 >    <mkdir dir="${build.jsr166y.dir}"/>
770 >
771 >    <javac srcdir="${topsrc.dir}"
772 >           destdir="${build.jsr166y.dir}"
773 >           debug="${build.debug}"
774 >           debuglevel="${build.debuglevel}"
775 >           deprecation="${build.deprecation}"
776 >           source="6"
777 >           classpath=""
778 >           bootclasspath="${bootclasspath6}"
779 >           includeAntRuntime="false"
780 >           includeJavaRuntime="false"
781 >           executable="${javac7}"
782 >           fork="true">
783 >
784 >      <include name="jsr166y/**/*.java"/>
785 >      <compilerarg line="${build.args}"/>
786 >      <compilerarg value="-XDignore.symbol.file=true"/>
787 >      <compilerarg value="-Xlint:all"/>
788 >    </javac>
789 >  </target>
790 >
791 >
792 >  <target name="jsr166yjar"
793 >          depends="jsr166ycompile"
794 >          description="Builds library jar from compiled sources">
795 >
796 >    <mkdir dir="${build.jsr166ylib.dir}"/>
797 >
798 >    <jar destfile="${jsr166y.jar}" index="true">
799 >      <fileset dir="${build.jsr166y.dir}"/>
800 >    </jar>
801  
802    </target>
803  
804  
795  <target name="cppdemo" depends="configure-cpp">
805  
806 <    <mkdir dir="${build.dir}"/>
806 >  <target name="jsr166ydocs"
807 >          description="Builds javadocs to dist dir">
808  
809 <    <cc multithreaded="true"
810 <                 name="g++"
801 <               objdir="${build.dir}"
802 <              outfile="${build.dir}/CppDemo">
803 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
804 <      <libset libs="stdc++"/>
805 <    </cc>
809 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
810 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
811  
812 <    <exec executable="${build.dir}/CppDemo">
813 <      <arg line="count in word frequency of word in command line count"/>
814 <    </exec>
812 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
813 >             packagenames="jsr166y.*"
814 >             link="${jdkapidocs.url}"
815 >             source="6"
816 >             bootclasspath="${bootclasspath6}"
817 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
818 >             executable="${javadoc7}"
819 >             additionalparam="-XDignore.symbol.file=true" />
820  
821    </target>
822  
823  
824 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
824 >  <target name="jsr166ydist"
825 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
826 >          description="Puts all distributable products in single hierarchy"/>
827  
816    <mkdir dir="${build.testcases.dir}"/>
828  
829 <    <javac srcdir="${test.src.dir}"
830 <          destdir="${build.testcases.dir}"
831 <            debug="${build.debug}"
832 <       debuglevel="${build.debuglevel}"
833 <      deprecation="${build.deprecation}"
834 <           source="${build.sourcelevel}"
835 <             fork="true">
836 <      <compilerarg value="${bootclasspath.args}"/>
829 >
830 >  <target name="jsr166yclean"
831 >          description="Removes all build products">
832 >
833 >    <delete dir="${build.jsr166y.dir}"/>
834 >    <delete dir="${build.jsr166ylib.dir}"/>
835 >
836 >  </target>
837 >
838 >
839 >
840 >  <target name="jsr166ydist-clean"
841 >          description="Removes all build and distribution products">
842 >
843 >  </target>
844 >
845 >  <target name="jsr166ydist-jar"
846 >          depends="jsr166yclean, jsr166yjar">
847 >
848 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
849 >
850 >  </target>
851 >
852 >
853 >  <!-- extra166y -->
854 >
855 >
856 >  <target name="extra166ycompile"
857 >          depends="configure-compiler, jsr166yjar"
858 >          description="Compiles extra166y sources">
859 >
860 >    <mkdir dir="${build.extra166y.dir}"/>
861 >
862 >    <javac srcdir="${topsrc.dir}"
863 >           destdir="${build.extra166y.dir}"
864 >           debug="${build.debug}"
865 >           debuglevel="${build.debuglevel}"
866 >           deprecation="${build.deprecation}"
867 >           classpath=""
868 >           source="6"
869 >           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
870 >           includeAntRuntime="false"
871 >           includeJavaRuntime="false"
872 >           executable="${javac7}"
873 >           fork="true">
874 >
875 >      <include name="extra166y/**/*.java"/>
876        <compilerarg line="${build.args}"/>
877 <      <classpath refid="test.classpath"/>
878 <      <include name="JniDemo.java"/>
877 >      <compilerarg value="-XDignore.symbol.file=true"/>
878 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
879 >
880      </javac>
881  
882 <    <javah destdir="${build.testcases.dir}"
883 <      classpathref="test.classpath">
833 <      <class name="JniDemo"/>
834 <    </javah>
882 >  </target>
883 >
884  
836    <cc multithreaded="true"
837                 name="g++"
838               objdir="${build.dir}"
839              outfile="${build.dir}/JniDemo"
840              outtype="shared">
885  
886 <      <compiler>
887 <        <defineset>
888 <          <define name="__int64" value="long long"/>
845 <        </defineset>
846 <        <includepath location="${java.home}/../include"/>
847 <        <includepath location="${java.home}/../include/${platform}"/>
848 <        <compilerarg value="-mno-cygwin"/>
849 <      </compiler>
886 >  <target name="extra166yjar"
887 >          depends="extra166ycompile"
888 >          description="Builds library jar from compiled sources">
889  
890 <      <linker>
852 <        <linkerarg value="--add-stdcall-alias"/>
853 <      </linker>
890 >    <mkdir dir="${build.extra166ylib.dir}"/>
891  
892 <      <includepath location="${build.testcases.dir}"/>
892 >    <jar destfile="${extra166y.jar}" index="true">
893 >      <fileset dir="${build.extra166y.dir}"/>
894 >    </jar>
895  
896 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
896 >  </target>
897  
859      <libset libs="stdc++"/>
898  
861    </cc>
899  
900 <    <!-- Necessary if windows, harmless if not -->
901 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
900 >  <target name="extra166ydocs"
901 >          description="Builds javadocs to build dir">
902  
903 <    <java classname="JniDemo" fork="true">
904 <      <!-- Watch out: path separator hardwired to semicolon here! -->
905 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
906 <      <classpath refid="test.classpath"/>
907 <      <arg line="count in word frequency of word in command line count"/>
908 <    </java>
903 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
904 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
905 >
906 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
907 >             packagenames="extra166y.*"
908 >             link="${jdkapidocs.url}"
909 >             source="6"
910 >             bootclasspath="${bootclasspath6}"
911 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
912 >             executable="${javadoc7}"
913 >             additionalparam="-XDignore.symbol.file=true" />
914  
915    </target>
916  
917  
918 +  <target name="extra166ydist"
919 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
920 +          description="Puts all distributable products in single hierarchy"/>
921  
877  <!-- Backward compatibility, work in progress (some files not checked in) -->
922  
923  
924 +  <target name="extra166yclean"
925 +          description="Removes all build products">
926  
927 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
928 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
883 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
884 <  <property name="pretiger.sourcelevel" value="1.4"/>
927 >    <delete dir="${build.extra166y.dir}"/>
928 >    <delete dir="${build.extra166ylib.dir}"/>
929  
930 <  <target name="defang"
887 <       depends="init"
888 <   description="Generates pre-Tiger compatible source">
930 >  </target>
931  
890    <delete dir="${pretiger.src.dir}"/>
891    <mkdir dir="${pretiger.src.dir}"/>
932  
933 <    <exec executable="perl">
934 <      <arg file="etc/defang.pl"/>
935 <      <!-- <arg value="-v"/> -->
896 <      <arg value="-s"/> <arg file="${src.dir}"/>
897 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
898 <    </exec>
933 >
934 >  <target name="extra166ydist-clean"
935 >          description="Removes all build and distribution products">
936  
937    </target>
938  
939 <  <target name="compile-pretiger"
940 <          depends="init, configure-compiler, defang"
904 <          description="Compiles pre-Tiger sources to build folder">
939 >  <target name="extra166ydist-jar"
940 >          depends="extra166yclean, extra166yjar">
941  
942 <    <mkdir dir="${build.pretiger.dir}"/>
942 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
943  
944 <    <javac srcdir="${pretiger.src.dir}"
945 <          destdir="${build.pretiger.dir}"
946 <            debug="${build.debug}"
947 <       debuglevel="${build.debuglevel}"
948 <      deprecation="${build.deprecation}"
949 <           source="${pretiger.sourcelevel}"
950 <             fork="true">
944 >  </target>
945 >
946 >  <!-- jsr166e -->
947 >
948 >  <target name="jsr166ecompile"
949 >          depends="configure-compiler"
950 >          description="Compiles jsr166e sources">
951 >
952 >    <mkdir dir="${build.jsr166e.dir}"/>
953  
954 +    <javac srcdir="${topsrc.dir}"
955 +           destdir="${build.jsr166e.dir}"
956 +           debug="${build.debug}"
957 +           debuglevel="${build.debuglevel}"
958 +           deprecation="${build.deprecation}"
959 +           source="7"
960 +           classpath=""
961 +           includeAntRuntime="false"
962 +           includeJavaRuntime="false"
963 +           executable="${javac7}"
964 +           fork="true">
965 +
966 +      <include name="jsr166e/**/*.java"/>
967        <compilerarg line="${build.args}"/>
968 <      <exclude name="**/Thread.java"/>
968 >      <compilerarg value="-XDignore.symbol.file=true"/>
969 >      <compilerarg value="-Xlint:all"/>
970  
971      </javac>
972  
973    </target>
974  
923  <target name="pretiger" depends="compile-pretiger">
975  
925    <mkdir dir="${build.lib.dir}"/>
976  
977 <    <jar destfile="${pretiger.jar}">
978 <      <fileset dir="${build.pretiger.dir}">
979 <      </fileset>
977 >  <target name="jsr166ejar"
978 >          depends="jsr166ecompile"
979 >          description="Builds library jar from compiled sources">
980 >
981 >    <mkdir dir="${build.jsr166elib.dir}"/>
982 >
983 >    <jar destfile="${jsr166e.jar}" index="true">
984 >      <fileset dir="${build.jsr166e.dir}"/>
985      </jar>
986  
987    </target>
988  
989 +
990 +
991 +  <target name="jsr166edocs"
992 +          description="Builds javadocs to build dir">
993 +
994 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
995 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
996 +
997 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
998 +             packagenames="jsr166e.*"
999 +             link="${jdkapidocs.url}"
1000 +             source="7"
1001 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1002 +             executable="${javadoc7}"
1003 +             additionalparam="-XDignore.symbol.file=true" >
1004 +    </javadoc>
1005 +
1006 +  </target>
1007 +
1008 +
1009 +  <target name="jsr166edist"
1010 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1011 +          description="Puts all distributable products in single hierarchy"/>
1012 +
1013 +
1014 +
1015 +  <target name="jsr166eclean"
1016 +          description="Removes all build products">
1017 +
1018 +    <delete dir="${build.jsr166e.dir}"/>
1019 +    <delete dir="${build.jsr166elib.dir}"/>
1020 +
1021 +  </target>
1022 +
1023 +
1024 +  <target name="jsr166edist-clean"
1025 +          description="Removes all build and distribution products">
1026 +
1027 +  </target>
1028 +
1029 +  <target name="jsr166edist-jar"
1030 +          depends="jsr166eclean, jsr166ejar">
1031 +
1032 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1033 +
1034 +  </target>
1035 +
1036   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines