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

Diff of /jsr166/build.xml

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

revision 1.107 by jsr166, Sat Jan 19 23:40:04 2013 UTC revision 1.143 by dl, Wed Jul 10 17:09:45 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="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
152    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
153    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
154    <property name="extra166y.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"/>
156    
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
   
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/"/>
159    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
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) -->    <!-- 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 -->
# Line 200  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"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
296        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
297    
298      </javac>      </javac>
   
299    </target>    </target>
300    
301    
   
302    <target name="jar"    <target name="jar"
303            depends="compile"            depends="compile"
304            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
305    
     <mkdir dir="${build.lib.dir}"/>  
   
306      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
307        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
308      </jar>      </jar>
   
309    </target>    </target>
310    
311    
   
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
   
312    <target name="docs"    <target name="docs"
313            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
314    
315      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
316      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
317    
318      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
319      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
320    
321      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
322               packagenames="none"               packagenames="none"
323               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
324               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
325                 access="${build.javadoc.access}"
326               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
327               classpath=""               classpath=""
328               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
329        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
330          <include name="**/*.java"/>          <include name="**/*.java"/>
331        </fileset>        </fileset>
332          <arg value="-XDignore.symbol.file=true"/>
333          <arg value="-tag"/>
334          <arg value="${javadoc.jls.option}"/>
335          <arg value="-tag"/>
336          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
337          <arg value="-tag"/>
338          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
339          <arg value="-tag"/>
340          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
341      </javadoc>      </javadoc>
   
342    </target>    </target>
343    
344    
   
345    <target name="dist"    <target name="dist"
346            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
347            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
348    
349    
# Line 284  Line 362 
362        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
363        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
364      </jar>      </jar>
   
365    </target>    </target>
366    
367    
   
368    <target name="clean"    <target name="clean"
369            description="Removes all build products">            description="Removes all build products">
370    
371      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
372    
373    </target>    </target>
374    
375    
   
376    <target name="dist-clean"    <target name="dist-clean"
377            description="Removes all build and distribution products">            description="Removes all build and distribution products">
378    
# Line 308  Line 381 
381    </target>    </target>
382    
383    
   
   <!-- Internal targets -->  
   
   
384    <target name="dist-jar"    <target name="dist-jar"
385            depends="clean, jar">            depends="clean, jar">
   
386      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
387    </target>    </target>
388    
389      <target name="dist-docs"
390    <target name="compile-tests"            depends="clean, docs">
391            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>  
 -->  
   
392    </target>    </target>
393    
394    
395    <target name="run-tests"    <target name="test-tck"
396            depends="compile-tests">            depends="jar"
397              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>  
398    
399        <run-tck-tests
400          target="8"
401          workdir="${build.dir}"
402          classes="${product.jar}"/>
403    </target>    </target>
404    
405      <target name="test-jtreg"
406              depends="jar"
407              description="Runs jtreg tests for main using the jtreg ant task">
408        <run-jtreg-tests
409           target="8"
410           workdir="${build.dir}"
411           classes="${product.jar}"/>
412      </target>
413    
414    <target name="report-tests"    <target name="test"
415            depends="run-tests">            depends="test-tck, test-jtreg"
416              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"/>  
   
417    </target>    </target>
418    
419    
420    
421    <target name="configure-compiler">    <target name="configure-compiler">
422    
423      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 469  Line 435 
435    </target>    </target>
436    
437    
   <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>  
   
438    
439    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
440    
# Line 524  Line 467 
467    
468    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
469    
   
470    <target name="4jdk7compile"    <target name="4jdk7compile"
471            depends="configure-compiler"            depends="configure-compiler"
472            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 545  Line 487 
487             fork="true">             fork="true">
488    
489        <include name="**/*.java"/>        <include name="**/*.java"/>
490        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
491        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
492        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
493          <compilerarg line="${build.args}"/>
494    
495      </javac>      </javac>
496      </target>
497    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
498    
499      <jar destfile="${4jdk7product.jar}" index="true">    <target name="4jdk7jar"
500              depends="4jdk7compile"
501              description="Builds library jar from compiled sources">
502    
503        <jar destfile="${4jdk7product.jar}">
504        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
505      </jar>      </jar>
506    
     <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="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>  
   
507    </target>    </target>
508    
509    
510    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
511            depends="4jdk7compile"            depends="4jdk7jar"
512            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
513    
514      <run-tck-tests      <run-tck-tests
515        jvm="${java7}"        target="7"
516        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
517        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
518          <javac-elements>
519            <!-- JDK8+ test classes -->
520            <exclude name="*8Test.java"/>
521            <exclude name="DoubleAccumulatorTest.java"/>
522            <exclude name="DoubleAdderTest.java"/>
523            <exclude name="LongAccumulatorTest.java"/>
524            <exclude name="LongAdderTest.java"/>
525            <exclude name="CompletableFutureTest.java"/>
526            <exclude name="StampedLockTest.java"/>
527          </javac-elements>
528        </run-tck-tests>
529    </target>    </target>
530    
531    
# Line 614  Line 551 
551    
552        <formatter type="brief"/>        <formatter type="brief"/>
553    
554        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
555        </test>        </test>
556    
557      </junit>      </junit>
558    </target>    </target>
559    
560      <target name="4jdk7-test-jtreg"
561              depends="4jdk7jar"
562              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
563        <run-jtreg-tests
564           target="7"
565           workdir="${build.4jdk7.dir}"
566           classes="${4jdk7product.jar}"
567           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
568      </target>
569    
570    
571      <target name="4jdk7-test"
572              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
573              description="Runs tck and jtreg tests for jsr166-4jdk7">
574      </target>
575    
576    
577    <target name="4jdk7docs"    <target name="4jdk7docs"
578            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
579    
580      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
581      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
582    
583      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
584               packagenames="none"               packagenames="none"
585               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
586               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
587                 access="${build.javadoc.access}"
588               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
589               classpath=""               classpath=""
590               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
591        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
592          <include name="**/*.java"/>          <include name="**/*.java"/>
593        </fileset>        </fileset>
594          <arg value="-XDignore.symbol.file=true"/>
595      </javadoc>      </javadoc>
   
596    </target>    </target>
597    
598    
599    <target name="4jdk7dist"    <target name="4jdk7dist"
600            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
601            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
602    
603    
   
604    <target name="4jdk7clean"    <target name="4jdk7clean"
605            description="Removes all build products">            description="Removes all 4jdk7 build products">
606    
607      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
608    
609    </target>    </target>
610    
611    
   
612    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
613            description="Removes all build and distribution products">            description="Removes all build and distribution products">
614    
615    </target>    </target>
616    
617    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
618            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
619      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
620      </target>
621    
622    
623      <target name="4jdk7dist-docs"
624              depends="4jdk7clean, 4jdk7docs">
625        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
626    </target>    </target>
627    
   <!-- jsr166x -->  
628    
629      <!-- jsr166x -->
630    
631    <target name="jsr166xcompile"    <target name="jsr166xcompile"
632            depends="configure-compiler"            depends="configure-compiler"
633            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
634    
635      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
636    
637      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
638             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
639             debug="${build.debug}"             debug="${build.debug}"
640             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
641             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
642             classpath=""             classpath=""
            source="5"  
643             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
644               source="5"
645             includeAntRuntime="false"             includeAntRuntime="false"
646             includeJavaRuntime="false"             includeJavaRuntime="false"
647             executable="${javac7}"             executable="${javac7}"
648             fork="true">             fork="true">
649    
650        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
651        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
652        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
653          <compilerarg line="${build.args}"/>
654    
655      </javac>      </javac>
   
656    </target>    </target>
657    
658    
   
659    <target name="jsr166xjar"    <target name="jsr166xjar"
660            depends="jsr166xcompile"            depends="jsr166xcompile"
661            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
662    
     <mkdir dir="${build.jsr166xlib.dir}"/>  
   
663      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
664        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
665      </jar>      </jar>
666    
667    </target>    </target>
668    
669    
   
