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

Diff of /jsr166/build.xml

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

revision 1.96 by jsr166, Mon Jan 14 21:06:16 2013 UTC revision 1.142 by jsr166, Tue Jun 18 20:54:57 2013 UTC
# Line 8  Line 8 
8    
9    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
11    
12      The repository contains all dependencies except for ant and the JDK
13      itself.  Because the JDK version matters and because different
14      targets require different JDKs, we assume that users have created a
15      hierarchy containing:
16      $HOME/jdk/jdk6
17      $HOME/jdk/jdk7
18      $HOME/jdk/jdk8
19      where each of the above is a JDK or a symlink to same, and
20      $HOME/jdk/src/jdk6
21      $HOME/jdk/src/jdk7
22      $HOME/jdk/src/jdk8
23      where each of the above is a complete JDK source tree
24      (e.g. mercurial forest) or a symlink to same.
25    As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
27    </description>    </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 21  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.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
64    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
65    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
66    <property name="build.jdk7.docs.dir"         location="${build.jdk7.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">
82      <attribute name="v"/>      <attribute name="v"/>
83      <sequential>      <sequential>
84      <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
85      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
86      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
87      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
88      <property name="bootclasspath@{v}"        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
89       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <local name="boot.jar.dir"/>
90        <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>
100      </macrodef>
101    
102      <macrodef name="mirror-dir">
103        <attribute name="src"/>
104        <attribute name="dst"/>
105        <sequential>
106        <delete dir="@{dst}"/>
107        <mkdir dir="@{dst}"/>
108        <copy todir="@{dst}" preservelastmodified="true">
109          <fileset dir="@{src}"/>
110        </copy>
111      </sequential>      </sequential>
112    </macrodef>    </macrodef>
113    
# Line 84  Line 124 
124    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
125    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
126    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
127    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
128    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
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.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <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="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.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 117  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 -->
266      <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
267      <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="init, configure-compiler"            depends="configure-compiler"
277            description="Compiles 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    
281      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
282            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
283              debug="${build.debug}"             debug="${build.debug}"
284         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
285        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
286             source="${build.sourcelevel}"             classpath=""
287               fork="true">             includeAntRuntime="false"
288               includeJavaRuntime="false"
289               executable="${javac8}"
290               fork="true">
291    
292        <include name="**/*.java"/>        <include name="**/*.java"/>
293          <compilerarg value="-Xprefer:source"/>
294        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
295          <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="init, 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 with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
314    
315      <delete dir="${build.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
316      <mkdir dir="${build.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="${build.javadocs.dir}"      <javadoc destdir="${docs.dir}"
322               packagenames="none"               packagenames="none"
323               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
324               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
325               sourcepath="${src.dir}:${jdksrc.dir}"               access="${build.javadoc.access}"
326               additionalparam="-XDignore.symbol.file=true" >               sourcepath="${src.dir}:${jdk8src.dir}"
327                 classpath=""
328                 executable="${javadoc8}">
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      </javadoc>      </javadoc>
   
336    </target>    </target>
337    
338    
   
339    <target name="dist"    <target name="dist"
340            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, dist-docs"
341            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
342    
343    
# Line 232  Line 356 
356        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
357        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
358      </jar>      </jar>
   
359    </target>    </target>
360    
361    
   
362    <target name="clean"    <target name="clean"
363            description="Removes all build products">            description="Removes all build products">
364    
365      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
366    
367    </target>    </target>
368    
369    
   
370    <target name="dist-clean"    <target name="dist-clean"
371            description="Removes all build and distribution products">            description="Removes all build and distribution products">
372    
# Line 256  Line 375 
375    </target>    </target>
376    
377    
   
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <!-- the packagenames="none" hack below prevents scanning the -->  
     <!-- sourcepath for packages -->  
   
     <javadoc destdir="${dist.javadocs.dir}"  
              packagenames="none"  
              link="${jdkapidocs.url}"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
   <!-- 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>  
   
   
378    <target name="dist-jar"    <target name="dist-jar"
379            depends="clean, jar">            depends="clean, jar">
   
