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.81 by jsr166, Sun Aug 2 00:11:59 2009 UTC vs.
Revision 1.135 by jsr166, Mon Feb 4 19:37:52 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.6"/>
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.loops.dir"             location="${build.dir}/loops"/>
34  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
52    <property name="build.reports.dir"           location="${build.dir}/reports"/>
37  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
53  
54 <  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
55 <  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
56 <  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
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 <  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
64 <  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
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"/>
# Line 55 | Line 115
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 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
120 <  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
121 <  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
122 <  <!-- Distribution locations -->
123 <  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
124 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
125 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
126 <  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
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="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
143 <  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
145 <
146 <  <!-- Bootclasspath argument -->
147 <  <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 81 | 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 +  <!-- 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, jsr166xdist, jsr166ydist, extra166ydist"
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 <      <compilerarg value="-XDignore.symbol.file"/>
281 <
282 < <!--
114 <      <exclude name="java/lang/**"/>
280 >      <compilerarg value="-Xprefer:source"/>
281 >      <compilerarg value="-XDignore.symbol.file=true"/>
282 >      <compilerarg value="-Xlint:all"/>
283        <compilerarg line="${build.args}"/>
116      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 -->
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">
305 >          description="Builds javadocs for src/main to dist dir">
306  
307 <    <delete dir="${build.javadocs.dir}"/>
308 <    <mkdir dir="${build.javadocs.dir}"/>
307 >    <delete dir="${docs.dir}"/>
308 >    <mkdir dir="${docs.dir}"/>
309  
310 <    <javadoc destdir="${build.javadocs.dir}"
311 <                link="http://java.sun.com/javase/6/docs/api/"
153 <            overview="${src.dir}/intro.html"
154 <            sourcepath="${src.dir}:${jdksrc.dir}"
155 <    >          
156 <
157 <      <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
328    </target>
329  
330  
164
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  
# Line 182 | Line 348
348        <exclude name="**/SyntaxTest.java"/>
349        <exclude name="**/SuperfluousAbstract.java"/>
350      </jar>
185
351    </target>
352  
353  
189
354    <target name="clean"
355            description="Removes all build products">
356  
357      <delete dir="${build.dir}"/>
194    <delete dir="${build.classes.dir}"/>
195    <delete dir="${build.lib.dir}"/>
358  
359    </target>
360  
361  
200
362    <target name="dist-clean"
363            description="Removes all build and distribution products">
364  
# Line 206 | Line 367
367    </target>
368  
369  
209
210  <target name="dist-docs"
211          description="Builds javadocs without custom tags to dist folder">
212
213    <delete dir="${dist.javadocs.dir}"/>
214    <mkdir dir="${dist.javadocs.dir}"/>
215
216    <javadoc destdir="${dist.javadocs.dir}"
217            link="http://java.sun.com/javase/6/docs/api/"
218            overview="${src.dir}/intro.html"
219
220            sourcepath="${src.dir}:${jdksrc.dir}"
221     >
222 <!--
223      <packageset dir="${src.dir}" defaultexcludes="yes">
224      <include name="java/util/concurrent"/>
225      <include name="java/util/concurrent/atomic"/>
226      <include name="java/util/concurrent/locks"/>
227      </packageset>
228 -->
229      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230      <include name="main/java/util/concurrent/*.java"/>
231      <include name="main/java/util/concurrent/atomic/*.java"/>
232      <include name="main/java/util/concurrent/locks/*.java"/>
233      <include name="main/java/util/*.java"/>
234 <!--
235      <include name="main/java/util/concurrent/*.html"/>
236      <include name="main/java/util/concurrent/atomic/*.html"/>
237      <include name="main/java/util/concurrent/locks/*.html"/>
238      <include name="main/java/util/*.html"/>
239 -->
240 <!--      <include name="jsr166x/*.java"/> -->
241      </fileset>
242    </javadoc>
243
244  </target>
245
246
247
370    <!-- Internal targets -->
371  
372  
251  <target name="init">
252
253    <!-- Version is kept in a separate file -->
254    <loadfile property="version" srcFile="version.properties"/>
255    <echo>Building JSR-166 version ${version}</echo>
256    <echo>java.home is ${java.home}</echo>
257
258  </target>
259
260
373    <target name="dist-jar"
374            depends="clean, jar">
263
375      <copy file="${product.jar}" todir="${dist.dir}"/>
376 +  </target>
377  
378 +  <target name="dist-docs"
379 +          depends="clean, docs">
380 +    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
381    </target>
382  
383  
# Line 272 | 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  
285      <classpath refid="test.classpath"/>
286
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  
302      <classpath refid="test.classpath"/>
303
427      </javac>
428  
429   <!--
# Line 312 | 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  
318      <classpath refid="test.classpath"/>
319
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 336 | 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 439 | Line 585
585    <!-- Various demos and test programs -->
586  
587  
588 <  <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 454 | 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 464 | Line 611
611    </target>
612  
613  
614 <  <!-- jsr166x -->
468 <
469 <
470 <  <target name="jsr166xcompile"
471 <          depends="init, configure-compiler"
472 <          description="Compiles jsr166x sources">
473 <
474 <    <mkdir dir="${build.jsr166x.dir}"/>
614 >  <!-- jsr166 4jdk7 -->
615  
616 <    <javac srcdir="${jsr166xsrc.dir}"
617 <          destdir="${build.jsr166x.dir}"
618 <            debug="${build.debug}"
619 <       debuglevel="${build.debuglevel}"
620 <      deprecation="${build.deprecation}"
621 <           source="${build.sourcelevel}"
622 <             fork="true">
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 +      <compilerarg value="-Xprefer:source"/>
637 +      <compilerarg value="-XDignore.symbol.file=true"/>
638 +      <compilerarg value="-Xlint:all"/>
639        <compilerarg line="${build.args}"/>
640  
641      </javac>
488
642    </target>
643  
644  
645 <
646 <  <target name="jsr166xjar"
494 <          depends="jsr166xcompile"
645 >  <target name="4jdk7jar"
646 >          depends="4jdk7compile"
647            description="Builds library jar from compiled sources">
648  
649 <    <mkdir dir="${build.jsr166xlib.dir}"/>
650 <
499 <    <jar destfile="${jsr166xproduct.jar}">
500 <      <fileset dir="${build.jsr166x.dir}"/>
649 >    <jar destfile="${4jdk7product.jar}">
650 >      <fileset dir="${build.4jdk7.classes.dir}"/>
651      </jar>
652  
653    </target>
654  
655  
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="StampedLockTest.java"/>
667 +      </javac-elements>
668 +    </run-tck-tests>
669 +  </target>
670  
507  <target name="jsr166xdocs"
508          description="Builds javadocs with custom tags to build folder">
671  
672 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
673 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
672 >  <target name="4jdk7-test-tck-junit"
673 >          depends="4jdk7compile"
674 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
675  
676 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
677 <             link="http://java.sun.com/javase/6/docs/api/"
678 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
679 <    >
680 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
681 <      <include name="jsr166x"/>
682 <      </packageset>
676 >    <junit printsummary="true"
677 >           showoutput="true"
678 >           errorProperty="junit.failed"
679 >           failureProperty="junit.failed"
680 >           includeantruntime="true"
681 >           jvm="${java7}"
682 >           fork="true">
683 >
684 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
685 >      <jvmarg value="-server"/>
686  
687 +      <classpath>
688 +        <pathelement location="${junit.jar}"/>
689 +        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
690 +      </classpath>
691  
692 <    </javadoc>
692 >      <formatter type="brief"/>
693  
694 +      <test name="JSR166TestCase" haltonfailure="no">
695 +      </test>
696 +
697 +    </junit>
698    </target>
699  
700 +  <target name="4jdk7-test-jtreg"
701 +          depends="4jdk7jar"
702 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
703 +    <run-jtreg-tests
704 +       target="7"
705 +       workdir="${build.4jdk7.dir}"
706 +       classes="${4jdk7product.jar}"/>
707 +  </target>
708  
709 <  <target name="jsr166xdist"
710 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
709 >
710 >  <target name="4jdk7-test"
711 >          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
712 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
713 >  </target>
714 >
715 >
716 >  <target name="4jdk7docs"
717 >          description="Builds javadocs for src/jdk7 to dist dir">
718 >
719 >    <delete dir="${4jdk7docs.dir}"/>
720 >    <mkdir dir="${4jdk7docs.dir}"/>
721 >
722 >    <javadoc destdir="${4jdk7docs.dir}"
723 >             packagenames="none"
724 >             link="${jdkapi7docs.url}"
725 >             overview="${4jdk7src.dir}/intro.html"
726 >             access="${build.javadoc.access}"
727 >             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
728 >             classpath=""
729 >             executable="${javadoc7}">
730 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
731 >        <include name="**/*.java"/>
732 >      </fileset>
733 >      <arg value="-XDignore.symbol.file=true"/>
734 >    </javadoc>
735 >  </target>
736 >
737 >
738 >  <target name="4jdk7dist"
739 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
740            description="Puts all distributable products in single hierarchy"/>
741  
742  
743 +  <target name="4jdk7clean"
744 +          description="Removes all 4jdk7 build products">
745  
746 <  <target name="jsr166xclean"
534 <          description="Removes all build products">
746 >    <delete dir="${build.4jdk7.dir}"/>
747  
748 <    <delete dir="${build.jsr166x.dir}"/>
749 <    <delete dir="${build.jsr166xlib.dir}"/>
748 >  </target>
749 >
750 >
751 >  <target name="4jdk7dist-clean"
752 >          description="Removes all build and distribution products">
753  
754    </target>
755  
756 +  <target name="4jdk7dist-jar"
757 +          depends="4jdk7clean, 4jdk7jar">
758 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
759 +  </target>
760  
761  
762 <  <target name="jsr166xdist-clean"
763 <          description="Removes all build and distribution products">
762 >  <target name="4jdk7dist-docs"
763 >          depends="4jdk7clean, 4jdk7docs">
764 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
765 >  </target>
766 >
767 >
768 >  <!-- jsr166x -->
769 >
770 >  <target name="jsr166xcompile"
771 >          depends="configure-compiler"
772 >          description="Compiles jsr166x sources to build dir">
773 >
774 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
775 >
776 >    <javac srcdir="${topsrc.dir}"
777 >           destdir="${build.jsr166x.classes.dir}"
778 >           debug="${build.debug}"
779 >           debuglevel="${build.debuglevel}"
780 >           deprecation="${build.deprecation}"
781 >           classpath=""
782 >           bootclasspath="${bootclasspath6}"
783 >           source="5"
784 >           includeAntRuntime="false"
785 >           includeJavaRuntime="false"
786 >           executable="${javac7}"
787 >           fork="true">
788 >
789 >      <include name="jsr166x/**/*.java"/>
790 >      <compilerarg value="-XDignore.symbol.file=true"/>
791 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
792 >      <compilerarg line="${build.args}"/>
793  
794 +    </javac>
795    </target>
796  
797  
798 +  <target name="jsr166xjar"
799 +          depends="jsr166xcompile"
800 +          description="Builds library jar from compiled sources">
801 +
802 +    <jar destfile="${jsr166x.jar}">
803 +      <fileset dir="${build.jsr166x.classes.dir}"/>
804 +    </jar>
805  
806 <  <target name="jsr166xdist-docs"
807 <          description="Builds javadocs without custom tags to dist folder">
806 >  </target>
807 >
808 >
809 >  <target name="jsr166xdocs"
810 >          description="Builds javadocs to dist dir">
811  
812 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
813 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
812 >    <delete dir="${jsr166xdocs.dir}"/>
813 >    <mkdir dir="${jsr166xdocs.dir}"/>
814  
815 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
816 <                link="http://java.sun.com/javase/6/docs/api/"
817 <              source="${build.sourcelevel}">
818 <
819 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
820 <      <include name="jsr166x"/>
821 <      </packageset>
815 >    <javadoc destdir="${jsr166xdocs.dir}"
816 >             packagenames="jsr166x.*"
817 >             link="${jdkapidocs.url}"
818 >             access="${build.javadoc.access}"
819 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
820 >             bootclasspath="${bootclasspath6}"
821 >             source="5"
822 >             executable="${javadoc7}">
823 >      <arg value="-XDignore.symbol.file=true"/>
824  
825      </javadoc>
826 +  </target>
827 +
828 +
829 +  <target name="jsr166xdist"
830 +          depends="jsr166xdist-jar, jsr166xdist-docs"
831 +          description="Puts all distributable products in single hierarchy"/>
832 +
833 +
834 +  <target name="jsr166xclean"
835 +          description="Removes all jsr166x build products">
836 +
837 +    <delete dir="${build.jsr166x.dir}"/>
838 +
839 +  </target>
840 +
841 +
842 +  <target name="jsr166xdist-clean"
843 +          description="Removes all build and distribution products">
844  
845    </target>
846  
847 +
848    <target name="jsr166xdist-jar"
849            depends="jsr166xclean, jsr166xjar">
850 +    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
851 +  </target>
852  
853 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
854 <
853 >  <target name="jsr166xdist-docs"
854 >          depends="jsr166xclean, jsr166xdocs">
855 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
856    </target>
857  
858    <!-- jsr166y -->
859  
860  
861    <target name="jsr166ycompile"
862 <          depends="init, configure-compiler"
862 >          depends="configure-compiler"
863            description="Compiles jsr166y sources">
864  
865 <    <mkdir dir="${build.jsr166y.dir}"/>
865 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
866  
867 <    <javac srcdir="${jsr166ysrc.dir}"
868 <          destdir="${build.jsr166y.dir}"
869 <            debug="${build.debug}"
870 <       debuglevel="${build.debuglevel}"
871 <      deprecation="${build.deprecation}"
872 <           source="${build.sourcelevel}"
873 <             fork="true">
874 <
875 <      <include name="**/*.java"/>
867 >    <javac srcdir="${topsrc.dir}"
868 >           destdir="${build.jsr166y.classes.dir}"
869 >           debug="${build.debug}"
870 >           debuglevel="${build.debuglevel}"
871 >           deprecation="${build.deprecation}"
872 >           source="6"
873 >           classpath=""
874 >           bootclasspath="${bootclasspath6}"
875 >           includeAntRuntime="false"
876 >           includeJavaRuntime="false"
877 >           executable="${javac7}"
878 >           fork="true">
879 >
880 >      <include name="jsr166y/**/*.java"/>
881 >      <compilerarg value="-XDignore.symbol.file=true"/>
882 >      <compilerarg value="-Xlint:all"/>
883        <compilerarg line="${build.args}"/>
594      <compilerarg value="${bootclasspath.args}"/>
595
596 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
884  
885      </javac>
599
886    </target>
887  
888  
603
889    <target name="jsr166yjar"
890            depends="jsr166ycompile"
891            description="Builds library jar from compiled sources">
892  
893 <    <mkdir dir="${build.jsr166ylib.dir}"/>
894 <
610 <    <jar destfile="${jsr166yproduct.jar}" index="true">
611 <      <fileset dir="${build.jsr166y.dir}"/>
893 >    <jar destfile="${jsr166y.jar}" index="true">
894 >      <fileset dir="${build.jsr166y.classes.dir}"/>
895      </jar>
896  
897    </target>
898  
899  
617
900    <target name="jsr166ydocs"
901 <          description="Builds javadocs with custom tags to build folder">
901 >          description="Builds javadocs to dist dir">
902  
903 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
904 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
623 <
624 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
625 <                link="http://java.sun.com/javase/6/docs/api/"
626 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
627 <    >
628 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
629 <      <include name="jsr166y"/>
630 <      </packageset>
903 >    <delete dir="${jsr166ydocs.dir}"/>
904 >    <mkdir dir="${jsr166ydocs.dir}"/>
905  
906 +    <javadoc destdir="${jsr166ydocs.dir}"
907 +             packagenames="jsr166y.*"
908 +             link="${jdkapidocs.url}"
909 +             access="${build.javadoc.access}"
910 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
911 +             bootclasspath="${bootclasspath6}"
912 +             source="6"
913 +             executable="${javadoc7}">
914 +      <arg value="-XDignore.symbol.file=true"/>
915  
916      </javadoc>
634
917    </target>
918  
919  
920    <target name="jsr166ydist"
921 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
921 >          depends="jsr166ydist-jar, jsr166ydist-docs"
922            description="Puts all distributable products in single hierarchy"/>
923  
924  
643
925    <target name="jsr166yclean"
926 <          description="Removes all build products">
926 >          description="Removes all jsr166y build products">
927  
928      <delete dir="${build.jsr166y.dir}"/>
648    <delete dir="${build.jsr166ylib.dir}"/>
929  
930    </target>
931  
932  
653
933    <target name="jsr166ydist-clean"
934            description="Removes all build and distribution products">
935  
936    </target>
937  
659  <target name="jsr166ydist-docs"
660          description="Builds javadocs without custom tags to dist folder">
661
662    <delete dir="${dist.jsr166yjavadocs.dir}"/>
663    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
664
665    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
666                link="http://java.sun.com/javase/6/docs/api/"
667              source="${build.sourcelevel}"
668            sourcepath="${topsrc.dir}:${jdksrc.dir}"
669            >          
670      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
671      <include name="jsr166y/*.java"/>
672            </fileset>
673    </javadoc>
674
675  </target>
676
938    <target name="jsr166ydist-jar"
939            depends="jsr166yclean, jsr166yjar">
940 +    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
941 +  </target>
942  
943 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
944 <
943 >  <target name="jsr166ydist-docs"
944 >          depends="jsr166yclean, jsr166ydocs">
945 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
946    </target>
947  
948 +
949    <!-- extra166y -->
950  
951  
952    <target name="extra166ycompile"
953 <          depends="init, configure-compiler, jsr166ycompile"
953 >          depends="configure-compiler, jsr166yjar"
954            description="Compiles extra166y sources">
955  
956 <    <mkdir dir="${build.extra166y.dir}"/>
692 <
693 <    <javac srcdir="${extra166ysrc.dir}"
694 <          destdir="${build.extra166y.dir}"
695 <            debug="${build.debug}"
696 <            classpath="${jsr166yproduct.jar}"
697 <       debuglevel="${build.debuglevel}"
698 <      deprecation="${build.deprecation}"
699 <           source="${build.sourcelevel}"
700 <             fork="true">
956 >    <mkdir dir="${build.extra166y.classes.dir}"/>
957  
958 <      <include name="**/*.java"/>
958 >    <javac srcdir="${topsrc.dir}"
959 >           destdir="${build.extra166y.classes.dir}"
960 >           debug="${build.debug}"
961 >           debuglevel="${build.debuglevel}"
962 >           deprecation="${build.deprecation}"
963 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
964 >           classpath=""
965 >           source="6"
966 >           includeAntRuntime="false"
967 >           includeJavaRuntime="false"
968 >           executable="${javac7}"
969 >           fork="true">
970 >
971 >      <include name="extra166y/**/*.java"/>
972 >      <compilerarg value="-XDignore.symbol.file=true"/>
973 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
974        <compilerarg line="${build.args}"/>
704      <compilerarg value="${bootclasspath.args}"/>
705
706 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
975  
976      </javac>
709
977    </target>
978  
979  
713
980    <target name="extra166yjar"
981            depends="extra166ycompile"
982            description="Builds library jar from compiled sources">
983  
984 <    <mkdir dir="${build.extra166ylib.dir}"/>
985 <
720 <    <jar destfile="${extra166yproduct.jar}" index="true">
721 <      <fileset dir="${build.extra166y.dir}"/>
984 >    <jar destfile="${extra166y.jar}" index="true">
985 >      <fileset dir="${build.extra166y.classes.dir}"/>
986      </jar>
987  
988    </target>
989  
990  
727
991    <target name="extra166ydocs"
992 <          description="Builds javadocs with custom tags to build folder">
992 >          description="Builds javadocs to build dir">
993  
994 <    <delete dir="${build.extra166yjavadocs.dir}"/>
995 <    <mkdir dir="${build.extra166yjavadocs.dir}"/>
733 <
734 <    <javadoc destdir="${build.extra166yjavadocs.dir}"
735 <                link="http://java.sun.com/javase/6/docs/api/"
736 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
737 <    >
738 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
739 <      <include name="extra166y"/>
740 <      </packageset>
994 >    <delete dir="${extra166ydocs.dir}"/>
995 >    <mkdir dir="${extra166ydocs.dir}"/>
996  
997 +    <javadoc destdir="${extra166ydocs.dir}"
998 +             packagenames="extra166y.*"
999 +             link="${jdkapidocs.url}"
1000 +             access="${build.javadoc.access}"
1001 +             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002 +             bootclasspath="${bootclasspath6}"
1003 +             source="6"
1004 +             executable="${javadoc7}">
1005 +      <arg value="-XDignore.symbol.file=true"/>
1006  
1007      </javadoc>
744
1008    </target>
1009  
1010  
1011    <target name="extra166ydist"
1012 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
1012 >          depends="extra166ydist-jar, extra166ydist-docs"
1013            description="Puts all distributable products in single hierarchy"/>
1014  
1015  
753
1016    <target name="extra166yclean"
1017 <          description="Removes all build products">
1017 >          description="Removes all extra166y build products">
1018  
1019      <delete dir="${build.extra166y.dir}"/>
758    <delete dir="${build.extra166ylib.dir}"/>
1020  
1021    </target>
1022  
1023  
763
1024    <target name="extra166ydist-clean"
1025            description="Removes all build and distribution products">
1026  
1027    </target>
1028  
1029 +  <target name="extra166ydist-jar"
1030 +          depends="extra166yclean, extra166yjar">
1031 +    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1032 +  </target>
1033 +
1034    <target name="extra166ydist-docs"
1035 <          description="Builds javadocs without custom tags to dist folder">
1035 >          depends="extra166yclean, extra166ydocs">
1036 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1037 >  </target>
1038 >
1039 >  <!-- jsr166e -->
1040 >
1041 >  <target name="jsr166ecompile"
1042 >          depends="configure-compiler"
1043 >          description="Compiles jsr166e sources">
1044 >
1045 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1046 >
1047 >    <javac srcdir="${topsrc.dir}"
1048 >           destdir="${build.jsr166e.classes.dir}"
1049 >           debug="${build.debug}"
1050 >           debuglevel="${build.debuglevel}"
1051 >           deprecation="${build.deprecation}"
1052 >           source="7"
1053 >           classpath=""
1054 >           includeAntRuntime="false"
1055 >           includeJavaRuntime="false"
1056 >           executable="${javac7}"
1057 >           fork="true">
1058 >
1059 >      <include name="jsr166e/**/*.java"/>
1060 >      <compilerarg value="-XDignore.symbol.file=true"/>
1061 >      <compilerarg value="-Xlint:all"/>
1062 >      <compilerarg line="${build.args}"/>
1063 >
1064 >    </javac>
1065 >  </target>
1066  
772    <delete dir="${dist.extra166yjavadocs.dir}"/>
773    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
1067  
1068 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
1069 <                link="http://java.sun.com/javase/6/docs/api/"
1070 <              source="${build.sourcelevel}"
1071 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
1072 <            >
1073 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1074 <      <include name="extra166y/*.java"/>
1075 <            </fileset>
1068 >  <target name="jsr166ejar"
1069 >          depends="jsr166ecompile"
1070 >          description="Builds library jar from compiled sources">
1071 >
1072 >    <jar destfile="${jsr166e.jar}" index="true">
1073 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1074 >    </jar>
1075 >
1076 >  </target>
1077 >
1078 >
1079 >  <target name="jsr166edocs"
1080 >          description="Builds javadocs to build dir">
1081 >
1082 >    <delete dir="${jsr166edocs.dir}"/>
1083 >    <mkdir dir="${jsr166edocs.dir}"/>
1084 >
1085 >    <javadoc destdir="${jsr166edocs.dir}"
1086 >             packagenames="jsr166e.*"
1087 >             link="${jdkapidocs.url}"
1088 >             access="${build.javadoc.access}"
1089 >             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1090 >             source="7"
1091 >             executable="${javadoc7}">
1092 >      <arg value="-XDignore.symbol.file=true"/>
1093 >
1094      </javadoc>
1095 +  </target>
1096 +
1097  
1098 +  <target name="jsr166e-test-tck"
1099 +          depends="jsr166ejar"
1100 +          description="Runs tck tests for jsr166e">
1101 +
1102 +    <run-tck-tests
1103 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1104 +      source="7"
1105 +      target="8"
1106 +      workdir="${build.jsr166e.dir}"
1107 +      classes="${jsr166e.jar}"/>
1108    </target>
1109  
787  <target name="extra166ydist-jar"
788          depends="extra166yclean, extra166yjar">
1110  
1111 <    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1111 >  <target name="jsr166edist"
1112 >          depends="jsr166edist-jar, jsr166edist-docs"
1113 >          description="Puts all distributable products in single hierarchy"/>
1114  
1115 +
1116 +  <target name="jsr166eclean"
1117 +          description="Removes all jsr166e build products">
1118 +    <delete dir="${build.jsr166e.dir}"/>
1119 +  </target>
1120 +
1121 +
1122 +  <target name="jsr166edist-clean"
1123 +          description="Removes all build and distribution products">
1124 +
1125 +  </target>
1126 +
1127 +  <target name="jsr166edist-jar"
1128 +          depends="jsr166eclean, jsr166ejar">
1129 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1130    </target>
1131  
1132 +  <target name="jsr166edist-docs"
1133 +          depends="jsr166eclean, jsr166edocs">
1134 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1135 +  </target>
1136 +
1137 +
1138 + <!-- Find buglets that can be detected by static build tools -->
1139 +
1140 +  <target name="lint">
1141 +    <antcall target="dists">
1142 +      <param name="build.javadoc.access" value="private"/>
1143 +    </antcall>
1144 +  </target>
1145 +
1146 +
1147   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines