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

Diff of /jsr166/build.xml

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

revision 1.163 by jsr166, Fri Feb 20 22:33:13 2015 UTC revision 1.194 by jsr166, Wed Dec 16 02:29:06 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 28  Line 29 
29    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
30    ant -Djdk$N.home=...    ant -Djdk$N.home=...
31    for $N in 6 7 8 9 ...    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    
# Line 38  Line 44 
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 50  Line 57 
57    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
58    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
59    
   <!-- Tck options; see JSR166TestCase.java  
    To profile a single tck test class:  
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck  
    To stress test a single tck test class:  
    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck  
   -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
60    <!-- Build locations -->    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
62    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 93  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"/>      <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 129  Line 133 
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 168  Line 175 
175    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <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"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <!-- The expected canonical location does not yet exist as of 2015-11 -->
179    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
# Line 187  Line 194 
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}"/>
208      <attribute name="target"/>      <attribute name="target"/>
# Line 201  Line 211 
211      <attribute name="classes"/>      <attribute name="classes"/>
212      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <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 220  Line 236 
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}"/>        <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    
# Line 231  Line 248 
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 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
257            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258              <propertyref prefix="jsr166."/>
259          </syspropertyset>          </syspropertyset>
260    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
261          <classpath>          <classpath>
262            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 251  Line 267 
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">    <macrodef name="run-jtreg-tests">
293      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>  
294      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
295      <attribute name="target"/>      <attribute name="target"/>
296      <attribute name="workdir"/>      <attribute name="workdir"/>
297      <attribute name="classes"/>      <attribute name="classes"/>
298      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
299    
300      <sequential>      <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"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
311      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
312      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
313      <mkdir dir="@{workdir}/JTreport"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314      <jtreg dir="@{jtreg.src.dir}"      <mkdir dir="@{workdir}/JTreport/html"/>
315        <mkdir dir="@{workdir}/JTreport/text"/>
316        <jtreg dir="${jtreg@{target}.src.dir}"
317             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
318             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
319             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
320          <patternset refid="jdk@{target}.jtreg.tests"/>
321        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
322          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
323        <arg value="-agentvm"/>        <arg value="-agentvm"/>
324        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
325        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
326        <arg value="-automatic"/>        <arg value="-automatic"/>
327        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 302  Line 352 
352            depends="configure-compiler"            depends="configure-compiler"
353            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
354    
355      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
356        <condition property="modules">
357          <and>
358            <available file="${jdk9.home}/jmods" type="dir"/>
359            <equals arg1="9" arg2="${build.main.java.version}"/>
360          </and>
361        </condition>
362    
363        <local name="destdir"/>
364        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
365        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
366    
367        <mkdir dir="${destdir}"/>
368    
369      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
370             destdir="${build.classes.dir}"             destdir="${destdir}"
371             debug="${build.debug}"             debug="${build.debug}"
372             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
373             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 316  Line 378 
378             fork="true">             fork="true">
379    
380        <include name="**/*.java"/>        <include name="**/*.java"/>
381          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
382        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
383        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
384        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
385          <compilerarg value="-Werror"/>
386        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
387        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
388        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
389    
390      </javac>      </javac>
391    
392        <!-- We need jdk9's Contended annotation, but at compile time only -->
393        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
394    </target>    </target>
395    
396    
# Line 333  Line 400 
400    
401      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
402        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
403          <manifest>
404            <attribute name="Built-By" value="${user.name}"/>
405            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
406          </manifest>
407      </jar>      </jar>
408    </target>    </target>
409    
# Line 360  Line 431 
431        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
432        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
433        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
434    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
435        <arg value="-tag"/>        <arg value="-tag"/>
436        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
437        <arg value="-tag"/>        <arg value="-tag"/>
# Line 391  Line 463 
463        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
464        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
465        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
466          <manifest>
467            <attribute name="Built-By" value="${user.name}"/>
468            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
469          </manifest>
470      </jar>      </jar>
471    </target>    </target>
472    
# Line 422  Line 498 
498      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
499    </target>    </target>
500    
501    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
502            depends="jar"            depends="jar"
503            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
504    
# Line 433  Line 508 
508        classes="${product.jar}"/>        classes="${product.jar}"/>
509    </target>    </target>
510    
511    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
512            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
513      <antcall target="test-tck">      <antcall target="tck">
514        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
515      </antcall>      </antcall>
516    </target>    </target>
517    
518    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
519            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
520      <antcall target="test-tck">      <antcall target="tck">
521        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
522      </antcall>      </antcall>
523    </target>    </target>
524    
525    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
526            depends="jar"            depends="jar"
527            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
528      <run-jtreg-tests      <run-jtreg-tests
# Line 458  Line 532 
532    </target>    </target>
533    
534    <target name="test"    <target name="test"
535            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
536            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
537    </target>    </target>
538    
539      <target name="jtreg8" description="Runs jtreg tests with jdk8">
540    
541        <antcall target="jtreg">
542          <param name="build.main.java.version" value="8"/>
543          <param name="build.main.javac" value="${javac8}"/>
544        </antcall>
545    
546      </target>
547    
548    <target name="test89"    <target name="test89"
549            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
550    
# Line 482  Line 565 
565    
566    
567    <target name="configure-compiler">    <target name="configure-compiler">
568        <fail message="ant version too old">
569          <condition>
570            <not> <antversion atleast="1.9.1"/> </not>
571          </condition>
572        </fail>
573    
574      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
575    
# Line 513  Line 601 
601         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
602        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
603             source="${build.sourcelevel}"             source="${build.sourcelevel}"
604               target="${build.sourcelevel}"
605               fork="true">               fork="true">
606    
607        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 528  Line 617 
617    </target>    </target>
618    
619    
620      <target name="compile-test-loops" depends="jar"
621              description="compile all the perf tests in src/test/loops">
622    
623        <mkdir dir="${build.dir}/test/loops"/>
624    
625        <javac srcdir="${basedir}/src/test/loops"
626               destdir="${build.dir}/test/loops"
627               debug="${build.debug}"
628               debuglevel="${build.debuglevel}"
629               deprecation="${build.deprecation}"
630               includeAntRuntime="false"
631               includeJavaRuntime="false"
632               executable="${javac9}"
633               fork="true">
634    
635          <include name="*.java"/>
636          <compilerarg value="-XDignore.symbol.file=true"/>
637          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
638          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
639          <compilerarg line="${build.args}"/>
640    
641        </javac>
642    
643      </target>
644    
645    
646    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
647    
648    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 542  Line 657 
657             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
658             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
659             source="6"             source="6"
660               target="6"
661             classpath=""             classpath=""
662             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
663             includeAntRuntime="false"             includeAntRuntime="false"
# Line 553  Line 669 
669        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
670        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
671        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
672          <compilerarg value="-Werror"/>
673        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
674    
675      </javac>      </javac>
# Line 570  Line 687 
687             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
688             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
689             source="6"             source="6"
690               target="6"
691             classpath=""             classpath=""
692             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
693             includeAntRuntime="false"             includeAntRuntime="false"
694             includeJavaRuntime="false"             includeJavaRuntime="false"
695             executable="${javac8}"             executable="${javac8}"
# Line 594  Line 712 
712    
713      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
714        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
715          <manifest>
716            <attribute name="Built-By" value="${user.name}"/>
717            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
718          </manifest>
719      </jar>      </jar>
720    
721    </target>    </target>
722    
723    
724    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
725            depends="4jdk7jar"            depends="4jdk7jar"
726            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
727    
# Line 611  Line 733 
733          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
734          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
735          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
736            <exclude name="*10Test.java"/>
737          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
738          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
739          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 618  Line 741 
741          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
742          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
743          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
744            <exclude name="SubmissionPublisherTest.java"/>
745        </javac-elements>        </javac-elements>
746      </run-tck-tests>      </run-tck-tests>
747    </target>    </target>
748    
749    
750    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
751            depends="4jdk7compile"            depends="4jdk7compile"
752            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
753    
# Line 651  Line 775 
775      </junit>      </junit>
776    </target>    </target>
777    
778    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
779            depends="4jdk7jar"            depends="4jdk7jar"
780            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
781      <run-jtreg-tests      <run-jtreg-tests
782         target="7"         target="7"
783         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
784         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
785    </target>    </target>
786    
787    
788    <target name="4jdk7-test"    <target name="4jdk7-test"
789            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
790            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
791    </target>    </target>
792    
# Line 732  Line 855 
855             classpath=""             classpath=""
856             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
857             source="5"             source="5"
858               target="5"
859             includeAntRuntime="false"             includeAntRuntime="false"
860             includeJavaRuntime="false"             includeJavaRuntime="false"
861             executable="${javac7}"             executable="${javac7}"
# Line 740  Line 864 
864        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
865        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
866        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
867          <compilerarg value="-Werror"/>
868        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
869    
870      </javac>      </javac>
# Line 752  Line 877 
877    
878      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
879        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
880          <manifest>
881            <attribute name="Built-By" value="${user.name}"/>
882            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
883          </manifest>
884      </jar>      </jar>
885    
886    </target>    </target>
# Line 816  Line 945 
945             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
946             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
947             source="6"             source="6"
948               target="6"
949             classpath=""             classpath=""
950             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
951             includeAntRuntime="false"             includeAntRuntime="false"
# Line 826  Line 956 
956        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
957        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
958        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
959          <compilerarg value="-Werror"/>
960        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
961    
962      </javac>      </javac>
# Line 838  Line 969 
969    
970      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
971        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
972          <manifest>
973            <attribute name="Built-By" value="${user.name}"/>
974            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
975          </manifest>
976      </jar>      </jar>
977    
978    </target>    </target>
# Line 905  Line 1040 
1040             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1041             classpath=""             classpath=""
1042             source="6"             source="6"
1043               target="6"
1044             includeAntRuntime="false"             includeAntRuntime="false"
1045             includeJavaRuntime="false"             includeJavaRuntime="false"
1046             executable="${javac7}"             executable="${javac7}"
# Line 913  Line 1049 
1049        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1050        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1051        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1052          <compilerarg value="-Werror"/>
1053        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1054    
1055      </javac>      </javac>
# Line 925  Line 1062 
1062    
1063      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1064        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1065          <manifest>
1066            <attribute name="Built-By" value="${user.name}"/>
1067            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1068          </manifest>
1069      </jar>      </jar>
1070    
1071    </target>    </target>
# Line 991  Line 1132 
1132             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1133             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1134             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1135               target="${build.jsr166e.java.version}"
1136             classpath=""             classpath=""
1137             includeAntRuntime="false"             includeAntRuntime="false"
1138             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1000  Line 1142 
1142        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1143        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1144        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1145          <compilerarg value="-Werror"/>
1146        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1147    
1148      </javac>      </javac>
# Line 1016  Line 1159 
1159             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1160             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1161             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1162               target="${build.jsr166e.java.version}"
1163             classpath=""             classpath=""
1164             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1165             includeAntRuntime="false"             includeAntRuntime="false"
1166             includeJavaRuntime="false"             includeJavaRuntime="false"
1167             executable="${javac8}"             executable="${javac8}"
# Line 1026  Line 1170 
1170        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1171        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1172        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1173          <compilerarg value="-Werror"/>
1174        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1175    
1176      </javac>      </javac>
# Line 1038  Line 1183 
1183    
1184      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1185        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1186          <manifest>
1187            <attribute name="Built-By" value="${user.name}"/>
1188            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1189          </manifest>
1190      </jar>      </jar>
1191    
1192    </target>    </target>
# Line 1063  Line 1212 
1212    </target>    </target>
1213    
1214    
1215    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1216            depends="jsr166ejar">            depends="jsr166ejar">
1217    
1218      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1075  Line 1224 
1224        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1225    </target>    </target>
1226    
1227    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1228            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1229    
1230  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1231  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1232  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1233  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1234  <!--     </antcall> -->  <!--     </antcall> -->
1235    
1236      <antcall target="clean"/>      <antcall target="clean"/>
1237      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1238        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1239        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1240      </antcall>      </antcall>
1241    
1242      <antcall target="clean"/>      <antcall target="clean"/>
1243      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1244        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1245        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1246      </antcall>      </antcall>
# Line 1099  Line 1248 
1248    
1249    
1250    <target name="jsr166e-test"    <target name="jsr166e-test"
1251            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1252            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1253    </target>    </target>
1254    

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.194

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