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

Diff of /jsr166/build.xml

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

revision 1.170 by jsr166, Wed Sep 2 03:53:43 2015 UTC revision 1.182 by jsr166, Sun Sep 13 17:46:07 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 52  Line 59 
59    
60    <!-- Tck options; see JSR166TestCase.java    <!-- Tck options; see JSR166TestCase.java
61     To profile a single tck test class:     To profile a single tck test class:
62     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
63     To stress test a single tck test class:     To stress test a single tck test class:
64     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
65    -->    -->
66    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
67    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
# Line 93  Line 100 
100      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
101      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
102      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
103      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <local name="have.java.base"/>
104        <available property="have.java.base"
105          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
106        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
107          if:set="have.java.base"/>
108        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
109          unless:set="have.java.base"/>
110        <local name="modules"/>
111        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
112      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
113      <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"/>
114      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
115        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
116        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
117        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
118        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
119        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
120      </path>      </path>
121      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
122      </sequential>      </sequential>
123    </macrodef>    </macrodef>
124    
# Line 129  Line 144 
144    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
145    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
146    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
147    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
148      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
149      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
152    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
153    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 201  Line 219 
219      <attribute name="classes"/>      <attribute name="classes"/>
220      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
221      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
222    
223      <sequential>      <sequential>
224    
225        <local name="modules"/>
226        <condition property="modules">
227          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
228        </condition>
229    
230      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
231    
232      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 221  Line 245 
245        <include name="*.java"/>        <include name="*.java"/>
246        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
247        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
248        <compilerarg value="-Xbootclasspath/p:@{classes}"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
249          <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
250        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
251        <javac-elements/>        <javac-elements/>
252    
# Line 231  Line 256 
256            failonerror="true"            failonerror="true"
257            jvm="${java@{target}}"            jvm="${java@{target}}"
258            fork="true">            fork="true">
259          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
260            <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
261          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
262    
263          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
264          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
265            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
266          </syspropertyset>          </syspropertyset>
# Line 252  Line 278 
278    </macrodef>    </macrodef>
279    
280    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
281    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
282      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
283        <include name="**/*.java"/>        <include name="**/*.java"/>
284      </patternset>      </patternset>
285    </fileset>    </fileset>
286    
287    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
288      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
289        <include name="**/*.java"/>        <include name="**/*.java"/>
290        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
291        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
292        <exclude name="util/WeakHashMap/GCDuringIteration.java"/>        <exclude name="**/GCDuringIteration.java"/>
293      </patternset>      </patternset>
294    </fileset>    </fileset>
295    
296    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
297      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
298        <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="**/CompletableFuture/**/*.java"/>  
       <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>  
       <exclude name="**/StampedLock/**/*.java"/>  
       <exclude name="**/AtomicReferenceTest.java"/>  
       <exclude name="util/concurrent/atomic/Serial.java"/>  
