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

Diff of /jsr166/build.xml

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

revision 1.133 by jsr166, Sun Feb 3 02:16:08 2013 UTC revision 1.192 by jsr166, Mon Nov 30 00:51:40 2015 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  As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.  
29      Alternatively, define ant variables thus:
30      ant -Djdk$N.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.dir="$HOME/jdk/src/jigsaw" clean test dist
36      "docs" target is still broken.
37  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
38    </description>    </description>
39    
40    <target name="usage" description="Display main targets by running 'ant -projecthelp'">    <!-- Display main targets by running 'ant -projecthelp' -->
41      <target name="usage">
42      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
43        <arg value="-projecthelp" />        <arg value="-projecthelp" />
44      </java>      </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 76  As of 2013-02, the very latest lambda 8 Line 89  As of 2013-02, the very latest lambda 8
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"/>      <local name="have.java.base"/>
93        <available property="have.java.base"
94          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96          if:set="have.java.base"/>
97        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98          unless:set="have.java.base"/>
99        <local name="modules"/>
100        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
102      <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"/>
103      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
104        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
105        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
106        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
107        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
108        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
109      </path>      </path>
110      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111      </sequential>      </sequential>
112    </macrodef>    </macrodef>
113    
# Line 105  As of 2013-02, the very latest lambda 8 Line 126  As of 2013-02, the very latest lambda 8
126    <defjdklocations v="6"/>    <defjdklocations v="6"/>
127    <defjdklocations v="7"/>    <defjdklocations v="7"/>
128    <defjdklocations v="8"/>    <defjdklocations v="8"/>
129      <defjdklocations v="9"/>
130    
131    <!-- Source locations -->    <!-- Source locations -->
132    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
133    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
134    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
135    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
136    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
137      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
138      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
139      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
140    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
141    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
142    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 145  As of 2013-02, the very latest lambda 8 Line 170  As of 2013-02, the very latest lambda 8
170    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
171    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
172    
173    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
174    <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"/>
175    <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"/>
176    <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"/>
177      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2015-11 -->
179    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180    <!-- <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"/>
181      <!-- Default jdk doc location (latest stable release seems best) -->
182      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
183    
184    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
185    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
186      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
187      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
188      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
189      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
190      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
191    
192    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
193    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
196    
197    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
198    <path id="test.classpath">     To profile a single tck test class:
199      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
201    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202       To stress test a single tck test method:
203       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204      -->
205      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
208      <attribute name="target"/>      <attribute name="target"/>
209        <attribute name="compile-target" default="@{target}"/>
210      <attribute name="workdir"/>      <attribute name="workdir"/>
211      <attribute name="classes"/>      <attribute name="classes"/>
212      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
214    
215      <sequential>      <sequential>
216    
217        <local name="modules"/>
218        <condition property="modules">
219          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220        </condition>
221    
222      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
223    
224      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 185  As of 2013-02, the very latest lambda 8 Line 226  As of 2013-02, the very latest lambda 8
226             debug="${build.debug}"             debug="${build.debug}"
227             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
228             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
229             source="@{source}"             source="@{compile-target}"
230               target="@{compile-target}"
231             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{source}}"  
232             includeAntRuntime="false"             includeAntRuntime="false"
233             includeJavaRuntime="false"             includeJavaRuntime="false"
234             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
235             fork="true">             fork="true">
236    
237        <include name="*.java"/>        <include name="*.java"/>
238        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
239        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240          <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241          <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
243        <javac-elements/>        <javac-elements/>
244    
245      </javac>      </javac>
246    
247      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
248            failonerror="true"            failonerror="true"
249            jvm="${java@{target}}"            jvm="${java@{target}}"
250            fork="true">            fork="true">
251          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252            <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
253          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
254    
255            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256            <syspropertyset id="system-properties-used-by-tck">
257              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258              <propertyref prefix="jsr166."/>
259            </syspropertyset>
260    
261          <classpath>          <classpath>
262            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 216  As of 2013-02, the very latest lambda 8 Line 267  As of 2013-02, the very latest lambda 8
267      </sequential>      </sequential>
268    </macrodef>    </macrodef>
269    
270      <!-- Define jtreg test sets for different jdk versions -->
271      <fileset dir="${jtreg9.src.dir}">
272        <patternset id="jdk9.jtreg.tests">
273          <include name="**/*.java"/>
274        </patternset>
275      </fileset>
276    
277      <fileset dir="${jtreg8.src.dir}">
278        <patternset id="jdk8.jtreg.tests">
279          <include name="**/*.java"/>
280          <exclude name="**/SpliteratorCharacteristics.java"/>
281          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282          <exclude name="**/GCDuringIteration.java"/>
283        </patternset>
284      </fileset>
285    
286      <fileset dir="${jtreg7.src.dir}">
287        <patternset id="jdk7.jtreg.tests">
288          <include name="**/*.java"/>
289        </patternset>
290      </fileset>
291    
292      <macrodef name="run-jtreg-tests">
293        <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
294        <attribute name="source" default="7"/>
295        <attribute name="target"/>
296        <attribute name="workdir"/>
297        <attribute name="classes"/>
298        <attribute name="jtregflags" default=""/>
299    
300        <sequential>
301    
302        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303        <property name="jtreg.verbose" value="nopass,fail,error"/>
304    
305        <local name="modules"/>
306        <condition property="modules">
307          <available file="${jdk@{target}.home}/jmods" type="dir"/>
308        </condition>
309    
310        <delete dir="@{workdir}/JTwork"   quiet="true"/>
311        <delete dir="@{workdir}/JTreport" quiet="true"/>
312        <mkdir dir="@{workdir}/JTwork/scratch"/>
313        <mkdir dir="@{workdir}/JTreport"/>
314        <jtreg dir="${jtreg@{target}.src.dir}"
315               jdk="${jdk@{target}.home}"
316               workDir="@{workdir}/JTwork"
317               reportDir="@{workdir}/JTreport">
318          <patternset refid="jdk@{target}.jtreg.tests"/>
319          <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321          <arg value="-agentvm"/>
322          <arg value="-verbose:${jtreg.verbose}"/>
323          <arg value="-vmoptions:-esa -ea"/>
324          <arg value="-automatic"/>
325          <arg value="-k:!ignore"/>
326          <arg line="@{jtregflags}"/>
327        </jtreg>
328        </sequential>
329      </macrodef>
330    
331    <!-- ALoops classpath -->    <!-- ALoops classpath -->
332    <path id="loops.classpath">    <path id="loops.classpath">
333      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 227  As of 2013-02, the very latest lambda 8 Line 339  As of 2013-02, the very latest lambda 8
339    
340    <!-- Main targets -->    <!-- Main targets -->
341    
342      <property name="build.main.java.version" value="9"/>
343      <property name="build.main.javac" value="${javac9}"/>
344    
345    <target name="dists"    <target name="dists"
346            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
347            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 235  As of 2013-02, the very latest lambda 8 Line 350  As of 2013-02, the very latest lambda 8
350            depends="configure-compiler"            depends="configure-compiler"
351            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
352    
353      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
354        <condition property="modules">
355          <and>
356            <available file="${jdk9.home}/jmods" type="dir"/>
357            <equals arg1="9" arg2="${build.main.java.version}"/>
358          </and>
359        </condition>
360    
361        <local name="destdir"/>
362        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
363        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
364    
365        <mkdir dir="${destdir}"/>
366    
367      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
368             destdir="${build.classes.dir}"             destdir="${destdir}"
369             debug="${build.debug}"             debug="${build.debug}"
370             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
371             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
372             classpath=""             classpath=""
373             includeAntRuntime="false"             includeAntRuntime="false"
374             includeJavaRuntime="false"             includeJavaRuntime="false"
375             executable="${javac8}"             executable="${build.main.javac}"
376             fork="true">             fork="true">
377    
378        <include name="**/*.java"/>        <include name="**/*.java"/>
379          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
380        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
381        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
382        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
383          <compilerarg value="-Werror"/>
384          <compilerarg value="-Xdoclint:all/protected"/>
385          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
386        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
387    
388      </javac>      </javac>
# Line 264  As of 2013-02, the very latest lambda 8 Line 395  As of 2013-02, the very latest lambda 8
395    
396      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
397        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
398          <manifest>
399            <attribute name="Built-By" value="${user.name}"/>
400            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
401          </manifest>
402      </jar>      </jar>
403    </target>    </target>
404    
405    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
406    <target name="docs"    <target name="docs"
407            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
408    
# Line 284  As of 2013-02, the very latest lambda 8 Line 414  As of 2013-02, the very latest lambda 8
414    
415      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
416               packagenames="none"               packagenames="none"
417               link="${jdkapi8docs.url}"               link="${java9.api.url}"
418               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
419               access="${build.javadoc.access}"               access="${build.javadoc.access}"
420               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
421               classpath=""               classpath=""
422               executable="${javadoc8}">               executable="${javadoc9}">
423        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
424          <include name="**/*.java"/>          <include name="**/*.java"/>
425        </fileset>        </fileset>
426          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
427          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
428        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
429    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
430        <arg value="-tag"/>        <arg value="-tag"/>
431        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
432          <arg value="-tag"/>
433          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
434          <arg value="-tag"/>
435          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
436          <arg value="-tag"/>
437          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
438      </javadoc>      </javadoc>
439    </target>    </target>
440    
# Line 319  As of 2013-02, the very latest lambda 8 Line 458  As of 2013-02, the very latest lambda 8
458        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
459        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
460        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
461          <manifest>
462            <attribute name="Built-By" value="${user.name}"/>
463            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
464          </manifest>
465      </jar>      </jar>
466    </target>    </target>
467    
# Line 334  As of 2013-02, the very latest lambda 8 Line 477  As of 2013-02, the very latest lambda 8
477    <target name="dist-clean"    <target name="dist-clean"
478            description="Removes all build and distribution products">            description="Removes all build and distribution products">
479    
480        <delete dir="${build.dir}"/>
481      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
482    
483    </target>    </target>
484    
485    
   <!-- Internal targets -->  
   
   
