ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.67 by jsr166, Sun Apr 11 22:00:40 2004 UTC vs.
Revision 1.99 by jsr166, Sat Jan 19 01:37:44 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.javadocs.dir"          location="${build.dir}/javadocs"/>
50 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
51 >
52 >  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53 >  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54 >  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55 >  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56 >  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57 >
58 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61 >
62 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65 >
66 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68 >  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69 >
70 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73 >
74 >  <!-- JDK binary locations -->
75 >  <property name="jdks.home"  location="${user.home}/jdk"/>
76 >
77 >  <macrodef name="defjdklocations">
78 >    <attribute name="v"/>
79 >    <sequential>
80 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84 >    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86 >    <property name="bootclasspath@{v}"
87 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88 >    </sequential>
89 >  </macrodef>
90 >
91 >  <defjdklocations v="6"/>
92 >  <defjdklocations v="7"/>
93 >  <defjdklocations v="8"/>
94 >
95 >  <macrodef name="run-tck-tests">
96 >    <attribute name="jvm"/>
97 >    <attribute name="tck.classes"/>
98 >    <attribute name="product.jar" default="${product.jar}"/>
99 >    <attribute name="jvmflags" default=""/>
100 >    <sequential>
101 >    <java classname="JSR166TestCase"
102 >          jvm="@{jvm}" fork="true">
103 >        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104 >        <jvmarg line="@{jvmflags}"/>
105 >        <classpath>
106 >          <pathelement location="${junit.jar}"/>
107 >          <pathelement location="@{tck.classes}"/>
108 >        </classpath>
109 >    </java>
110 >    </sequential>
111 >  </macrodef>
112  
113    <!-- Source locations -->
114    <property name="src.dir"              location="${basedir}/src/main"/>
115    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
116    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
117    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
118    <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"/>
119    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>
121 +  <property name="topsrc.dir"           location="${basedir}/src"/>
122 +  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128  
129    <!-- Distribution locations -->
130 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
130 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131 >  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136  
137    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139 +  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
145  
146    <!-- Bootclasspath argument -->
147    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148  
149 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153 +
154 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155 +  <!-- The below does not yet exist as of 2012-11 -->
156 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158 +
159    <!-- Test classpath -->
160    <path id="test.classpath">
161      <pathelement location="${build.testcases.dir}"/>
# Line 75 | Line 167
167      <pathelement location="${build.loops.dir}"/>
168    </path>
169  
78  <!-- J1 classpath -->
79  <path id="j1.classpath">
80    <pathelement location="${build.j1.dir}"/>
81    <pathelement location="${junit.jar}"/>
82    <pathelement location="${concurrent.jar}"/>
83  </path>
84
170  
171    <!-- Main targets -->
172  
173 +  <target name="dists"
174 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
175 +          description="Builds all public jars and docs"/>
176  
177    <target name="compile"
178            depends="init, configure-compiler"
# Line 100 | Line 188
188             source="${build.sourcelevel}"
189               fork="true">
190  
191 +      <include name="**/*.java"/>
192 +      <compilerarg value="-XDignore.symbol.file=true"/>
193 +
194 + <!--
195 +      <exclude name="java/lang/**"/>
196        <compilerarg line="${build.args}"/>
197 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
198 + -->
199  
200      </javac>
201  
# Line 134 | Line 229
229      <delete dir="${build.javadocs.dir}"/>
230      <mkdir dir="${build.javadocs.dir}"/>
231  
232 <    <javadoc destdir="${build.javadocs.dir}"
233 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
139 <            overview="${src.dir}/intro.html"
140 <              source="${build.sourcelevel}">
232 >    <!-- the packagenames="none" hack below prevents scanning the -->
233 >    <!-- sourcepath for packages -->
234  
235 <      <tag name="revised" description="Last revised:"/>
236 <      <tag name="spec"    description="Specified by:"/>
237 <
238 <      <packageset dir="${src.dir}"/>
239 <
240 <    </javadoc>
241 <
242 <  </target>
243 <
151 <
152 <
153 <  <target name="doccheck"
154 <          depends="filter-doccheck"
155 <          description="Reports on javadoc style errors">
156 <
157 <    <delete dir="${build.doccheck.dir}"/>
158 <    <mkdir dir="${build.doccheck.dir}"/>
159 <
160 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
161 <         docletpath="${lib.dir}/doccheck.jar"
162 <            destdir="${build.doccheck.dir}">
163 <      <packageset dir="${build.dc-filter.dir}"/>
235 >    <javadoc destdir="${build.javadocs.dir}"
236 >             packagenames="none"
237 >             link="${jdkapidocs.url}"
238 >             overview="${src.dir}/intro.html"
239 >             sourcepath="${src.dir}:${jdksrc.dir}"
240 >             additionalparam="-XDignore.symbol.file=true" >
241 >      <fileset dir="${src.dir}" defaultexcludes="yes">
242 >        <include name="**/*.java"/>
243 >      </fileset>
244      </javadoc>
245  
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
246    </target>
247  
248  
# Line 197 | Line 252
252            description="Puts all distributable products in single hierarchy"/>
253  
254  
200
255    <target name="release"
256            depends="dist"
257            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 244 | Line 298
298      <delete dir="${dist.javadocs.dir}"/>
299      <mkdir dir="${dist.javadocs.dir}"/>
300  
301 <    <javadoc destdir="${dist.javadocs.dir}"
302 <                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}"/>
301 >    <!-- the packagenames="none" hack below prevents scanning the -->
302 >    <!-- sourcepath for packages -->
303  
304 +    <javadoc destdir="${dist.javadocs.dir}"
305 +             packagenames="none"
306 +             link="${jdkapidocs.url}"
307 +             overview="${src.dir}/intro.html"
308 +             sourcepath="${src.dir}:${jdksrc.dir}"
309 +             additionalparam="-XDignore.symbol.file=true" >
310 +      <fileset dir="${src.dir}" defaultexcludes="yes">
311 +        <include name="**/*.java"/>
312 +      </fileset>
313      </javadoc>
314  
315    </target>
# Line 278 | Line 337
337    </target>
338  
339  
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
340    <target name="compile-tests"
341            depends="jar">
342  
# Line 404 | Line 352
352  
353        <compilerarg value="${bootclasspath.args}"/>
354        <compilerarg line="${build.args}"/>
355 +      <compilerarg value="-XDignore.symbol.file=true"/>
356  
357        <classpath refid="test.classpath"/>
358  
# Line 421 | Line 370
370  
371        <compilerarg value="${bootclasspath.args}"/>
372        <compilerarg line="${build.args}"/>
373 +      <compilerarg value="-XDignore.symbol.file=true"/>
374  
375        <classpath refid="test.classpath"/>
376  
# Line 437 | Line 387
387  
388        <compilerarg value="${bootclasspath.args}"/>
389        <compilerarg line="${build.args}"/>
390 +      <compilerarg value="-XDignore.symbol.file=true"/>
391  
392        <classpath refid="test.classpath"/>
393  
# Line 509 | Line 460
460        <fileset dir="${build.reports.dir}">
461          <include name="TEST-*.xml"/>
462        </fileset>
463 <      <report styledir="${stylesheet.dir}"
513 <                format="${junit.report.format}"
514 <                 todir="${build.reports.dir}"
463 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
464        />
465      </junitreport>
466  
# Line 561 | Line 510
510    </target>
511  
512  
513 +  <!-- Various demos and test programs -->
514  
565  <!-- Anthill targets -->
515  
516 <  <target name="anthill-build">
516 >  <target name="loops" depends="init, configure-compiler"
517 >          description="Benchmark from Doug Lea's AQS paper">
518 >
519 >    <mkdir dir="${build.loops.dir}"/>
520 >
521 >    <javac srcdir="${loops.src.dir}"
522 >          destdir="${build.loops.dir}"
523 >            debug="${build.debug}"
524 >       debuglevel="${build.debuglevel}"
525 >      deprecation="${build.deprecation}"
526 >           source="${build.sourcelevel}"
527 >             fork="true">
528  
529 <    <!-- Override this in user.properties -->
530 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
529 >      <compilerarg line="${build.args}"/>
530 >      <classpath refid="loops.classpath"/>
531 >      <compilerarg value="-XDignore.symbol.file=true"/>
532 >
533 >    </javac>
534  
535 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
536 <      <arg value="-Xmx256000000"/>
537 <      <!-- classpath of new JVM -->
575 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
576 <      <!-- location of Ant home directory -->
577 <      <arg value="-Dant.home=${ant.home}"/>
578 <      <!-- the Ant main class -->
579 <      <arg value="org.apache.tools.ant.Main"/>
580 <      <!-- The build file -->
581 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
582 <      <!-- the target to build on the new Ant instance -->
583 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
584 <      <arg value="do-anthill-build"/>
585 <    </exec>
586 <  </target>
587 <
588 <  <target name="do-anthill-build"
589 <          depends="jar, test, docs, dist-docs"/>
590 <
591 <  <target name="anthill-publish">
592 <
593 <    <copy todir="${deployDir}/docs/private">
594 <      <fileset dir="${build.javadocs.dir}"/>
595 <    </copy>
596 <
597 <    <copy todir="${deployDir}/docs/public">
598 <      <fileset dir="${dist.javadocs.dir}"/>
599 <    </copy>
600 <
601 <    <copy tofile="${deployDir}/index.html"
602 <          file="${basedir}/etc/anthill-index.html"/>
603 <
604 <    <copy todir="${deployDir}/notes">
605 <      <fileset dir="${basedir}/etc/notes"/>
606 <    </copy>
535 >    <java classname="ALoops" fork="true">
536 >      <classpath refid="loops.classpath"/>
537 >    </java>
538  
539    </target>
540  
541  
542 +  <!-- jsr166 4jdk7 -->
543  
612  <!-- Various demos and test programs -->
544  
545 +  <target name="4jdk7compile"
546 +          depends="configure-compiler"
547 +          description="Compiles src/jdk7 sources, targeting jdk7">
548 +
549 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
550 +
551 +    <javac srcdir="${4jdk7src.dir}"
552 +           destdir="${build.4jdk7.classes.dir}"
553 +           debug="${build.debug}"
554 +           debuglevel="${build.debuglevel}"
555 +           deprecation="${build.deprecation}"
556 +           source="1.6"
557 +           classpath=""
558 +           bootclasspath="${bootclasspath6}"
559 +           includeAntRuntime="false"
560 +           includeJavaRuntime="false"
561 +           executable="${javac7}"
562 +           fork="true">
563 +
564 +      <include name="**/*.java"/>
565 +      <compilerarg line="${build.args}"/>
566 +      <compilerarg value="-XDignore.symbol.file=true"/>
567 +      <compilerarg value="-Xlint:all"/>
568  
569 <  <target name="sample" depends="init, configure-compiler"
616 <          description="Standalone demo program">
569 >    </javac>
570  
571 <    <mkdir dir="${build.testcases.dir}"/>
571 >    <mkdir dir="${build.4jdk7.lib.dir}"/>
572  
573 <    <javac srcdir="${test.src.dir}"
574 <          destdir="${build.testcases.dir}"
575 <            debug="${build.debug}"
576 <       debuglevel="${build.debuglevel}"
577 <      deprecation="${build.deprecation}"
625 <           source="${build.sourcelevel}"
626 <             fork="true">
573 >    <jar destfile="${4jdk7product.jar}" index="true">
574 >      <fileset dir="${build.4jdk7.classes.dir}"/>
575 >    </jar>
576 >
577 >    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
578  
579 <      <include name="jsr166/test/Sample.java"/>
579 >    <javac srcdir="${tck.src.dir}"
580 >           destdir="${build.4jdk7.tck.classes.dir}"
581 >           debug="${build.debug}"
582 >           debuglevel="${build.debuglevel}"
583 >           deprecation="${build.deprecation}"
584 >           source="1.6"
585 >           classpath="${junit.jar}"
586 >           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
587 >           includeAntRuntime="false"
588 >           includeJavaRuntime="false"
589 >           executable="${javac7}"
590 >           fork="true">
591 >
592 >      <include name="**/*.java"/>
593 >      <compilerarg line="${build.args}"/>
594 >      <compilerarg value="-XDignore.symbol.file=true"/>
595 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
596  
597      </javac>
598  
599 <    <copy todir="${build.testcases.dir}">
600 <      <fileset dir="${test.src.dir}">
601 <        <include name="**/*.properties"/>
599 >  </target>
600 >
601 >
602 >  <target name="4jdk7-test-tck"
603 >          depends="4jdk7compile"
604 >          description="Runs tck tests for jsr166-4jdk7 directly">
605 >    <run-tck-tests
606 >      jvm="${java7}"
607 >      tck.classes="${build.4jdk7.tck.classes.dir}"
608 >      product.jar="${4jdk7product.jar}"/>
609 >  </target>
610 >
611 >
612 >  <target name="4jdk7-test-tck-junit"
613 >          depends="4jdk7compile"
614 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
615 >
616 >    <junit printsummary="true"
617 >           showoutput="true"
618 >           errorProperty="junit.failed"
619 >           failureProperty="junit.failed"
620 >           includeantruntime="true"
621 >           jvm="${java7}"
622 >           fork="true">
623 >
624 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
625 >      <jvmarg value="-server"/>
626 >
627 >      <classpath>
628 >        <pathelement location="${junit.jar}"/>
629 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
630 >      </classpath>
631 >
632 >      <formatter type="brief"/>
633 >
634 >      <test name="JSR166TestCase" haltonfailure="no">
635 >      </test>
636 >
637 >    </junit>
638 >  </target>
639 >
640 >
641 >  <target name="4jdk7docs"
642 >          description="Builds javadocs with custom tags to build folder">
643 >
644 >    <delete dir="${build.4jdk7.docs.dir}"/>
645 >    <mkdir dir="${build.4jdk7.docs.dir}"/>
646 >
647 >    <javadoc destdir="${build.4jdk7.docs.dir}"
648 >             packagenames="none"
649 >             link="${jdkapi7docs.url}"
650 >             overview="${4jdk7src.dir}/intro.html"
651 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
652 >             classpath=""
653 >             executable="${javadoc7}">
654 >      <arg value="-XDignore.symbol.file=true"/>
655 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
656 >        <include name="**/*.java"/>
657        </fileset>
658 <    </copy>
658 >    </javadoc>
659  
660 +  </target>
661 +
662 +
663 +  <target name="4jdk7dist"
664 +          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
665 +          description="Puts all distributable products in single hierarchy"/>
666 +
667 +
668 +
669 +  <target name="4jdk7clean"
670 +          description="Removes all build products">
671 +
672 +    <delete dir="${build.4jdk7.dir}"/>
673  
639    <java classname="jsr166.test.Sample" fork="true">
640      <classpath refid="test.classpath"/>
641      <!-- <jvmarg value="-ea"/> -->
642      <!-- <jvmarg value="-server"/> -->
643      <!-- <arg value="1000"/> -->
644    </java>
674    </target>
675  
676  
648  <target name="loops" depends="init, configure-compiler"
649          description="Benchmark from Doug Lea's AQS paper">
677  
678 <    <mkdir dir="${build.loops.dir}"/>
678 >  <target name="4jdk7dist-clean"
679 >          description="Removes all build and distribution products">
680  
681 <    <javac srcdir="${loops.src.dir}"
682 <          destdir="${build.loops.dir}"
681 >  </target>
682 >
683 >  <target name="4jdk7dist-docs"
684 >          description="Builds javadocs without custom tags to dist folder">
685 >
686 >    <delete dir="${dist.4jdk7.docs.dir}"/>
687 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
688 >
689 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
690 >             packagenames="none"
691 >             link="${jdkapi7docs.url}"
692 >             overview="${4jdk7src.dir}/intro.html"
693 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
694 >             classpath=""
695 >             executable="${javadoc7}">
696 >      <arg value="-XDignore.symbol.file=true"/>
697 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
698 >        <include name="**/*.java"/>
699 >      </fileset>
700 >    </javadoc>
701 >
702 >  </target>
703 >
704 >  <target name="4jdk7dist-jar"
705 >          depends="4jdk7clean, 4jdk7compile">
706 >
707 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
708 >
709 >  </target>
710 >
711 >  <!-- jsr166x -->
712 >
713 >
714 >  <target name="jsr166xcompile"
715 >          depends="init, configure-compiler"
716 >          description="Compiles jsr166x sources">
717 >
718 >    <mkdir dir="${build.jsr166x.dir}"/>
719 >
720 >    <javac srcdir="${jsr166xsrc.dir}"
721 >          destdir="${build.jsr166x.dir}"
722              debug="${build.debug}"
723         debuglevel="${build.debuglevel}"
724        deprecation="${build.deprecation}"
725             source="${build.sourcelevel}"
726               fork="true">
727  
728 +      <include name="**/*.java"/>
729        <compilerarg line="${build.args}"/>
730 <      <classpath refid="loops.classpath"/>
730 >      <compilerarg value="-XDignore.symbol.file=true"/>
731  
732      </javac>
733  
734 <    <java classname="ALoops" fork="true">
735 <      <classpath refid="loops.classpath"/>
736 <    </java>
734 >  </target>
735 >
736 >
737 >
738 >  <target name="jsr166xjar"
739 >          depends="jsr166xcompile"
740 >          description="Builds library jar from compiled sources">
741 >
742 >    <mkdir dir="${build.jsr166xlib.dir}"/>
743 >
744 >    <jar destfile="${jsr166xproduct.jar}">
745 >      <fileset dir="${build.jsr166x.dir}"/>
746 >    </jar>
747 >
748 >  </target>
749 >
750 >
751 >
752 >  <target name="jsr166xdocs"
753 >          description="Builds javadocs with custom tags to build folder">
754 >
755 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
756 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
757 >
758 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
759 >             packagenames="jsr166x"
760 >             link="${jdkapidocs.url}"
761 >             source="${build.sourcelevel}"
762 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
763 >             additionalparam="-XDignore.symbol.file=true" />
764 >
765 >  </target>
766 >
767 >
768 >  <target name="jsr166xdist"
769 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
770 >          description="Puts all distributable products in single hierarchy"/>
771 >
772 >
773 >
774 >  <target name="jsr166xclean"
775 >          description="Removes all build products">
776 >
777 >    <delete dir="${build.jsr166x.dir}"/>
778 >    <delete dir="${build.jsr166xlib.dir}"/>
779  
780    </target>
781  
782  
673  <target name="compile-j1" depends="init, configure-compiler">
783  
784 <    <mkdir dir="${build.j1.dir}"/>
784 >  <target name="jsr166xdist-clean"
785 >          description="Removes all build and distribution products">
786 >
787 >  </target>
788 >
789 >
790 >
791 >  <target name="jsr166xdist-docs"
792 >          description="Builds javadocs without custom tags to dist folder">
793 >
794 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
795 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
796 >
797 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
798 >             packagenames="jsr166x"
799 >             link="${jdkapidocs.url}"
800 >             source="${build.sourcelevel}"
801 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
802 >             additionalparam="-XDignore.symbol.file=true" />
803 >
804 >  </target>
805 >
806 >  <target name="jsr166xdist-jar"
807 >          depends="jsr166xclean, jsr166xjar">
808 >
809 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
810 >
811 >  </target>
812 >
813 >  <!-- jsr166y -->
814 >
815 >
816 >  <target name="jsr166ycompile"
817 >          depends="init, configure-compiler"
818 >          description="Compiles jsr166y sources">
819  
820 <    <javac srcdir="${j1.src.dir}"
821 <          destdir="${build.j1.dir}"
820 >    <mkdir dir="${build.jsr166y.dir}"/>
821 >
822 >    <javac srcdir="${jsr166ysrc.dir}"
823 >          destdir="${build.jsr166y.dir}"
824              debug="${build.debug}"
825         debuglevel="${build.debuglevel}"
826        deprecation="${build.deprecation}"
827 <           source="${build.sourcelevel}" >
827 >           source="${build.sourcelevel}"
828 >             fork="true">
829  
830        <include name="**/*.java"/>
685      <exclude name="**/dijkstra/**"/>
686
831        <compilerarg line="${build.args}"/>
832 <      <classpath refid="j1.classpath"/>
832 >      <compilerarg value="-XDignore.symbol.file=true"/>
833 >      <compilerarg value="${bootclasspath.args}"/>
834 >
835 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
836  
837      </javac>
838  
839    </target>
840  
841  
695  <target name="sw" depends="compile-j1"
696          description="Runs the SwingWorker demo">
842  
843 <    <!--
844 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
845 <      <classpath refid="j1.classpath"/>
701 <    </java>
702 <    -->
843 >  <target name="jsr166yjar"
844 >          depends="jsr166ycompile"
845 >          description="Builds library jar from compiled sources">
846  
847 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
847 >    <mkdir dir="${build.jsr166ylib.dir}"/>
848  
849 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
850 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
851 <    </exec>
849 >    <jar destfile="${jsr166yproduct.jar}" index="true">
850 >      <fileset dir="${build.jsr166y.dir}"/>
851 >    </jar>
852  
853    </target>
854  
712  <target name="j1" depends="compile-j1"
713          description="Runs a standalone JavaOne program">
855  
715    <java classname="jsr166.random.TestRandom" fork="true">
716      <classpath refid="j1.classpath"/>
717      <jvmarg value="-client"/>
718    </java>
856  
857 <  </target>
857 >  <target name="jsr166ydocs"
858 >          description="Builds javadocs with custom tags to build folder">
859  
860 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
861 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
862  
863 <  <target name="test-j1" depends="compile-j1"
864 <          description="Runs testcases from the JavaOne source directories">
863 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
864 >             packagenames="jsr166y"
865 >             link="${jdkapidocs.url}"
866 >             source="${build.sourcelevel}"
867 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
868 >             additionalparam="-XDignore.symbol.file=true" />
869  
870 <    <junit printsummary="true"
727 <             showoutput="true"
728 <          errorProperty="junit.failed"
729 <        failureProperty="junit.failed"
730 <                    dir="${build.j1.dir}"
731 <                   fork="true">
870 >  </target>
871  
733      <!-- <jvmarg value="-server"/> -->
734      <classpath refid="j1.classpath"/>
735      <formatter type="xml"/>
872  
873 <      <batchtest todir="${build.j1.dir}">
874 <        <fileset dir="${j1.src.dir}">
875 <          <include name="**/*Test.java"/>
740 <        </fileset>
741 <      </batchtest>
873 >  <target name="jsr166ydist"
874 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
875 >          description="Puts all distributable products in single hierarchy"/>
876  
743    </junit>
877  
745    <available property="junit.report.format"
746                  value="frames"
747              classname="org.apache.xalan.lib.Redirect"/>
748    <property name="junit.report.format" value="noframes"/>
878  
879 <    <junitreport todir="${build.j1.dir}">
880 <      <fileset dir="${build.j1.dir}">
752 <        <include name="TEST-*.xml"/>
753 <      </fileset>
754 <      <report styledir="${stylesheet.dir}"
755 <                format="${junit.report.format}"
756 <                 todir="${build.j1.dir}"
757 <      />
758 <    </junitreport>
879 >  <target name="jsr166yclean"
880 >          description="Removes all build products">
881  
882 <    <fail message="Test Cases Failed" if="junit.failed"/>
882 >    <delete dir="${build.jsr166y.dir}"/>
883 >    <delete dir="${build.jsr166ylib.dir}"/>
884  
885    </target>
886  
887  
888  
889 <  <!-- C++ and JNI definitions and demos -->
890 <
768 <  <target name="configure-cpp">
889 >  <target name="jsr166ydist-clean"
890 >          description="Removes all build and distribution products">
891  
892 <    <!-- Define tasks and types -->
892 >  </target>
893  
894 <    <path id="cpptasks.path">
895 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
774 <    </path>
775 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
776 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
894 >  <target name="jsr166ydist-docs"
895 >          description="Builds javadocs without custom tags to dist folder">
896  
897 <    <!-- Set platform property for JNI includes -->
897 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
898 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
899  
900 <    <condition property="platform" value="linux">
901 <      <os name="Linux"/>
902 <    </condition>
903 <    <condition property="platform" value="win32">
904 <      <os family="windows"/>
905 <    </condition>
786 <    <condition property="platform" value="solaris">
787 <      <os name="SunOS"/>
788 <    </condition>
900 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
901 >             packagenames="jsr166y"
902 >             link="${jdkapidocs.url}"
903 >             source="${build.sourcelevel}"
904 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
905 >             additionalparam="-XDignore.symbol.file=true" />
906  
907    </target>
908  
909 +  <target name="jsr166ydist-jar"
910 +          depends="jsr166yclean, jsr166yjar">
911  
912 <  <target name="cppdemo" depends="configure-cpp">
912 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
913  
914 <    <mkdir dir="${build.dir}"/>
796 <
797 <    <cc multithreaded="true"
798 <                 name="g++"
799 <               objdir="${build.dir}"
800 <              outfile="${build.dir}/CppDemo">
801 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
802 <      <libset libs="stdc++"/>
803 <    </cc>
914 >  </target>
915  
805    <exec executable="${build.dir}/CppDemo">
806      <arg line="count in word frequency of word in command line count"/>
807    </exec>
916  
917 <  </target>
917 >  <!-- extra166y -->
918  
919  
920 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
920 >  <target name="extra166ycompile"
921 >          depends="init, configure-compiler, jsr166ycompile"
922 >          description="Compiles extra166y sources">
923  
924 <    <mkdir dir="${build.testcases.dir}"/>
924 >    <mkdir dir="${build.extra166y.dir}"/>
925  
926 <    <javac srcdir="${test.src.dir}"
927 <          destdir="${build.testcases.dir}"
926 >    <javac srcdir="${extra166ysrc.dir}"
927 >          destdir="${build.extra166y.dir}"
928              debug="${build.debug}"
929 +            classpath="${jsr166yproduct.jar}"
930         debuglevel="${build.debuglevel}"
931        deprecation="${build.deprecation}"
932             source="${build.sourcelevel}"
933               fork="true">
934 <      <compilerarg value="${bootclasspath.args}"/>
934 >
935 >      <include name="**/*.java"/>
936        <compilerarg line="${build.args}"/>
937 <      <classpath refid="test.classpath"/>
938 <      <include name="JniDemo.java"/>
937 >      <compilerarg value="-XDignore.symbol.file=true"/>
938 >      <compilerarg value="${bootclasspath.args}"/>
939 >
940 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
941 >
942      </javac>
943  
944 <    <javah destdir="${build.testcases.dir}"
830 <      classpathref="test.classpath">
831 <      <class name="JniDemo"/>
832 <    </javah>
944 >  </target>
945  
834    <cc multithreaded="true"
835                 name="g++"
836               objdir="${build.dir}"
837              outfile="${build.dir}/JniDemo"
838              outtype="shared">
946  
840      <compiler>
841        <defineset>
842          <define name="__int64" value="long long"/>
843        </defineset>
844        <includepath location="${java.home}/../include"/>
845        <includepath location="${java.home}/../include/${platform}"/>
846        <compilerarg value="-mno-cygwin"/>
847      </compiler>
947  
948 <      <linker>
949 <        <linkerarg value="--add-stdcall-alias"/>
950 <      </linker>
948 >  <target name="extra166yjar"
949 >          depends="extra166ycompile"
950 >          description="Builds library jar from compiled sources">
951 >
952 >    <mkdir dir="${build.extra166ylib.dir}"/>
953  
954 <      <includepath location="${build.testcases.dir}"/>
954 >    <jar destfile="${extra166yproduct.jar}" index="true">
955 >      <fileset dir="${build.extra166y.dir}"/>
956 >    </jar>
957  
958 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
958 >  </target>
959  
857      <libset libs="stdc++"/>
960  
859    </cc>
961  
962 <    <!-- Necessary if windows, harmless if not -->
963 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
962 >  <target name="extra166ydocs"
963 >          description="Builds javadocs with custom tags to build folder">
964  
965 <    <java classname="JniDemo" fork="true">
966 <      <!-- Watch out: path separator hardwired to semicolon here! -->
967 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
968 <      <classpath refid="test.classpath"/>
969 <      <arg line="count in word frequency of word in command line count"/>
970 <    </java>
965 >    <delete dir="${build.extra166yjavadocs.dir}"/>
966 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
967 >
968 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
969 >             packagenames="extra166y"
970 >             link="${jdkapidocs.url}"
971 >             source="${build.sourcelevel}"
972 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
973 >             additionalparam="-XDignore.symbol.file=true" />
974  
975    </target>
976  
977  
978 +  <target name="extra166ydist"
979 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
980 +          description="Puts all distributable products in single hierarchy"/>
981 +
982  
875  <!-- Backward compatibility, work in progress (some files not checked in) -->
983  
984 +  <target name="extra166yclean"
985 +          description="Removes all build products">
986  
987 +    <delete dir="${build.extra166y.dir}"/>
988 +    <delete dir="${build.extra166ylib.dir}"/>
989  
990 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
880 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
881 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
882 <  <property name="pretiger.sourcelevel" value="1.4"/>
990 >  </target>
991  
884  <target name="defang"
885       depends="init"
886   description="Generates pre-Tiger compatible source">
992  
888    <delete dir="${pretiger.src.dir}"/>
889    <mkdir dir="${pretiger.src.dir}"/>
993  
994 <    <exec executable="perl">
995 <      <arg file="etc/defang.pl"/>
893 <      <!-- <arg value="-v"/> -->
894 <      <arg value="-s"/> <arg file="${src.dir}"/>
895 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
896 <    </exec>
994 >  <target name="extra166ydist-clean"
995 >          description="Removes all build and distribution products">
996  
997    </target>
998  
999 <  <target name="compile-pretiger"
1000 <          depends="init, configure-compiler, defang"
902 <          description="Compiles pre-Tiger sources to build folder">
999 >  <target name="extra166ydist-docs"
1000 >          description="Builds javadocs without custom tags to dist folder">
1001  
1002 <    <mkdir dir="${build.pretiger.dir}"/>
1002 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
1003 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
1004  
1005 <    <javac srcdir="${pretiger.src.dir}"
1006 <          destdir="${build.pretiger.dir}"
1007 <            debug="${build.debug}"
1008 <       debuglevel="${build.debuglevel}"
1009 <      deprecation="${build.deprecation}"
1010 <           source="${pretiger.sourcelevel}"
1011 <             fork="true">
1005 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
1006 >             packagenames="extra166y"
1007 >             link="${jdkapidocs.url}"
1008 >             source="${build.sourcelevel}"
1009 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1010 >             additionalparam="-XDignore.symbol.file=true" />
1011 >
1012 >  </target>
1013 >
1014 >  <target name="extra166ydist-jar"
1015 >          depends="extra166yclean, extra166yjar">
1016 >
1017 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1018 >
1019 >  </target>
1020 >
1021 >  <!-- jsr166e -->
1022 >
1023 >  <target name="jsr166ecompile"
1024 >          depends="configure-compiler"
1025 >          description="Compiles jsr166e sources">
1026 >
1027 >    <mkdir dir="${build.jsr166e.dir}"/>
1028 >
1029 >    <javac srcdir="${topsrc.dir}"
1030 >           destdir="${build.jsr166e.dir}"
1031 >           debug="${build.debug}"
1032 >           debuglevel="${build.debuglevel}"
1033 >           deprecation="${build.deprecation}"
1034 >           source="1.7"
1035 >           classpath=""
1036 >           includeAntRuntime="false"
1037 >           includeJavaRuntime="false"
1038 >           executable="${javac7}"
1039 >           fork="true">
1040  
1041 +      <include name="jsr166e/**/*.java"/>
1042        <compilerarg line="${build.args}"/>
1043 <      <exclude name="**/Thread.java"/>
1043 >      <compilerarg value="-XDignore.symbol.file=true"/>
1044 >      <compilerarg value="-Xlint:all"/>
1045  
1046      </javac>
1047  
1048    </target>
1049  
921  <target name="pretiger" depends="compile-pretiger">
1050  
923    <mkdir dir="${build.lib.dir}"/>
1051  
1052 <    <jar destfile="${pretiger.jar}">
1053 <      <fileset dir="${build.pretiger.dir}">
1054 <      </fileset>
1052 >  <target name="jsr166ejar"
1053 >          depends="jsr166ecompile"
1054 >          description="Builds library jar from compiled sources">
1055 >
1056 >    <mkdir dir="${build.jsr166elib.dir}"/>
1057 >
1058 >    <jar destfile="${jsr166eproduct.jar}" index="true">
1059 >      <fileset dir="${build.jsr166e.dir}"/>
1060      </jar>
1061  
1062    </target>
1063  
1064 +
1065 +
1066 +  <target name="jsr166edocs"
1067 +          description="Builds javadocs with custom tags to build folder">
1068 +
1069 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
1070 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1071 +
1072 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
1073 +             packagenames="jsr166e,jsr166e.extra"
1074 +             link="${jdkapi7docs.url}"
1075 +             source="1.7"
1076 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1077 +             executable="${javadoc7}"
1078 +             additionalparam="-XDignore.symbol.file=true" >
1079 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1080 +        <include name="jsr166e/**/*.java"/>
1081 +      </fileset>
1082 +    </javadoc>
1083 +
1084 +  </target>
1085 +
1086 +
1087 +  <target name="jsr166edist"
1088 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1089 +          description="Puts all distributable products in single hierarchy"/>
1090 +
1091 +
1092 +
1093 +  <target name="jsr166eclean"
1094 +          description="Removes all build products">
1095 +
1096 +    <delete dir="${build.jsr166e.dir}"/>
1097 +    <delete dir="${build.jsr166elib.dir}"/>
1098 +
1099 +  </target>
1100 +
1101 +
1102 +
1103 +  <target name="jsr166edist-clean"
1104 +          description="Removes all build and distribution products">
1105 +
1106 +  </target>
1107 +
1108 +  <target name="jsr166edist-docs"
1109 +          description="Builds javadocs without custom tags to dist folder">
1110 +
1111 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1112 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1113 +
1114 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1115 +             packagenames="jsr166e,jsr166e.extra"
1116 +             link="${jdkapidocs.url}"
1117 +             source="1.7"
1118 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1119 +             additionalparam="-XDignore.symbol.file=true" />
1120 +
1121 +  </target>
1122 +
1123 +  <target name="jsr166edist-jar"
1124 +          depends="jsr166eclean, jsr166ejar">
1125 +
1126 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1127 +
1128 +  </target>
1129 +
1130   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines