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.72 by dl, Fri May 20 16:29:57 2005 UTC vs.
Revision 1.137 by jsr166, Wed Feb 6 19:55:06 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 + As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26   ------------------------------------------------------------------------------
27    </description>
28  
29 <  <target name="usage" description="Advises user to run with -projecthelp">
30 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
29 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30 >    <java classname="org.apache.tools.ant.Main">
31 >      <arg value="-projecthelp" />
32 >    </java>
33    </target>
34  
35  
# Line 21 | Line 38
38  
39  
40    <!-- Compilation options -->
41 <  <property name="build.sourcelevel"    value="1.5"/>
41 >  <property name="build.sourcelevel"    value="6"/>
42    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>
45 +  <property name="build.javadoc.access" value="protected"/>
46  
47    <!-- Build locations -->
48 <  <property name="build.dir"            location="build"/>
49 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
50 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
51 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
52 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
53 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
54 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
55 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
56 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
57 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
58 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
59 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
60 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
61 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
62 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
63 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
48 >  <property name="build.dir"                   location="build"/>
49 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
50 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
51 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
52 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
53 >
54 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
55 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
56 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
57 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
58 >
59 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
60 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
63 >
64 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68 >
69 >  <!-- JDK 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="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
80 >    <local name="boot.jar.dir"/>
81 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
82 >    <path id="bootclasspath@{v}">
83 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
84 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
85 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
86 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
87 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
88 >    </path>
89 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
90 >    </sequential>
91 >  </macrodef>
92 >
93 >  <macrodef name="mirror-dir">
94 >    <attribute name="src"/>
95 >    <attribute name="dst"/>
96 >    <sequential>
97 >    <delete dir="@{dst}"/>
98 >    <mkdir dir="@{dst}"/>
99 >    <copy todir="@{dst}" preservelastmodified="true">
100 >      <fileset dir="@{src}"/>
101 >    </copy>
102 >    </sequential>
103 >  </macrodef>
104 >
105 >  <defjdklocations v="6"/>
106 >  <defjdklocations v="7"/>
107 >  <defjdklocations v="8"/>
108  
109    <!-- Source locations -->
110    <property name="src.dir"              location="${basedir}/src/main"/>
111    <property name="test.src.dir"         location="${basedir}/src/test"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
112    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
113    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
114    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
115    <property name="lib.dir"              location="${basedir}/lib"/>
116    <property name="dist.dir"             location="${basedir}/dist"/>
117    <property name="topsrc.dir"           location="${basedir}/src"/>
118 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
119 <
120 <  <!-- Distribution locations -->
121 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
122 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
118 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
119 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
120 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
121 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
123 >
124 >  <!-- Javadoc locations -->
125 >  <property name="docs.dir"          location="${build.dir}/docs"/>
126 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131 >
132 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138  
139    <!-- Jar locations -->
140 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
141 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
142 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
143 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
144 <
145 <  <!-- Bootclasspath argument -->
146 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
140 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
141 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
142 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
143 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
144 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
145 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
146 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
147 >
148 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
149 >  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
150 >  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
151 >  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
152 >
153 >  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154 >  <!-- The below does not yet exist as of 2013-01 -->
155 >  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
156 >
157 >  <!-- Default jdk api doc location (latest stable release seems best) -->
158 >  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
159 >
160 >  <!-- Define the "jtreg" task -->
161 >  <!-- See the docs in "jtreg -onlineHelp" -->
162 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
163 >           classpath="${lib.dir}/jtreg.jar" />
164  
165    <!-- Test classpath -->
166    <path id="test.classpath">
# Line 77 | Line 168
168      <pathelement location="${junit.jar}"/>
169    </path>
170  
171 +  <macrodef name="run-tck-tests">
172 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173 +    <attribute name="source" default="6"/>
174 +    <attribute name="target"/>
175 +    <attribute name="workdir"/>
176 +    <attribute name="classes"/>
177 +    <attribute name="jvmflags" default=""/>
178 +    <element name="javac-elements" optional="true"/>
179 +    <sequential>
180 +
181 +    <mkdir dir="@{workdir}/tck-classes"/>
182 +
183 +    <javac srcdir="@{tck.src.dir}"
184 +           destdir="@{workdir}/tck-classes"
185 +           debug="${build.debug}"
186 +           debuglevel="${build.debuglevel}"
187 +           deprecation="${build.deprecation}"
188 +           source="@{source}"
189 +           classpath="${junit.jar}"
190 +           bootclasspath="@{classes}:${bootclasspath@{source}}"
191 +           includeAntRuntime="false"
192 +           includeJavaRuntime="false"
193 +           executable="${javac@{target}}"
194 +           fork="true">
195 +
196 +      <include name="*.java"/>
197 +      <compilerarg value="-XDignore.symbol.file=true"/>
198 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199 +      <compilerarg line="${build.args}"/>
200 +      <javac-elements/>
201 +
202 +    </javac>
203 +
204 +    <java classname="JSR166TestCase"
205 +          failonerror="true"
206 +          jvm="${java@{target}}"
207 +          fork="true">
208 +        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
209 +        <jvmarg line="@{jvmflags}"/>
210 +        <classpath>
211 +          <pathelement location="${junit.jar}"/>
212 +          <pathelement location="@{workdir}/tck-classes"/>
213 +        </classpath>
214 +    </java>
215 +
216 +    </sequential>
217 +  </macrodef>
218 +
219 +  <macrodef name="run-jtreg-tests">
220 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221 +    <attribute name="source" default="7"/>
222 +    <attribute name="target"/>
223 +    <attribute name="workdir"/>
224 +    <attribute name="classes"/>
225 +    <attribute name="jtregflags" default=""/>
226 +    <sequential>
227 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
228 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
229 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
230 +    <mkdir dir="@{workdir}/JTreport"/>
231 +    <jtreg dir="@{jtreg.src.dir}"
232 +           jdk="${jdk@{target}.home}"
233 +           workDir="@{workdir}/JTwork"
234 +           reportDir="@{workdir}/JTreport">
235 +
236 +      <arg value="-Xbootclasspath/p:@{classes}"/>
237 +      <arg value="-agentvm"/>
238 +      <arg value="-v:nopass,fail"/>
239 +      <arg value="-vmoptions:-esa -ea"/>
240 +      <arg value="-automatic"/>
241 +      <arg value="-k:!ignore"/>
242 +      <arg line="@{jtregflags}"/>
243 +    </jtreg>
244 +    </sequential>
245 +  </macrodef>
246 +
247    <!-- ALoops classpath -->
248    <path id="loops.classpath">
249      <pathelement location="${build.loops.dir}"/>
250    </path>
251  
252 <  <!-- J1 classpath -->
253 <  <path id="j1.classpath">
254 <    <pathelement location="${build.classes.dir}"/>
88 <    <pathelement location="${build.j1.dir}"/>
89 <    <pathelement location="${junit.jar}"/>
90 <
91 <    <!-- Include dl.u.c for BoundedBuffer comparison -->
92 <    <pathelement location="${concurrent.jar}"/>
93 <  </path>
94 <
252 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
253 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
254 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
255  
256    <!-- Main targets -->
257  
258 +  <target name="dists"
259 +          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
260 +          description="Builds all public jars and docs"/>
261  
262    <target name="compile"
263 <          depends="init, configure-compiler"
264 <          description="Compiles main sources to build folder">
263 >          depends="configure-compiler"
264 >          description="Compiles src/main sources to build dir">
265  
266      <mkdir dir="${build.classes.dir}"/>
267  
268      <javac srcdir="${src.dir}"
269 <          destdir="${build.classes.dir}"
270 <            debug="${build.debug}"
271 <       debuglevel="${build.debuglevel}"
272 <      deprecation="${build.deprecation}"
273 <           source="${build.sourcelevel}"
274 <             fork="true">
269 >           destdir="${build.classes.dir}"
270 >           debug="${build.debug}"
271 >           debuglevel="${build.debuglevel}"
272 >           deprecation="${build.deprecation}"
273 >           classpath=""
274 >           includeAntRuntime="false"
275 >           includeJavaRuntime="false"
276 >           executable="${javac8}"
277 >           fork="true">
278  
279        <include name="**/*.java"/>
280 < <!--
281 <      <exclude name="java/lang/**"/>
282 < -->
280 >      <compilerarg value="-Xprefer:source"/>
281 >      <compilerarg value="-XDignore.symbol.file=true"/>
282 >      <compilerarg value="-Xlint:all"/>
283        <compilerarg line="${build.args}"/>
284  
285      </javac>
120
286    </target>
287  
288  
124
289    <target name="jar"
290            depends="compile"
291            description="Builds library jar from compiled sources">
292  
129    <mkdir dir="${build.lib.dir}"/>
130
293      <jar destfile="${product.jar}">
294        <fileset dir="${build.classes.dir}"/>
295      </jar>
134
296    </target>
297  
298  
138
299    <target name="test"
300 <          depends="init, configure-tests, report-tests"
300 >          depends="configure-tests, report-tests"
301            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
302  
303  
144
304    <target name="docs"
305 <          description="Builds javadocs with custom tags to build folder">
147 <
148 <    <delete dir="${build.javadocs.dir}"/>
149 <    <mkdir dir="${build.javadocs.dir}"/>
305 >          description="Builds javadocs for src/main to dist dir">
306  
307 <    <javadoc destdir="${build.javadocs.dir}"
308 <                link="http://java.sun.com/j2se/1.5.0/docs/api"
153 <            overview="${src.dir}/intro.html"
154 <            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
155 <    >          
307 >    <delete dir="${docs.dir}"/>
308 >    <mkdir dir="${docs.dir}"/>
309  
310 <      <packageset dir="${src.dir}"/>
310 >    <!-- the packagenames="none" hack below prevents scanning the -->
311 >    <!-- sourcepath for packages -->
312  
313 +    <javadoc destdir="${docs.dir}"
314 +             packagenames="none"
315 +             link="${jdkapi8docs.url}"
316 +             overview="${src.dir}/intro.html"
317 +             access="${build.javadoc.access}"
318 +             sourcepath="${src.dir}:${jdk8src.dir}"
319 +             classpath=""
320 +             executable="${javadoc8}">
321 +      <fileset dir="${src.dir}" defaultexcludes="yes">
322 +        <include name="**/*.java"/>
323 +      </fileset>
324 +      <arg value="-XDignore.symbol.file=true"/>
325 +      <arg value="-tag"/>
326 +      <arg value="${javadoc.jls.option}"/>
327      </javadoc>
160
161  </target>
162
163
164
165  <target name="doccheck"
166          depends="filter-doccheck"
167          description="Reports on javadoc style errors">
168
169    <delete dir="${build.doccheck.dir}"/>
170    <mkdir dir="${build.doccheck.dir}"/>
171
172    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
173         docletpath="${lib.dir}/doccheck.jar"
174            destdir="${build.doccheck.dir}">
175      <packageset dir="${build.dc-filter.dir}"/>
176    </javadoc>
177
178    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
179
180  </target>
181
182
183
184  <target name="checkstyle"
185          depends="filter-src"
186          description="Reports on style errors in Java source (verbose, mostly chaff)">
187
188    <taskdef resource="checkstyletask.properties"
189            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
190
191    <mkdir dir="${build.checkstyle.dir}"/>
192
193    <checkstyle config="etc/checkstyle/sun_checks.xml"
194       failOnViolation="false">
195      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
196      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
197    </checkstyle>
198
199    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
200          out="${build.checkstyle.dir}/checkstyle-report.html"
201        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
202
328    </target>
329  
330  
206
331    <target name="dist"
332 <          depends="init, dist-clean, dist-jar, dist-docs"
332 >          depends="dist-clean, dist-jar, dist-docs"
333            description="Puts all distributable products in single hierarchy"/>
334  
335  
212
336    <target name="release"
337            depends="dist"
338            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 225 | Line 348
348        <exclude name="**/SyntaxTest.java"/>
349        <exclude name="**/SuperfluousAbstract.java"/>
350      </jar>
228
351    </target>
352  
353  
232
354    <target name="clean"
355            description="Removes all build products">
356  
357      <delete dir="${build.dir}"/>
237    <delete dir="${build.classes.dir}"/>
238    <delete dir="${build.lib.dir}"/>
358  
359    </target>
360  
361  
243
362    <target name="dist-clean"
363            description="Removes all build and distribution products">
364  
# Line 249 | Line 367
367    </target>
368  
369  
252
253  <target name="dist-docs"
254          description="Builds javadocs without custom tags to dist folder">
255
256    <delete dir="${dist.javadocs.dir}"/>
257    <mkdir dir="${dist.javadocs.dir}"/>
258
259    <javadoc destdir="${dist.javadocs.dir}"
260              link="http://java.sun.com/j2se/1.5.0/docs/api"
261            overview="${src.dir}/intro.html"
262
263            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
264     >
265      <packageset dir="${src.dir}" defaultexcludes="yes">
266      <include name="java/util/concurrent"/>
267      <include name="java/util/concurrent/atomic"/>
268      <include name="java/util/concurrent/locks"/>
269      </packageset>
270      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
271      <include name="main/java/util/*.java"/>
272 <!--      <include name="jsr166x/*.java"/> -->
273      </fileset>
274    </javadoc>
275
276  </target>
277
278
279
370    <!-- Internal targets -->
371  
372  
283  <target name="init">
284
285    <!-- Version is kept in a separate file -->
286    <loadfile property="version" srcFile="version.properties"/>
287    <echo>Building JSR-166 version ${version}</echo>
288    <echo>java.home is ${java.home}</echo>
289
290  </target>
291
292
373    <target name="dist-jar"
374            depends="clean, jar">
295
375      <copy file="${product.jar}" todir="${dist.dir}"/>
297
298  </target>
299
300
301  <target name="compile-ant-filter"
302          depends="init">
303
304    <mkdir dir="${build.ant.dir}"/>
305
306    <javac srcdir="${ant.src.dir}"
307          destdir="${build.ant.dir}"
308           source="1.4"/>
309
310  </target>
311
312
313  <target name="filter-src"
314          depends="compile-ant-filter">
315
316    <mkdir dir="${build.filter.src.dir}"/>
317
318    <copy todir="${build.filter.src.dir}">
319      <fileset dir="${src.dir}">
320        <include name="**/*.html"/>
321      </fileset>
322    </copy>
323
324    <copy todir="${build.filter.src.dir}">
325      <fileset dir="${src.dir}">
326        <exclude name="**/*.html"/>
327        <!-- Files excluded from dist-docs -->
328        <exclude name="java/util/Random.*"/>
329        <exclude name="sun/misc/Unsafe.*"/>
330      </fileset>
331      <!--
332      <filterchain>
333      -->
334
335        <!--
336         # This filter gets rid of angle-bracketed type parameters
337         # so that javadoc can run on the result. The following
338         # heuristic seems to work:
339         #
340         # For all lines not starting with space(s)-asterisk-space(s),
341         #   replace <something> with a space, where there may be more
342         #   than one right angle bracket at the end, and "something"
343         #   must not contain parens or pipes. (This may need some
344         #   tweaking.)
345         -->
346
347        <!--
348        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
349                      classpath="${build.ant.dir}">
350          <param name="notmatching" value="^\s+\*\s.*$"/>
351          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
352          <param name="replacement" value=" "/>
353        </filterreader>
354        -->
355
356      <!--
357      </filterchain>
358      -->
359    </copy>
360
376    </target>
377  
378 <
379 <  <target name="filter-doccheck"
380 <          depends="filter-src">
366 <
367 <    <mkdir dir="${build.dc-filter.dir}"/>
368 <
369 <    <copy todir="${build.dc-filter.dir}">
370 <      <fileset dir="${build.filter.src.dir}">
371 <        <include name="**/*.html"/>
372 <      </fileset>
373 <    </copy>
374 <
375 <    <property name="generic.declarations"
376 <             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 {}"
377 <    />
378 <
379 <    <copy todir="${build.dc-filter.dir}">
380 <      <fileset dir="${build.filter.src.dir}">
381 <        <exclude name="**/*.html"/>
382 <      </fileset>
383 <      <filterchain>
384 <        <!--
385 <         # These two filters try to make the source look like
386 <         # something that doccheck can process. The first removes
387 <         # -source 1.4 assertions and the second adds in a bunch
388 <         # of single letter public nested marker interfaces so that
389 <         # the generic type parameters are recognized.
390 <         -->
391 <
392 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
393 <                      classpath="${build.ant.dir}">
394 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
395 <          <param name="pattern"     value="assert"/>
396 <          <param name="replacement" value="//assert"/>
397 <        </filterreader>
398 <
399 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
400 <                      classpath="${build.ant.dir}">
401 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
402 <          <param name="pattern"     value="$"/>
403 <          <param name="replacement" value=" ${generic.declarations}"/>
404 <        </filterreader>
405 <
406 <      </filterchain>
407 <    </copy>
408 <
378 >  <target name="dist-docs"
379 >          depends="clean, docs">
380 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
381    </target>
382  
383  
# Line 415 | Line 387
387      <mkdir dir="${build.testcases.dir}"/>
388  
389      <javac srcdir="${tck.src.dir}"
390 <          destdir="${build.testcases.dir}"
391 <            debug="${build.debug}"
392 <       debuglevel="${build.debuglevel}"
393 <      deprecation="${build.deprecation}"
394 <           source="${build.sourcelevel}"
395 <             fork="true">
390 >           destdir="${build.testcases.dir}"
391 >           debug="${build.debug}"
392 >           debuglevel="${build.debuglevel}"
393 >           deprecation="${build.deprecation}"
394 >           source="6"
395 >           classpath="${junit.jar}"
396 >           bootclasspath="@{product.jar}:${bootclasspath6}"
397 >           includeAntRuntime="false"
398 >           includeJavaRuntime="false"
399 >           executable="${javac8}"
400 >           fork="true">
401  
402 <      <compilerarg value="${bootclasspath.args}"/>
402 >      <include name="**/*.java"/>
403 >      <compilerarg value="-XDignore.symbol.file=true"/>
404 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
405        <compilerarg line="${build.args}"/>
406  
428      <classpath refid="test.classpath"/>
429
407      </javac>
408  
409      <javac srcdir="${test.src.dir}"
410 <          destdir="${build.testcases.dir}"
411 <            debug="${build.debug}"
412 <       debuglevel="${build.debuglevel}"
413 <      deprecation="${build.deprecation}"
414 <           source="${build.sourcelevel}"
415 <             fork="true">
416 <
417 <      <include name="jsr166/test/**"/>
418 <
419 <      <compilerarg value="${bootclasspath.args}"/>
410 >           destdir="${build.testcases.dir}"
411 >           debug="${build.debug}"
412 >           debuglevel="${build.debuglevel}"
413 >           deprecation="${build.deprecation}"
414 >           source="6"
415 >           classpath=""
416 >           bootclasspath="@{product.jar}:${bootclasspath6}"
417 >           includeAntRuntime="false"
418 >           includeJavaRuntime="false"
419 >           executable="${javac8}"
420 >           fork="true">
421 >
422 >      <include name="jsr166/test/**/*.java"/>
423 >      <compilerarg value="-XDignore.symbol.file=true"/>
424 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
425        <compilerarg line="${build.args}"/>
426  
445      <classpath refid="test.classpath"/>
446
427      </javac>
428  
429   <!--
# Line 455 | Line 435
435             source="${build.sourcelevel}"
436               fork="true">
437  
438 <      <compilerarg value="${bootclasspath.args}"/>
438 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
439 >      <compilerarg value="-XDignore.symbol.file=true"/>
440        <compilerarg line="${build.args}"/>
441  
461      <classpath refid="test.classpath"/>
462
442      </javac>
443   -->
444  
445    </target>
446  
447 +  <target name="test-tck"
448 +          depends="jar"
449 +          description="Runs tck tests for main directly">
450 +
451 +    <run-tck-tests
452 +      target="8"
453 +      workdir="${build.dir}"
454 +      classes="${product.jar}"/>
455 +  </target>
456 +
457 +  <target name="test-jtreg"
458 +          depends="jar"
459 +          description="Runs jtreg tests for main using the jtreg ant task">
460 +    <run-jtreg-tests
461 +       target="8"
462 +       workdir="${build.dir}"
463 +       classes="${product.jar}"/>
464 +  </target>
465 +
466 +  <target name="test-ng"
467 +          depends="test-tck, test-jtreg"
468 +          description="Runs tck and jtreg tests for main">
469 +  </target>
470  
471    <target name="run-tests"
472            depends="compile-tests">
# Line 479 | Line 481
481            errorProperty="junit.failed"
482          failureProperty="junit.failed"
483                      dir="${build.reports.dir}"
484 +                    jvm="${java8}"
485                     fork="true">
486  
487 <      <jvmarg value="${bootclasspath.args}"/>
487 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
488        <jvmarg value="-server"/>
489        <jvmarg value="-showversion"/>
490  
# Line 529 | Line 532
532        <fileset dir="${build.reports.dir}">
533          <include name="TEST-*.xml"/>
534        </fileset>
535 <      <report styledir="${stylesheet.dir}"
533 <                format="${junit.report.format}"
534 <                 todir="${build.reports.dir}"
535 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
536        />
537      </junitreport>
538  
# Line 581 | Line 582
582    </target>
583  
584  
584
585  <!-- Anthill targets -->
586
587  <target name="anthill-build">
588
589    <!-- Override this in user.properties -->
590    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
591
592    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
593      <arg value="-Xmx256000000"/>
594      <!-- classpath of new JVM -->
595      <arg value="-classpath"/> <arg path="${java.class.path}"/>
596      <!-- location of Ant home directory -->
597      <arg value="-Dant.home=${ant.home}"/>
598      <!-- the Ant main class -->
599      <arg value="org.apache.tools.ant.Main"/>
600      <!-- The build file -->
601      <arg value="-buildfile"/>  <arg value="build.xml"/>
602      <!-- the target to build on the new Ant instance -->
603      <arg value="-DJAVA_HOME=${tiger.home}"/>
604      <arg value="do-anthill-build"/>
605    </exec>
606  </target>
607
608  <target name="do-anthill-build"
609          depends="jar, test, docs, dist-docs"/>
610
611  <target name="anthill-publish">
612
613    <copy todir="${deployDir}/docs/private">
614      <fileset dir="${build.javadocs.dir}"/>
615    </copy>
616
617    <copy todir="${deployDir}/docs/public">
618      <fileset dir="${dist.javadocs.dir}"/>
619    </copy>
620
621    <copy tofile="${deployDir}/index.html"
622          file="${basedir}/etc/anthill-index.html"/>
623
624    <copy todir="${deployDir}/notes">
625      <fileset dir="${basedir}/etc/notes"/>
626    </copy>
627
628  </target>
629
630
631
585    <!-- Various demos and test programs -->
586  
587  
588 <  <target name="sample" depends="init, configure-compiler"
636 <          description="Standalone demo program">
637 <
638 <    <mkdir dir="${build.testcases.dir}"/>
639 <
640 <    <javac srcdir="${test.src.dir}"
641 <          destdir="${build.testcases.dir}"
642 <            debug="${build.debug}"
643 <       debuglevel="${build.debuglevel}"
644 <      deprecation="${build.deprecation}"
645 <           source="${build.sourcelevel}"
646 <             fork="true">
647 <
648 <      <include name="jsr166/test/Sample.java"/>
649 <
650 <    </javac>
651 <
652 <    <copy todir="${build.testcases.dir}">
653 <      <fileset dir="${test.src.dir}">
654 <        <include name="**/*.properties"/>
655 <      </fileset>
656 <    </copy>
657 <
658 <
659 <    <java classname="jsr166.test.Sample" fork="true">
660 <      <classpath refid="test.classpath"/>
661 <      <!-- <jvmarg value="-ea"/> -->
662 <      <!-- <jvmarg value="-server"/> -->
663 <      <!-- <arg value="1000"/> -->
664 <    </java>
665 <  </target>
666 <
667 <
668 <  <target name="loops" depends="init, configure-compiler"
588 >  <target name="loops" depends="configure-compiler"
589            description="Benchmark from Doug Lea's AQS paper">
590  
591      <mkdir dir="${build.loops.dir}"/>
# Line 680 | Line 600
600  
601        <compilerarg line="${build.args}"/>
602        <classpath refid="loops.classpath"/>
603 +      <compilerarg value="-XDignore.symbol.file=true"/>
604  
605      </javac>
606  
# Line 690 | Line 611
611    </target>
612  
613  
614 <  <target name="compile-j1" depends="init, configure-compiler, compile">
694 <
695 <    <mkdir dir="${build.j1.dir}"/>
614 >  <!-- jsr166 4jdk7 -->
615  
616 <    <javac srcdir="${j1.src.dir}"
617 <          destdir="${build.j1.dir}"
618 <            debug="${build.debug}"
619 <       debuglevel="${build.debuglevel}"
620 <      deprecation="${build.deprecation}"
621 <           source="${build.sourcelevel}" >
616 >  <target name="4jdk7compile"
617 >          depends="configure-compiler"
618 >          description="Compiles src/jdk7 sources, targeting jdk7">
619 >
620 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
621 >
622 >    <javac srcdir="${4jdk7src.dir}"
623 >           destdir="${build.4jdk7.classes.dir}"
624 >           debug="${build.debug}"
625 >           debuglevel="${build.debuglevel}"
626 >           deprecation="${build.deprecation}"
627 >           source="6"
628 >           classpath=""
629 >           bootclasspath="${bootclasspath6}"
630 >           includeAntRuntime="false"
631 >           includeJavaRuntime="false"
632 >           executable="${javac7}"
633 >           fork="true">
634  
635        <include name="**/*.java"/>
636 <      <exclude name="**/dijkstra/**"/>
637 <
636 >      <compilerarg value="-Xprefer:source"/>
637 >      <compilerarg value="-XDignore.symbol.file=true"/>
638 >      <compilerarg value="-Xlint:all"/>
639        <compilerarg line="${build.args}"/>
708      <classpath refid="j1.classpath"/>
640  
641      </javac>
642 +  </target>
643 +
644 +
645 +  <target name="4jdk7jar"
646 +          depends="4jdk7compile"
647 +          description="Builds library jar from compiled sources">
648 +
649 +    <jar destfile="${4jdk7product.jar}">
650 +      <fileset dir="${build.4jdk7.classes.dir}"/>
651 +    </jar>
652  
653    </target>
654  
655  
656 <  <target name="sw" depends="compile-j1"
657 <          description="Runs the SwingWorker demo">
656 >  <target name="4jdk7-test-tck"
657 >          depends="4jdk7jar"
658 >          description="Runs tck tests for jsr166-4jdk7 directly">
659 >
660 >    <run-tck-tests
661 >      target="7"
662 >      workdir="${build.4jdk7.dir}"
663 >      classes="${4jdk7product.jar}">
664 >      <javac-elements>
665 >        <!-- JDK8+ test classes -->
666 >        <exclude name="*8Test.java"/>
667 >        <exclude name="CompletableFutureTest.java"/>
668 >        <exclude name="StampedLockTest.java"/>
669 >      </javac-elements>
670 >    </run-tck-tests>
671 >  </target>
672  
718    <!--
719    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
720      <classpath refid="j1.classpath"/>
721    </java>
722    -->
673  
674 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
674 >  <target name="4jdk7-test-tck-junit"
675 >          depends="4jdk7compile"
676 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
677  
678 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
679 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
680 <    </exec>
678 >    <junit printsummary="true"
679 >           showoutput="true"
680 >           errorProperty="junit.failed"
681 >           failureProperty="junit.failed"
682 >           includeantruntime="true"
683 >           jvm="${java7}"
684 >           fork="true">
685 >
686 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
687 >      <jvmarg value="-server"/>
688 >
689 >      <classpath>
690 >        <pathelement location="${junit.jar}"/>
691 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
692 >      </classpath>
693 >
694 >      <formatter type="brief"/>
695 >
696 >      <test name="JSR166TestCase" haltonfailure="no">
697 >      </test>
698  
699 +    </junit>
700    </target>
701  
702 <  <target name="j1" depends="compile-j1"
703 <          description="Runs a standalone JavaOne program">
702 >  <target name="4jdk7-test-jtreg"
703 >          depends="4jdk7jar"
704 >          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
705 >    <run-jtreg-tests
706 >       target="7"
707 >       workdir="${build.4jdk7.dir}"
708 >       classes="${4jdk7product.jar}"/>
709 >  </target>
710  
735    <java classname="${j1.test}" fork="true">
736      <classpath refid="j1.classpath"/>
737      <jvmarg value="-client"/>
711  
712 <      <!-- TestPseudoRandom args -->
713 <      <arg value="2"/>
714 <      <arg value="25"/>
715 <      <arg value="100000"/>
712 >  <target name="4jdk7-test"
713 >          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
714 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
715 >  </target>
716  
744      <!-- WebCrawler args -->
745      <!--
746      <arg value="jsr166.webcrawler.WebCrawler3"/>
747      <arg value="http://www.priorartisans.com"/>
748      <arg value="25"/>
749      -->
717  
718 <    </java>
718 >  <target name="4jdk7docs"
719 >          description="Builds javadocs for src/jdk7 to dist dir">
720 >
721 >    <delete dir="${4jdk7docs.dir}"/>
722 >    <mkdir dir="${4jdk7docs.dir}"/>
723 >
724 >    <javadoc destdir="${4jdk7docs.dir}"
725 >             packagenames="none"
726 >             link="${jdkapi7docs.url}"
727 >             overview="${4jdk7src.dir}/intro.html"
728 >             access="${build.javadoc.access}"
729 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
730 >             classpath=""
731 >             executable="${javadoc7}">
732 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
733 >        <include name="**/*.java"/>
734 >      </fileset>
735 >      <arg value="-XDignore.symbol.file=true"/>
736 >    </javadoc>
737 >  </target>
738 >
739 >
740 >  <target name="4jdk7dist"
741 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
742 >          description="Puts all distributable products in single hierarchy"/>
743 >
744 >
745 >  <target name="4jdk7clean"
746 >          description="Removes all 4jdk7 build products">
747 >
748 >    <delete dir="${build.4jdk7.dir}"/>
749  
750    </target>
751  
752  
753 <  <target name="test-j1" depends="compile-j1"
754 <          description="Runs testcases from the JavaOne source directories">
753 >  <target name="4jdk7dist-clean"
754 >          description="Removes all build and distribution products">
755  
756 <    <junit printsummary="true"
760 <             showoutput="true"
761 <          errorProperty="junit.failed"
762 <        failureProperty="junit.failed"
763 <                    dir="${build.j1.dir}"
764 <                   fork="true">
756 >  </target>
757  
758 <      <!-- <jvmarg value="-server"/> -->
759 <      <classpath refid="j1.classpath"/>
760 <      <formatter type="xml"/>
758 >  <target name="4jdk7dist-jar"
759 >          depends="4jdk7clean, 4jdk7jar">
760 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
761 >  </target>
762  
770      <batchtest todir="${build.j1.dir}">
771        <fileset dir="${j1.src.dir}">
772          <include name="**/*Test.java"/>
773        </fileset>
774      </batchtest>
763  
764 <    </junit>
764 >  <target name="4jdk7dist-docs"
765 >          depends="4jdk7clean, 4jdk7docs">
766 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
767 >  </target>
768  
778    <available property="junit.report.format"
779                  value="frames"
780              classname="org.apache.xalan.lib.Redirect"/>
781    <property name="junit.report.format" value="noframes"/>
769  
770 <    <junitreport todir="${build.j1.dir}">
784 <      <fileset dir="${build.j1.dir}">
785 <        <include name="TEST-*.xml"/>
786 <      </fileset>
787 <      <report styledir="${stylesheet.dir}"
788 <                format="${junit.report.format}"
789 <                 todir="${build.j1.dir}"
790 <      />
791 <    </junitreport>
770 >  <!-- jsr166x -->
771  
772 <    <fail message="Test Cases Failed" if="junit.failed"/>
772 >  <target name="jsr166xcompile"
773 >          depends="configure-compiler"
774 >          description="Compiles jsr166x sources to build dir">
775 >
776 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
777  
778 +    <javac srcdir="${topsrc.dir}"
779 +           destdir="${build.jsr166x.classes.dir}"
780 +           debug="${build.debug}"
781 +           debuglevel="${build.debuglevel}"
782 +           deprecation="${build.deprecation}"
783 +           classpath=""
784 +           bootclasspath="${bootclasspath6}"
785 +           source="5"
786 +           includeAntRuntime="false"
787 +           includeJavaRuntime="false"
788 +           executable="${javac7}"
789 +           fork="true">
790 +
791 +      <include name="jsr166x/**/*.java"/>
792 +      <compilerarg value="-XDignore.symbol.file=true"/>
793 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
794 +      <compilerarg line="${build.args}"/>
795 +
796 +    </javac>
797    </target>
798  
799  
800 +  <target name="jsr166xjar"
801 +          depends="jsr166xcompile"
802 +          description="Builds library jar from compiled sources">
803  
804 <  <!-- C++ and JNI definitions and demos -->
804 >    <jar destfile="${jsr166x.jar}">
805 >      <fileset dir="${build.jsr166x.classes.dir}"/>
806 >    </jar>
807  
808 <  <target name="configure-cpp">
808 >  </target>
809  
803    <!-- Define tasks and types -->
810  
811 <    <path id="cpptasks.path">
812 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
807 <    </path>
808 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
809 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
811 >  <target name="jsr166xdocs"
812 >          description="Builds javadocs to dist dir">
813  
814 <    <!-- Set platform property for JNI includes -->
814 >    <delete dir="${jsr166xdocs.dir}"/>
815 >    <mkdir dir="${jsr166xdocs.dir}"/>
816  
817 <    <condition property="platform" value="linux">
818 <      <os name="Linux"/>
819 <    </condition>
820 <    <condition property="platform" value="win32">
821 <      <os family="windows"/>
822 <    </condition>
823 <    <condition property="platform" value="solaris">
824 <      <os name="SunOS"/>
825 <    </condition>
817 >    <javadoc destdir="${jsr166xdocs.dir}"
818 >             packagenames="jsr166x.*"
819 >             link="${jdkapidocs.url}"
820 >             access="${build.javadoc.access}"
821 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
822 >             bootclasspath="${bootclasspath6}"
823 >             source="5"
824 >             executable="${javadoc7}">
825 >      <arg value="-XDignore.symbol.file=true"/>
826  
827 +    </javadoc>
828    </target>
829  
830  
831 <  <target name="cppdemo" depends="configure-cpp">
831 >  <target name="jsr166xdist"
832 >          depends="jsr166xdist-jar, jsr166xdist-docs"
833 >          description="Puts all distributable products in single hierarchy"/>
834  
828    <mkdir dir="${build.dir}"/>
835  
836 <    <cc multithreaded="true"
837 <                 name="g++"
832 <               objdir="${build.dir}"
833 <              outfile="${build.dir}/CppDemo">
834 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
835 <      <libset libs="stdc++"/>
836 <    </cc>
836 >  <target name="jsr166xclean"
837 >          description="Removes all jsr166x build products">
838  
839 <    <exec executable="${build.dir}/CppDemo">
839 <      <arg line="count in word frequency of word in command line count"/>
840 <    </exec>
839 >    <delete dir="${build.jsr166x.dir}"/>
840  
841    </target>
842  
843  
844 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
844 >  <target name="jsr166xdist-clean"
845 >          description="Removes all build and distribution products">
846  
847 <    <mkdir dir="${build.testcases.dir}"/>
847 >  </target>
848  
849    <javac srcdir="${test.src.dir}"
850          destdir="${build.testcases.dir}"
851            debug="${build.debug}"
852       debuglevel="${build.debuglevel}"
853      deprecation="${build.deprecation}"
854           source="${build.sourcelevel}"
855             fork="true">
856      <compilerarg value="${bootclasspath.args}"/>
857      <compilerarg line="${build.args}"/>
858      <classpath refid="test.classpath"/>
859      <include name="JniDemo.java"/>
860    </javac>
849  
850 <    <javah destdir="${build.testcases.dir}"
851 <      classpathref="test.classpath">
852 <      <class name="JniDemo"/>
853 <    </javah>
866 <
867 <    <cc multithreaded="true"
868 <                 name="g++"
869 <               objdir="${build.dir}"
870 <              outfile="${build.dir}/JniDemo"
871 <              outtype="shared">
872 <
873 <      <compiler>
874 <        <defineset>
875 <          <define name="__int64" value="long long"/>
876 <        </defineset>
877 <        <includepath location="${java.home}/../include"/>
878 <        <includepath location="${java.home}/../include/${platform}"/>
879 <        <compilerarg value="-mno-cygwin"/>
880 <      </compiler>
881 <
882 <      <linker>
883 <        <linkerarg value="--add-stdcall-alias"/>
884 <      </linker>
885 <
886 <      <includepath location="${build.testcases.dir}"/>
887 <
888 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
889 <
890 <      <libset libs="stdc++"/>
891 <
892 <    </cc>
893 <
894 <    <!-- Necessary if windows, harmless if not -->
895 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
896 <
897 <    <java classname="JniDemo" fork="true">
898 <      <!-- Watch out: path separator hardwired to semicolon here! -->
899 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
900 <      <classpath refid="test.classpath"/>
901 <      <arg line="count in word frequency of word in command line count"/>
902 <    </java>
850 >  <target name="jsr166xdist-jar"
851 >          depends="jsr166xclean, jsr166xjar">
852 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
853 >  </target>
854  
855 +  <target name="jsr166xdist-docs"
856 +          depends="jsr166xclean, jsr166xdocs">
857 +    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
858    </target>
859  
860 +  <!-- jsr166y -->
861 +
862 +
863 +  <target name="jsr166ycompile"
864 +          depends="configure-compiler"
865 +          description="Compiles jsr166y sources">
866 +
867 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
868 +
869 +    <javac srcdir="${topsrc.dir}"
870 +           destdir="${build.jsr166y.classes.dir}"
871 +           debug="${build.debug}"
872 +           debuglevel="${build.debuglevel}"
873 +           deprecation="${build.deprecation}"
874 +           source="6"
875 +           classpath=""
876 +           bootclasspath="${bootclasspath6}"
877 +           includeAntRuntime="false"
878 +           includeJavaRuntime="false"
879 +           executable="${javac7}"
880 +           fork="true">
881 +
882 +      <include name="jsr166y/**/*.java"/>
883 +      <compilerarg value="-XDignore.symbol.file=true"/>
884 +      <compilerarg value="-Xlint:all"/>
885 +      <compilerarg line="${build.args}"/>
886 +
887 +    </javac>
888 +  </target>
889  
890  
891 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
891 >  <target name="jsr166yjar"
892 >          depends="jsr166ycompile"
893 >          description="Builds library jar from compiled sources">
894  
895 +    <jar destfile="${jsr166y.jar}" index="true">
896 +      <fileset dir="${build.jsr166y.classes.dir}"/>
897 +    </jar>
898  
899 +  </target>
900  
912  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
913  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
914  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
915  <property name="pretiger.sourcelevel" value="1.4"/>
901  
902 <  <target name="defang"
903 <       depends="init"
919 <   description="Generates pre-Tiger compatible source">
902 >  <target name="jsr166ydocs"
903 >          description="Builds javadocs to dist dir">
904  
905 <    <delete dir="${pretiger.src.dir}"/>
906 <    <mkdir dir="${pretiger.src.dir}"/>
905 >    <delete dir="${jsr166ydocs.dir}"/>
906 >    <mkdir dir="${jsr166ydocs.dir}"/>
907  
908 <    <exec executable="perl">
909 <      <arg file="etc/defang.pl"/>
910 <      <!-- <arg value="-v"/> -->
911 <      <arg value="-s"/> <arg file="${src.dir}"/>
912 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
913 <    </exec>
908 >    <javadoc destdir="${jsr166ydocs.dir}"
909 >             packagenames="jsr166y.*"
910 >             link="${jdkapidocs.url}"
911 >             access="${build.javadoc.access}"
912 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
913 >             bootclasspath="${bootclasspath6}"
914 >             source="6"
915 >             executable="${javadoc7}">
916 >      <arg value="-XDignore.symbol.file=true"/>
917  
918 +    </javadoc>
919    </target>
920  
933  <target name="compile-pretiger"
934          depends="init, configure-compiler, defang"
935          description="Compiles pre-Tiger sources to build folder">
921  
922 <    <mkdir dir="${build.pretiger.dir}"/>
922 >  <target name="jsr166ydist"
923 >          depends="jsr166ydist-jar, jsr166ydist-docs"
924 >          description="Puts all distributable products in single hierarchy"/>
925  
939    <javac srcdir="${pretiger.src.dir}"
940          destdir="${build.pretiger.dir}"
941            debug="${build.debug}"
942       debuglevel="${build.debuglevel}"
943      deprecation="${build.deprecation}"
944           source="${pretiger.sourcelevel}"
945             fork="true">
926  
927 <      <compilerarg line="${build.args}"/>
928 <      <exclude name="**/Thread.java"/>
927 >  <target name="jsr166yclean"
928 >          description="Removes all jsr166y build products">
929  
930 <    </javac>
930 >    <delete dir="${build.jsr166y.dir}"/>
931  
932    </target>
933  
954  <target name="pretiger" depends="compile-pretiger">
934  
935 <    <mkdir dir="${build.lib.dir}"/>
935 >  <target name="jsr166ydist-clean"
936 >          description="Removes all build and distribution products">
937  
938 <    <jar destfile="${pretiger.jar}">
959 <      <fileset dir="${build.pretiger.dir}">
960 <      </fileset>
961 <    </jar>
938 >  </target>
939  
940 +  <target name="jsr166ydist-jar"
941 +          depends="jsr166yclean, jsr166yjar">
942 +    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
943    </target>
944  
945 <  <!-- jsr166x -->
945 >  <target name="jsr166ydist-docs"
946 >          depends="jsr166yclean, jsr166ydocs">
947 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
948 >  </target>
949  
950  
951 <  <target name="jsr166xcompile"
969 <          depends="init, configure-compiler"
970 <          description="Compiles jsr166x sources">
951 >  <!-- extra166y -->
952  
972    <mkdir dir="${build.jsr166x.dir}"/>
953  
954 <    <javac srcdir="${jsr166xsrc.dir}"
955 <          destdir="${build.jsr166x.dir}"
956 <            debug="${build.debug}"
977 <       debuglevel="${build.debuglevel}"
978 <      deprecation="${build.deprecation}"
979 <           source="${build.sourcelevel}"
980 <             fork="true">
954 >  <target name="extra166ycompile"
955 >          depends="configure-compiler, jsr166yjar"
956 >          description="Compiles extra166y sources">
957  
958 <      <include name="**/*.java"/>
958 >    <mkdir dir="${build.extra166y.classes.dir}"/>
959 >
960 >    <javac srcdir="${topsrc.dir}"
961 >           destdir="${build.extra166y.classes.dir}"
962 >           debug="${build.debug}"
963 >           debuglevel="${build.debuglevel}"
964 >           deprecation="${build.deprecation}"
965 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
966 >           classpath=""
967 >           source="6"
968 >           includeAntRuntime="false"
969 >           includeJavaRuntime="false"
970 >           executable="${javac7}"
971 >           fork="true">
972 >
973 >      <include name="extra166y/**/*.java"/>
974 >      <compilerarg value="-XDignore.symbol.file=true"/>
975 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
976        <compilerarg line="${build.args}"/>
977  
978      </javac>
986
979    </target>
980  
981  
982 <
983 <  <target name="jsr166xjar"
992 <          depends="jsr166xcompile"
982 >  <target name="extra166yjar"
983 >          depends="extra166ycompile"
984            description="Builds library jar from compiled sources">
985  
986 <    <mkdir dir="${build.jsr166xlib.dir}"/>
987 <
997 <    <jar destfile="${jsr166xproduct.jar}">
998 <      <fileset dir="${build.jsr166x.dir}"/>
986 >    <jar destfile="${extra166y.jar}" index="true">
987 >      <fileset dir="${build.extra166y.classes.dir}"/>
988      </jar>
989  
990    </target>
991  
992  
993 +  <target name="extra166ydocs"
994 +          description="Builds javadocs to build dir">
995  
996 <  <target name="jsr166xdocs"
997 <          description="Builds javadocs with custom tags to build folder">
996 >    <delete dir="${extra166ydocs.dir}"/>
997 >    <mkdir dir="${extra166ydocs.dir}"/>
998 >
999 >    <javadoc destdir="${extra166ydocs.dir}"
1000 >             packagenames="extra166y.*"
1001 >             link="${jdkapidocs.url}"
1002 >             access="${build.javadoc.access}"
1003 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1004 >             bootclasspath="${bootclasspath6}"
1005 >             source="6"
1006 >             executable="${javadoc7}">
1007 >      <arg value="-XDignore.symbol.file=true"/>
1008  
1009 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
1010 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1009 >    </javadoc>
1010 >  </target>
1011  
1011    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1012                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1013            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1014
1015    >
1016      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1017      <include name="jsr166x"/>
1018      </packageset>
1012  
1013 +  <target name="extra166ydist"
1014 +          depends="extra166ydist-jar, extra166ydist-docs"
1015 +          description="Puts all distributable products in single hierarchy"/>
1016  
1017 <    </javadoc>
1017 >
1018 >  <target name="extra166yclean"
1019 >          description="Removes all extra166y build products">
1020 >
1021 >    <delete dir="${build.extra166y.dir}"/>
1022  
1023    </target>
1024  
1025  
1026 <  <target name="jsr166xdist"
1027 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1028 <          description="Puts all distributable products in single hierarchy"/>
1026 >  <target name="extra166ydist-clean"
1027 >          description="Removes all build and distribution products">
1028  
1029 +  </target>
1030  
1031 +  <target name="extra166ydist-jar"
1032 +          depends="extra166yclean, extra166yjar">
1033 +    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1034 +  </target>
1035 +
1036 +  <target name="extra166ydist-docs"
1037 +          depends="extra166yclean, extra166ydocs">
1038 +    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1039 +  </target>
1040 +
1041 +  <!-- jsr166e -->
1042 +
1043 +  <target name="jsr166ecompile"
1044 +          depends="configure-compiler"
1045 +          description="Compiles jsr166e sources">
1046 +
1047 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1048 +
1049 +    <javac srcdir="${topsrc.dir}"
1050 +           destdir="${build.jsr166e.classes.dir}"
1051 +           debug="${build.debug}"
1052 +           debuglevel="${build.debuglevel}"
1053 +           deprecation="${build.deprecation}"
1054 +           source="7"
1055 +           classpath=""
1056 +           includeAntRuntime="false"
1057 +           includeJavaRuntime="false"
1058 +           executable="${javac7}"
1059 +           fork="true">
1060 +
1061 +      <include name="jsr166e/**/*.java"/>
1062 +      <compilerarg value="-XDignore.symbol.file=true"/>
1063 +      <compilerarg value="-Xlint:all"/>
1064 +      <compilerarg line="${build.args}"/>
1065  
1066 <  <target name="jsr166xclean"
1067 <          description="Removes all build products">
1066 >    </javac>
1067 >  </target>
1068  
1069 <    <delete dir="${build.jsr166x.dir}"/>
1070 <    <delete dir="${build.jsr166xlib.dir}"/>
1069 >
1070 >  <target name="jsr166ejar"
1071 >          depends="jsr166ecompile"
1072 >          description="Builds library jar from compiled sources">
1073 >
1074 >    <jar destfile="${jsr166e.jar}" index="true">
1075 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1076 >    </jar>
1077  
1078    </target>
1079  
1080  
1081 +  <target name="jsr166edocs"
1082 +          description="Builds javadocs to build dir">
1083  
1084 <  <target name="jsr166xdist-clean"
1085 <          description="Removes all build and distribution products">
1084 >    <delete dir="${jsr166edocs.dir}"/>
1085 >    <mkdir dir="${jsr166edocs.dir}"/>
1086  
1087 +    <javadoc destdir="${jsr166edocs.dir}"
1088 +             packagenames="jsr166e.*"
1089 +             link="${jdkapidocs.url}"
1090 +             access="${build.javadoc.access}"
1091 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1092 +             source="7"
1093 +             executable="${javadoc7}">
1094 +      <arg value="-XDignore.symbol.file=true"/>
1095 +
1096 +    </javadoc>
1097    </target>
1098  
1099  
1100 +  <target name="jsr166e-test-tck"
1101 +          depends="jsr166ejar"
1102 +          description="Runs tck tests for jsr166e">
1103  
1104 <  <target name="jsr166xdist-docs"
1105 <          description="Builds javadocs without custom tags to dist folder">
1104 >    <run-tck-tests
1105 >      tck.src.dir="${test.src.dir}/tck-jsr166e"
1106 >      source="7"
1107 >      target="8"
1108 >      workdir="${build.jsr166e.dir}"
1109 >      classes="${jsr166e.jar}"/>
1110 >  </target>
1111  
1052    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1053    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1112  
1113 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1114 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1115 <              source="${build.sourcelevel}">
1058 <
1059 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1060 <      <include name="jsr166x"/>
1061 <      </packageset>
1113 >  <target name="jsr166edist"
1114 >          depends="jsr166edist-jar, jsr166edist-docs"
1115 >          description="Puts all distributable products in single hierarchy"/>
1116  
1063    </javadoc>
1117  
1118 +  <target name="jsr166eclean"
1119 +          description="Removes all jsr166e build products">
1120 +    <delete dir="${build.jsr166e.dir}"/>
1121    </target>
1122  
1067  <target name="jsr166xdist-jar"
1068          depends="jsr166xclean, jsr166xjar">
1123  
1124 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1124 >  <target name="jsr166edist-clean"
1125 >          description="Removes all build and distribution products">
1126 >
1127 >  </target>
1128 >
1129 >  <target name="jsr166edist-jar"
1130 >          depends="jsr166eclean, jsr166ejar">
1131 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1132 >  </target>
1133  
1134 +  <target name="jsr166edist-docs"
1135 +          depends="jsr166eclean, jsr166edocs">
1136 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1137    </target>
1138  
1139 +
1140 + <!-- Find buglets that can be detected by static build tools -->
1141 +
1142 +  <target name="lint">
1143 +    <antcall target="dists">
1144 +      <param name="build.javadoc.access" value="private"/>
1145 +    </antcall>
1146 +  </target>
1147 +
1148 +
1149   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines