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

Diff of /jsr166/build.xml

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

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

Legend:
Removed from v.1.94  
changed lines
  Added in v.1.148

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