/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.101 by jsr166, Sat Jan 19 17:30:36 2013 UTC revision 1.146 by jsr166, Thu Jul 18 18:27:55 2013 UTC
# Line 22  Line 22 
22    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.    (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>    </description>
28    
29    <target name="usage" description="Advises user to run with -projecthelp">    <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30      <echo>Run "ant -projecthelp" for full usage information.</echo>      <java classname="org.apache.tools.ant.Main">
31          <arg value="-projecthelp" />
32        </java>
33    </target>    </target>
34    
35    
# Line 35  Line 38 
38    
39    
40    <!-- Compilation options -->    <!-- Compilation options -->
41    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
42    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45      <property name="build.javadoc.access" value="protected"/>
46    
47      <!-- Tck options; see JSR166TestCase.java -->
48      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49      <property name="jsr166.profileTests"     value="false"/>
50      <property name="jsr166.profileThreshold" value="100"/>
51      <property name="jsr166.runsPerTest"      value="1"/>
52      <!-- Allow running an individual tck test class -->
53      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55    
56    <!-- Build locations -->    <!-- Build locations -->
57    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
58    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
59    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
60    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
61    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
62    
63    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
64    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
65    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
66    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>  
67    
68    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
   
69    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
70    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
71    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
   <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
72    
73    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74      <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75      <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76      <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77    
78      <!-- JDK locations -->
79    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
80    
81    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 81  Line 85 
85      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
86      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
87      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
     <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>  
88      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
89      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
90       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91        <path id="bootclasspath@{v}">
92          <pathelement path="${boot.jar.dir}/resources.jar"/>
93          <pathelement path="${boot.jar.dir}/rt.jar"/>
94          <pathelement path="${boot.jar.dir}/jsse.jar"/>
95          <pathelement path="${boot.jar.dir}/jce.jar"/>
96          <pathelement path="${boot.jar.dir}/charsets.jar"/>
97        </path>
98        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
99      </sequential>      </sequential>
100    </macrodef>    </macrodef>
101    
102    <defjdklocations v="6"/>    <macrodef name="mirror-dir">
103    <defjdklocations v="7"/>      <attribute name="src"/>
104    <defjdklocations v="8"/>      <attribute name="dst"/>
   
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
105      <sequential>      <sequential>
106      <java classname="JSR166TestCase"      <delete dir="@{dst}"/>
107            jvm="@{jvm}" fork="true">      <mkdir dir="@{dst}"/>
108          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>      <copy todir="@{dst}" preservelastmodified="true">
109          <jvmarg line="@{jvmflags}"/>        <fileset dir="@{src}"/>
110          <classpath>      </copy>
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
111      </sequential>      </sequential>
112    </macrodef>    </macrodef>
113    
114      <defjdklocations v="6"/>
115      <defjdklocations v="7"/>
116      <defjdklocations v="8"/>
117    
118    <!-- Source locations -->    <!-- Source locations -->
119    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
120    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 124  Line 129 
129    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
130    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>  
132    
133    <!-- Distribution locations -->    <!-- Javadoc locations -->
134    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
135    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140    
141      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147    
148    <!-- Jar locations -->    <!-- Jar locations -->
149    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
150    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
151    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
152    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
153    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
154    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
155    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
   
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
156    
157    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
158    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
# Line 152  Line 160 
160    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
161    
162    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
164    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165    
166      <!-- Default jdk api doc location (latest stable release seems best) -->
167    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
168    
169      <!-- Define the "jtreg" task -->
170      <!-- See the docs in "jtreg -onlineHelp" -->
171      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
172               classpath="${lib.dir}/jtreg.jar" />
173    
174    <!-- Test classpath -->    <!-- Test classpath -->
175    <path id="test.classpath">    <path id="test.classpath">
176      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
177      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
178    </path>    </path>
179    
180      <macrodef name="run-tck-tests">
181        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
182        <attribute name="target"/>
183        <attribute name="compile-target" default="@{target}"/>
184        <attribute name="workdir"/>
185        <attribute name="classes"/>
186        <attribute name="jvmflags" default=""/>
187        <element name="javac-elements" optional="true"/>
188        <sequential>
189    
190        <mkdir dir="@{workdir}/tck-classes"/>
191    
192        <javac srcdir="@{tck.src.dir}"
193               destdir="@{workdir}/tck-classes"
194               debug="${build.debug}"
195               debuglevel="${build.debuglevel}"
196               deprecation="${build.deprecation}"
197               source="@{compile-target}"
198               target="@{compile-target}"
199               classpath="${junit.jar}"
200               bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201               includeAntRuntime="false"
202               includeJavaRuntime="false"
203               executable="${javac@{compile-target}}"
204               fork="true">
205    
206          <include name="*.java"/>
207          <compilerarg value="-XDignore.symbol.file=true"/>
208          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209          <compilerarg line="${build.args}"/>
210          <javac-elements/>
211    
212        </javac>
213    
214        <java classname="${jsr166.tckTestClass}"
215              failonerror="true"
216              jvm="${java@{target}}"
217              fork="true">
218            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
219            <jvmarg line="@{jvmflags}"/>
220            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223            <classpath>
224              <pathelement location="${junit.jar}"/>
225              <pathelement location="@{workdir}/tck-classes"/>
226            </classpath>
227        </java>
228    
229        </sequential>
230      </macrodef>
231    
232      <macrodef name="run-jtreg-tests">
233        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234        <attribute name="source" default="7"/>
235        <attribute name="target"/>
236        <attribute name="workdir"/>
237        <attribute name="classes"/>
238        <attribute name="jtregflags" default=""/>
239        <sequential>
240        <delete dir="@{workdir}/JTwork"   quiet="true"/>
241        <delete dir="@{workdir}/JTreport" quiet="true"/>
242        <mkdir dir="@{workdir}/JTwork/scratch"/>
243        <mkdir dir="@{workdir}/JTreport"/>
244        <jtreg dir="@{jtreg.src.dir}"
245               jdk="${jdk@{target}.home}"
246               workDir="@{workdir}/JTwork"
247               reportDir="@{workdir}/JTreport">
248    
249          <arg value="-Xbootclasspath/p:@{classes}"/>
250          <arg value="-agentvm"/>
251          <arg value="-v:nopass,fail"/>
252          <arg value="-vmoptions:-esa -ea"/>
253          <arg value="-automatic"/>
254          <arg value="-k:!ignore"/>
255          <arg line="@{jtregflags}"/>
256        </jtreg>
257        </sequential>
258      </macrodef>
259    
260    <!-- ALoops classpath -->    <!-- ALoops classpath -->
261    <path id="loops.classpath">    <path id="loops.classpath">
262      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
263    </path>    </path>
264    
265    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
266    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
267    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
268    
269    <!-- Main targets -->    <!-- Main targets -->
270    
271    <target name="dists"    <target name="dists"
272            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
273            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
274    
275    <target name="compile"    <target name="compile"
276            depends="configure-compiler"            depends="configure-compiler"
277            description="Compiles src/main sources to build folder">            description="Compiles src/main sources to build dir">
278    
279      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
280    
# Line 198  Line 290 
290             fork="true">             fork="true">
291    
292        <include name="**/*.java"/>        <include name="**/*.java"/>
293        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
294        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
295        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
296          <compilerarg value="-Xdoclint:all/protected"/>
297  <!--        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <exclude name="java/lang/**"/>  
298        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
299    
300      </javac>      </javac>
   
301    </target>    </target>
302    
303    
   
304    <target name="jar"    <target name="jar"
305            depends="compile"            depends="compile"
306            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
307    
     <mkdir dir="${build.lib.dir}"/>  
   
308      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
309        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
310      </jar>      </jar>
   
311    </target>    </target>
312    
313    
   
   <target name="test"  
           depends="init, configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
   
314    <target name="docs"    <target name="docs"
315            description="Builds javadocs for src/main">            description="Builds javadocs for src/main to dist dir">
316    
317      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
318      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
319    
320      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
321      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
322    
323      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
324               packagenames="none"               packagenames="none"
325               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
326               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
327                 access="${build.javadoc.access}"
328               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
329               classpath=""               classpath=""
330               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
331        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
332          <include name="**/*.java"/>          <include name="**/*.java"/>
333        </fileset>        </fileset>
334          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
335          <arg value="-XDignore.symbol.file=true"/>
336          <arg value="-tag"/>
337          <arg value="${javadoc.jls.option}"/>
338          <arg value="-tag"/>
339          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
340          <arg value="-tag"/>
341          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
342          <arg value="-tag"/>
343          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
344      </javadoc>      </javadoc>
   
345    </target>    </target>
346    
347    
   
348    <target name="dist"    <target name="dist"
349            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
350            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
351    
352    
# Line 282  Line 365 
365        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
366        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
367      </jar>      </jar>
   
368    </target>    </target>
369    
370    
   
371    <target name="clean"    <target name="clean"
372            description="Removes all build products">            description="Removes all build products">
373    
374      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
375    
376    </target>    </target>
377    
378    
   
379    <target name="dist-clean"    <target name="dist-clean"
380            description="Removes all build and distribution products">            description="Removes all build and distribution products">
381    
# Line 306  Line 384 
384    </target>    </target>
385    
386    
   
   <!-- Internal targets -->  
   
   
   <target name="init">  
   
     <!-- Version is kept in a separate file -->  
     <loadfile property="version" srcFile="version.properties"/>  
     <echo>Building JSR-166 version ${version}</echo>  
     <echo>java.home is ${java.home}</echo>  
   
   </target>  
   
   
387    <target name="dist-jar"    <target name="dist-jar"
388            depends="clean, jar">            depends="clean, jar">
   
389      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
390    </target>    </target>
391    
392      <target name="dist-docs"
393    <target name="compile-tests"            depends="clean, docs">
394            depends="jar">      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   
     <mkdir dir="${build.testcases.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg value="${bootclasspath.args}"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
       <classpath refid="test.classpath"/>  
   
     </javac>  
   
     <javac srcdir="${test.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <include name="jsr166/test/**"/>  
   
       <compilerarg value="${bootclasspath.args}"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
       <classpath refid="test.classpath"/>  
   
     </javac>  
   
 <!--  
     <javac srcdir="${jtreg.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg value="${bootclasspath.args}"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
       <classpath refid="test.classpath"/>  
   
     </javac>  
 -->  
   
395    </target>    </target>
396    
397    
398    <target name="run-tests"    <target name="test-tck"
399            depends="compile-tests">            depends="jar"
400              description="Runs tck tests for main directly">
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
   
     <mkdir dir="${build.reports.dir}"/>  
   
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                    fork="true">  
   
       <jvmarg value="${bootclasspath.args}"/>  
       <jvmarg value="-server"/>  
       <jvmarg value="-showversion"/>  
   
       <classpath refid="test.classpath"/>  
   
       <formatter type="xml"/>  
   
       <batchtest todir="${build.reports.dir}" unless="no.test.tck">  
         <fileset dir="${tck.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
 <!--  
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
   
     </junit>  
401    
402        <run-tck-tests
403          target="8"
404          workdir="${build.dir}"
405          classes="${product.jar}"/>
406    </target>    </target>
407    
408      <target name="test-jtreg"
409              depends="jar"
410              description="Runs jtreg tests for main using the jtreg ant task">
411        <run-jtreg-tests
412           target="8"
413           workdir="${build.dir}"
414           classes="${product.jar}"/>
415      </target>
416    
417    <target name="report-tests"    <target name="test"
418            depends="run-tests">            depends="test-tck, test-jtreg"
419              description="Runs tck and jtreg tests for main">
     <!-- Sets junit.report.format to frames if redirection is present,  
          otherwise sets it to noframes. -->  
     <available property="junit.report.format"  
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"  
     />  
     <property name="junit.report.format" value="noframes"/>  
   
     <junitreport todir="${build.reports.dir}">  
       <fileset dir="${build.reports.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
   
     <fail message="Test Cases Failed" if="junit.failed"/>  
   
420    </target>    </target>
421    
422    
423    
424    <target name="configure-compiler">    <target name="configure-compiler">
425    
426      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 438 
438    </target>    </target>
439    
440    
   <target name="configure-tests"  
        depends="configure-compiler">  
   
     <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->  
     <available property="junit.available"  
                classname="junit.framework.Protectable"/>  
   
     <!-- Xalan -->  
     <available property="xalan.available"  
                classname="org.apache.xalan.Version"/>  
   
   
     <!-- Ant 1.6beta and later don't need or want this check -->  
     <!--  
     <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"  
           unless="junit.available"/>  
   
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
   
   </target>  
   
441    
442    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
443    
444    
445    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
446            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
447    
448      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 532  Line 470 
470    
471    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
472    
   
473    <target name="4jdk7compile"    <target name="4jdk7compile"
474            depends="configure-compiler"            depends="configure-compiler"
475            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 544  Line 481 
481             debug="${build.debug}"             debug="${build.debug}"
482             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
483             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
484             source="1.6"             source="6"
485             classpath=""             classpath=""
486             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
487             includeAntRuntime="false"             includeAntRuntime="false"
# Line 553  Line 490 
490             fork="true">             fork="true">
491    
492        <include name="**/*.java"/>        <include name="**/*.java"/>
493        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
494        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
495        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
496          <compilerarg line="${build.args}"/>
497    
498      </javac>      </javac>
499      </target>
500    
501    
502      <mkdir dir="${build.4jdk7.lib.dir}"/>    <target name="4jdk7jar"
503              depends="4jdk7compile"
504              description="Builds library jar from compiled sources">
505    
506      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}">
507        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
508      </jar>      </jar>
509    
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="1.6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </javac>  
   
510    </target>    </target>
511    
512    
513    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
514            depends="4jdk7compile"            depends="4jdk7jar"
515            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
516    
517      <run-tck-tests      <run-tck-tests
518        jvm="${java7}"        target="7"
519        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
520        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
521          <javac-elements>
522            <!-- JDK8+ test classes -->
523            <exclude name="*8Test.java"/>
524            <exclude name="DoubleAccumulatorTest.java"/>
525            <exclude name="DoubleAdderTest.java"/>
526            <exclude name="LongAccumulatorTest.java"/>
527            <exclude name="LongAdderTest.java"/>
528            <exclude name="CompletableFutureTest.java"/>
529            <exclude name="SplittableRandomTest.java"/>
530            <exclude name="StampedLockTest.java"/>
531          </javac-elements>
532        </run-tck-tests>
533    </target>    </target>
534    
535    
# Line 622  Line 555 
555    
556        <formatter type="brief"/>        <formatter type="brief"/>
557    
558        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
559        </test>        </test>
560    
561      </junit>      </junit>
562    </target>    </target>
563    
564      <target name="4jdk7-test-jtreg"
565              depends="4jdk7jar"
566              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
567        <run-jtreg-tests
568           target="7"
569           workdir="${build.4jdk7.dir}"
570           classes="${4jdk7product.jar}"
571           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
572      </target>
573    
574    
575      <target name="4jdk7-test"
576              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
577              description="Runs tck and jtreg tests for jsr166-4jdk7">
578      </target>
579    
580    
581    <target name="4jdk7docs"    <target name="4jdk7docs"
582            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
583    
584      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
585      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
586    
587      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
588               packagenames="none"               packagenames="none"
589               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
590               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
591                 access="${build.javadoc.access}"
592               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
593               classpath=""               classpath=""
594               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
595        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
596          <include name="**/*.java"/>          <include name="**/*.java"/>
597        </fileset>        </fileset>
598          <arg value="-XDignore.symbol.file=true"/>
599      </javadoc>      </javadoc>
   
600    </target>    </target>
601    
602    
603    <target name="4jdk7dist"    <target name="4jdk7dist"
604            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
605            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
606    
607    
   
608    <target name="4jdk7clean"    <target name="4jdk7clean"
609            description="Removes all build products">            description="Removes all 4jdk7 build products">
610    
611      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
612    
613    </target>    </target>
614    
615    
   
616    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
617            description="Removes all build and distribution products">            description="Removes all build and distribution products">
618    
619    </target>    </target>
620    
   <target name="4jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.4jdk7.docs.dir}"/>  
     <mkdir dir="${dist.4jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.4jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${4jdk7src.dir}/intro.html"  
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
621    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
622            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
623      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
624      </target>
625    
626    
627      <target name="4jdk7dist-docs"
628              depends="4jdk7clean, 4jdk7docs">
629        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
630    </target>    </target>
631    
   <!-- jsr166x -->  
632    
633      <!-- jsr166x -->
634    
635    <target name="jsr166xcompile"    <target name="jsr166xcompile"
636            depends="init, configure-compiler"            depends="configure-compiler"
637            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
638    
639      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
640    
641      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
642            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
643              debug="${build.debug}"             debug="${build.debug}"
644         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
645        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
646             source="${build.sourcelevel}"             classpath=""
647               fork="true">             bootclasspath="${bootclasspath6}"
648               source="5"
649               includeAntRuntime="false"
650               includeJavaRuntime="false"
651               executable="${javac7}"
652               fork="true">
653    
654        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
655        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
656          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
657          <compilerarg line="${build.args}"/>
658    
659      </javac>      </javac>
   
660    </target>    </target>
661    
662    
   
663    <target name="jsr166xjar"    <target name="jsr166xjar"
664            depends="jsr166xcompile"            depends="jsr166xcompile"
665            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
666    
667      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
668          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
669      </jar>      </jar>
670    
671    </target>    </target>
672    
673    
   
674    <target name="jsr166xdocs"    <target name="jsr166xdocs"
675            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
676    
677      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
678      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
679    
680      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
681               packagenames="jsr166x"               packagenames="jsr166x.*"
682               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
683               source="${build.sourcelevel}"               access="${build.javadoc.access}"
684               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
685               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
686                 source="5"
687                 executable="${javadoc7}">
688          <arg value="-XDignore.symbol.file=true"/>
689    
690        </javadoc>
691    </target>    </target>
692    
693    
694    <target name="jsr166xdist"    <target name="jsr166xdist"
695            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
696            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
697    
698    
   
699    <target name="jsr166xclean"    <target name="jsr166xclean"
700            description="Removes all build products">            description="Removes all jsr166x build products">
701    
702      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
703    
704    </target>    </target>
705    
706    
   
707    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
708            description="Removes all build and distribution products">            description="Removes all build and distribution products">
709    
710    </target>    </target>
711    
712    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
713    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
714            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
715        <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
716      </target>
717    
718      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166xdist-docs"
719              depends="jsr166xclean, jsr166xdocs">
720        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
721    </target>    </target>
722    
723    <!-- jsr166y -->    <!-- jsr166y -->
724    
725    
726    <target name="jsr166ycompile"    <target name="jsr166ycompile"
727            depends="init, configure-compiler"            depends="configure-compiler"
728            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
729    
730      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
731    
732      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
733            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
734              debug="${build.debug}"             debug="${build.debug}"
735         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
736        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
737             source="${build.sourcelevel}"             source="6"
738               fork="true">             classpath=""
739               bootclasspath="${bootclasspath6}"
740               includeAntRuntime="false"
741               includeJavaRuntime="false"
742               executable="${javac7}"
743               fork="true">
744    
745        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
746        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
747        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
748          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
749    
750      </javac>      </javac>
   
751    </target>    </target>
752    
753    
   
754    <target name="jsr166yjar"    <target name="jsr166yjar"
755            depends="jsr166ycompile"            depends="jsr166ycompile"
756            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
757    
758      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
759          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
760      </jar>      </jar>
761    
762    </target>    </target>
763    
764    
   
765    <target name="jsr166ydocs"    <target name="jsr166ydocs"
766            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
767    
768      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
769      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
770    
771      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
772               packagenames="jsr166y"               packagenames="jsr166y.*"
773               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
774               source="${build.sourcelevel}"               access="${build.javadoc.access}"
775               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
776               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
777                 source="6"
778                 executable="${javadoc7}">
779          <arg value="-XDignore.symbol.file=true"/>
780    
781        </javadoc>
782    </target>    </target>
783    
784    
785    <target name="jsr166ydist"    <target name="jsr166ydist"
786            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
787            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
788    
789    
   
790    <target name="jsr166yclean"    <target name="jsr166yclean"
791            description="Removes all build products">            description="Removes all jsr166y build products">
792    
793      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
794    
795    </target>    </target>
796    
797    
   
798    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
799            description="Removes all build and distribution products">            description="Removes all build and distribution products">
800    
801    </target>    </target>
802    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
803    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
804            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
805        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
806      </target>
807    
808      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166ydist-docs"
809              depends="jsr166yclean, jsr166ydocs">
810        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
811    </target>    </target>
812    
813    
# Line 909  Line 815 
815    
816    
817    <target name="extra166ycompile"    <target name="extra166ycompile"
818            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
819            description="Compiles extra166y sources">            description="Compiles extra166y sources">
820    
821      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
822    
823      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
824            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
825              debug="${build.debug}"             debug="${build.debug}"
826              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
827         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
828        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
829             source="${build.sourcelevel}"             classpath=""
830               fork="true">             source="6"
831               includeAntRuntime="false"
832               includeJavaRuntime="false"
833               executable="${javac7}"
834               fork="true">
835    
836        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
837        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
838        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
839          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
840    
841      </javac>      </javac>
   
842    </target>    </target>
843    
844    
   
845    <target name="extra166yjar"    <target name="extra166yjar"
846            depends="extra166ycompile"            depends="extra166ycompile"
847            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
848    
849      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
850          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
851      </jar>      </jar>
852    
853    </target>    </target>
854    
855    
   
856    <target name="extra166ydocs"    <target name="extra166ydocs"
857            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
858    
859      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
860      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
861    
862      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
863               packagenames="extra166y"               packagenames="extra166y.*"
864               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
865               source="${build.sourcelevel}"               access="${build.javadoc.access}"
866               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
867               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
868                 source="6"
869                 executable="${javadoc7}">
870          <arg value="-XDignore.symbol.file=true"/>
871    
872        </javadoc>
873    </target>    </target>
874    
875    
876    <target name="extra166ydist"    <target name="extra166ydist"
877            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
878            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
879    
880    
   
881    <target name="extra166yclean"    <target name="extra166yclean"
882            description="Removes all build products">            description="Removes all extra166y build products">
883    
884      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
885    
886    </target>    </target>
887    
888    
   
889    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
890            description="Removes all build and distribution products">            description="Removes all build and distribution products">
891    
892    </target>    </target>
893    
   <target name="extra166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
894    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
895            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
896        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
897      </target>
898    
899      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>    <target name="extra166ydist-docs"
900              depends="extra166yclean, extra166ydocs">
901        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
902    </target>    </target>
903    
904    <!-- jsr166e -->    <!-- jsr166e -->
905    
906      <property name="build.jsr166e.java.version" value="6"/>
907      <property name="build.jsr166e.javac" value="${javac6}"/>
908    
909    <target name="jsr166ecompile"    <target name="jsr166ecompile"
910            depends="configure-compiler"            depends="configure-compiler"
911            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
912    
913      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
914    
915      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
916             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
917             debug="${build.debug}"             debug="${build.debug}"
918             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
919             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
920             source="1.7"             source="${build.jsr166e.java.version}"
921             classpath=""             classpath=""
922             includeAntRuntime="false"             includeAntRuntime="false"
923             includeJavaRuntime="false"             includeJavaRuntime="false"
924             executable="${javac7}"             executable="${build.jsr166e.javac}"
925             fork="true">             fork="true">
926    
927        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
928        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
929        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
930          <compilerarg line="${build.args}"/>
931    
932      </javac>      </javac>
   
933    </target>    </target>
934    
935    
   
936    <target name="jsr166ejar"    <target name="jsr166ejar"
937            depends="jsr166ecompile"            depends="jsr166ecompile"
938            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
939    
940      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
941          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
942      </jar>      </jar>
943    
944    </target>    </target>
945    
946    
   
947    <target name="jsr166edocs"    <target name="jsr166edocs"
948            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
949    
950      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
951      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
952    
953        <javadoc destdir="${jsr166edocs.dir}"
954                 packagenames="jsr166e.*"
955                 link="${jdkapidocs.url}"
956                 access="${build.javadoc.access}"
957                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
958                 source="${build.jsr166e.java.version}"
959                 executable="${javadoc7}">
960          <arg value="-XDignore.symbol.file=true"/>
961    
     <javadoc destdir="${build.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapi7docs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
962      </javadoc>      </javadoc>
963      </target>
964    
965    
966      <target name="jsr166e-test-tck-one-java-version"
967              depends="jsr166ejar"
968              description="Runs tck tests for jsr166e">
969    
970        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
971    
972        <run-tck-tests
973          tck.src.dir="${test.src.dir}/tck-jsr166e"
974          target="${build.jsr166e.java.version}"
975          workdir="${build.jsr166e.dir}"
976          classes="${jsr166e.jar}"/>
977      </target>
978    
979      <target name="jsr166e-test-tck"
980              description="Runs tck tests for jsr166e for multiple java versions">
981    
982    <!--     <antcall target="clean"/> -->
983    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
984    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
985    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
986    <!--     </antcall> -->
987    
988        <antcall target="clean"/>
989        <antcall target="jsr166e-test-tck-one-java-version">
990          <param name="build.jsr166e.java.version" value="7"/>
991          <param name="build.jsr166e.javac" value="${javac7}"/>
992        </antcall>
993    
994        <antcall target="clean"/>
995        <antcall target="jsr166e-test-tck-one-java-version">
996          <param name="build.jsr166e.java.version" value="6"/>
997          <param name="build.jsr166e.javac" value="${javac6}"/>
998        </antcall>
999    </target>    </target>
1000    
1001    
1002    <target name="jsr166edist"    <target name="jsr166edist"
1003            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1004            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1005    
1006    
   
1007    <target name="jsr166eclean"    <target name="jsr166eclean"
1008            description="Removes all build products">            description="Removes all jsr166e build products">
   
1009      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
1010    </target>    </target>
1011    
1012    
   
1013    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1014            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1015    
1016    </target>    </target>
1017    
1018    <target name="jsr166edist-docs"    <target name="jsr166edist-jar"
1019            description="Builds javadocs without custom tags to dist folder">            depends="jsr166eclean, jsr166ejar">
1020        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1021      <delete dir="${dist.jsr166ejavadocs.dir}"/>    </target>
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapidocs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
1022    
1023      <target name="jsr166edist-docs"
1024              depends="jsr166eclean, jsr166edocs">
1025        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1026    </target>    </target>
1027    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
1028    
1029      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1030    
1031      <target name="lint">
1032        <antcall target="dists">
1033          <param name="build.javadoc.access" value="private"/>
1034        </antcall>
1035    </target>    </target>
1036    
1037    
1038  </project>  </project>

Legend:
Removed from v.1.101  
changed lines
  Added in v.1.146

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27