670    <target name="jsr166xdocs"    <target name="jsr166xdocs"
671            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
672    
673      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
674      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
675    
676      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
677               packagenames="jsr166x.*"               packagenames="jsr166x.*"
678               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
679               source="5"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
680               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
681               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
682               additionalparam="-XDignore.symbol.file=true" />               source="5"
683                 executable="${javadoc7}">
684          <arg value="-XDignore.symbol.file=true"/>
685    
686        </javadoc>
687    </target>    </target>
688    
689    
690    <target name="jsr166xdist"    <target name="jsr166xdist"
691            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
692            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
693    
694    
   
695    <target name="jsr166xclean"    <target name="jsr166xclean"
696            description="Removes all build products">            description="Removes all jsr166x build products">
697    
698      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
699    
700    </target>    </target>
701    
702    
   
703    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
704            description="Removes all build and distribution products">            description="Removes all build and distribution products">
705    
706    </target>    </target>
707    
708    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs to dist dir">  
   
     <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}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
709    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
710            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
   
711      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
712      </target>
713    
714      <target name="jsr166xdist-docs"
715              depends="jsr166xclean, jsr166xdocs">
716        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
717    </target>    </target>
718    
719    <!-- jsr166y -->    <!-- jsr166y -->
# Line 788  Line 723 
723            depends="configure-compiler"            depends="configure-compiler"
724            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
725    
726      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
727    
728      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
729             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
730             debug="${build.debug}"             debug="${build.debug}"
731             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
732             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 804  Line 739 
739             fork="true">             fork="true">
740    
741        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
742        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
743        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
744          <compilerarg line="${build.args}"/>
745    
746      </javac>      </javac>
747    </target>    </target>
748    
# Line 815  Line 751 
751            depends="jsr166ycompile"            depends="jsr166ycompile"
752            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
753    
     <mkdir dir="${build.jsr166ylib.dir}"/>  
   
754      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
755        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
756      </jar>      </jar>
757    
758    </target>    </target>
759    
760    
   
761    <target name="jsr166ydocs"    <target name="jsr166ydocs"
762            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
763    
764      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
765      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
766    
767      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
768               packagenames="jsr166y.*"               packagenames="jsr166y.*"
769               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
770               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
771               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
772               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
773               additionalparam="-XDignore.symbol.file=true" />               source="6"
774                 executable="${javadoc7}">
775          <arg value="-XDignore.symbol.file=true"/>
776    
777        </javadoc>
778    </target>    </target>
779    
780    
781    <target name="jsr166ydist"    <target name="jsr166ydist"
782            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
783            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
784    
785    
   
786    <target name="jsr166yclean"    <target name="jsr166yclean"
787            description="Removes all build products">            description="Removes all jsr166y build products">
788    
789      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
790    
791    </target>    </target>
792    
793    
   
794    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
795            description="Removes all build and distribution products">            description="Removes all build and distribution products">
796    
797    </target>    </target>
798    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <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}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
799    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
800            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
   
801      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
802      </target>
803    
804      <target name="jsr166ydist-docs"
805              depends="jsr166yclean, jsr166ydocs">
806        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
807    </target>    </target>
808    
809    
# Line 895  Line 814 
814            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
815            description="Compiles extra166y sources">            description="Compiles extra166y sources">
816    
817      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
818    
819      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
820             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
821             debug="${build.debug}"             debug="${build.debug}"
822             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
823             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
824               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
825             classpath=""             classpath=""
826             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
827             includeAntRuntime="false"             includeAntRuntime="false"
828             includeJavaRuntime="false"             includeJavaRuntime="false"
829             executable="${javac7}"             executable="${javac7}"
830             fork="true">             fork="true">
831    
832        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
833        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
834        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
835          <compilerarg line="${build.args}"/>
836    
837      </javac>      </javac>
   
838    </target>    </target>
839    
840    
   
841    <target name="extra166yjar"    <target name="extra166yjar"
842            depends="extra166ycompile"            depends="extra166ycompile"
843            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
844    
     <mkdir dir="${build.extra166ylib.dir}"/>  
   
845      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
846        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
847      </jar>      </jar>
848    
849    </target>    </target>
850    
851    
   