380      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
381    </target>    </target>
382    
383      <target name="dist-docs"
384    <target name="compile-tests"            depends="clean, docs">
385            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>  
 -->  
   
386    </target>    </target>
387    
388    
389    <target name="run-tests"    <target name="test-tck"
390            depends="compile-tests">            depends="jar"
391              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>  
392    
393        <run-tck-tests
394          target="8"
395          workdir="${build.dir}"
396          classes="${product.jar}"/>
397    </target>    </target>
398    
399      <target name="test-jtreg"
400              depends="jar"
401              description="Runs jtreg tests for main using the jtreg ant task">
402        <run-jtreg-tests
403           target="8"
404           workdir="${build.dir}"
405           classes="${product.jar}"/>
406      </target>
407    
408    <target name="report-tests"    <target name="test"
409            depends="run-tests">            depends="test-tck, test-jtreg"
410              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"/>  
   
411    </target>    </target>
412    
413    
414    
415    <target name="configure-compiler">    <target name="configure-compiler">
416    
417      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 451  Line 429 
429    </target>    </target>
430    
431    
   <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>  
   
432    
433    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
434    
435    
436    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
437            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
438    
439      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 504  Line 459 
459    </target>    </target>
460    
461    
462    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
463    
464      <target name="4jdk7compile"
   <target name="jdk7compile"  
465            depends="configure-compiler"            depends="configure-compiler"
466            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
467    
468      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
469    
470      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
471             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
472             debug="${build.debug}"             debug="${build.debug}"
473             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
474             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
475             source="1.6"             source="6"
476             classpath=""             classpath=""
477             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
478             includeAntRuntime="false"             includeAntRuntime="false"
479             includeJavaRuntime="false"             includeJavaRuntime="false"
480             executable="${javac6}"             executable="${javac7}"
481             fork="true">             fork="true">
482    
483        <include name="**/*.java"/>        <include name="**/*.java"/>
484        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
485        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
486        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
487          <compilerarg line="${build.args}"/>
488    
489      </javac>      </javac>
490      </target>
491    
492    
493      <target name="4jdk7jar"
494              depends="4jdk7compile"
495              description="Builds library jar from compiled sources">
496    
497        <jar destfile="${4jdk7product.jar}">
498          <fileset dir="${build.4jdk7.classes.dir}"/>
499        </jar>
500    
501    </target>    </target>
502    
503    
504      <target name="4jdk7-test-tck"
505              depends="4jdk7jar"
506              description="Runs tck tests for jsr166-4jdk7 directly">
507    
508        <run-tck-tests
509          target="7"
510          workdir="${build.4jdk7.dir}"
511          classes="${4jdk7product.jar}">
512          <javac-elements>
513            <!-- JDK8+ test classes -->
514            <exclude name="*8Test.java"/>
515            <exclude name="DoubleAccumulatorTest.java"/>
516            <exclude name="DoubleAdderTest.java"/>
517            <exclude name="LongAccumulatorTest.java"/>
518            <exclude name="LongAdderTest.java"/>
519            <exclude name="CompletableFutureTest.java"/>
520            <exclude name="StampedLockTest.java"/>
521          </javac-elements>
522        </run-tck-tests>
523      </target>
524    
   <target name="jdk7jar"  
           depends="jdk7compile"  
           description="Builds library jar from compiled sources">  
