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

Diff of /jsr166/build.xml

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

revision 1.113 by jsr166, Sun Jan 20 03:51:38 2013 UTC revision 1.140 by jsr166, Mon May 20 19:12:23 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"/>
# Line 57  Line 70 
70    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
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 67  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 111  Line 130 
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"/>
132    
133    <!-- Distribution locations -->    <!-- Javadoc locations -->
134    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
135    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <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.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 154 
154    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
155    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
156    
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
   
157    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
158    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
159    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
160    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
161    
162    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
164    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165    
166    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
167    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
168    
169      <!-- Define the "jtreg" task -->
170      <!-- See the docs in "jtreg -onlineHelp" -->
171      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
172               classpath="${lib.dir}/jtreg.jar" />
173    
174    <!-- Test classpath -->    <!-- Test classpath -->
175    <path id="test.classpath">    <path id="test.classpath">
176      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
177      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
178    </path>    </path>
179    
180      <macrodef name="run-tck-tests">
181        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
182        <attribute name="target"/>
183        <attribute name="compile-target" default="@{target}"/>
184        <attribute name="workdir"/>
185        <attribute name="classes"/>
186        <attribute name="jvmflags" default=""/>
187        <element name="javac-elements" optional="true"/>
188        <sequential>
189    
190        <mkdir dir="@{workdir}/tck-classes"/>
191    
192        <javac srcdir="@{tck.src.dir}"
193               destdir="@{workdir}/tck-classes"
194               debug="${build.debug}"
195               debuglevel="${build.debuglevel}"
196               deprecation="${build.deprecation}"
197               source="@{compile-target}"
198               target="@{compile-target}"
199               classpath="${junit.jar}"
200               bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201               includeAntRuntime="false"
202               includeJavaRuntime="false"
203               executable="${javac@{compile-target}}"
204               fork="true">
205    
206          <include name="*.java"/>
207          <compilerarg value="-XDignore.symbol.file=true"/>
208          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209          <compilerarg line="${build.args}"/>
210          <javac-elements/>
211    
212        </javac>
213    
214        <java classname="${jsr166.tckTestClass}"
215              failonerror="true"
216              jvm="${java@{target}}"
217              fork="true">
218            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
219            <jvmarg line="@{jvmflags}"/>
220            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223            <classpath>
224              <pathelement location="${junit.jar}"/>
225              <pathelement location="@{workdir}/tck-classes"/>
226            </classpath>
227        </java>
228    
229        </sequential>
230      </macrodef>
231    
232      <macrodef name="run-jtreg-tests">
233        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234        <attribute name="source" default="7"/>
235        <attribute name="target"/>
236        <attribute name="workdir"/>
237        <attribute name="classes"/>
238        <attribute name="jtregflags" default=""/>
239        <sequential>
240        <delete dir="@{workdir}/JTwork"   quiet="true"/>
241        <delete dir="@{workdir}/JTreport" quiet="true"/>
242        <mkdir dir="@{workdir}/JTwork/scratch"/>
243        <mkdir dir="@{workdir}/JTreport"/>
244        <jtreg dir="@{jtreg.src.dir}"
245               jdk="${jdk@{target}.home}"
246               workDir="@{workdir}/JTwork"
247               reportDir="@{workdir}/JTreport">
248    
249          <arg value="-Xbootclasspath/p:@{classes}"/>
250          <arg value="-agentvm"/>
251          <arg value="-v:nopass,fail"/>
252          <arg value="-vmoptions:-esa -ea"/>
253          <arg value="-automatic"/>
254          <arg value="-k:!ignore"/>
255          <arg line="@{jtregflags}"/>
256        </jtreg>
257        </sequential>
258      </macrodef>
259    
260    <!-- ALoops classpath -->    <!-- ALoops classpath -->
261    <path id="loops.classpath">    <path id="loops.classpath">
262      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
263    </path>    </path>
264    
265    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
266    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
267    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
268    
269    <!-- Main targets -->    <!-- Main targets -->
# Line 185  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">
# Line 208  Line 306 
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="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 to dist dir">            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="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 267  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    
# Line 280  Line 372 
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 289  Line 380 
380    </target>    </target>
381    
382    
   
