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

Diff of /jsr166/build.xml

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

revision 1.101 by jsr166, Sat Jan 19 17:30:36 2013 UTC revision 1.141 by jsr166, Tue Jun 18 19:03:50 2013 UTC
# Line 22  Line 22 
22    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
25    As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
27    </description>    </description>
28    
29    <target name="usage" description="Advises user to run with -projecthelp">    <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30      <echo>Run "ant -projecthelp" for full usage information.</echo>      <java classname="org.apache.tools.ant.Main">
31          <arg value="-projecthelp" />
32        </java>
33    </target>    </target>
34    
35    
# Line 35  Line 38 
38    
39    
40    <!-- Compilation options -->    <!-- Compilation options -->
41    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
42    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45      <property name="build.javadoc.access" value="protected"/>
46    
47      <!-- Tck options; see JSR166TestCase.java -->
48      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49      <property name="jsr166.profileTests"     value="false"/>
50      <property name="jsr166.profileThreshold" value="100"/>
51      <property name="jsr166.runsPerTest"      value="1"/>
52      <!-- Allow running an individual tck test class -->
53      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55    
56    <!-- Build locations -->    <!-- Build locations -->
57    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
58    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
59    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
60    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
61    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
62    
63    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
64    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
65    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
66    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>  
67    
68    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
   
69    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
70    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
71    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
   <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
72    
73    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74      <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75      <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76      <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77    
78      <!-- JDK locations -->
79    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
80    
81    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 81  Line 85 
85      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
86      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
87      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
     <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>  