525    
526      <mkdir dir="${build.jdk7.lib.dir}"/>    <target name="4jdk7-test-tck-junit"
527              depends="4jdk7compile"
528              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
529    
530      <jar destfile="${jdk7product.jar}" index="true">      <junit printsummary="true"
531        <fileset dir="${build.jdk7.classes.dir}"/>             showoutput="true"
532      </jar>             errorProperty="junit.failed"
533               failureProperty="junit.failed"
534               includeantruntime="true"
535               jvm="${java7}"
536               fork="true">
537    
538          <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
539          <jvmarg value="-server"/>
540    
541          <classpath>
542            <pathelement location="${junit.jar}"/>
543            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
544          </classpath>
545    
546          <formatter type="brief"/>
547    
548          <test name="${jsr166.tckTestClass}" haltonfailure="no">
549          </test>
550    
551        </junit>
552      </target>
553    
554      <target name="4jdk7-test-jtreg"
555              depends="4jdk7jar"
556              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
557        <run-jtreg-tests
558           target="7"
559           workdir="${build.4jdk7.dir}"
560           classes="${4jdk7product.jar}"
561           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
562    </target>    </target>
563    
564    
565      <target name="4jdk7-test"
566              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
567              description="Runs tck and jtreg tests for jsr166-4jdk7">
568      </target>
569    
570    
571    <target name="jdk7docs"    <target name="4jdk7docs"
572            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
573    
574      <delete dir="${build.jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
575      <mkdir dir="${build.jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
576    
577      <javadoc destdir="${build.jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
578               packagenames="none"               packagenames="none"
579               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
580               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
581               sourcepath="${jdk7src.dir}"               access="${build.javadoc.access}"
582               bootclasspath="${bootclasspath6}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
583               classpath=""               classpath=""
584               source="1.6"               executable="${javadoc7}">
585               executable="${javadoc7}"        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
586          <include name="**/*.java"/>          <include name="**/*.java"/>
587        </fileset>        </fileset>
588          <arg value="-XDignore.symbol.file=true"/>
589      </javadoc>      </javadoc>
   
590    </target>    </target>
591    
592    
593    <target name="jdk7dist"    <target name="4jdk7dist"
594            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
595            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
596    
597    
598      <target name="4jdk7clean"
599              description="Removes all 4jdk7 build products">
600    
601    <target name="jdk7clean"      <delete dir="${build.4jdk7.dir}"/>
           description="Removes all build products">  
   
     <delete dir="${build.jdk7.dir}"/>  
602    
603    </target>    </target>
604    
605    
606      <target name="4jdk7dist-clean"
   <target name="jdk7dist-clean"  
607            description="Removes all build and distribution products">            description="Removes all build and distribution products">
608    
609    </target>    </target>
610    
611    <target name="jdk7dist-docs"    <target name="4jdk7dist-jar"
612            description="Builds javadocs without custom tags to dist folder">            depends="4jdk7clean, 4jdk7jar">
613        <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
     <delete dir="${dist.jdk7.docs.dir}"/>  
     <mkdir dir="${dist.jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${jdk7src.dir}/intro.html"  
              sourcepath="${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}"  
              bootclasspath="${bootclasspath6}"  
              source="1.6">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
614    </target>    </target>
615    
   <target name="jdk7dist-jar"  
           depends="jdk7clean, jdk7jar">  
   
     <copy file="${jdk7product.jar}" todir="${dist.dir}"/>  
616    
617      <target name="4jdk7dist-docs"
618              depends="4jdk7clean, 4jdk7docs">
619        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
620    </target>    </target>
621    
   <!-- jsr166x -->  
622    
623      <!-- jsr166x -->
624    
625    <target name="jsr166xcompile"    <target name="jsr166xcompile"
626            depends="init, configure-compiler"            depends="configure-compiler"
627            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
628    
629      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
630    
631      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
632            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
633              debug="${build.debug}"             debug="${build.debug}"
634         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
635        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
636             source="${build.sourcelevel}"             classpath=""
637               fork="true">             bootclasspath="${bootclasspath6}"
638               source="5"
639               includeAntRuntime="false"
640               includeJavaRuntime="false"
641               executable="${javac7}"
642               fork="true">
643    
644        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
645        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
646          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
647          <compilerarg line="${build.args}"/>
648    
649      </javac>      </javac>
   
650    </target>    </target>
651    
652    
   
653    <target name="jsr166xjar"    <target name="jsr166xjar"
654            depends="jsr166xcompile"            depends="jsr166xcompile"
655            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
656    
657      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
658          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
659      </jar>      </jar>
660    
661    </target>    </target>
662    
663    
   