383    <!-- Internal targets -->    <!-- Internal targets -->
384    
385    
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 313  Line 406 
406             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
407             source="6"             source="6"
408             classpath="${junit.jar}"             classpath="${junit.jar}"
409             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
410             includeAntRuntime="false"             includeAntRuntime="false"
411             includeJavaRuntime="false"             includeJavaRuntime="false"
412             executable="${javac8}"             executable="${javac8}"
413             fork="true">             fork="true">
414    
415        <include name="**/*.java"/>        <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"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418          <compilerarg line="${build.args}"/>
419    
420      </javac>      </javac>
421    
# Line 333  Line 426 
426             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
427             source="6"             source="6"
428             classpath=""             classpath=""
429             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
430             includeAntRuntime="false"             includeAntRuntime="false"
431             includeJavaRuntime="false"             includeJavaRuntime="false"
432             executable="${javac8}"             executable="${javac8}"
433             fork="true">             fork="true">
434    
435        <include name="jsr166/test/**/*.java"/>        <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"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438          <compilerarg line="${build.args}"/>
439    
440      </javac>      </javac>
441    
# Line 356  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}"/>
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 511  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 532  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    
     <jar destfile="${4jdk7product.jar}" index="true">  
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
657    
658      <javac srcdir="${tck.src.dir}"    <target name="4jdk7jar"
659             destdir="${build.4jdk7.tck.classes.dir}"            depends="4jdk7compile"
660             debug="${build.debug}"            description="Builds library jar from compiled sources">
            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"/>  
661    
662      </javac>      <jar destfile="${4jdk7product.jar}">
663          <fileset dir="${build.4jdk7.classes.dir}"/>
664        </jar>
665    
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 599  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      </target>
727    
728    
729      <target name="4jdk7-test"
730              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
731              description="Runs tck and jtreg tests for jsr166-4jdk7">
732      </target>
733    
734    
735    <target name="4jdk7docs"    <target name="4jdk7docs"
736            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
737    
738      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
739      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
740    
741      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
742               packagenames="none"               packagenames="none"
743               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
744               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
745                 access="${build.javadoc.access}"
746               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
747               classpath=""               classpath=""
748               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
749        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
750          <include name="**/*.java"/>          <include name="**/*.java"/>
751        </fileset>        </fileset>
752          <arg value="-XDignore.symbol.file=true"/>
753      </javadoc>      </javadoc>
   
754    </target>    </target>
755    
756    
757    <target name="4jdk7dist"    <target name="4jdk7dist"
758            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
759            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
760    
761    
   
762    <target name="4jdk7clean"    <target name="4jdk7clean"
763            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
764    
# Line 642  Line 767 
767    </target>    </target>
768    
769    
   
770    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
771            description="Removes all build and distribution products">            description="Removes all build and distribution products">
772    
773    </target>    </target>
774    
775    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
776            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
777      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
778      </target>
779    
780    
781      <target name="4jdk7dist-docs"
782              depends="4jdk7clean, 4jdk7docs">
783        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
784    </target>    </target>
785    
786    
# Line 662  Line 790 
790            depends="configure-compiler"            depends="configure-compiler"
791            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
792    
793      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
794    
795      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
796             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
797             debug="${build.debug}"             debug="${build.debug}"
798             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
799             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
800             classpath=""             classpath=""
            source="5"  
801             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
802               source="5"
803             includeAntRuntime="false"             includeAntRuntime="false"
804             includeJavaRuntime="false"             includeJavaRuntime="false"
805             executable="${javac7}"             executable="${javac7}"
806             fork="true">             fork="true">
807    
808        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
809        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
810        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
811          <compilerarg line="${build.args}"/>
812    
813      </javac>      </javac>
   
814    </target>    </target>
815    
816    
   
