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

Diff of /jsr166/build.xml

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

revision 1.107 by jsr166, Sat Jan 19 23:40:04 2013 UTC revision 1.134 by jsr166, Sun Feb 3 02:25:01 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    <!-- Build locations -->    <!-- Build locations -->
48    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
49    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
50    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
51    <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"/>  
52    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
53    
54    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
55    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
56    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
57    <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"/>  
58    
59    <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"/>  
   
60    <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"/>  
   
61    <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"/>  
   
62    <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"/>  
63    
64    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65      <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66      <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67      <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68    
69      <!-- JDK locations -->
70    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
71    
72    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 81  Line 76 
76      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
77      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
78      <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"/>  
79      <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"/>
80      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
81       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"/>
82        <path id="bootclasspath@{v}">
83          <pathelement path="${boot.jar.dir}/resources.jar"/>
84          <pathelement path="${boot.jar.dir}/rt.jar"/>
85          <pathelement path="${boot.jar.dir}/jsse.jar"/>
86          <pathelement path="${boot.jar.dir}/jce.jar"/>
87          <pathelement path="${boot.jar.dir}/charsets.jar"/>
88        </path>
89        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
90      </sequential>      </sequential>
91    </macrodef>    </macrodef>
92    
93    <defjdklocations v="6"/>    <macrodef name="mirror-dir">
94    <defjdklocations v="7"/>      <attribute name="src"/>
95    <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=""/>  
96      <sequential>      <sequential>
97      <java classname="JSR166TestCase"      <delete dir="@{dst}"/>
98            jvm="@{jvm}" fork="true">      <mkdir dir="@{dst}"/>
99          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>      <copy todir="@{dst}" preservelastmodified="true">
100          <jvmarg line="@{jvmflags}"/>        <fileset dir="@{src}"/>
101          <classpath>      </copy>
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
102      </sequential>      </sequential>
103    </macrodef>    </macrodef>
104    
105      <defjdklocations v="6"/>
106      <defjdklocations v="7"/>
107      <defjdklocations v="8"/>
108    
109    <!-- Source locations -->    <!-- Source locations -->
110    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
111    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 124  Line 120 
120    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
121    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122    <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"/>  
123    
124    <!-- Distribution locations -->    <!-- Javadoc locations -->
125    <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
126    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131    
132      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138    
139    <!-- Jar locations -->    <!-- Jar locations -->
140    <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
141    <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
142    <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
143    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
144    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
145    <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
146    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
147    
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
   
148    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
149    <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/"/>
150    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
151    <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/"/>
152    
153    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
155    <!-- <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/"/> -->
156    
157    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
158    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
159    
160      <!-- Define the "jtreg" task -->
161      <!-- See the docs in "jtreg -onlineHelp" -->
162      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
163               classpath="${lib.dir}/jtreg.jar" />
164    
165    <!-- Test classpath -->    <!-- Test classpath -->
166    <path id="test.classpath">    <path id="test.classpath">
167      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
168      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
169    </path>    </path>
170    
171      <macrodef name="run-tck-tests">
172        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173        <attribute name="source" default="6"/>
174        <attribute name="target"/>
175        <attribute name="workdir"/>
176        <attribute name="classes"/>
177        <attribute name="jvmflags" default=""/>
178        <element name="javac-elements" optional="true"/>
179        <sequential>
180    
181        <mkdir dir="@{workdir}/tck-classes"/>
182    
183        <javac srcdir="@{tck.src.dir}"
184               destdir="@{workdir}/tck-classes"
185               debug="${build.debug}"
186               debuglevel="${build.debuglevel}"
187               deprecation="${build.deprecation}"
188               source="@{source}"
189               classpath="${junit.jar}"
190               bootclasspath="@{classes}:${bootclasspath@{source}}"
191               includeAntRuntime="false"
192               includeJavaRuntime="false"
193               executable="${javac@{target}}"
194               fork="true">
195    
196          <include name="*.java"/>
197          <compilerarg value="-XDignore.symbol.file=true"/>
198          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199          <compilerarg line="${build.args}"/>
200          <javac-elements/>
201    
202        </javac>
203    
204        <java classname="JSR166TestCase"
205              failonerror="true"
206              jvm="${java@{target}}"
207              fork="true">
208            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
209            <jvmarg line="@{jvmflags}"/>
210            <classpath>
211              <pathelement location="${junit.jar}"/>
212              <pathelement location="@{workdir}/tck-classes"/>
213            </classpath>
214        </java>
215    
216        </sequential>
217      </macrodef>
218    
219    <!-- ALoops classpath -->    <!-- ALoops classpath -->
220    <path id="loops.classpath">    <path id="loops.classpath">
221      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
222    </path>    </path>
223    
224    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
225    <!-- 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"/>  
226    <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;:"/>
227    
228    <!-- Main targets -->    <!-- Main targets -->
# Line 200  Line 249 
249             fork="true">             fork="true">
250    
251        <include name="**/*.java"/>        <include name="**/*.java"/>
252        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
253        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
255        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
256    
257      </javac>      </javac>
   
