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

Diff of /jsr166/build.xml

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

revision 1.124, Tue Jan 22 21:22:57 2013 UTC revision 1.199, Fri Mar 25 03:36:15 2016 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if" xmlns:unless="ant:unless">
3    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 16  Line 17 
17    $HOME/jdk/jdk6    $HOME/jdk/jdk6
18    $HOME/jdk/jdk7    $HOME/jdk/jdk7
19    $HOME/jdk/jdk8    $HOME/jdk/jdk8
20      $HOME/jdk/jdk9
21    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
22    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
23    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
24    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
25      $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
28    
29      Alternatively, define ant variables thus:
30      ant -Djdk$N.home=... -Djdk$N.src.home=...
31      for $N in 6 7 8 9 ...
32    
33      As of 2015-09, there is incomplete hacky support for jigsaw
34      Build for jigsaw using something like:
35      ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36      "docs" target is still broken.
37  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
38    </description>    </description>
39    
40    <target name="usage" description="Advises user to run with -projecthelp">    <!-- Display main targets by running 'ant -projecthelp' -->
41      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
42        <java classname="org.apache.tools.ant.Main">
43          <arg value="-projecthelp" />
44        </java>
45    </target>    </target>
46    
47      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48    
49    <!-- User-specific settings -->    <!-- User-specific settings -->
50    <property file="user.properties"/>    <property file="user.properties"/>
# Line 39  Line 55 
55    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
56    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
57    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
58      <property name="build.javadoc.access" value="protected"/>
59    
60    <!-- Build locations -->    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 72  Line 89 
89      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
93        <local name="have.java.base"/>
94        <available property="have.java.base"
95          file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
96        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
97          if:set="have.java.base"/>
98        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
99          unless:set="have.java.base"/>
100        <local name="modules"/>
101        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
102      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
103      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
104      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
105        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
106        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
107        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
108        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
109        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
110      </path>      </path>
111      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
112        </sequential>
113      </macrodef>
114    
115      <macrodef name="mirror-dir">
116        <attribute name="src"/>
117        <attribute name="dst"/>
118        <sequential>
119        <delete dir="@{dst}"/>
120        <mkdir dir="@{dst}"/>
121        <copy todir="@{dst}" preservelastmodified="true">
122          <fileset dir="@{src}"/>
123        </copy>
124      </sequential>      </sequential>
125    </macrodef>    </macrodef>
126    
127    <defjdklocations v="6"/>    <defjdklocations v="6"/>
128    <defjdklocations v="7"/>    <defjdklocations v="7"/>
129    <defjdklocations v="8"/>    <defjdklocations v="8"/>
130      <defjdklocations v="9"/>
131    
132    <!-- Source locations -->    <!-- Source locations -->
133    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
134    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
135    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
136    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
137    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
138      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
139      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
140      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
141    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
142    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
143    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 105  Line 147 
147    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
148    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
149    
150    <!-- Distribution locations -->    <!-- Javadoc locations -->
151    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
152    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
153    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
154    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
155    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
156    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
157    
158      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
159      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
160      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
161      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
162      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
163      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
164    
165    <!-- Jar locations -->    <!-- Jar locations -->
166    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 122  Line 171 
171    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
172    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
173    
174    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
175    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
176    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
177    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
178      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
179    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2015-11 -->
180    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
181    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
182      <!-- Default jdk doc location (latest stable release seems best) -->
183      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
184    
185    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
186    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
187      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
188      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
189      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
190      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
191      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
192    
193    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
194    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
195    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
196             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
197    
198    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
199    <path id="test.classpath">     To profile a single tck test class:
200      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
201      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
202    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
203       To stress test a single tck test method:
204       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
205      -->
206      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
207    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
208      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
209      <attribute name="target"/>      <attribute name="target"/>
210        <attribute name="compile-target" default="@{target}"/>
211      <attribute name="workdir"/>      <attribute name="workdir"/>
212      <attribute name="classes"/>      <attribute name="classes"/>
213      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
214        <element name="javac-elements" optional="true"/>
215    
216      <sequential>      <sequential>
217    
218        <local name="modules"/>
219        <condition property="modules">
220          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
221        </condition>
222    
223      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
224    
225      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 161  Line 227 
227             debug="${build.debug}"             debug="${build.debug}"
228             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
229             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
230             source="@{source}"             source="@{compile-target}"
231               target="@{compile-target}"
232             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{source}}"  
233             includeAntRuntime="false"             includeAntRuntime="false"
234             includeJavaRuntime="false"             includeJavaRuntime="false"
235             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
236             fork="true">             fork="true">
237    
238        <include name="*.java"/>        <include name="*.java"/>
239        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
240        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
241          <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
242          <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
243        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
244          <javac-elements/>
245    
246      </javac>      </javac>
247    
248      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
249            failonerror="true"            failonerror="true"
250            jvm="${java@{target}}"            jvm="${java@{target}}"
251            fork="true">            fork="true">
252          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
253            <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
254          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
255    
256            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
257            <syspropertyset id="system-properties-used-by-tck">
258              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
259              <propertyref prefix="jsr166."/>
260              <propertyref name="test.timeout.factor"/>
261            </syspropertyset>
262    
263          <classpath>          <classpath>
264            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
265            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 191  Line 269 
269      </sequential>      </sequential>
270    </macrodef>    </macrodef>
271    
272      <!-- Define jtreg test sets for different jdk versions -->
273      <fileset dir="${jtreg9.src.dir}">
274        <patternset id="jdk9.jtreg.tests">
275          <include name="**/*.java"/>
276        </patternset>
277      </fileset>
278    
279      <fileset dir="${jtreg8.src.dir}">
280        <patternset id="jdk8.jtreg.tests">
281          <include name="**/*.java"/>
282          <exclude name="**/SpliteratorCharacteristics.java"/>
283          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
284          <exclude name="**/GCDuringIteration.java"/>
285        </patternset>
286      </fileset>
287    
288      <fileset dir="${jtreg7.src.dir}">
289        <patternset id="jdk7.jtreg.tests">
290          <include name="**/*.java"/>
291        </patternset>
292      </fileset>
293    
294      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
295      <property name="jtreg.flags" value=""/>
296    
297      <macrodef name="run-jtreg-tests">
298        <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
299        <attribute name="source" default="7"/>
300        <attribute name="target"/>
301        <attribute name="workdir"/>
302        <attribute name="classes"/>
303        <attribute name="jtregflags" default=""/>
304    
305        <sequential>
306    
307        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
308        <property name="jtreg.verbose" value="nopass,fail,error"/>
309    
310        <local name="modules"/>
311        <condition property="modules">
312          <available file="${jdk@{target}.home}/jmods" type="dir"/>
313        </condition>
314    
315        <delete dir="@{workdir}/JTwork"   quiet="true"/>
316        <delete dir="@{workdir}/JTreport" quiet="true"/>
317        <mkdir dir="@{workdir}/JTwork/scratch"/>
318        <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
319        <mkdir dir="@{workdir}/JTreport/html"/>
320        <mkdir dir="@{workdir}/JTreport/text"/>
321        <jtreg dir="${jtreg@{target}.src.dir}"
322               jdk="${jdk@{target}.home}"
323               workDir="@{workdir}/JTwork"
324               reportDir="@{workdir}/JTreport">
325          <patternset refid="jdk@{target}.jtreg.tests"/>
326          <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
327          <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
328          <arg value="-agentvm"/>
329          <arg value="-verbose:${jtreg.verbose}"/>
330          <arg value="-vmoptions:-esa -ea"/>
331          <arg value="-automatic"/>
332          <arg value="-k:!ignore"/>
333          <arg line="@{jtregflags}"/>
334          <arg line="${jtreg.flags}"/>
335        </jtreg>
336        </sequential>
337      </macrodef>
338    
339    <!-- ALoops classpath -->    <!-- ALoops classpath -->
340    <path id="loops.classpath">    <path id="loops.classpath">
341      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 202  Line 347 
347    
348    <!-- Main targets -->    <!-- Main targets -->
349    
350      <property name="build.main.java.version" value="9"/>
351      <property name="build.main.javac" value="${javac9}"/>
352    
353    <target name="dists"    <target name="dists"
354            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
355            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 210  Line 358 
358            depends="configure-compiler"            depends="configure-compiler"
359            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
360    
361      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
362        <condition property="modules">
363          <and>
364            <available file="${jdk9.home}/jmods" type="dir"/>
365            <equals arg1="9" arg2="${build.main.java.version}"/>
366          </and>
367        </condition>
368    
369        <local name="destdir"/>
370        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
371        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
372    
373        <mkdir dir="${destdir}"/>
374    
375      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
376             destdir="${build.classes.dir}"             destdir="${destdir}"
377             debug="${build.debug}"             debug="${build.debug}"
378             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
379             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
380             classpath=""             classpath=""
381             includeAntRuntime="false"             includeAntRuntime="false"
382             includeJavaRuntime="false"             includeJavaRuntime="false"
383             executable="${javac8}"             executable="${build.main.javac}"
384             fork="true">             fork="true">
385    
386        <include name="**/*.java"/>        <include name="**/*.java"/>
387          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
388          <compilerarg value="-Xprefer:source"/>
389        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
390        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
391          <compilerarg value="-Werror"/>
392          <compilerarg value="-Xdoclint:all/protected"/>
393          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
394        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
395    
396      </javac>      </javac>
397    
398        <!-- We need jdk9's Contended annotation, but at compile time only -->
399        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
400    </target>    </target>
401    
402    
# Line 238  Line 406 
406    
407      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
408        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
409          <manifest>
410            <attribute name="Built-By" value="${user.name}"/>
411            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
412          </manifest>
413      </jar>      </jar>
414    </target>    </target>
415    
416    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
417    <target name="docs"    <target name="docs"
418            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
419    
420      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
421      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
422    
423      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
424      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
425    
426      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
427               packagenames="none"               packagenames="none"
428               link="${jdkapi8docs.url}"               link="${java9.api.url}"
429               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
430               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
431                 sourcepath="${src.dir}:${jdk9.src.dir}"
432               classpath=""               classpath=""
433               executable="${javadoc8}">               executable="${javadoc9}">
434        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
435          <include name="**/*.java"/>          <include name="**/*.java"/>
436        </fileset>        </fileset>
437          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
438          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
440    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
441        <arg value="-tag"/>        <arg value="-tag"/>
442        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
443          <arg value="-tag"/>
444          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
445          <arg value="-tag"/>
446          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
447          <arg value="-tag"/>
448          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
449    <!-- tags added in jdk9 -->
450          <arg value="-tag"/>
451          <arg value="revised:X"/>
452          <arg value="-tag"/>
453          <arg value="spec:X"/>
454      </javadoc>      </javadoc>
455    </target>    </target>
456    
457    
458    <target name="dist"    <target name="dist"
459            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
460            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
461    
462    
# Line 292  Line 474 
474        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
475        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
476        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
477          <manifest>
478            <attribute name="Built-By" value="${user.name}"/>
479            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
480          </manifest>
481      </jar>      </jar>
482    </target>    </target>
483    
# Line 307  Line 493 
493    <target name="dist-clean"    <target name="dist-clean"
494            description="Removes all build and distribution products">            description="Removes all build and distribution products">
495    
496        <delete dir="${build.dir}"/>
497      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
498    
499    </target>    </target>
500    
501    
   <!-- Internal targets -->  
   
   
502    <target name="dist-jar"    <target name="dist-jar"
503            depends="clean, jar">            depends="clean, jar">
   
504      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
505    </target>    </target>
506    
507      <target name="dist-docs"
508    <target name="compile-tests"            depends="clean, docs">
509            depends="jar">      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   
     <mkdir dir="${build.testcases.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
     <javac srcdir="${test.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath=""  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="jsr166/test/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
 <!--  
     <javac srcdir="${jtreg.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg value="-Xbootclasspath/p:${product.jar}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
 -->  
   
510    </target>    </target>
511    
512      <target name="tck"
513              depends="jar"
514              description="Runs tck tests for main directly">
515    
516    <target name="run-tests"      <run-tck-tests
517            depends="compile-tests">        target="${build.main.java.version}"
518          workdir="${build.dir}"
519      <!-- May be overridden by user.properties -->        classes="${product.jar}"/>
520      <property name="testcase" value="*"/>    </target>
521    
522      <mkdir dir="${build.reports.dir}"/>    <target name="tck-parallelism-1"
523              description="Runs tck with given common pool parallelism">
524      <junit printsummary="true"      <antcall target="tck">
525               showoutput="true"        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
526            errorProperty="junit.failed"      </antcall>
527          failureProperty="junit.failed"    </target>
528                      dir="${build.reports.dir}"  
529                      jvm="${java8}"    <target name="tck-parallelism-0"
530                     fork="true">            description="Runs tck with given common pool parallelism">
531        <antcall target="tck">
532        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
533        <jvmarg value="-server"/>      </antcall>
534        <jvmarg value="-showversion"/>    </target>
535    
536        <classpath refid="test.classpath"/>    <target name="jtreg"
537              depends="jar"
538        <formatter type="xml"/>            description="Runs jtreg tests for main using the jtreg ant task">
539        <run-jtreg-tests
540        <batchtest todir="${build.reports.dir}" unless="no.test.tck">         target="${build.main.java.version}"
541          <fileset dir="${tck.src.dir}">         workdir="${build.dir}"
542            <include name="**/${testcase}Test.java"/>         classes="${product.jar}"/>
543          </fileset>    </target>
       </batchtest>  