486    <target name="dist-jar"    <target name="dist-jar"
487            depends="clean, jar">            depends="clean, jar">
488      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 352  As of 2013-02, the very latest lambda 8 Line 493  As of 2013-02, the very latest lambda 8
493      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
494    </target>    </target>
495    
496      <target name="tck"
   <target name="compile-tests"  
           depends="jar">  
   
     <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>  
 -->  
   
   </target>  
   
   <target name="test-tck"  
497            depends="jar"            depends="jar"
498            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
499    
500      <run-tck-tests      <run-tck-tests
501        target="8"        target="${build.main.java.version}"
502        workdir="${build.dir}"        workdir="${build.dir}"
503        classes="${product.jar}"/>        classes="${product.jar}"/>
504    </target>    </target>
505    
506    <target name="run-tests"    <target name="tck-parallelism-1"
507            depends="compile-tests">            description="Runs tck with given common pool parallelism">
508        <antcall target="tck">
509      <!-- May be overridden by user.properties -->        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
510      <property name="testcase" value="*"/>      </antcall>
511      </target>
     <mkdir dir="${build.reports.dir}"/>  
   
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                     jvm="${java8}"  
                    fork="true">  
512    
513        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>    <target name="tck-parallelism-0"
514        <jvmarg value="-server"/>            description="Runs tck with given common pool parallelism">
515        <jvmarg value="-showversion"/>      <antcall target="tck">
516          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
517        </antcall>
518      </target>
519    
520        <classpath refid="test.classpath"/>    <target name="jtreg"
521              depends="jar"
522              description="Runs jtreg tests for main using the jtreg ant task">
523        <run-jtreg-tests
524           target="${build.main.java.version}"
525           workdir="${build.dir}"
526           classes="${product.jar}"/>
527      </target>
528    
529        <formatter type="xml"/>    <target name="test"
530              depends="tck, tck-parallelism-1, jtreg"
531              description="Runs tck and jtreg tests for main">
532      </target>
533    
534        <batchtest todir="${build.reports.dir}" unless="no.test.tck">    <target name="jtreg8" description="Runs jtreg tests with jdk8">
         <fileset dir="${tck.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
 <!--  
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
535    
536      </junit>      <antcall target="jtreg">
537          <param name="build.main.java.version" value="8"/>
538          <param name="build.main.javac" value="${javac8}"/>
539        </antcall>
540    
541    </target>    </target>
542    
543      <target name="test89"
544              description="Runs tck and jtreg tests for main for multiple java versions">
545    
546    <target name="report-tests"      <antcall target="clean"/>
547            depends="run-tests">      <antcall target="test">
548          <param name="build.main.java.version" value="8"/>
549      <!-- Sets junit.report.format to frames if redirection is present,        <param name="build.main.javac" value="${javac8}"/>
550           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>  
551    
552      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
553        <antcall target="test">
554          <param name="build.main.java.version" value="9"/>
555          <param name="build.main.javac" value="${javac9}"/>
556        </antcall>
557    
558    </target>    </target>
559    
560    
561    
562    <target name="configure-compiler">    <target name="configure-compiler">
563        <fail message="ant version too old">
564          <condition>
565            <not> <antversion atleast="1.9.1"/> </not>
566          </condition>
567        </fail>
568    
569      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
570    
# Line 516  As of 2013-02, the very latest lambda 8 Line 581  As of 2013-02, the very latest lambda 8
581    </target>    </target>
582    
583    
   <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>  
   