258    </target>    </target>
259    
260    
   
261    <target name="jar"    <target name="jar"
262            depends="compile"            depends="compile"
263            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
264    
     <mkdir dir="${build.lib.dir}"/>  
   
265      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
266        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
267      </jar>      </jar>
   
268    </target>    </target>
269    
270    
   
271    <target name="test"    <target name="test"
272            depends="configure-tests, report-tests"            depends="configure-tests, report-tests"
273            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)" />
274    
275    
   
276    <target name="docs"    <target name="docs"
277            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
278    
279      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
280      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
281    
282      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
283      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
284    
285      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
286               packagenames="none"               packagenames="none"
287               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
288               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
289                 access="${build.javadoc.access}"
290               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
291               classpath=""               classpath=""
292               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
293        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
294          <include name="**/*.java"/>          <include name="**/*.java"/>
295        </fileset>        </fileset>
296          <arg value="-XDignore.symbol.file=true"/>
297          <arg value="-tag"/>
298          <arg value="${javadoc.jls.option}"/>
299      </javadoc>      </javadoc>
   
300    </target>    </target>
301    
302    
   
303    <target name="dist"    <target name="dist"
304            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
305            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
306    
307    
# Line 284  Line 320 
320        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
321        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
322      </jar>      </jar>
   
323    </target>    </target>
324    
325    
   
326    <target name="clean"    <target name="clean"
327            description="Removes all build products">            description="Removes all build products">
328    
329      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
330    
331    </target>    </target>
332    
333    
   
334    <target name="dist-clean"    <target name="dist-clean"
335            description="Removes all build and distribution products">            description="Removes all build and distribution products">
336    
# Line 308  Line 339 
339    </target>    </target>
340    
341    
   
342    <!-- Internal targets -->    <!-- Internal targets -->
343    
344    
345    <target name="dist-jar"    <target name="dist-jar"
346            depends="clean, jar">            depends="clean, jar">
   
347      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
348      </target>
349    
350      <target name="dist-docs"
351              depends="clean, docs">
352        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
353    </target>    </target>
354    
355    
# Line 326  Line 359 
359      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
360    
361      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
362            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
363              debug="${build.debug}"             debug="${build.debug}"
364         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
365        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
366             source="${build.sourcelevel}"             source="6"
367               fork="true">             classpath="${junit.jar}"
368               bootclasspath="@{product.jar}:${bootclasspath6}"
369               includeAntRuntime="false"
370               includeJavaRuntime="false"
371               executable="${javac8}"
372               fork="true">
373    
374        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
375        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
376          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
377        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
378    
379      </javac>      </javac>
380    
381      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
382            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
383              debug="${build.debug}"             debug="${build.debug}"
384         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
385        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
386             source="${build.sourcelevel}"             source="6"
387               fork="true">             classpath=""
388               bootclasspath="@{product.jar}:${bootclasspath6}"
389        <include name="jsr166/test/**"/>             includeAntRuntime="false"
390               includeJavaRuntime="false"
391               executable="${javac8}"
392               fork="true">
393    
394        <compilerarg value="${bootclasspath.args}"/>        <include name="jsr166/test/**/*.java"/>
       <compilerarg line="${build.args}"/>  
395        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
396          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
397        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
398    
399      </javac>      </javac>
400    
# Line 368  Line 407 
407             source="${build.sourcelevel}"             source="${build.sourcelevel}"
408               fork="true">               fork="true">
409    
410        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
411        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
412          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
413    
414      </javac>      </javac>
415  -->  -->
416    
417    </target>    </target>
418    
419      <target name="test-tck"
420              depends="jar"
421              description="Runs tck tests for main directly">
422    
423        <run-tck-tests
424          target="8"
425          workdir="${build.dir}"
426          classes="${product.jar}"/>
427      </target>
428    
429    <target name="run-tests"    <target name="run-tests"
430            depends="compile-tests">            depends="compile-tests">
# Line 393  Line 439 
439            errorProperty="junit.failed"            errorProperty="junit.failed"
440          failureProperty="junit.failed"          failureProperty="junit.failed"
441                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
442                        jvm="${java8}"
443                     fork="true">                     fork="true">
444    
445        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
446        <jvmarg value="-server"/>        <jvmarg value="-server"/>
447        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
448    
# Line 524  Line 571 
571    
572    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
573    
   
