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

Diff of /jsr166/build.xml

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

revision 1.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC revision 1.186 by jsr166, Wed Sep 30 18:12:20 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 221  Line 237 
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"/>
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 -->        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282        <exclude name="util/WeakHashMap/GCDuringIteration.java"/>        <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        <local name="modules"/>
303        <condition property="modules">
304          <available file="${jdk@{target}.home}/jmods" type="dir"/>
305        </condition>
306    
307      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
308      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
309      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
310      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
311      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
312             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
313             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
314             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
315        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
316        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
317          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
318        <arg value="-agentvm"/>        <arg value="-agentvm"/>
319        <arg value="-v:nopass,fail"/>        <arg value="-verbose:nopass,fail,error"/>
320        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
321        <arg value="-automatic"/>        <arg value="-automatic"/>
322        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 330  Line 347 
347            depends="configure-compiler"            depends="configure-compiler"
348            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
349    
350      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
351        <condition property="modules">
352          <and>
353            <available file="${jdk9.home}/jmods" type="dir"/>
354            <equals arg1="9" arg2="${build.main.java.version}"/>
355          </and>
356        </condition>
357    
358        <local name="destdir"/>
359        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
360        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
361    
362        <mkdir dir="${destdir}"/>
363    
364      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
365             destdir="${build.classes.dir}"             destdir="${destdir}"
366             debug="${build.debug}"             debug="${build.debug}"
367             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
368             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 344  Line 373 
373             fork="true">             fork="true">
374    
375        <include name="**/*.java"/>        <include name="**/*.java"/>
376          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
377        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
378        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
379        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 362  Line 392 
392    
393      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
394        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
395          <manifest>
396            <attribute name="Built-By" value="${user.name}"/>
397            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
398          </manifest>
399      </jar>      </jar>
400    </target>    </target>
401    
# Line 389  Line 423 
423        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
424        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
425        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
426    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
427        <arg value="-tag"/>        <arg value="-tag"/>
428        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
429        <arg value="-tag"/>        <arg value="-tag"/>
# Line 420  Line 455 
455        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
456        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
457        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
458          <manifest>
459            <attribute name="Built-By" value="${user.name}"/>
460            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
461          </manifest>
462      </jar>      </jar>
463    </target>    </target>
464    
# Line 451  Line 490 
490      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
491    </target>    </target>
492    
493    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
494            depends="jar"            depends="jar"
495            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
496    
# Line 462  Line 500 
500        classes="${product.jar}"/>        classes="${product.jar}"/>
501    </target>    </target>
502    
503    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
504            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
505      <antcall target="test-tck">      <antcall target="tck">
506        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
507      </antcall>      </antcall>
508    </target>    </target>
509    
510    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
511            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
512      <antcall target="test-tck">      <antcall target="tck">
513        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
514      </antcall>      </antcall>
515    </target>    </target>
516    
517    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
518            depends="jar"            depends="jar"
519            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
520      <run-jtreg-tests      <run-jtreg-tests
# Line 487  Line 524 
524    </target>    </target>
525    
526    <target name="test"    <target name="test"
527            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
528            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
529    </target>    </target>
530    
# Line 520  Line 557 
557    
558    
559    <target name="configure-compiler">    <target name="configure-compiler">
560        <fail message="ant version too old">
561          <condition>
562            <not> <antversion atleast="1.9.1"/> </not>
563          </condition>
564        </fail>
565    
566      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
567    
# Line 659  Line 701 
701    
702      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
703        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
704          <manifest>
705            <attribute name="Built-By" value="${user.name}"/>
706            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
707          </manifest>
708      </jar>      </jar>
709    
710    </target>    </target>
711    
712    
713    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
714            depends="4jdk7jar"            depends="4jdk7jar"
715            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
716    
# Line 676  Line 722 
722          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
723          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
724          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
725            <exclude name="*10Test.java"/>
726          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
727          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
728          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 683  Line 730 
730          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
731          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
732          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
733            <exclude name="SubmissionPublisherTest.java"/>
734        </javac-elements>        </javac-elements>
735      </run-tck-tests>      </run-tck-tests>
736    </target>    </target>
737    
738    
739    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
740            depends="4jdk7compile"            depends="4jdk7compile"
741            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
742    
# Line 716  Line 764 
764      </junit>      </junit>
765    </target>    </target>
766    
767    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
768            depends="4jdk7jar"            depends="4jdk7jar"
769            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
770      <run-jtreg-tests      <run-jtreg-tests
# Line 727  Line 775 
775    
776    
777    <target name="4jdk7-test"    <target name="4jdk7-test"
778            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
779            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
780    </target>    </target>
781    
# Line 817  Line 865 
865    
866      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
867        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
868          <manifest>
869            <attribute name="Built-By" value="${user.name}"/>
870            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
871          </manifest>
872      </jar>      </jar>
873    
874    </target>    </target>
# Line 904  Line 956 
956    
957      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
958        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
959          <manifest>
960            <attribute name="Built-By" value="${user.name}"/>
961            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
962          </manifest>
963      </jar>      </jar>
964    
965    </target>    </target>
# Line 992  Line 1048 
1048    
1049      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1050        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1051          <manifest>
1052            <attribute name="Built-By" value="${user.name}"/>
1053            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1054          </manifest>
1055      </jar>      </jar>
1056    
1057    </target>    </target>
# Line 1107  Line 1167 
1167    
1168      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1169        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1170          <manifest>
1171            <attribute name="Built-By" value="${user.name}"/>
1172            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1173          </manifest>
1174      </jar>      </jar>
1175    
1176    </target>    </target>
# Line 1132  Line 1196 
1196    </target>    </target>
1197    
1198    
1199    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1200            depends="jsr166ejar">            depends="jsr166ejar">
1201    
1202      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1144  Line 1208 
1208        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1209    </target>    </target>
1210    
1211    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1212            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1213    
1214  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1215  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1216  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1217  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1218  <!--     </antcall> -->  <!--     </antcall> -->
1219    
1220      <antcall target="clean"/>      <antcall target="clean"/>
1221      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1222        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1223        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1224      </antcall>      </antcall>
1225    
1226      <antcall target="clean"/>      <antcall target="clean"/>
1227      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1228        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1229        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1230      </antcall>      </antcall>
# Line 1168  Line 1232 
1232    
1233    
1234    <target name="jsr166e-test"    <target name="jsr166e-test"
1235            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1236            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1237    </target>    </target>
1238    
Legend:
Removed from v.1.168  
changed lines
  Added in v.1.186
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27