852    <target name="extra166ydocs"    <target name="extra166ydocs"
853            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
854    
855      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
856      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
857    
858      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
859               packagenames="extra166y.*"               packagenames="extra166y.*"
860               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
861               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
862               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
863               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
864               additionalparam="-XDignore.symbol.file=true" />               source="6"
865                 executable="${javadoc7}">
866          <arg value="-XDignore.symbol.file=true"/>
867    
868        </javadoc>
869    </target>    </target>
870    
871    
872    <target name="extra166ydist"    <target name="extra166ydist"
873            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
874            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
875    
876    
   
877    <target name="extra166yclean"    <target name="extra166yclean"
878            description="Removes all build products">            description="Removes all extra166y build products">
879    
880      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
881    
882    </target>    </target>
883    
884    
   
885    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
886            description="Removes all build and distribution products">            description="Removes all build and distribution products">
887    
888    </target>    </target>
889    
   <target name="extra166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <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}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
890    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
891            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
   
892      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
893      </target>
894    
895      <target name="extra166ydist-docs"
896              depends="extra166yclean, extra166ydocs">
897        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
898    </target>    </target>
899    
900    <!-- jsr166e -->    <!-- jsr166e -->
# Line 1003  Line 903 
903            depends="configure-compiler"            depends="configure-compiler"
904            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
905    
906      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
907    
908      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
909             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
910             debug="${build.debug}"             debug="${build.debug}"
911             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
912             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 1018  Line 918 
918             fork="true">             fork="true">
919    
920        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
921        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
922        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
923          <compilerarg line="${build.args}"/>
924    
925      </javac>      </javac>
   
926    </target>    </target>
927    
928    
   
929    <target name="jsr166ejar"    <target name="jsr166ejar"
930            depends="jsr166ecompile"            depends="jsr166ecompile"
931            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
932    
     <mkdir dir="${build.jsr166elib.dir}"/>  
   
933      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
934        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
935      </jar>      </jar>
936    
937    </target>    </target>
938    
939    
   
940    <target name="jsr166edocs"    <target name="jsr166edocs"
941            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
942    
943      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
944      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
945    
946      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
947               packagenames="jsr166e.*"               packagenames="jsr166e.*"
948               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
949               source="7"               access="${build.javadoc.access}"
950               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
951               executable="${javadoc7}"               source="7"
952               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
953          <arg value="-XDignore.symbol.file=true"/>
954    
955      </javadoc>      </javadoc>
956      </target>
957    
958    
959      <target name="jsr166e-test-tck"
960              depends="jsr166ejar"
961              description="Runs tck tests for jsr166e">
962    
963        <run-tck-tests
964          tck.src.dir="${test.src.dir}/tck-jsr166e"
965          target="7"
966          workdir="${build.jsr166e.dir}"
967          classes="${jsr166e.jar}"/>
968    </target>    </target>
969    
970    
971    <target name="jsr166edist"    <target name="jsr166edist"
972            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
973            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
974    
975    
   
976    <target name="jsr166eclean"    <target name="jsr166eclean"
977            description="Removes all build products">            description="Removes all jsr166e build products">
   
978      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
979    </target>    </target>
980    
981    
   
982    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
983            description="Removes all build and distribution products">            description="Removes all build and distribution products">
984    
985    </target>    </target>
986    
987    <target name="jsr166edist-docs"    <target name="jsr166edist-jar"
988            description="Builds javadocs to dist dir">            depends="jsr166eclean, jsr166ejar">
989        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
990      <delete dir="${dist.jsr166ejavadocs.dir}"/>    </target>
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e.*"  
              link="${jdkapidocs.url}"  
              source="7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
991    
992      <target name="jsr166edist-docs"
993              depends="jsr166eclean, jsr166edocs">
994        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
995    </target>    </target>
996    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
997    
998      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
999    
1000      <target name="lint">
1001        <antcall target="dists">
1002          <param name="build.javadoc.access" value="private"/>
1003        </antcall>
1004    </target>    </target>
1005    
1006    
1007  </project>  </project>

Legend:
Removed from v.1.107  
changed lines
  Added in v.1.143

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