574    <target name="4jdk7compile"    <target name="4jdk7compile"
575            depends="configure-compiler"            depends="configure-compiler"
576            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 545  Line 591 
591             fork="true">             fork="true">
592    
593        <include name="**/*.java"/>        <include name="**/*.java"/>
594        <compilerarg line="${build.args}"/>        <compilerarg value="-Xprefer:source"/>
595        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
596        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
597          <compilerarg line="${build.args}"/>
598    
599      </javac>      </javac>
600      </target>
601    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
602    
603      <jar destfile="${4jdk7product.jar}" index="true">    <target name="4jdk7jar"
604              depends="4jdk7compile"
605              description="Builds library jar from compiled sources">
606    
607        <jar destfile="${4jdk7product.jar}">
608        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
609      </jar>      </jar>
610    
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </javac>  
   
611    </target>    </target>
612    
613    
614    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
615            depends="4jdk7compile"            depends="4jdk7jar"
616            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
617    
618      <run-tck-tests      <run-tck-tests
619        jvm="${java7}"        target="7"
620        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
621        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
622          <javac-elements>
623            <!-- JDK8+ test classes -->
624            <exclude name="StampedLockTest.java"/>
625          </javac-elements>
626        </run-tck-tests>
627    </target>    </target>
628    
629    
# Line 620  Line 655 
655      </junit>      </junit>
656    </target>    </target>
657    
658      <target name="4jdk7-test-jtreg"
659              depends="4jdk7compile"
660              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
661        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
662        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
663        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
664        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
665        <jtreg dir="${jtreg.src.dir}"
666               jdk="${jdk7.home}"
667               workDir="${build.4jdk7.dir}/JTwork"
668               reportDir="${build.4jdk7.dir}/JTreport">
669    
670          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
671          <arg value="-agentvm"/>
672          <arg value="-v:nopass,fail"/>
673          <arg value="-vmoptions:-esa -ea"/>
674          <arg value="-automatic"/>
675          <arg value="-k:!ignore"/>
676        </jtreg>
677      </target>
678    
679    
680      <target name="4jdk7-test"
681              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
682              description="Runs tck and jtreg tests for jsr166-4jdk7">
683      </target>
684    
685    
686    <target name="4jdk7docs"    <target name="4jdk7docs"
687            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
688    
689      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
690      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
691    
692      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
693               packagenames="none"               packagenames="none"
694               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
695               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
696                 access="${build.javadoc.access}"
697               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
698               classpath=""               classpath=""
699               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
700        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
701          <include name="**/*.java"/>          <include name="**/*.java"/>
702        </fileset>        </fileset>
703          <arg value="-XDignore.symbol.file=true"/>
704      </javadoc>      </javadoc>
   
705    </target>    </target>
706    
707    
708    <target name="4jdk7dist"    <target name="4jdk7dist"
709            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
710            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
711    
712    
   
713    <target name="4jdk7clean"    <target name="4jdk7clean"
714            description="Removes all build products">            description="Removes all 4jdk7 build products">
715    
716      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
717    
718    </target>    </target>
719    
720    
   
721    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
722            description="Removes all build and distribution products">            description="Removes all build and distribution products">
723    
724    </target>    </target>
725    
726    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
727            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
728      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
729      </target>
730    
731    
732      <target name="4jdk7dist-docs"
733              depends="4jdk7clean, 4jdk7docs">
734        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
735    </target>    </target>
736    
   <!-- jsr166x -->  
737    
738      <!-- jsr166x -->
739    
740    <target name="jsr166xcompile"    <target name="jsr166xcompile"
741            depends="configure-compiler"            depends="configure-compiler"
742            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
743    
744      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
745    
746      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
747             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
748             debug="${build.debug}"             debug="${build.debug}"
749             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
750             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
751             classpath=""             classpath=""
            source="5"  