544    
545        <batchtest todir="${build.reports.dir}" if="do.test.old">    <target name="test"
546          <fileset dir="${test.src.dir}">            depends="tck, tck-parallelism-1, jtreg"
547            <include name="jsr166/test/**/${testcase}Test.java"/>            description="Runs tck and jtreg tests for main">
548          </fileset>    </target>
       </batchtest>  
549    
550  <!--    <target name="jtreg8" description="Runs jtreg tests with jdk8">
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
551    
552      </junit>      <antcall target="jtreg">
553          <param name="build.main.java.version" value="8"/>
554          <param name="build.main.javac" value="${javac8}"/>
555        </antcall>
556    
557    </target>    </target>
558    
559      <target name="test89"
560              description="Runs tck and jtreg tests for main for multiple java versions">
561    
562    <target name="report-tests"      <antcall target="clean"/>
563            depends="run-tests">      <antcall target="test">
564          <param name="build.main.java.version" value="8"/>
565      <!-- Sets junit.report.format to frames if redirection is present,        <param name="build.main.javac" value="${javac8}"/>
566           otherwise sets it to noframes. -->      </antcall>
     <available property="junit.report.format"  
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"  
     />  
     <property name="junit.report.format" value="noframes"/>  
   
     <junitreport todir="${build.reports.dir}">  
       <fileset dir="${build.reports.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