88      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
89      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
90       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91        <path id="bootclasspath@{v}">
92          <pathelement path="${boot.jar.dir}/resources.jar"/>
93          <pathelement path="${boot.jar.dir}/rt.jar"/>
94          <pathelement path="${boot.jar.dir}/jsse.jar"/>
95          <pathelement path="${boot.jar.dir}/jce.jar"/>
96          <pathelement path="${boot.jar.dir}/charsets.jar"/>
97        </path>
98        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
99      </sequential>      </sequential>
100    </macrodef>    </macrodef>
101    
102    <defjdklocations v="6"/>    <macrodef name="mirror-dir">
103    <defjdklocations v="7"/>      <attribute name="src"/>
104    <defjdklocations v="8"/>      <attribute name="dst"/>
   
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
105      <sequential>      <sequential>
106      <java classname="JSR166TestCase"      <delete dir="@{dst}"/>
107            jvm="@{jvm}" fork="true">      <mkdir dir="@{dst}"/>
108          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>      <copy todir="@{dst}" preservelastmodified="true">
109          <jvmarg line="@{jvmflags}"/>        <fileset dir="@{src}"/>
110          <classpath>      </copy>
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
111      </sequential>      </sequential>
112    </macrodef>    </macrodef>
113    
114      <defjdklocations v="6"/>
115      <defjdklocations v="7"/>
116      <defjdklocations v="8"/>
117    
118    <!-- Source locations -->    <!-- Source locations -->
119    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
120    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 124  Line 129 
129    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
130    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>  
132    
133    <!-- Distribution locations -->    <!-- Javadoc locations -->
134    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
135    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140    
141      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147    
148    <!-- Jar locations -->    <!-- Jar locations -->
149    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
150    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
151    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
152    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
153    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
154    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
155    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
   
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
156    
157    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
158    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
# Line 152  Line 160 
160    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
161    
162    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
164    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165    
166      <!-- Default jdk api doc location (latest stable release seems best) -->
167    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
168    
169      <!-- Define the "jtreg" task -->
170      <!-- See the docs in "jtreg -onlineHelp" -->
171      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
172               classpath="${lib.dir}/jtreg.jar" />
173    
174    <!-- Test classpath -->    <!-- Test classpath -->
175    <path id="test.classpath">    <path id="test.classpath">
176      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
177      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
178    </path>    </path>
179    
180      <macrodef name="run-tck-tests">
181        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
182        <attribute name="target"/>
183        <attribute name="compile-target" default="@{target}"/>
184        <attribute name="workdir"/>
185        <attribute name="classes"/>
186        <attribute name="jvmflags" default=""/>
187        <element name="javac-elements" optional="true"/>
188        <sequential>
189    
190        <mkdir dir="@{workdir}/tck-classes"/>
191    
192        <javac srcdir="@{tck.src.dir}"
193               destdir="@{workdir}/tck-classes"
194               debug="${build.debug}"
195               debuglevel="${build.debuglevel}"
196               deprecation="${build.deprecation}"
197               source="@{compile-target}"
198               target="@{compile-target}"
199               classpath="${junit.jar}"
200               bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201               includeAntRuntime="false"
202               includeJavaRuntime="false"
203               executable="${javac@{compile-target}}"
204               fork="true">
205    
206          <include name="*.java"/>
207          <compilerarg value="-XDignore.symbol.file=true"/>
208          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209          <compilerarg line="${build.args}"/>
210          <javac-elements/>
211    
212        </javac>
213    
214        <java classname="${jsr166.tckTestClass}"
215              failonerror="true"
216              jvm="${java@{target}}"
217              fork="true">
218            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
219            <jvmarg line="@{jvmflags}"/>
220            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223            <classpath>
224              <pathelement location="${junit.jar}"/>
225              <pathelement location="@{workdir}/tck-classes"/>
226            </classpath>
227        </java>
228    
229        </sequential>
230      </macrodef>
231    
232      <macrodef name="run-jtreg-tests">
233        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234        <attribute name="source" default="7"/>
235        <attribute name="target"/>
236        <attribute name="workdir"/>
237        <attribute name="classes"/>
238        <attribute name="jtregflags" default=""/>
239        <sequential>
240        <delete dir="@{workdir}/JTwork"   quiet="true"/>
241        <delete dir="@{workdir}/JTreport" quiet="true"/>
242        <mkdir dir="@{workdir}/JTwork/scratch"/>
243        <mkdir dir="@{workdir}/JTreport"/>
244        <jtreg dir="@{jtreg.src.dir}"
245               jdk="${jdk@{target}.home}"
246               workDir="@{workdir}/JTwork"
247               reportDir="@{workdir}/JTreport">
248    
249          <arg value="-Xbootclasspath/p:@{classes}"/>
250          <arg value="-agentvm"/>
251          <arg value="-v:nopass,fail"/>
252          <arg value="-vmoptions:-esa -ea"/>
253          <arg value="-automatic"/>
254          <arg value="-k:!ignore"/>
255          <arg line="@{jtregflags}"/>
256        </jtreg>
257        </sequential>
258      </macrodef>
259    
260    <!-- ALoops classpath -->    <!-- ALoops classpath -->
261    <path id="loops.classpath">    <path id="loops.classpath">
262      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
263    </path>    </path>
264    
265    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
266    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
267    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
268    
269    <!-- Main targets -->    <!-- Main targets -->
270    
271    <target name="dists"    <target name="dists"
272            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
273            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
274    
275    <target name="compile"    <target name="compile"
276            depends="configure-compiler"            depends="configure-compiler"
277            description="Compiles src/main sources to build folder">            description="Compiles src/main sources to build dir">
278    
279      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
280    
# Line 198  Line 290 
290             fork="true">             fork="true">
291    
292        <include name="**/*.java"/>        <include name="**/*.java"/>
293        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
294        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
295        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <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    
   
312    <target name="test"    <target name="test"
313            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
314            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315    
316    
   
317    <target name="docs"    <target name="docs"
318            description="Builds javadocs for src/main">            description="Builds javadocs for src/main to dist dir">
319    
320      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
321      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
322    
323      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
324      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
325    
326      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
327               packagenames="none"               packagenames="none"
328               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
329               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
330                 access="${build.javadoc.access}"
331               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
332               classpath=""               classpath=""
333               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
334        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
335          <include name="**/*.java"/>          <include name="**/*.java"/>
336        </fileset>        </fileset>
337          <arg value="-XDignore.symbol.file=true"/>
338          <arg value="-tag"/>
339          <arg value="${javadoc.jls.option}"/>
340      </javadoc>      </javadoc>
   
341    </target>    </target>
342    
343    
   
344    <target name="dist"    <target name="dist"
345            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
346            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
347    
348    
# Line 282  Line 361 
361        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
362        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
363      </jar>      </jar>
   
364    </target>    </target>
365    
366    
   