752             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
753               source="5"
754             includeAntRuntime="false"             includeAntRuntime="false"
755             includeJavaRuntime="false"             includeJavaRuntime="false"
756             executable="${javac7}"             executable="${javac7}"
757             fork="true">             fork="true">
758    
759        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
760        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
761        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
762          <compilerarg line="${build.args}"/>
763    
764      </javac>      </javac>
   
765    </target>    </target>
766    
767    
   
768    <target name="jsr166xjar"    <target name="jsr166xjar"
769            depends="jsr166xcompile"            depends="jsr166xcompile"
770            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
771    
     <mkdir dir="${build.jsr166xlib.dir}"/>  
   
772      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
773        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
774      </jar>      </jar>
775    
776    </target>    </target>
777    
778    
   
779    <target name="jsr166xdocs"    <target name="jsr166xdocs"
780            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
781    
782      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
783      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
784    
785      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
786               packagenames="jsr166x.*"               packagenames="jsr166x.*"
787               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
788               source="5"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
789               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
790               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
791               additionalparam="-XDignore.symbol.file=true" />               source="5"
792                 executable="${javadoc7}">
793          <arg value="-XDignore.symbol.file=true"/>
794    
795        </javadoc>
796    </target>    </target>
797    
798    
799    <target name="jsr166xdist"    <target name="jsr166xdist"
800            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
801            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
802    
803    
   
804    <target name="jsr166xclean"    <target name="jsr166xclean"
805            description="Removes all build products">            description="Removes all jsr166x build products">
806    
807      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
808    
809    </target>    </target>
810    
811    
   
812    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
813            description="Removes all build and distribution products">            description="Removes all build and distribution products">
814    
815    </target>    </target>
816    
817    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
818    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
819            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
   
820      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
821      </target>
822    
823      <target name="jsr166xdist-docs"
824              depends="jsr166xclean, jsr166xdocs">
825        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
826    </target>    </target>
827    
828    <!-- jsr166y -->    <!-- jsr166y -->
# Line 788  Line 832 
832            depends="configure-compiler"            depends="configure-compiler"
833            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
834    
835      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
836    
837      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
838             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
839             debug="${build.debug}"             debug="${build.debug}"
840             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
841             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 804  Line 848 
848             fork="true">             fork="true">
849    
850        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
851        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
852        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
853          <compilerarg line="${build.args}"/>
854    
855      </javac>      </javac>
856    </target>    </target>
857    
# Line 815  Line 860 
860            depends="jsr166ycompile"            depends="jsr166ycompile"
861            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
862    
     <mkdir dir="${build.jsr166ylib.dir}"/>  
   
863      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
864        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
865      </jar>      </jar>
866    
867    </target>    </target>
868    
869    
   
870    <target name="jsr166ydocs"    <target name="jsr166ydocs"
871            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
872    
873      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
874      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
875    
876      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
877               packagenames="jsr166y.*"               packagenames="jsr166y.*"
878               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
879               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
880               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
881               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
882               additionalparam="-XDignore.symbol.file=true" />               source="6"
883                 executable="${javadoc7}">
884          <arg value="-XDignore.symbol.file=true"/>
885    
886        </javadoc>
887    </target>    </target>
888    
889    
890    <target name="jsr166ydist"    <target name="jsr166ydist"
891            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
892            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
893    
894    
   
895    <target name="jsr166yclean"    <target name="jsr166yclean"
896            description="Removes all build products">            description="Removes all jsr166y build products">
897    
898      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
899    
900    </target>    </target>
901    
902    
   
903    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
904            description="Removes all build and distribution products">            description="Removes all build and distribution products">
905    
906    </target>    </target>
907    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
908    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
909            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
   
910      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
911      </target>
912    
913      <target name="jsr166ydist-docs"
914              depends="jsr166yclean, jsr166ydocs">
915        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
916    </target>    </target>
917    
918    
# Line 895  Line 923 
923            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
924            description="Compiles extra166y sources">            description="Compiles extra166y sources">
925    
926      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
927    
928      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
929             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
930             debug="${build.debug}"             debug="${build.debug}"
931             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
932             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
933               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
934             classpath=""             classpath=""
935             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
936             includeAntRuntime="false"             includeAntRuntime="false"
937             includeJavaRuntime="false"             includeJavaRuntime="false"
938             executable="${javac7}"             executable="${javac7}"
939             fork="true">             fork="true">
940    
941        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
942        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
943        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
944          <compilerarg line="${build.args}"/>
945    
946      </javac>      </javac>
   
947    </target>    </target>
948    
949    
   
