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

Diff of /jsr166/build.xml

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

revision 1.165 by jsr166, Wed Jun 17 01:55:44 2015 UTC revision 1.190 by jsr166, Thu Nov 5 17:18:53 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 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 252  Line 268 
268    </macrodef>    </macrodef>
269    
270    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
271    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
272      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
273        <include name="**/*.java"/>        <include name="**/*.java"/>
274      </patternset>      </patternset>
275    </fileset>    </fileset>
276    
277    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
278      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
279        <include name="**/*.java"/>        <include name="**/*.java"/>
280        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
281          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282          <exclude name="**/GCDuringIteration.java"/>
283      </patternset>      </patternset>
284    </fileset>    </fileset>
285    
286    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
287      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
288        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="util/Collection/CollectionDefaults.java"/>  
       <exclude name="util/List/ListDefaults.java"/>  
       <exclude name="util/Spliterator/**/*.java"/>  
       <exclude name="util/concurrent/CompletableFuture/**/*.java"/>  
       <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>  
       <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>  
289      </patternset>      </patternset>
290    </fileset>    </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"/>      <mkdir dir="@{workdir}/JTreport"/>
314      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
315             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
316             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
317             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
318        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
319        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321        <arg value="-agentvm"/>        <arg value="-agentvm"/>
322        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
323        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
324        <arg value="-automatic"/>        <arg value="-automatic"/>
325        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 328  Line 350 
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}"
# Line 342  Line 376 
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"/>
# Line 360  Line 395 
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    
# Line 387  Line 426 
426        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
427        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <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"/>        <arg value="-tag"/>
# Line 418  Line 458 
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 449  Line 493 
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" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <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    
# Line 460  Line 503 
503        classes="${product.jar}"/>        classes="${product.jar}"/>
504    </target>    </target>
505    
506    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
507            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
508      <antcall target="test-tck">      <antcall target="tck">
509        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
510      </antcall>      </antcall>
511    </target>    </target>
512    
513    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
514            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
515      <antcall target="test-tck">      <antcall target="tck">
516        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
517      </antcall>      </antcall>
518    </target>    </target>
519    
520    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
521            depends="jar"            depends="jar"
522            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
523      <run-jtreg-tests      <run-jtreg-tests
# Line 485  Line 527 
527    </target>    </target>
528    
529    <target name="test"    <target name="test"
530            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
531            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
532    </target>    </target>
533    
534      <target name="jtreg8" description="Runs jtreg tests with jdk8">
535    
536        <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>
542    
543    <target name="test89"    <target name="test89"
544            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
545    
# Line 496  Line 547 
547      <antcall target="test">      <antcall target="test">
548        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
549        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
550      </antcall>      </antcall>
551    
552      <antcall target="clean"/>      <antcall target="clean"/>
# Line 510  Line 560 
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 556  Line 611 
611    </target>    </target>
612    
613    
614      <target name="compile-test-loops" depends="jar"
615              description="compile all the perf tests in src/test/loops">
616    
617        <mkdir dir="${build.dir}/test/loops"/>
618    
619        <javac srcdir="${basedir}/src/test/loops"
620               destdir="${build.dir}/test/loops"
621               debug="${build.debug}"
622               debuglevel="${build.debuglevel}"
623               deprecation="${build.deprecation}"
624               includeAntRuntime="false"
625               includeJavaRuntime="false"
626               executable="${javac9}"
627               fork="true">
628    
629          <include name="*.java"/>
630          <compilerarg value="-XDignore.symbol.file=true"/>
631          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
632          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
633          <compilerarg line="${build.args}"/>
634    
635        </javac>
636    
637      </target>
638    
639    
640    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
641    
642    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 570  Line 651 
651             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
652             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
653             source="6"             source="6"
654               target="6"
655             classpath=""             classpath=""
656             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
657             includeAntRuntime="false"             includeAntRuntime="false"
# Line 599  Line 681 
681             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
682             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
683             source="6"             source="6"
684               target="6"
685             classpath=""             classpath=""
686             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
687             includeAntRuntime="false"             includeAntRuntime="false"
688             includeJavaRuntime="false"             includeJavaRuntime="false"
689             executable="${javac8}"             executable="${javac8}"
# Line 623  Line 706 
706    
707      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
708        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
709          <manifest>
710            <attribute name="Built-By" value="${user.name}"/>
711            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
712          </manifest>
713      </jar>      </jar>
714    
715    </target>    </target>
716    
717    
718    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
719            depends="4jdk7jar"            depends="4jdk7jar"
720            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
721    
# Line 640  Line 727 
727          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
728          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
729          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
730            <exclude name="*10Test.java"/>
731          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
732          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
733          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 647  Line 735 
735          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
736          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
737          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
738            <exclude name="SubmissionPublisherTest.java"/>
739        </javac-elements>        </javac-elements>
740      </run-tck-tests>      </run-tck-tests>
741    </target>    </target>
742    
743    
744    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
745            depends="4jdk7compile"            depends="4jdk7compile"
746            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
747    
# Line 680  Line 769 
769      </junit>      </junit>
770    </target>    </target>
771    
772    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
773            depends="4jdk7jar"            depends="4jdk7jar"
774            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
775      <run-jtreg-tests      <run-jtreg-tests
# Line 691  Line 780 
780    
781    
782    <target name="4jdk7-test"    <target name="4jdk7-test"
783            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
784            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
785    </target>    </target>
786    
# Line 760  Line 849 
849             classpath=""             classpath=""
850             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
851             source="5"             source="5"
852               target="5"
853             includeAntRuntime="false"             includeAntRuntime="false"
854             includeJavaRuntime="false"             includeJavaRuntime="false"
855             executable="${javac7}"             executable="${javac7}"
# Line 781  Line 871 
871    
872      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
873        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
874          <manifest>
875            <attribute name="Built-By" value="${user.name}"/>
876            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
877          </manifest>
878      </jar>      </jar>
879    
880    </target>    </target>
# Line 845  Line 939 
939             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
940             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
941             source="6"             source="6"
942               target="6"
943             classpath=""             classpath=""
944             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
945             includeAntRuntime="false"             includeAntRuntime="false"
# Line 868  Line 963 
963    
964      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
965        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
966          <manifest>
967            <attribute name="Built-By" value="${user.name}"/>
968            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
969          </manifest>
970      </jar>      </jar>
971    
972    </target>    </target>
# Line 935  Line 1034 
1034             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1035             classpath=""             classpath=""
1036             source="6"             source="6"
1037               target="6"
1038             includeAntRuntime="false"             includeAntRuntime="false"
1039             includeJavaRuntime="false"             includeJavaRuntime="false"
1040             executable="${javac7}"             executable="${javac7}"
# Line 956  Line 1056 
1056    
1057      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1058        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1059          <manifest>
1060            <attribute name="Built-By" value="${user.name}"/>
1061            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1062          </manifest>
1063      </jar>      </jar>
1064    
1065    </target>    </target>
# Line 1022  Line 1126 
1126             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1127             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1128             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1129               target="${build.jsr166e.java.version}"
1130             classpath=""             classpath=""
1131             includeAntRuntime="false"             includeAntRuntime="false"
1132             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1048  Line 1153 
1153             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1154             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1155             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1156               target="${build.jsr166e.java.version}"
1157             classpath=""             classpath=""
1158             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1159             includeAntRuntime="false"             includeAntRuntime="false"
1160             includeJavaRuntime="false"             includeJavaRuntime="false"
1161             executable="${javac8}"             executable="${javac8}"
# Line 1071  Line 1177 
1177    
1178      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1179        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1180          <manifest>
1181            <attribute name="Built-By" value="${user.name}"/>
1182            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1183          </manifest>
1184      </jar>      </jar>
1185    
1186    </target>    </target>
# Line 1096  Line 1206 
1206    </target>    </target>
1207    
1208    
1209    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1210            depends="jsr166ejar">            depends="jsr166ejar">
1211    
1212      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1108  Line 1218 
1218        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1219    </target>    </target>
1220    
1221    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1222            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1223    
1224  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1225  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1226  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1227  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1228  <!--     </antcall> -->  <!--     </antcall> -->
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="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1233        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
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="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1239        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1240      </antcall>      </antcall>
# Line 1132  Line 1242 
1242    
1243    
1244    <target name="jsr166e-test"    <target name="jsr166e-test"
1245            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1246            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1247    </target>    </target>
1248    

Legend:
Removed from v.1.165  
changed lines
  Added in v.1.190

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