367    <target name="clean"    <target name="clean"
368            description="Removes all build products">            description="Removes all build products">
369    
370      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
371    
372    </target>    </target>
373    
374    
   
375    <target name="dist-clean"    <target name="dist-clean"
376            description="Removes all build and distribution products">            description="Removes all build and distribution products">
377    
# Line 306  Line 380 
380    </target>    </target>
381    
382    
   
383    <!-- Internal targets -->    <!-- Internal targets -->
384    
385    
   <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>  
   
   
386    <target name="dist-jar"    <target name="dist-jar"
387            depends="clean, jar">            depends="clean, jar">
   
388      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
389      </target>
390    
391      <target name="dist-docs"
392              depends="clean, docs">
393        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
394    </target>    </target>
395    
396    
# Line 334  Line 400 
400      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
401    
402      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
403            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
404              debug="${build.debug}"             debug="${build.debug}"
405         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
406        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
407             source="${build.sourcelevel}"             source="6"
408               fork="true">             classpath="${junit.jar}"
409               bootclasspath="@{product.jar}:${bootclasspath6}"
410               includeAntRuntime="false"
411               includeJavaRuntime="false"
412               executable="${javac8}"
413               fork="true">
414    
415        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
416        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
417          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
419    
420      </javac>      </javac>
421    
422      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
423            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
424              debug="${build.debug}"             debug="${build.debug}"
425         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
426        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
427             source="${build.sourcelevel}"             source="6"
428               fork="true">             classpath=""
429               bootclasspath="@{product.jar}:${bootclasspath6}"
430        <include name="jsr166/test/**"/>             includeAntRuntime="false"
431               includeJavaRuntime="false"
432               executable="${javac8}"
433               fork="true">
434    
435        <compilerarg value="${bootclasspath.args}"/>        <include name="jsr166/test/**/*.java"/>
       <compilerarg line="${build.args}"/>  
436        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
437          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
439    
440      </javac>      </javac>
441    
# Line 376  Line 448 
448             source="${build.sourcelevel}"             source="${build.sourcelevel}"
449               fork="true">               fork="true">
450    
451        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
452        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
453          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
454    
455      </javac>      </javac>
456  -->  -->
457    
458    </target>    </target>
459    
460      <target name="test-tck"
461              depends="jar"
462              description="Runs tck tests for main directly">
463    
464        <run-tck-tests
465          target="8"
466          workdir="${build.dir}"
467          classes="${product.jar}"/>
468      </target>
469    
470      <target name="test-jtreg"
471              depends="jar"
472              description="Runs jtreg tests for main using the jtreg ant task">
473        <run-jtreg-tests
474           target="8"
475           workdir="${build.dir}"
476           classes="${product.jar}"/>
477      </target>
478    
479      <target name="test-ng"
480              depends="test-tck, test-jtreg"
481              description="Runs tck and jtreg tests for main">
482      </target>
483    
484    <target name="run-tests"    <target name="run-tests"
485            depends="compile-tests">            depends="compile-tests">
# Line 401  Line 494 
494            errorProperty="junit.failed"            errorProperty="junit.failed"
495          failureProperty="junit.failed"          failureProperty="junit.failed"
496                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
497                        jvm="${java8}"
498                     fork="true">                     fork="true">
499    
500        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501        <jvmarg value="-server"/>        <jvmarg value="-server"/>
502        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
503    
# Line 504  Line 598 
598    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
599    
600    
601    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
602            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
603    
604      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 532  Line 626 
626    
627    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
628    
   
629    <target name="4jdk7compile"    <target name="4jdk7compile"
630            depends="configure-compiler"            depends="configure-compiler"
631            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 544  Line 637 
637             debug="${build.debug}"             debug="${build.debug}"
638             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
639             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
640             source="1.6"             source="6"
641             classpath=""             classpath=""
642             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
643             includeAntRuntime="false"             includeAntRuntime="false"
# Line 553  Line 646 
646             fork="true">             fork="true">
647    
648        <include name="**/*.java"/>        <include name="**/*.java"/>
649        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
650        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
651        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
652          <compilerarg line="${build.args}"/>
653    
654      </javac>      </javac>
655      </target>
656    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
657    
658      <jar destfile="${4jdk7product.jar}" index="true">    <target name="4jdk7jar"
659              depends="4jdk7compile"
660              description="Builds library jar from compiled sources">
661    
662        <jar destfile="${4jdk7product.jar}">
663        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
664      </jar>      </jar>
665    
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="1.6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </javac>  
   
