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

Diff of /jsr166/build.xml

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

revision 1.164 by jsr166, Wed May 20 06:13:09 2015 UTC revision 1.193 by jsr166, Fri Dec 11 23:58:52 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"/>
# Line 334  Line 397 
397    
398      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
399        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
400          <manifest>
401            <attribute name="Built-By" value="${user.name}"/>
402            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
403          </manifest>
404      </jar>      </jar>
405    </target>    </target>
406    
# Line 361  Line 428 
428        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
429        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
430        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
431    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
432        <arg value="-tag"/>        <arg value="-tag"/>
433        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
434        <arg value="-tag"/>        <arg value="-tag"/>
# Line 392  Line 460 
460        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
461        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
462        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
463          <manifest>
464            <attribute name="Built-By" value="${user.name}"/>
465            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
466          </manifest>
467      </jar>      </jar>
468    </target>    </target>
469    
# Line 423  Line 495 
495      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
496    </target>    </target>
497    
498    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
499            depends="jar"            depends="jar"
500            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
501    
# Line 434  Line 505 
505        classes="${product.jar}"/>        classes="${product.jar}"/>
506    </target>    </target>
507    
508    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
509            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
510      <antcall target="test-tck">      <antcall target="tck">
511        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
512      </antcall>      </antcall>
513    </target>    </target>
514    
515    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
516            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
517      <antcall target="test-tck">      <antcall target="tck">
518        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
519      </antcall>      </antcall>
520    </target>    </target>
521    
522    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
523            depends="jar"            depends="jar"
524            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
525      <run-jtreg-tests      <run-jtreg-tests
# Line 459  Line 529 
529    </target>    </target>
530    
531    <target name="test"    <target name="test"
532            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
533            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
534    </target>    </target>
535    
536      <target name="jtreg8" description="Runs jtreg tests with jdk8">
537    
538        <antcall target="jtreg">
539          <param name="build.main.java.version" value="8"/>
540          <param name="build.main.javac" value="${javac8}"/>
541        </antcall>
542    
543      </target>
544    
545    <target name="test89"    <target name="test89"
546            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
547    
# Line 483  Line 562 
562    
563    
564    <target name="configure-compiler">    <target name="configure-compiler">
565        <fail message="ant version too old">
566          <condition>
567            <not> <antversion atleast="1.9.1"/> </not>
568          </condition>
569        </fail>
570    
571      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
572    
# Line 514  Line 598 
598         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
599        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
600             source="${build.sourcelevel}"             source="${build.sourcelevel}"
601               target="${build.sourcelevel}"
602               fork="true">               fork="true">
603    
604        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 529  Line 614 
614    </target>    </target>
615    
616    
617      <target name="compile-test-loops" depends="jar"
618              description="compile all the perf tests in src/test/loops">
619    
620        <mkdir dir="${build.dir}/test/loops"/>
621    
622        <javac srcdir="${basedir}/src/test/loops"
623               destdir="${build.dir}/test/loops"
624               debug="${build.debug}"
625               debuglevel="${build.debuglevel}"
626               deprecation="${build.deprecation}"
627               includeAntRuntime="false"
628               includeJavaRuntime="false"
629               executable="${javac9}"
630               fork="true">
631    
632          <include name="*.java"/>
633          <compilerarg value="-XDignore.symbol.file=true"/>
634          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
635          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
636          <compilerarg line="${build.args}"/>
637    
638        </javac>
639    
640      </target>
641    
642    
643    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
644    
645    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 543  Line 654 
654             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
655             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
656             source="6"             source="6"
657               target="6"
658             classpath=""             classpath=""
659             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
660             includeAntRuntime="false"             includeAntRuntime="false"
# Line 572  Line 684 
684             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
685             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
686             source="6"             source="6"
687               target="6"
688             classpath=""             classpath=""
689             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
690             includeAntRuntime="false"             includeAntRuntime="false"
691             includeJavaRuntime="false"             includeJavaRuntime="false"
692             executable="${javac8}"             executable="${javac8}"
# Line 596  Line 709 
709    
710      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
711        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
712          <manifest>
713            <attribute name="Built-By" value="${user.name}"/>
714            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
715          </manifest>
716      </jar>      </jar>
717    
718    </target>    </target>
719    
720    
721    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
722            depends="4jdk7jar"            depends="4jdk7jar"
723            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
724    
# Line 613  Line 730 
730          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
731          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
732          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
733            <exclude name="*10Test.java"/>
734          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
735          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
736          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 620  Line 738 
738          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
739          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
740          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
741            <exclude name="SubmissionPublisherTest.java"/>
742        </javac-elements>        </javac-elements>
743      </run-tck-tests>      </run-tck-tests>
744    </target>    </target>
745    
746    
747    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
748            depends="4jdk7compile"            depends="4jdk7compile"
749            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
750    
# Line 653  Line 772 
772      </junit>      </junit>
773    </target>    </target>
774    
775    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
776            depends="4jdk7jar"            depends="4jdk7jar"
777            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
778      <run-jtreg-tests      <run-jtreg-tests
779         target="7"         target="7"
780         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
781         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
782    </target>    </target>
783    
784    
785    <target name="4jdk7-test"    <target name="4jdk7-test"
786            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
787            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
788    </target>    </target>
789    
# Line 734  Line 852 
852             classpath=""             classpath=""
853             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
854             source="5"             source="5"
855               target="5"
856             includeAntRuntime="false"             includeAntRuntime="false"
857             includeJavaRuntime="false"             includeJavaRuntime="false"
858             executable="${javac7}"             executable="${javac7}"
# Line 755  Line 874 
874    
875      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
876        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
877          <manifest>
878            <attribute name="Built-By" value="${user.name}"/>
879            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
880          </manifest>
881      </jar>      </jar>
882    
883    </target>    </target>
# Line 819  Line 942 
942             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
943             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
944             source="6"             source="6"
945               target="6"
946             classpath=""             classpath=""
947             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
948             includeAntRuntime="false"             includeAntRuntime="false"
# Line 842  Line 966 
966    
967      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
968        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
969          <manifest>
970            <attribute name="Built-By" value="${user.name}"/>
971            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
972          </manifest>
973      </jar>      </jar>
974    
975    </target>    </target>
# Line 909  Line 1037 
1037             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1038             classpath=""             classpath=""
1039             source="6"             source="6"
1040               target="6"
1041             includeAntRuntime="false"             includeAntRuntime="false"
1042             includeJavaRuntime="false"             includeJavaRuntime="false"
1043             executable="${javac7}"             executable="${javac7}"
# Line 930  Line 1059 
1059    
1060      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1061        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1062          <manifest>
1063            <attribute name="Built-By" value="${user.name}"/>
1064            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1065          </manifest>
1066      </jar>      </jar>
1067    
1068    </target>    </target>
# Line 996  Line 1129 
1129             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1130             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1131             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1132               target="${build.jsr166e.java.version}"
1133             classpath=""             classpath=""
1134             includeAntRuntime="false"             includeAntRuntime="false"
1135             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1022  Line 1156 
1156             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1157             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1158             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1159               target="${build.jsr166e.java.version}"
1160             classpath=""             classpath=""
1161             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1162             includeAntRuntime="false"             includeAntRuntime="false"
1163             includeJavaRuntime="false"             includeJavaRuntime="false"
1164             executable="${javac8}"             executable="${javac8}"
# Line 1045  Line 1180 
1180    
1181      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1182        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1183          <manifest>
1184            <attribute name="Built-By" value="${user.name}"/>
1185            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186          </manifest>
1187      </jar>      </jar>
1188    
1189    </target>    </target>
# Line 1070  Line 1209 
1209    </target>    </target>
1210    
1211    
1212    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1213            depends="jsr166ejar">            depends="jsr166ejar">
1214    
1215      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1082  Line 1221 
1221        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1222    </target>    </target>
1223    
1224    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1225            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1226    
1227  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1228  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1229  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1230  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1231  <!--     </antcall> -->  <!--     </antcall> -->
1232    
1233      <antcall target="clean"/>      <antcall target="clean"/>
1234      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1235        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1236        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1237      </antcall>      </antcall>
1238    
1239      <antcall target="clean"/>      <antcall target="clean"/>
1240      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1241        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1242        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1243      </antcall>      </antcall>
# Line 1106  Line 1245 
1245    
1246    
1247    <target name="jsr166e-test"    <target name="jsr166e-test"
1248            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1249            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1250    </target>    </target>
1251    

Legend:
Removed from v.1.164  
changed lines
  Added in v.1.193

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