817    <target name="jsr166xjar"    <target name="jsr166xjar"
818            depends="jsr166xcompile"            depends="jsr166xcompile"
819            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
820    
821      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
822        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
823      </jar>      </jar>
824    
825    </target>    </target>
826    
827    
   
828    <target name="jsr166xdocs"    <target name="jsr166xdocs"
829            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
830    
831      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
832      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
833    
834      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
835               packagenames="jsr166x.*"               packagenames="jsr166x.*"
836               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
837               source="5"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
838               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
839               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
840               additionalparam="-XDignore.symbol.file=true" />               source="5"
841                 executable="${javadoc7}">
842          <arg value="-XDignore.symbol.file=true"/>
843    
844        </javadoc>
845    </target>    </target>
846    
847    
848    <target name="jsr166xdist"    <target name="jsr166xdist"
849            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
850            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
851    
852    
   
853    <target name="jsr166xclean"    <target name="jsr166xclean"
854            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
855    
# Line 732  Line 858 
858    </target>    </target>
859    
860    
   
861    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
862            description="Removes all build and distribution products">            description="Removes all build and distribution products">
863    
# Line 741  Line 866 
866    
867    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
868            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
   
869      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
870      </target>
871    
872      <target name="jsr166xdist-docs"
873              depends="jsr166xclean, jsr166xdocs">
874        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
875    </target>    </target>
876    
877    <!-- jsr166y -->    <!-- jsr166y -->
# Line 753  Line 881 
881            depends="configure-compiler"            depends="configure-compiler"
882            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
883    
884      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
885    
886      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
887             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
888             debug="${build.debug}"             debug="${build.debug}"
889             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
890             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 769  Line 897 
897             fork="true">             fork="true">
898    
899        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
900        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
901        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
902          <compilerarg line="${build.args}"/>
903    
904      </javac>      </javac>
905    </target>    </target>
906    
# Line 781  Line 910 
910            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
911    
912      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
913        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
914      </jar>      </jar>
915    
916    </target>    </target>
917    
918    
   
919    <target name="jsr166ydocs"    <target name="jsr166ydocs"
920            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
921    
922      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
923      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
924    
925      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
926               packagenames="jsr166y.*"               packagenames="jsr166y.*"
927               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
928               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
929               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
930               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
931               additionalparam="-XDignore.symbol.file=true" />               source="6"
932                 executable="${javadoc7}">
933          <arg value="-XDignore.symbol.file=true"/>
934    
935        </javadoc>
936    </target>    </target>
937    
938    
939    <target name="jsr166ydist"    <target name="jsr166ydist"
940            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
941            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
942    
943    
   
944    <target name="jsr166yclean"    <target name="jsr166yclean"
945            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
946    
# Line 820  Line 949 
949    </target>    </target>
950    
951    
   
952    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
953            description="Removes all build and distribution products">            description="Removes all build and distribution products">
954    
# Line 828  Line 956 
956    
957    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
958            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
   
959      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
960      </target>
961    
962      <target name="jsr166ydist-docs"
963              depends="jsr166yclean, jsr166ydocs">
964        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
965    </target>    </target>
966    
967    
# Line 841  Line 972 
972            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
973            description="Compiles extra166y sources">            description="Compiles extra166y sources">
974    
975      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
976    
977      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
978             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
979             debug="${build.debug}"             debug="${build.debug}"
980             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
981             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
982               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
983             classpath=""             classpath=""
984             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
985             includeAntRuntime="false"             includeAntRuntime="false"
986             includeJavaRuntime="false"             includeJavaRuntime="false"
987             executable="${javac7}"             executable="${javac7}"
988             fork="true">             fork="true">
989    
990        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
991        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
992        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
993          <compilerarg line="${build.args}"/>
994    
995      </javac>      </javac>
   
996    </target>    </target>
997    
998    
   
999    <target name="extra166yjar"    <target name="extra166yjar"
1000            depends="extra166ycompile"            depends="extra166ycompile"
1001            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1002    
1003      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1004        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1005      </jar>      </jar>
1006    
1007    </target>    </target>
1008    
1009    
   