666    </target>    </target>
667    
668    
669    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
670            depends="4jdk7compile"            depends="4jdk7jar"
671            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
672    
673      <run-tck-tests      <run-tck-tests
674        jvm="${java7}"        target="7"
675        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
676        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
677          <javac-elements>
678            <!-- JDK8+ test classes -->
679            <exclude name="*8Test.java"/>
680            <exclude name="DoubleAccumulatorTest.java"/>
681            <exclude name="DoubleAdderTest.java"/>
682            <exclude name="LongAccumulatorTest.java"/>
683            <exclude name="LongAdderTest.java"/>
684            <exclude name="CompletableFutureTest.java"/>
685            <exclude name="StampedLockTest.java"/>
686          </javac-elements>
687        </run-tck-tests>
688    </target>    </target>
689    
690    
# Line 622  Line 710 
710    
711        <formatter type="brief"/>        <formatter type="brief"/>
712    
713        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
714        </test>        </test>
715    
716      </junit>      </junit>
717    </target>    </target>
718    
719      <target name="4jdk7-test-jtreg"
720              depends="4jdk7jar"
721              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
722        <run-jtreg-tests
723           target="7"
724           workdir="${build.4jdk7.dir}"
725           classes="${4jdk7product.jar}"
726           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
727      </target>
728    
729    
730      <target name="4jdk7-test"
731              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
732              description="Runs tck and jtreg tests for jsr166-4jdk7">
733      </target>
734    
735    
736    <target name="4jdk7docs"    <target name="4jdk7docs"
737            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
738    
739      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
740      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
741    
742      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
743               packagenames="none"               packagenames="none"
744               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
745               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
746                 access="${build.javadoc.access}"
747               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
748               classpath=""               classpath=""
749               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
750        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
751          <include name="**/*.java"/>          <include name="**/*.java"/>
752        </fileset>        </fileset>
753          <arg value="-XDignore.symbol.file=true"/>
754      </javadoc>      </javadoc>
   
755    </target>    </target>
756    
757    
758    <target name="4jdk7dist"    <target name="4jdk7dist"
759            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
760            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
761    
762    
   
763    <target name="4jdk7clean"    <target name="4jdk7clean"
764            description="Removes all build products">            description="Removes all 4jdk7 build products">
765    
766      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
767    
768    </target>    </target>
769    
770    
   
771    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
772            description="Removes all build and distribution products">            description="Removes all build and distribution products">
773    
774    </target>    </target>
775    
   <target name="4jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.4jdk7.docs.dir}"/>  
     <mkdir dir="${dist.4jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.4jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${4jdk7src.dir}/intro.html"  
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
776    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
777            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
778      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
779      </target>
780    
781    
782      <target name="4jdk7dist-docs"
783              depends="4jdk7clean, 4jdk7docs">
784        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
785    </target>    </target>
786    
   <!-- jsr166x -->  
787    
788      <!-- jsr166x -->
789    
790    <target name="jsr166xcompile"    <target name="jsr166xcompile"
791            depends="init, configure-compiler"            depends="configure-compiler"
792            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
793    
794      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
795    
796      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
797            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
798              debug="${build.debug}"             debug="${build.debug}"
799         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
800        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
801             source="${build.sourcelevel}"             classpath=""
802               fork="true">             bootclasspath="${bootclasspath6}"
803               source="5"
804               includeAntRuntime="false"
805               includeJavaRuntime="false"
806               executable="${javac7}"
807               fork="true">
808    
809        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
810        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
811          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
812          <compilerarg line="${build.args}"/>
813    
814      </javac>      </javac>
   
815    </target>    </target>
816    
817    
   
818    <target name="jsr166xjar"    <target name="jsr166xjar"
819            depends="jsr166xcompile"            depends="jsr166xcompile"
820            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
821    
822      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
823          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
824      </jar>      </jar>
825    
826    </target>    </target>
827    
828    
   