664    <target name="jsr166xdocs"    <target name="jsr166xdocs"
665            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
666    
667      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
668      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
669    
670      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
671               packagenames="jsr166x"               packagenames="jsr166x.*"
672               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
673               source="${build.sourcelevel}"               access="${build.javadoc.access}"
674               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
675               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
676                 source="5"
677                 executable="${javadoc7}">
678          <arg value="-XDignore.symbol.file=true"/>
679    
680        </javadoc>
681    </target>    </target>
682    
683    
684    <target name="jsr166xdist"    <target name="jsr166xdist"
685            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
686            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
687    
688    
   
689    <target name="jsr166xclean"    <target name="jsr166xclean"
690            description="Removes all build products">            description="Removes all jsr166x build products">
691    
692      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
693    
694    </target>    </target>
695    
696    
   
697    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
698            description="Removes all build and distribution products">            description="Removes all build and distribution products">
699    
700    </target>    </target>
701    
702    
   
   <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>  
   
703    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
704            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
705        <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
706      </target>
707    
708      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166xdist-docs"
709              depends="jsr166xclean, jsr166xdocs">
710        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
711    </target>    </target>
712    
713    <!-- jsr166y -->    <!-- jsr166y -->
714    
715    
716    <target name="jsr166ycompile"    <target name="jsr166ycompile"
717            depends="init, configure-compiler"            depends="configure-compiler"
718            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
719    
720      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
721    
722      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
723            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
724              debug="${build.debug}"             debug="${build.debug}"
725         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
726        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
727             source="${build.sourcelevel}"             source="6"
728               fork="true">             classpath=""
729               bootclasspath="${bootclasspath6}"
730               includeAntRuntime="false"
731               includeJavaRuntime="false"
732               executable="${javac7}"
733               fork="true">
734    
735        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
736        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
737        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
738          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
739    
740      </javac>      </javac>
   
741    </target>    </target>
742    
743    
   
744    <target name="jsr166yjar"    <target name="jsr166yjar"
745            depends="jsr166ycompile"            depends="jsr166ycompile"
746            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
747    
748      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
749          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
750      </jar>      </jar>
751    
752    </target>    </target>
753    
754    
   
755    <target name="jsr166ydocs"    <target name="jsr166ydocs"
756            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
757    
758      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
759      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
760    
761      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
762               packagenames="jsr166y"               packagenames="jsr166y.*"
763               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
764               source="${build.sourcelevel}"               access="${build.javadoc.access}"
765               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
766               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
767                 source="6"
768                 executable="${javadoc7}">
769          <arg value="-XDignore.symbol.file=true"/>
770    
771        </javadoc>
772    </target>    </target>
773    
774    
775    <target name="jsr166ydist"    <target name="jsr166ydist"
776            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
777            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
778    
779    
   
780    <target name="jsr166yclean"    <target name="jsr166yclean"
781            description="Removes all build products">            description="Removes all jsr166y build products">
782    
783      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
784    
785    </target>    </target>
786    
787    
   
788    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
789            description="Removes all build and distribution products">            description="Removes all build and distribution products">
790    
791    </target>    </target>
792    
   <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>  
   
793    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
794            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
795        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
796      </target>
797    
798      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166ydist-docs"
799              depends="jsr166yclean, jsr166ydocs">
800        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
801    </target>    </target>
802    
803    
# Line 835  Line 805 
805    
806    
807    <target name="extra166ycompile"    <target name="extra166ycompile"
808            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
809            description="Compiles extra166y sources">            description="Compiles extra166y sources">
810    
811      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
812    
813      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
814            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
815              debug="${build.debug}"             debug="${build.debug}"
816              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
817         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
818        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
819             source="${build.sourcelevel}"             classpath=""
820               fork="true">             source="6"
821               includeAntRuntime="false"
822               includeJavaRuntime="false"
823               executable="${javac7}"
824               fork="true">
825    
826        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
827        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
828        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
829          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
830    
831      </javac>      </javac>
   
832    </target>    </target>
833    
834    
   
835    <target name="extra166yjar"    <target name="extra166yjar"
836            depends="extra166ycompile"            depends="extra166ycompile"
837            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
838    
839      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
840          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
841      </jar>      </jar>
842    
843    </target>    </target>
844    
845    
   