1010    <target name="extra166ydocs"    <target name="extra166ydocs"
1011            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1012    
1013      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1014      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1015    
1016      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1017               packagenames="extra166y.*"               packagenames="extra166y.*"
1018               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1019               source="6"               access="${build.javadoc.access}"
              bootclasspath="${bootclasspath6}"  
1020               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1021               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
1022               additionalparam="-XDignore.symbol.file=true" />               source="6"
1023                 executable="${javadoc7}">
1024          <arg value="-XDignore.symbol.file=true"/>
1025    
1026        </javadoc>
1027    </target>    </target>
1028    
1029    
1030    <target name="extra166ydist"    <target name="extra166ydist"
1031            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1032            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1033    
1034    
   
1035    <target name="extra166yclean"    <target name="extra166yclean"
1036            description="Removes all extra166y build products">            description="Removes all extra166y build products">
1037    
# Line 911  Line 1040 
1040    </target>    </target>
1041    
1042    
   
1043    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
1044            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1045    
# Line 919  Line 1047 
1047    
1048    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1049            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
   
1050      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1051      </target>
1052    
1053      <target name="extra166ydist-docs"
1054              depends="extra166yclean, extra166ydocs">
1055        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1056    </target>    </target>
1057    
1058    <!-- jsr166e -->    <!-- jsr166e -->
# Line 930  Line 1061 
1061            depends="configure-compiler"            depends="configure-compiler"
1062            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
1063    
1064      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1065    
1066      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
1067             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
1068             debug="${build.debug}"             debug="${build.debug}"
1069             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1070             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 945  Line 1076 
1076             fork="true">             fork="true">
1077    
1078        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1079        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1080        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1081          <compilerarg line="${build.args}"/>
1082    
1083      </javac>      </javac>
   
1084    </target>    </target>
1085    
1086    
   
1087    <target name="jsr166ejar"    <target name="jsr166ejar"
1088            depends="jsr166ecompile"            depends="jsr166ecompile"
1089            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1090    
1091      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1092        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1093      </jar>      </jar>
1094    
1095    </target>    </target>
1096    
1097    
   
1098    <target name="jsr166edocs"    <target name="jsr166edocs"
1099            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1100    
1101      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1102      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1103    
1104      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1105               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1106               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1107               source="7"               access="${build.javadoc.access}"
1108               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1109               executable="${javadoc7}"               source="7"
1110               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1111          <arg value="-XDignore.symbol.file=true"/>
1112    
1113      </javadoc>      </javadoc>
1114      </target>
1115    
1116    
1117      <target name="jsr166e-test-tck"
1118              depends="jsr166ejar"
1119              description="Runs tck tests for jsr166e">
1120    
1121        <run-tck-tests
1122          tck.src.dir="${test.src.dir}/tck-jsr166e"
1123          target="7"
1124          workdir="${build.jsr166e.dir}"
1125          classes="${jsr166e.jar}"/>
1126    </target>    </target>
1127    
1128    
1129    <target name="jsr166edist"    <target name="jsr166edist"
1130            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1131            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1132    
1133    
   
1134    <target name="jsr166eclean"    <target name="jsr166eclean"
1135            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1136      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1137    </target>    </target>
1138    
1139    
# Line 1006  Line 1144 
1144    
1145    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1146            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
   
1147      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1148      </target>
1149    
1150      <target name="jsr166edist-docs"
1151              depends="jsr166eclean, jsr166edocs">
1152        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1153      </target>
1154    
1155    
1156    <!-- Find buglets that can be detected by static build tools -->
1157    
1158      <target name="lint">
1159        <antcall target="dists">
1160          <param name="build.javadoc.access" value="private"/>
1161        </antcall>
1162    </target>    </target>
1163    
1164    
1165  </project>  </project>

Legend:
Removed from v.1.113  
changed lines
  Added in v.1.140

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