829    <target name="jsr166xdocs"    <target name="jsr166xdocs"
830            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
831    
832      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
833      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
834    
835      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
836               packagenames="jsr166x"               packagenames="jsr166x.*"
837               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
838               source="${build.sourcelevel}"               access="${build.javadoc.access}"
839               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
840               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
841                 source="5"
842                 executable="${javadoc7}">
843          <arg value="-XDignore.symbol.file=true"/>
844    
845        </javadoc>
846    </target>    </target>
847    
848    
849    <target name="jsr166xdist"    <target name="jsr166xdist"
850            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
851            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
852    
853    
   
854    <target name="jsr166xclean"    <target name="jsr166xclean"
855            description="Removes all build products">            description="Removes all jsr166x build products">
856    
857      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
858    
859    </target>    </target>
860    
861    
   
862    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
863            description="Removes all build and distribution products">            description="Removes all build and distribution products">
864    
865    </target>    </target>
866    
867    
   
   <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>  
   
868    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
869            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
870        <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
871      </target>
872    
873      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166xdist-docs"
874              depends="jsr166xclean, jsr166xdocs">
875        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
876    </target>    </target>
877    
878    <!-- jsr166y -->    <!-- jsr166y -->
879    
880    
881    <target name="jsr166ycompile"    <target name="jsr166ycompile"
882            depends="init, configure-compiler"            depends="configure-compiler"
883            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
884    
885      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
886    
887      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
888            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
889              debug="${build.debug}"             debug="${build.debug}"
890         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
891        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
892             source="${build.sourcelevel}"             source="6"
893               fork="true">             classpath=""
894               bootclasspath="${bootclasspath6}"
895               includeAntRuntime="false"
896               includeJavaRuntime="false"
897               executable="${javac7}"
898               fork="true">
899    
900        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
901        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
902        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
903          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
904    
905      </javac>      </javac>
   
906    </target>    </target>
907    
908    
   
909    <target name="jsr166yjar"    <target name="jsr166yjar"
910            depends="jsr166ycompile"            depends="jsr166ycompile"
911            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
912    
913      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
914          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
915      </jar>      </jar>
916    
917    </target>    </target>
918    
919    
   
920    <target name="jsr166ydocs"    <target name="jsr166ydocs"
921            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
922    
923      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
924      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
925    
926      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
927               packagenames="jsr166y"               packagenames="jsr166y.*"
928               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
929               source="${build.sourcelevel}"               access="${build.javadoc.access}"
930               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
931               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
932                 source="6"
933                 executable="${javadoc7}">
934          <arg value="-XDignore.symbol.file=true"/>
935    
936        </javadoc>
937    </target>    </target>
938    
939    
940    <target name="jsr166ydist"    <target name="jsr166ydist"
941            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
942            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
943    
944    
   
945    <target name="jsr166yclean"    <target name="jsr166yclean"
946            description="Removes all build products">            description="Removes all jsr166y build products">
947    
948      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
949    
950    </target>    </target>
951    
952    
   
953    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
954            description="Removes all build and distribution products">            description="Removes all build and distribution products">
955    
956    </target>    </target>
957    
   <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>  
   
958    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
959            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
960        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
961      </target>
962    
963      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166ydist-docs"
964              depends="jsr166yclean, jsr166ydocs">
965        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
966    </target>    </target>
967    
968    
# Line 909  Line 970 
970    
971    
972    <target name="extra166ycompile"    <target name="extra166ycompile"
973            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
974            description="Compiles extra166y sources">            description="Compiles extra166y sources">
975    
976      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
977    
978      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
979            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
980              debug="${build.debug}"             debug="${build.debug}"
981              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
982         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
983        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
984             source="${build.sourcelevel}"             classpath=""
985               fork="true">             source="6"
986               includeAntRuntime="false"
987               includeJavaRuntime="false"
988               executable="${javac7}"
989               fork="true">
990    
991        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
992        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
993        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
994          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
995    
996      </javac>      </javac>
   
997    </target>    </target>
998    
999    
   
1000    <target name="extra166yjar"    <target name="extra166yjar"
1001            depends="extra166ycompile"            depends="extra166ycompile"
1002            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1003    
1004      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
1005          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
1006      </jar>      </jar>
1007    
1008    </target>    </target>
1009    
1010    
   