299      </patternset>      </patternset>
300    </fileset>    </fileset>
301    
302    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
303      <!-- 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}"/>  
304      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
305      <attribute name="target"/>      <attribute name="target"/>
306      <attribute name="workdir"/>      <attribute name="workdir"/>
307      <attribute name="classes"/>      <attribute name="classes"/>
308      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
309    
310      <sequential>      <sequential>
311    
312        <local name="modules"/>
313        <condition property="modules">
314          <available file="${jdk@{target}.home}/jmods" type="dir"/>
315        </condition>
316    
317      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
318      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
319      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
320      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
321      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
322             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
323             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
324             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
325        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
326        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
327          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
328        <arg value="-agentvm"/>        <arg value="-agentvm"/>
329        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
330        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 332  Line 357 
357            depends="configure-compiler"            depends="configure-compiler"
358            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
359    
360      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
361        <condition property="modules">
362          <and>
363            <available file="${jdk9.home}/jmods" type="dir"/>
364            <equals arg1="9" arg2="${build.main.java.version}"/>
365          </and>
366        </condition>
367    
368        <local name="destdir"/>
369        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
370        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
371    
372        <mkdir dir="${destdir}"/>
373    
374      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
375             destdir="${build.classes.dir}"             destdir="${destdir}"
376             debug="${build.debug}"             debug="${build.debug}"
377             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
378             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 346  Line 383 
383             fork="true">             fork="true">
384    
385        <include name="**/*.java"/>        <include name="**/*.java"/>
386          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
387        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
388        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
389        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 364  Line 402 
402    
403      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
404        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
405          <manifest>
406            <attribute name="Built-By" value="${user.name}"/>
407            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
408          </manifest>
409      </jar>      </jar>
410    </target>    </target>
411    
# Line 391  Line 433 
433        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
434        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
435        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
436    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
437        <arg value="-tag"/>        <arg value="-tag"/>
438        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
439        <arg value="-tag"/>        <arg value="-tag"/>
# Line 422  Line 465 
465        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
466        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
467        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
468          <manifest>
469            <attribute name="Built-By" value="${user.name}"/>
470            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
471          </manifest>
472      </jar>      </jar>
473    </target>    </target>
474    
# Line 453  Line 500 
500      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
501    </target>    </target>
502    
503    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
504            depends="jar"            depends="jar"
505            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
506    
# Line 464  Line 510 
510        classes="${product.jar}"/>        classes="${product.jar}"/>
511    </target>    </target>
512    
513    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
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="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
517      </antcall>      </antcall>
518    </target>    </target>
519    
520    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
521            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
522      <antcall target="test-tck">      <antcall target="tck">
523        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
524      </antcall>      </antcall>
525    </target>    </target>
526    
527    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
528            depends="jar"            depends="jar"
529            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
530      <run-jtreg-tests      <run-jtreg-tests
# Line 489  Line 534 
534    </target>    </target>
535    
536    <target name="test"    <target name="test"
537            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
538            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
539    </target>    </target>
540    
# Line 522  Line 567 
567    
568    
569    <target name="configure-compiler">    <target name="configure-compiler">
570        <fail message="ant version too old">
571          <condition>
572            <not> <antversion atleast="1.9.1"/> </not>
573          </condition>
574        </fail>
575    
576      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
577    
# Line 661  Line 711 
711    
712      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
713        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
714          <manifest>
715            <attribute name="Built-By" value="${user.name}"/>
716            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
717          </manifest>
718      </jar>      </jar>
719    
720    </target>    </target>
721    
722    
723    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
724            depends="4jdk7jar"            depends="4jdk7jar"
725            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
726    
# Line 678  Line 732 
732          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
733          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
734          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
735            <exclude name="*10Test.java"/>
736          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
737          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
738          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 685  Line 740 
740          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
741          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
742          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
743            <exclude name="SubmissionPublisherTest.java"/>
744        </javac-elements>        </javac-elements>
745      </run-tck-tests>      </run-tck-tests>
746    </target>    </target>
747    
748    
749    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
750            depends="4jdk7compile"            depends="4jdk7compile"
751            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
752    
# Line 718  Line 774 
774      </junit>      </junit>
775    </target>    </target>
776    
777    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
778            depends="4jdk7jar"            depends="4jdk7jar"
779            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
780      <run-jtreg-tests      <run-jtreg-tests
# Line 729  Line 785 
785    
786    
787    <target name="4jdk7-test"    <target name="4jdk7-test"
788            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
789            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
790    </target>    </target>
791    
# Line 819  Line 875 
875    
876      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
877        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
878          <manifest>
879            <attribute name="Built-By" value="${user.name}"/>
880            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
881          </manifest>
882      </jar>      </jar>
883    
884    </target>    </target>
# Line 906  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 994  Line 1058 
1058    
1059      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1060        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1061          <manifest>
1062            <attribute name="Built-By" value="${user.name}"/>
1063            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1064          </manifest>
1065      </jar>      </jar>
1066    
1067    </target>    </target>
# Line 1109  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 1134  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 1146  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 1170  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.170  
changed lines
  Added in v.1.182

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