950    <target name="extra166yjar"    <target name="extra166yjar"
951            depends="extra166ycompile"            depends="extra166ycompile"
952            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
953    
     <mkdir dir="${build.extra166ylib.dir}"/>  
   
954      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
955        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
956      </jar>      </jar>
957    
958    </target>    </target>
959    
960    
   
961    <target name="extra166ydocs"    <target name="extra166ydocs"
962            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
963    
964      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
965      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
966    
967      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
968               packagenames="extra166y.*"               packagenames="extra166y.*"
969               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
970               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
971               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
972               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
973               additionalparam="-XDignore.symbol.file=true" />               source="6"
974                 executable="${javadoc7}">
975          <arg value="-XDignore.symbol.file=true"/>
976    
977        </javadoc>
978    </target>    </target>
979    
980    
981    <target name="extra166ydist"    <target name="extra166ydist"
982            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
983            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
984    
985    
   
986    <target name="extra166yclean"    <target name="extra166yclean"
987            description="Removes all build products">            description="Removes all extra166y build products">
988    
989      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
990    
991    </target>    </target>
992    
993    
   
994    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
995            description="Removes all build and distribution products">            description="Removes all build and distribution products">
996    
997    </target>    </target>
998    
   <target name="extra166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
999    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1000            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
   
1001      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1002      </target>
1003    
1004      <target name="extra166ydist-docs"
1005              depends="extra166yclean, extra166ydocs">
1006        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1007    </target>    </target>
1008    
1009    <!-- jsr166e -->    <!-- jsr166e -->
# Line 1003  Line 1012 
1012            depends="configure-compiler"            depends="configure-compiler"
1013            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
1014    
1015      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1016    
1017      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
1018             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
1019             debug="${build.debug}"             debug="${build.debug}"
1020             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1021             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 1018  Line 1027 
1027             fork="true">             fork="true">
1028    
1029        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1030        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1031        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1032          <compilerarg line="${build.args}"/>
1033    
1034      </javac>      </javac>
   
1035    </target>    </target>
1036    
1037    
   
1038    <target name="jsr166ejar"    <target name="jsr166ejar"
1039            depends="jsr166ecompile"            depends="jsr166ecompile"
1040            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1041    
     <mkdir dir="${build.jsr166elib.dir}"/>  
   
1042      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1043        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1044      </jar>      </jar>
1045    
1046    </target>    </target>
1047    
1048    
   
1049    <target name="jsr166edocs"    <target name="jsr166edocs"
1050            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1051    
1052      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1053      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1054    
1055      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1056               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1057               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1058               source="7"               access="${build.javadoc.access}"
1059               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1060               executable="${javadoc7}"               source="7"
1061               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1062          <arg value="-XDignore.symbol.file=true"/>
1063    
1064      </javadoc>      </javadoc>
1065      </target>
1066    
1067    
1068      <target name="jsr166e-test-tck"
1069              depends="jsr166ejar"
1070              description="Runs tck tests for jsr166e">
1071    
1072        <run-tck-tests
1073          tck.src.dir="${test.src.dir}/tck-jsr166e"
1074          source="7"
1075          target="8"
1076          workdir="${build.jsr166e.dir}"
1077          classes="${jsr166e.jar}"/>
1078    </target>    </target>
1079    
1080    
1081    <target name="jsr166edist"    <target name="jsr166edist"
1082            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1083            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1084    
1085    
   
1086    <target name="jsr166eclean"    <target name="jsr166eclean"
1087            description="Removes all build products">            description="Removes all jsr166e build products">
   
1088      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
1089    </target>    </target>
1090    
1091    
   
1092    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1093            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1094    
1095    </target>    </target>
1096    
1097    <target name="jsr166edist-docs"    <target name="jsr166edist-jar"
1098            description="Builds javadocs to dist dir">            depends="jsr166eclean, jsr166ejar">
1099        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1100      <delete dir="${dist.jsr166ejavadocs.dir}"/>    </target>
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e.*"  
              link="${jdkapidocs.url}"  
              source="7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
1101    
1102      <target name="jsr166edist-docs"
1103              depends="jsr166eclean, jsr166edocs">
1104        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1105    </target>    </target>
1106    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
1107    
1108      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1109    
1110      <target name="lint">
1111        <antcall target="dists">
1112          <param name="build.javadoc.access" value="private"/>
1113        </antcall>
1114    </target>    </target>
1115    
1116    
1117  </project>  </project>

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

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