1011    <target name="extra166ydocs"    <target name="extra166ydocs"
1012            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1013    
1014      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1015      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1016    
1017      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1018               packagenames="extra166y"               packagenames="extra166y.*"
1019               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1020               source="${build.sourcelevel}"               access="${build.javadoc.access}"
1021               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1022               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
1023                 source="6"
1024                 executable="${javadoc7}">
1025          <arg value="-XDignore.symbol.file=true"/>
1026    
1027        </javadoc>
1028    </target>    </target>
1029    
1030    
1031    <target name="extra166ydist"    <target name="extra166ydist"
1032            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
1033            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1034    
1035    
   
1036    <target name="extra166yclean"    <target name="extra166yclean"
1037            description="Removes all build products">            description="Removes all extra166y build products">
1038    
1039      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
1040    
1041    </target>    </target>
1042    
1043    
   
1044    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
1045            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1046    
1047    </target>    </target>
1048    
   <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>  
   
1049    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1050            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1051        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1052      </target>
1053    
1054      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>    <target name="extra166ydist-docs"
1055              depends="extra166yclean, extra166ydocs">
1056        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1057    </target>    </target>
1058    
1059    <!-- jsr166e -->    <!-- jsr166e -->
# Line 1015  Line 1062 
1062            depends="configure-compiler"            depends="configure-compiler"
1063            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
1064    
1065      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1066    
1067      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
1068             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
1069             debug="${build.debug}"             debug="${build.debug}"
1070             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1071             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1072             source="1.7"             source="7"
1073             classpath=""             classpath=""
1074             includeAntRuntime="false"             includeAntRuntime="false"
1075             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1030  Line 1077 
1077             fork="true">             fork="true">
1078    
1079        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1080        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1081        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1082          <compilerarg line="${build.args}"/>
1083    
1084      </javac>      </javac>
   
1085    </target>    </target>
1086    
1087    
   
1088    <target name="jsr166ejar"    <target name="jsr166ejar"
1089            depends="jsr166ecompile"            depends="jsr166ecompile"
1090            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1091    
1092      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
1093          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
1094      </jar>      </jar>
1095    
1096    </target>    </target>
1097    
1098    
   
1099    <target name="jsr166edocs"    <target name="jsr166edocs"
1100            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1101    
1102      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1103      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1104    
1105      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1106               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1107               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1108               source="1.7"               access="${build.javadoc.access}"
1109               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1110               executable="${javadoc7}"               source="7"
1111               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1112        <fileset dir="${topsrc.dir}" defaultexcludes="yes">        <arg value="-XDignore.symbol.file=true"/>
1113          <include name="jsr166e/**/*.java"/>  
       </fileset>  
1114      </javadoc>      </javadoc>
1115      </target>
1116    
1117    
1118      <target name="jsr166e-test-tck"
1119              depends="jsr166ejar"
1120              description="Runs tck tests for jsr166e">
1121    
1122        <run-tck-tests
1123          tck.src.dir="${test.src.dir}/tck-jsr166e"
1124          target="7"
1125          workdir="${build.jsr166e.dir}"
1126          classes="${jsr166e.jar}"/>
1127    </target>    </target>
1128    
1129    
1130    <target name="jsr166edist"    <target name="jsr166edist"
1131            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1132            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1133    
1134    
   
1135    <target name="jsr166eclean"    <target name="jsr166eclean"
1136            description="Removes all build products">            description="Removes all jsr166e build products">
   
1137      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
1138    </target>    </target>
1139    
1140    
   
1141    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1142            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1143    
1144    </target>    </target>
1145    
1146    <target name="jsr166edist-docs"    <target name="jsr166edist-jar"
1147            description="Builds javadocs without custom tags to dist folder">            depends="jsr166eclean, jsr166ejar">
1148        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1149      <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" />  
1150    
1151      <target name="jsr166edist-docs"
1152              depends="jsr166eclean, jsr166edocs">
1153        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1154    </target>    </target>
1155    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
1156    
1157      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1158    
1159      <target name="lint">
1160        <antcall target="dists">
1161          <param name="build.javadoc.access" value="private"/>
1162        </antcall>
1163    </target>    </target>
1164    
1165    
1166  </project>  </project>

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

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