584    
585    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
586    
# Line 554  As of 2013-02, the very latest lambda 8 Line 596  As of 2013-02, the very latest lambda 8
596         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
597        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
598             source="${build.sourcelevel}"             source="${build.sourcelevel}"
599               target="${build.sourcelevel}"
600               fork="true">               fork="true">
601    
602        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 569  As of 2013-02, the very latest lambda 8 Line 612  As of 2013-02, the very latest lambda 8
612    </target>    </target>
613    
614    
615      <target name="compile-test-loops" depends="jar"
616              description="compile all the perf tests in src/test/loops">
617    
618        <mkdir dir="${build.dir}/test/loops"/>
619    
620        <javac srcdir="${basedir}/src/test/loops"
621               destdir="${build.dir}/test/loops"
622               debug="${build.debug}"
623               debuglevel="${build.debuglevel}"
624               deprecation="${build.deprecation}"
625               includeAntRuntime="false"
626               includeJavaRuntime="false"
627               executable="${javac9}"
628               fork="true">
629    
630          <include name="*.java"/>
631          <compilerarg value="-XDignore.symbol.file=true"/>
632          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
633          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
634          <compilerarg line="${build.args}"/>
635    
636        </javac>
637    
638      </target>
639    
640    
641    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
642    
643    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 583  As of 2013-02, the very latest lambda 8 Line 652  As of 2013-02, the very latest lambda 8
652             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
653             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
654             source="6"             source="6"
655               target="6"
656             classpath=""             classpath=""
657             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
658             includeAntRuntime="false"             includeAntRuntime="false"
# Line 594  As of 2013-02, the very latest lambda 8 Line 664  As of 2013-02, the very latest lambda 8
664        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
665        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
666        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
667          <compilerarg value="-Werror"/>
668          <compilerarg line="${build.args}"/>
669    
670        </javac>
671      </target>
672    
673      <target name="4jdk7doclint"
674              depends="configure-compiler"
675              description="Finds doclint warnings">
676    
677        <mkdir dir="${build.4jdk7.classes.dir}"/>
678    
679        <javac srcdir="${4jdk7src.dir}"
680               destdir="${build.4jdk7.classes.dir}"
681               debug="${build.debug}"
682               debuglevel="${build.debuglevel}"
683               deprecation="${build.deprecation}"
684               source="6"
685               target="6"
686               classpath=""
687               bootclasspath="${bootclasspath6}"
688               includeAntRuntime="false"
689               includeJavaRuntime="false"
690               executable="${javac8}"
691               fork="true">
692    
693          <include name="**/*.java"/>
694          <compilerarg value="-Xprefer:source"/>
695          <compilerarg value="-XDignore.symbol.file=true"/>
696          <compilerarg value="-Xlint:all"/>
697          <compilerarg value="-Xdoclint:all/protected"/>
698        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
699    
700      </javac>      </javac>
# Line 606  As of 2013-02, the very latest lambda 8 Line 707  As of 2013-02, the very latest lambda 8
707    
708      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
709        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
710          <manifest>
711            <attribute name="Built-By" value="${user.name}"/>
712            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
713          </manifest>
714      </jar>      </jar>
715    
716    </target>    </target>
717    
718    
719    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
720            depends="4jdk7jar"            depends="4jdk7jar"
721            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
722    
# Line 620  As of 2013-02, the very latest lambda 8 Line 725  As of 2013-02, the very latest lambda 8
725        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
726        classes="${4jdk7product.jar}">        classes="${4jdk7product.jar}">
727        <javac-elements>        <javac-elements>
728            <!-- JDK8+ test classes -->
729            <exclude name="*8Test.java"/>
730            <exclude name="*9Test.java"/>
731            <exclude name="*10Test.java"/>
732            <exclude name="DoubleAccumulatorTest.java"/>
733            <exclude name="DoubleAdderTest.java"/>
734            <exclude name="LongAccumulatorTest.java"/>
735            <exclude name="LongAdderTest.java"/>
736            <exclude name="CompletableFutureTest.java"/>
737            <exclude name="SplittableRandomTest.java"/>
738          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
739            <exclude name="SubmissionPublisherTest.java"/>
740        </javac-elements>        </javac-elements>
741      </run-tck-tests>      </run-tck-tests>
742    </target>    </target>
743    
744    
745    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
746            depends="4jdk7compile"            depends="4jdk7compile"
747            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
748    
# Line 648  As of 2013-02, the very latest lambda 8 Line 764  As of 2013-02, the very latest lambda 8
764    
765        <formatter type="brief"/>        <formatter type="brief"/>
766    
767        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
768        </test>        </test>
769    
770      </junit>      </junit>
771    </target>    </target>
772    
773    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
774            depends="4jdk7compile"            depends="4jdk7jar"
775            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
776      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
777      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
778      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
779      <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>  
780    </target>    </target>
781    
782    
783    <target name="4jdk7-test"    <target name="4jdk7-test"
784            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
785            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
786    </target>    </target>
787    
# Line 690  As of 2013-02, the very latest lambda 8 Line 794  As of 2013-02, the very latest lambda 8
794    
795      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
796               packagenames="none"               packagenames="none"
797               link="${jdkapi7docs.url}"               link="${java7.api.url}"
798               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
799               access="${build.javadoc.access}"               access="${build.javadoc.access}"
800               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 699  As of 2013-02, the very latest lambda 8 Line 803  As of 2013-02, the very latest lambda 8
803        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
804          <include name="**/*.java"/>          <include name="**/*.java"/>
805        </fileset>        </fileset>
806          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
807        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
808      </javadoc>      </javadoc>
809    </target>    </target>
# Line 717  As of 2013-02, the very latest lambda 8 Line 822  As of 2013-02, the very latest lambda 8
822    </target>    </target>
823    
824    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
825    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
826            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
827      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 750  As of 2013-02, the very latest lambda 8 Line 850  As of 2013-02, the very latest lambda 8
850             classpath=""             classpath=""
851             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
852             source="5"             source="5"
853               target="5"
854             includeAntRuntime="false"             includeAntRuntime="false"
855             includeJavaRuntime="false"             includeJavaRuntime="false"
856             executable="${javac7}"             executable="${javac7}"
# Line 758  As of 2013-02, the very latest lambda 8 Line 859  As of 2013-02, the very latest lambda 8
859        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
860        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
861        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
862          <compilerarg value="-Werror"/>
863        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
864    
865      </javac>      </javac>
# Line 770  As of 2013-02, the very latest lambda 8 Line 872  As of 2013-02, the very latest lambda 8
872    
873      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
874        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
875          <manifest>
876            <attribute name="Built-By" value="${user.name}"/>
877            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
878          </manifest>
879      </jar>      </jar>
880    
881    </target>    </target>
# Line 783  As of 2013-02, the very latest lambda 8 Line 889  As of 2013-02, the very latest lambda 8
889    
890      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
891               packagenames="jsr166x.*"               packagenames="jsr166x.*"
892               link="${jdkapidocs.url}"               link="${java.api.url}"
893               access="${build.javadoc.access}"               access="${build.javadoc.access}"
894               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
895               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
896               source="5"               source="5"
897               executable="${javadoc7}">               executable="${javadoc7}">
898          <arg line="-Xdocrootparent ${java.docroot.url}"/>
899        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
900    
901      </javadoc>      </javadoc>
# Line 808  As of 2013-02, the very latest lambda 8 Line 915  As of 2013-02, the very latest lambda 8
915    </target>    </target>
916    
917    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
918    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
919            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
920      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 839  As of 2013-02, the very latest lambda 8 Line 940  As of 2013-02, the very latest lambda 8
940             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
941             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
942             source="6"             source="6"
943               target="6"
944             classpath=""             classpath=""
945             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
946             includeAntRuntime="false"             includeAntRuntime="false"
# Line 849  As of 2013-02, the very latest lambda 8 Line 951  As of 2013-02, the very latest lambda 8
951        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
952        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
953        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
954          <compilerarg value="-Werror"/>
955        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
956    
957      </javac>      </javac>
# Line 861  As of 2013-02, the very latest lambda 8 Line 964  As of 2013-02, the very latest lambda 8
964    
965      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
966        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
967          <manifest>
968            <attribute name="Built-By" value="${user.name}"/>
969            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
970          </manifest>
971      </jar>      </jar>
972    
973    </target>    </target>
# Line 874  As of 2013-02, the very latest lambda 8 Line 981  As of 2013-02, the very latest lambda 8
981    
982      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
983               packagenames="jsr166y.*"               packagenames="jsr166y.*"
984               link="${jdkapidocs.url}"               link="${java.api.url}"
985               access="${build.javadoc.access}"               access="${build.javadoc.access}"
986               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
987               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
988               source="6"               source="6"
989               executable="${javadoc7}">               executable="${javadoc7}">
990          <arg line="-Xdocrootparent ${java.docroot.url}"/>
991        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
992    
993      </javadoc>      </javadoc>
# Line 899  As of 2013-02, the very latest lambda 8 Line 1007  As of 2013-02, the very latest lambda 8
1007    </target>    </target>
1008    
1009    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1010    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
1011            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
1012      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 932  As of 2013-02, the very latest lambda 8 Line 1035  As of 2013-02, the very latest lambda 8
1035             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1036             classpath=""             classpath=""
1037             source="6"             source="6"
1038               target="6"
1039             includeAntRuntime="false"             includeAntRuntime="false"
1040             includeJavaRuntime="false"             includeJavaRuntime="false"
1041             executable="${javac7}"             executable="${javac7}"
# Line 940  As of 2013-02, the very latest lambda 8 Line 1044  As of 2013-02, the very latest lambda 8
1044        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1045        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1046        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1047          <compilerarg value="-Werror"/>
1048        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1049    
1050      </javac>      </javac>
# Line 952  As of 2013-02, the very latest lambda 8 Line 1057  As of 2013-02, the very latest lambda 8
1057    
1058      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1059        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1060          <manifest>
1061            <attribute name="Built-By" value="${user.name}"/>
1062            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1063          </manifest>
1064      </jar>      </jar>
1065    
1066    </target>    </target>
# Line 965  As of 2013-02, the very latest lambda 8 Line 1074  As of 2013-02, the very latest lambda 8
1074    
1075      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1076               packagenames="extra166y.*"               packagenames="extra166y.*"
1077               link="${jdkapidocs.url}"               link="${java.api.url}"
1078               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1079               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1080               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1081               source="6"               source="6"
1082               executable="${javadoc7}">               executable="${javadoc7}">
1083          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1084        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1085    
1086      </javadoc>      </javadoc>
# Line 990  As of 2013-02, the very latest lambda 8 Line 1100  As of 2013-02, the very latest lambda 8
1100    </target>    </target>
1101    
1102    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1103    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1104            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1105      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1007  As of 2013-02, the very latest lambda 8 Line 1112  As of 2013-02, the very latest lambda 8
1112    
1113    <!-- jsr166e -->    <!-- jsr166e -->
1114    
1115      <property name="build.jsr166e.java.version" value="6"/>
1116      <property name="build.jsr166e.javac" value="${javac6}"/>
1117    
1118    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1119            depends="configure-compiler"            depends="configure-compiler"
1120            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1018  As of 2013-02, the very latest lambda 8 Line 1126  As of 2013-02, the very latest lambda 8
1126             debug="${build.debug}"             debug="${build.debug}"
1127             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1128             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1129             source="7"             source="${build.jsr166e.java.version}"
1130               target="${build.jsr166e.java.version}"
1131             classpath=""             classpath=""
1132             includeAntRuntime="false"             includeAntRuntime="false"
1133             includeJavaRuntime="false"             includeJavaRuntime="false"
1134             executable="${javac7}"             executable="${build.jsr166e.javac}"
1135             fork="true">             fork="true">
1136    
1137        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1138        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1139        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1140          <compilerarg value="-Werror"/>
1141        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1142    
1143      </javac>      </javac>
1144    </target>    </target>
1145    
1146      <!-- jsr166e: find doclint errors -->
1147      <target name="jsr166edoclint">
1148    
1149        <mkdir dir="${build.jsr166e.classes.dir}"/>
1150    
1151        <javac srcdir="${topsrc.dir}"
1152               destdir="${build.jsr166e.classes.dir}"
1153               debug="${build.debug}"
1154               debuglevel="${build.debuglevel}"
1155               deprecation="${build.deprecation}"
1156               source="${build.jsr166e.java.version}"
1157               target="${build.jsr166e.java.version}"
1158               classpath=""
1159               bootclasspath="${bootclasspath6}"
1160               includeAntRuntime="false"
1161               includeJavaRuntime="false"
1162               executable="${javac8}"
1163               fork="true">
1164    
1165          <include name="jsr166e/**/*.java"/>
1166          <compilerarg value="-XDignore.symbol.file=true"/>
1167          <compilerarg value="-Xlint:all"/>
1168          <compilerarg value="-Werror"/>
1169          <compilerarg value="-Xdoclint:all/protected"/>
1170    
1171        </javac>
1172      </target>
1173    
1174    
1175    <target name="jsr166ejar"    <target name="jsr166ejar"
1176            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1040  As of 2013-02, the very latest lambda 8 Line 1178  As of 2013-02, the very latest lambda 8
1178    
1179      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1180        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1181          <manifest>
1182            <attribute name="Built-By" value="${user.name}"/>
1183            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1184          </manifest>
1185      </jar>      </jar>
1186    
1187    </target>    </target>
# Line 1053  As of 2013-02, the very latest lambda 8 Line 1195  As of 2013-02, the very latest lambda 8
1195    
1196      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1197               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1198               link="${jdkapidocs.url}"               link="${java.api.url}"
1199               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1200               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1201               source="7"               source="${build.jsr166e.java.version}"
1202               executable="${javadoc7}">               executable="${javadoc7}">
1203          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1204        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1205    
1206      </javadoc>      </javadoc>
1207    </target>    </target>
1208    
1209    
1210    <target name="jsr166e-test-tck"    <target name="jsr166e-tck-one-java-version"
1211            depends="jsr166ejar"            depends="jsr166ejar">
1212            description="Runs tck tests for jsr166e">  
1213        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1214    
1215      <run-tck-tests      <run-tck-tests
1216        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1217        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1218        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1219        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1220    </target>    </target>
1221    
1222      <target name="jsr166e-tck"
1223              description="Runs tck tests for jsr166e for multiple java versions">
1224    
1225    <!--     <antcall target="clean"/> -->
1226    <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1227    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1228    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1229    <!--     </antcall> -->
1230    
1231        <antcall target="clean"/>
1232        <antcall target="jsr166e-tck-one-java-version">
1233          <param name="build.jsr166e.java.version" value="7"/>
1234          <param name="build.jsr166e.javac" value="${javac7}"/>
1235        </antcall>
1236    
1237        <antcall target="clean"/>
1238        <antcall target="jsr166e-tck-one-java-version">
1239          <param name="build.jsr166e.java.version" value="6"/>
1240          <param name="build.jsr166e.javac" value="${javac6}"/>
1241        </antcall>
1242      </target>
1243    
1244    
1245      <target name="jsr166e-test"
1246              depends="jsr166e-tck"
1247              description="Runs all tests for jsr166e">
1248      </target>
1249    
1250    <target name="jsr166edist"    <target name="jsr166edist"
1251            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1088  As of 2013-02, the very latest lambda 8 Line 1258  As of 2013-02, the very latest lambda 8
1258    </target>    </target>
1259    
1260    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1261    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1262            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1263      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1108  As of 2013-02, the very latest lambda 8 Line 1273  As of 2013-02, the very latest lambda 8
1273    
1274    <target name="lint">    <target name="lint">
1275      <antcall target="dists">      <antcall target="dists">
1276          <param name="build.javadoc.access" value="public"/>
1277        </antcall>
1278      </target>
1279    
1280    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1281      <target name="lint-private">
1282        <antcall target="dist">
1283        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1284      </antcall>      </antcall>
1285    </target>    </target>

Legend:
Removed from v.1.133  
changed lines
  Added in v.1.192

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