567    
568      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
569        <antcall target="test">
570          <param name="build.main.java.version" value="9"/>
571          <param name="build.main.javac" value="${javac9}"/>
572        </antcall>
573    
574    </target>    </target>
575    
576    
577    
578    <target name="configure-compiler">    <target name="configure-compiler">
579        <fail message="ant version too old">
580          <condition>
581            <not> <antversion atleast="1.9.1"/> </not>
582          </condition>
583        </fail>
584    
585      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
586    
# Line 477  Line 597 
597    </target>    </target>
598    
599    
   <target name="configure-tests"  
        depends="configure-compiler">  
   
     <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->  
     <available property="junit.available"  
                classname="junit.framework.Protectable"/>  
   
     <!-- Xalan -->  
     <available property="xalan.available"  
                classname="org.apache.xalan.Version"/>  
   
   
     <!-- Ant 1.6beta and later don't need or want this check -->  
     <!--  
     <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"  
           unless="junit.available"/>  
   
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
   
   </target>  
   
600    
601    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
602    
# Line 515  Line 612 
612         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
613        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
614             source="${build.sourcelevel}"             source="${build.sourcelevel}"
615               target="${build.sourcelevel}"
616               fork="true">               fork="true">
617    
618        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 530  Line 628 
628    </target>    </target>
629    
630    
631      <target name="compile-test-loops" depends="jar"
632              description="compile all the perf tests in src/test/loops">
633    
634        <mkdir dir="${build.dir}/test/loops"/>
635    
636        <javac srcdir="${basedir}/src/test/loops"
637               destdir="${build.dir}/test/loops"
638               debug="${build.debug}"
639               debuglevel="${build.debuglevel}"
640               deprecation="${build.deprecation}"
641               includeAntRuntime="false"
642               includeJavaRuntime="false"
643               executable="${javac9}"
644               fork="true">
645    
646          <include name="*.java"/>
647          <compilerarg value="-XDignore.symbol.file=true"/>
648          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
649          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
650          <compilerarg line="${build.args}"/>
651    
652        </javac>
653    
654      </target>
655    
656    
657    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
658    
659    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 544  Line 668 
668             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
669             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
670             source="6"             source="6"
671               target="6"
672             classpath=""             classpath=""
673             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
674             includeAntRuntime="false"             includeAntRuntime="false"
# Line 552  Line 677 
677             fork="true">             fork="true">
678    
679        <include name="**/*.java"/>        <include name="**/*.java"/>
680          <compilerarg value="-Xprefer:source"/>
681        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
682        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
683          <compilerarg value="-Werror"/>
684        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
685    
686      </javac>      </javac>
687    </target>    </target>
688    
689      <target name="4jdk7doclint"
690              depends="configure-compiler"
691              description="Finds doclint warnings">
692    
693        <mkdir dir="${build.4jdk7.classes.dir}"/>
694    
695    <target name="4jdk7-jar"      <javac srcdir="${4jdk7src.dir}"
696               destdir="${build.4jdk7.classes.dir}"
697               debug="${build.debug}"
698               debuglevel="${build.debuglevel}"
699               deprecation="${build.deprecation}"
700               source="6"
701               target="6"
702               classpath=""
703               bootclasspath="${bootclasspath6}"
704               includeAntRuntime="false"
705               includeJavaRuntime="false"
706               executable="${javac8}"
707               fork="true">
708    
709          <include name="**/*.java"/>
710          <compilerarg value="-Xprefer:source"/>
711          <compilerarg value="-XDignore.symbol.file=true"/>
712          <compilerarg value="-Xlint:all"/>
713          <compilerarg value="-Xdoclint:all/protected"/>
714          <compilerarg line="${build.args}"/>
715    
716        </javac>
717      </target>
718    
719    
720      <target name="4jdk7jar"
721            depends="4jdk7compile"            depends="4jdk7compile"
722            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
723    
724      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
725        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
726          <manifest>
727            <attribute name="Built-By" value="${user.name}"/>
728            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
729          </manifest>
730      </jar>      </jar>
731    
732    </target>    </target>
733    
734    
735    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
736            depends="4jdk7-jar"            depends="4jdk7jar"
737            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
738    
739      <run-tck-tests      <run-tck-tests
740        target="7"        target="7"
741        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
742        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
743          <javac-elements>
744            <!-- JDK8+ test classes -->
745            <exclude name="*8Test.java"/>
746            <exclude name="*9Test.java"/>
747            <exclude name="*10Test.java"/>
748            <exclude name="DoubleAccumulatorTest.java"/>
749            <exclude name="DoubleAdderTest.java"/>
750            <exclude name="LongAccumulatorTest.java"/>
751            <exclude name="LongAdderTest.java"/>
752            <exclude name="CompletableFutureTest.java"/>
753            <exclude name="SplittableRandomTest.java"/>
754            <exclude name="StampedLockTest.java"/>
755            <exclude name="SubmissionPublisherTest.java"/>
756          </javac-elements>
757        </run-tck-tests>
758    </target>    </target>
759    
760    
761    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
762            depends="4jdk7compile"            depends="4jdk7compile"
763            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
764    
# Line 604  Line 780 
780    
781        <formatter type="brief"/>        <formatter type="brief"/>
782    
783        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
784        </test>        </test>
785    
786      </junit>      </junit>
787    </target>    </target>
788    
789    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
790            depends="4jdk7compile"            depends="4jdk7jar"
791            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
792      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
793      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
794      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
795      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
796    </target>    </target>
797    
798    
799    <target name="4jdk7-test"    <target name="4jdk7-test"
800            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
801            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
802    </target>    </target>
803    
# Line 641  Line 805 
805    <target name="4jdk7docs"    <target name="4jdk7docs"
806            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
807    
808      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
809      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
810    
811      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
812               packagenames="none"               packagenames="none"
813               link="${jdkapi7docs.url}"               link="${java7.api.url}"
814               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
815               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
816                 sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
817               classpath=""               classpath=""
818               executable="${javadoc7}">               executable="${javadoc7}">
819        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
820          <include name="**/*.java"/>          <include name="**/*.java"/>
821        </fileset>        </fileset>
822          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
823        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
824      </javadoc>      </javadoc>
825    </target>    </target>
826    
827    
828    <target name="4jdk7dist"    <target name="4jdk7dist"
829            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
830            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
831    
832    
# Line 672  Line 838 
838    </target>    </target>
839    
840    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
841    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
842            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
843      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
844      </target>
845    
846    
847      <target name="4jdk7dist-docs"
848              depends="4jdk7clean, 4jdk7docs">
849        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
850    </target>    </target>
851    
852    
# Line 701  Line 866 
866             classpath=""             classpath=""
867             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
868             source="5"             source="5"
869               target="5"
870             includeAntRuntime="false"             includeAntRuntime="false"
871             includeJavaRuntime="false"             includeJavaRuntime="false"
872             executable="${javac7}"             executable="${javac7}"
# Line 709  Line 875 
875        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
876        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
877        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
878          <compilerarg value="-Werror"/>
879        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
880    
881      </javac>      </javac>
882    </target>    </target>
883    
884    
885    <target name="jsr166x-jar"    <target name="jsr166xjar"
886            depends="jsr166xcompile"            depends="jsr166xcompile"
887            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
888    
889      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
890        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
891          <manifest>
892            <attribute name="Built-By" value="${user.name}"/>
893            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
894          </manifest>
895      </jar>      </jar>
896    
897    </target>    </target>
# Line 729  Line 900 
900    <target name="jsr166xdocs"    <target name="jsr166xdocs"
901            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
902    
903      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
904      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
905    
906      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
907               packagenames="jsr166x.*"               packagenames="jsr166x.*"
908               link="${jdkapidocs.url}"               link="${java.api.url}"
909               sourcepath="${topsrc.dir}:${jdk6src.dir}"               access="${build.javadoc.access}"
910                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
911               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
912               source="5"               source="5"
913               executable="${javadoc7}">               executable="${javadoc7}">
914          <arg line="-Xdocrootparent ${java.docroot.url}"/>
915        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
916    
917      </javadoc>      </javadoc>
# Line 746  Line 919 
919    
920    
921    <target name="jsr166xdist"    <target name="jsr166xdist"
922            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
923            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
924    
925    
# Line 758  Line 931 
931    </target>    </target>
932    
933    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
934    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
935            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
936      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
937      </target>
938    
939      <target name="jsr166xdist-docs"
940              depends="jsr166xclean, jsr166xdocs">
941        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
942    </target>    </target>
943    
944    <!-- jsr166y -->    <!-- jsr166y -->
# Line 786  Line 956 
956             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
957             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
958             source="6"             source="6"
959               target="6"
960             classpath=""             classpath=""
961             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
962             includeAntRuntime="false"             includeAntRuntime="false"
# Line 796  Line 967 
967        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
968        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
969        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
970          <compilerarg value="-Werror"/>
971        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
972    
973      </javac>      </javac>
974    </target>    </target>
975    
976    
977    <target name="jsr166y-jar"    <target name="jsr166yjar"
978            depends="jsr166ycompile"            depends="jsr166ycompile"
979            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
980    
981      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
982        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
983          <manifest>
984            <attribute name="Built-By" value="${user.name}"/>
985            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
986          </manifest>
987      </jar>      </jar>
988    
989    </target>    </target>
# Line 816  Line 992 
992    <target name="jsr166ydocs"    <target name="jsr166ydocs"
993            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
994    
995      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
996      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
997    
998      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
999               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1000               link="${jdkapidocs.url}"               link="${java.api.url}"
1001               sourcepath="${topsrc.dir}:${jdk6src.dir}"               access="${build.javadoc.access}"
1002                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1003               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1004               source="6"               source="6"
1005               executable="${javadoc7}">               executable="${javadoc7}">
1006          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1007        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1008    
1009      </javadoc>      </javadoc>
# Line 833  Line 1011 
1011    
1012    
1013    <target name="jsr166ydist"    <target name="jsr166ydist"
1014            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
1015            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1016    
1017    
# Line 845  Line 1023 
1023    </target>    </target>
1024    
1025    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1026    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
1027            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
1028      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1029      </target>
1030    
1031      <target name="jsr166ydist-docs"
1032              depends="jsr166yclean, jsr166ydocs">
1033        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1034    </target>    </target>
1035    
1036    
# Line 862  Line 1038 
1038    
1039    
1040    <target name="extra166ycompile"    <target name="extra166ycompile"
1041            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
1042            description="Compiles extra166y sources">            description="Compiles extra166y sources">
1043    
1044      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 875  Line 1051 
1051             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1052             classpath=""             classpath=""
1053             source="6"             source="6"
1054               target="6"
1055             includeAntRuntime="false"             includeAntRuntime="false"
1056             includeJavaRuntime="false"             includeJavaRuntime="false"
1057             executable="${javac7}"             executable="${javac7}"
# Line 883  Line 1060 
1060        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1061        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1062        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1063          <compilerarg value="-Werror"/>
1064        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1065    
1066      </javac>      </javac>
1067    </target>    </target>
1068    
1069    
1070    <target name="extra166y-jar"    <target name="extra166yjar"
1071            depends="extra166ycompile"            depends="extra166ycompile"
1072            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1073    
1074      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1075        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1076          <manifest>
1077            <attribute name="Built-By" value="${user.name}"/>
1078            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1079          </manifest>
1080      </jar>      </jar>
1081    
1082    </target>    </target>
# Line 903  Line 1085 
1085    <target name="extra166ydocs"    <target name="extra166ydocs"
1086            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1087    
1088      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1089      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1090    
1091      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1092               packagenames="extra166y.*"               packagenames="extra166y.*"
1093               link="${jdkapidocs.url}"               link="${java.api.url}"
1094               sourcepath="${topsrc.dir}:${jdk6src.dir}"               access="${build.javadoc.access}"
1095                 sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1096               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1097               source="6"               source="6"
1098               executable="${javadoc7}">               executable="${javadoc7}">
1099          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1100        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1101    
1102      </javadoc>      </javadoc>
# Line 920  Line 1104 
1104    
1105    
1106    <target name="extra166ydist"    <target name="extra166ydist"
1107            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
1108            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1109    
1110    
# Line 932  Line 1116 
1116    </target>    </target>
1117    
1118    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1119    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1120            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
1121      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1122      </target>
1123    
1124      <target name="extra166ydist-docs"
1125              depends="extra166yclean, extra166ydocs">
1126        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1127    </target>    </target>
1128    
1129    <!-- jsr166e -->    <!-- jsr166e -->
1130    
1131      <property name="build.jsr166e.java.version" value="6"/>
1132      <property name="build.jsr166e.javac" value="${javac6}"/>
1133    
1134    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1135            depends="configure-compiler"            depends="configure-compiler"
1136            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 957  Line 1142 
1142             debug="${build.debug}"             debug="${build.debug}"
1143             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1144             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1145             source="7"             source="${build.jsr166e.java.version}"
1146               target="${build.jsr166e.java.version}"
1147             classpath=""             classpath=""
1148             includeAntRuntime="false"             includeAntRuntime="false"
1149             includeJavaRuntime="false"             includeJavaRuntime="false"
1150             executable="${javac7}"             executable="${build.jsr166e.javac}"
1151             fork="true">             fork="true">
1152    
1153        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1154        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1155        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1156          <compilerarg value="-Werror"/>
1157        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1158    
1159      </javac>      </javac>
1160    </target>    </target>
1161    
1162      <!-- jsr166e: find doclint errors -->
1163      <target name="jsr166edoclint">
1164    
1165        <mkdir dir="${build.jsr166e.classes.dir}"/>
1166    
1167    <target name="jsr166e-jar"      <javac srcdir="${topsrc.dir}"
1168               destdir="${build.jsr166e.classes.dir}"
1169               debug="${build.debug}"
1170               debuglevel="${build.debuglevel}"
1171               deprecation="${build.deprecation}"
1172               source="${build.jsr166e.java.version}"
1173               target="${build.jsr166e.java.version}"
1174               classpath=""
1175               bootclasspath="${bootclasspath6}"
1176               includeAntRuntime="false"
1177               includeJavaRuntime="false"
1178               executable="${javac8}"
1179               fork="true">
1180    
1181          <include name="jsr166e/**/*.java"/>
1182          <compilerarg value="-XDignore.symbol.file=true"/>
1183          <compilerarg value="-Xlint:all"/>
1184          <compilerarg value="-Werror"/>
1185          <compilerarg value="-Xdoclint:all/protected"/>
1186    
1187        </javac>
1188      </target>
1189    
1190    
1191      <target name="jsr166ejar"
1192            depends="jsr166ecompile"            depends="jsr166ecompile"
1193            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1194    
1195      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1196        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1197          <manifest>
1198            <attribute name="Built-By" value="${user.name}"/>
1199            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200          </manifest>
1201      </jar>      </jar>
1202    
1203    </target>    </target>
# Line 987  Line 1206 
1206    <target name="jsr166edocs"    <target name="jsr166edocs"
1207            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1208    
1209      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1210      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1211    
1212      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1213               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1214               link="${jdkapidocs.url}"               link="${java.api.url}"
1215               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
1216               source="7"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217                 source="${build.jsr166e.java.version}"
1218               executable="${javadoc7}">               executable="${javadoc7}">
1219          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1220        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1221    
1222      </javadoc>      </javadoc>
1223    </target>    </target>
1224    
1225    
1226    <target name="jsr166e-test-tck"    <target name="jsr166e-tck-one-java-version"
1227            depends="jsr166e-jar"            depends="jsr166ejar">
1228            description="Runs tck tests for jsr166e">  
1229        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1230    
1231      <run-tck-tests      <run-tck-tests
1232        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1233        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1234        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1235        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1236    </target>    </target>
1237    
1238      <target name="jsr166e-tck"
1239              description="Runs tck tests for jsr166e for multiple java versions">
1240    
1241    <!--     <antcall target="clean"/> -->
1242    <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1243    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1244    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1245    <!--     </antcall> -->
1246    
1247        <antcall target="clean"/>
1248        <antcall target="jsr166e-tck-one-java-version">
1249          <param name="build.jsr166e.java.version" value="7"/>
1250          <param name="build.jsr166e.javac" value="${javac7}"/>
1251        </antcall>
1252    
1253        <antcall target="clean"/>
1254        <antcall target="jsr166e-tck-one-java-version">
1255          <param name="build.jsr166e.java.version" value="6"/>
1256          <param name="build.jsr166e.javac" value="${javac6}"/>
1257        </antcall>
1258      </target>
1259    
1260    
1261      <target name="jsr166e-test"
1262              depends="jsr166e-tck"
1263              description="Runs all tests for jsr166e">
1264      </target>
1265    
1266    <target name="jsr166edist"    <target name="jsr166edist"
1267            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1268            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1269    
1270    
1271    <target name="jsr166eclean"    <target name="jsr166eclean"
1272            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1273      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1274    </target>    </target>
1275    
1276    
1277    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
1278            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1279        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1280      </target>
1281    
1282      <target name="jsr166edist-docs"
1283              depends="jsr166eclean, jsr166edocs">
1284        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1285    </target>    </target>
1286    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166e-jar">  
1287    
1288      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1289    
1290      <target name="lint">
1291        <antcall target="dists">
1292          <param name="build.javadoc.access" value="public"/>
1293        </antcall>
1294      </target>
1295    
1296    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1297      <target name="lint-private">
1298        <antcall target="dist">
1299          <param name="build.javadoc.access" value="private"/>
1300        </antcall>
1301    </target>    </target>
1302    
1303    
1304  </project>  </project>

Legend:
Removed from v.1.124  
changed lines
  Added in v.1.199

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8