846    <target name="extra166ydocs"    <target name="extra166ydocs"
847            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
848    
849      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
850      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
851    
852      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
853               packagenames="extra166y"               packagenames="extra166y.*"
854               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
855               source="${build.sourcelevel}"               access="${build.javadoc.access}"
856               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
857               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
858                 source="6"
859                 executable="${javadoc7}">
860          <arg value="-XDignore.symbol.file=true"/>
861    
862        </javadoc>
863    </target>    </target>
864    
865    
866    <target name="extra166ydist"    <target name="extra166ydist"
867            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
868            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
869    
870    
   
871    <target name="extra166yclean"    <target name="extra166yclean"
872            description="Removes all build products">            description="Removes all extra166y build products">
873    
874      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
875    
876    </target>    </target>
877    
878    
   
879    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
880            description="Removes all build and distribution products">            description="Removes all build and distribution products">
881    
882    </target>    </target>
883    
   <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>  
   
884    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
885            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
886        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
887      </target>
888    
889      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>    <target name="extra166ydist-docs"
890              depends="extra166yclean, extra166ydocs">
891        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
892    </target>    </target>
893    
894    <!-- jsr166e -->    <!-- jsr166e -->
# Line 941  Line 897 
897            depends="configure-compiler"            depends="configure-compiler"
898            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
899    
900      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
901    
902      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
903             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
904             debug="${build.debug}"             debug="${build.debug}"
905             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
906             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
907             source="1.7"             source="7"
908             classpath=""             classpath=""
909             includeAntRuntime="false"             includeAntRuntime="false"
910             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 956  Line 912 
912             fork="true">             fork="true">
913    
914        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
915        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
916        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
917          <compilerarg line="${build.args}"/>
918    
919      </javac>      </javac>
   
920    </target>    </target>
921    
922    
   
923    <target name="jsr166ejar"    <target name="jsr166ejar"
924            depends="jsr166ecompile"            depends="jsr166ecompile"
925            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
926    
927      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
928          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
929      </jar>      </jar>
930    
931    </target>    </target>
932    
933    
   
934    <target name="jsr166edocs"    <target name="jsr166edocs"
935            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
936    
937      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
938      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
939    
940        <javadoc destdir="${jsr166edocs.dir}"
941                 packagenames="jsr166e.*"
942                 link="${jdkapidocs.url}"
943                 access="${build.javadoc.access}"
944                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
945                 source="7"
946                 executable="${javadoc7}">
947          <arg value="-XDignore.symbol.file=true"/>
948    
     <javadoc destdir="${build.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapi7docs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
949      </javadoc>      </javadoc>
950      </target>
951    
952    
953      <target name="jsr166e-test-tck"
954              depends="jsr166ejar"
955              description="Runs tck tests for jsr166e">
956    
957        <run-tck-tests
958          tck.src.dir="${test.src.dir}/tck-jsr166e"
959          target="7"
960          workdir="${build.jsr166e.dir}"
961          classes="${jsr166e.jar}"/>
962    </target>    </target>
963    
964    
965    <target name="jsr166edist"    <target name="jsr166edist"
966            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
967            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
968    
969    
   
970    <target name="jsr166eclean"    <target name="jsr166eclean"
971            description="Removes all build products">            description="Removes all jsr166e build products">
   
972      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
973    </target>    </target>
974    
975    
   
976    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
977            description="Removes all build and distribution products">            description="Removes all build and distribution products">
978    
979    </target>    </target>
980    
981    <target name="jsr166edist-docs"    <target name="jsr166edist-jar"
982            description="Builds javadocs without custom tags to dist folder">            depends="jsr166eclean, jsr166ejar">
983        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
984      <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" />  
985    
986      <target name="jsr166edist-docs"
987              depends="jsr166eclean, jsr166edocs">
988        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
989    </target>    </target>
990    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
991    
992      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
993    
994      <target name="lint">
995        <antcall target="dists">
996          <param name="build.javadoc.access" value="private"/>
997        </antcall>
998    </target>    </target>
999    
1000    
1001  </project>  </project>

Legend:
Removed from v.1.96  
changed lines
  Added in v.1.142

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