ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.173 by jsr166, Thu Sep 3 01:24:31 2015 UTC vs.
Revision 1.178 by jsr166, Sun Sep 13 02:09:35 2015 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless">
3  
4    <description>
5   ------------------------------------------------------------------------------
# Line 38 | Line 39
39      </java>
40    </target>
41  
42 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43  
44    <!-- User-specific settings -->
45    <property file="user.properties"/>
# Line 52 | Line 54
54  
55    <!-- Tck options; see JSR166TestCase.java
56     To profile a single tck test class:
57 <   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
57 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58     To stress test a single tck test class:
59 <   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
59 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60    -->
61    <property name="jsr166.profileTests"     value="false"/>
62    <property name="jsr166.profileThreshold" value="100"/>
# Line 93 | Line 95
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
98 >    <available property="jdk@{v}.have.java.base"
99 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101 >      if:set="jdk@{v}.have.java.base"/>
102 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103 >      unless:set="jdk@{v}.have.java.base"/>
104      <local name="boot.jar.dir"/>
105      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106      <path id="bootclasspath@{v}">
# Line 237 | Line 244
244          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
245          <jvmarg line="@{jvmflags}"/>
246  
247 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
247 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250          </syspropertyset>
# Line 277 | Line 284
284    </fileset>
285  
286    <macrodef name="run-jtreg-tests">
287 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
287 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
288      <attribute name="source" default="7"/>
289      <attribute name="target"/>
290      <attribute name="workdir"/>
# Line 358 | Line 365
365  
366      <jar destfile="${product.jar}">
367        <fileset dir="${build.classes.dir}"/>
368 +      <manifest>
369 +      <attribute name="Built-By" value="${user.name}"/>
370 +      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
371 +      </manifest>
372      </jar>
373    </target>
374  
# Line 416 | Line 427
427        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>
429        <exclude name="**/SuperfluousAbstract.java"/>
430 +      <manifest>
431 +      <attribute name="Built-By" value="${user.name}"/>
432 +      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
433 +      </manifest>
434      </jar>
435    </target>
436  
# Line 447 | Line 462
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>
464  
465 <  <target name="tck" depends="test-tck" description="alias for test-tck"/>
451 <  <target name="test-tck"
465 >  <target name="tck"
466            depends="jar"
467            description="Runs tck tests for main directly">
468  
# Line 458 | Line 472
472        classes="${product.jar}"/>
473    </target>
474  
475 <  <target name="test-tck-parallelism-1"
476 <          description="Runs test-tck with given common pool parallelism">
477 <    <antcall target="test-tck">
475 >  <target name="tck-parallelism-1"
476 >          description="Runs tck with given common pool parallelism">
477 >    <antcall target="tck">
478        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479      </antcall>
480    </target>
481  
482 <  <target name="test-tck-parallelism-0"
483 <          description="Runs test-tck with given common pool parallelism">
484 <    <antcall target="test-tck">
482 >  <target name="tck-parallelism-0"
483 >          description="Runs tck with given common pool parallelism">
484 >    <antcall target="tck">
485        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486      </antcall>
487    </target>
488  
489 <  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
476 <  <target name="test-jtreg"
489 >  <target name="jtreg"
490            depends="jar"
491            description="Runs jtreg tests for main using the jtreg ant task">
492      <run-jtreg-tests
# Line 483 | Line 496
496    </target>
497  
498    <target name="test"
499 <          depends="test-tck, test-tck-parallelism-1, test-jtreg"
499 >          depends="tck, tck-parallelism-1, jtreg"
500            description="Runs tck and jtreg tests for main">
501    </target>
502  
# Line 655 | Line 668
668  
669      <jar destfile="${4jdk7product.jar}">
670        <fileset dir="${build.4jdk7.classes.dir}"/>
671 +      <manifest>
672 +      <attribute name="Built-By" value="${user.name}"/>
673 +      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
674 +      </manifest>
675      </jar>
676  
677    </target>
678  
679  
680 <  <target name="4jdk7-test-tck"
680 >  <target name="4jdk7-tck"
681            depends="4jdk7jar"
682            description="Runs tck tests for jsr166-4jdk7 directly">
683  
# Line 672 | Line 689
689          <!-- JDK8+ test classes -->
690          <exclude name="*8Test.java"/>
691          <exclude name="*9Test.java"/>
692 +        <exclude name="*10Test.java"/>
693          <exclude name="DoubleAccumulatorTest.java"/>
694          <exclude name="DoubleAdderTest.java"/>
695          <exclude name="LongAccumulatorTest.java"/>
# Line 679 | Line 697
697          <exclude name="CompletableFutureTest.java"/>
698          <exclude name="SplittableRandomTest.java"/>
699          <exclude name="StampedLockTest.java"/>
700 +        <exclude name="SubmissionPublisherTest.java"/>
701        </javac-elements>
702      </run-tck-tests>
703    </target>
704  
705  
706 <  <target name="4jdk7-test-tck-junit"
706 >  <target name="4jdk7-tck-junit"
707            depends="4jdk7compile"
708            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
709  
# Line 712 | Line 731
731      </junit>
732    </target>
733  
734 <  <target name="4jdk7-test-jtreg"
734 >  <target name="4jdk7-jtreg"
735            depends="4jdk7jar"
736            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
737      <run-jtreg-tests
# Line 723 | Line 742
742  
743  
744    <target name="4jdk7-test"
745 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
745 >          depends="4jdk7-tck, 4jdk7-jtreg"
746            description="Runs tck and jtreg tests for jsr166-4jdk7">
747    </target>
748  
# Line 813 | Line 832
832  
833      <jar destfile="${jsr166x.jar}">
834        <fileset dir="${build.jsr166x.classes.dir}"/>
835 +      <manifest>
836 +      <attribute name="Built-By" value="${user.name}"/>
837 +      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
838 +      </manifest>
839      </jar>
840  
841    </target>
# Line 900 | Line 923
923  
924      <jar destfile="${jsr166y.jar}" index="true">
925        <fileset dir="${build.jsr166y.classes.dir}"/>
926 +      <manifest>
927 +      <attribute name="Built-By" value="${user.name}"/>
928 +      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929 +      </manifest>
930      </jar>
931  
932    </target>
# Line 988 | Line 1015
1015  
1016      <jar destfile="${extra166y.jar}" index="true">
1017        <fileset dir="${build.extra166y.classes.dir}"/>
1018 +      <manifest>
1019 +      <attribute name="Built-By" value="${user.name}"/>
1020 +      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1021 +      </manifest>
1022      </jar>
1023  
1024    </target>
# Line 1103 | Line 1134
1134  
1135      <jar destfile="${jsr166e.jar}" index="true">
1136        <fileset dir="${build.jsr166e.classes.dir}"/>
1137 +      <manifest>
1138 +      <attribute name="Built-By" value="${user.name}"/>
1139 +      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1140 +      </manifest>
1141      </jar>
1142  
1143    </target>
# Line 1128 | Line 1163
1163    </target>
1164  
1165  
1166 <  <target name="jsr166e-test-tck-one-java-version"
1166 >  <target name="jsr166e-tck-one-java-version"
1167            depends="jsr166ejar">
1168  
1169      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1140 | Line 1175
1175        classes="${jsr166e.jar}"/>
1176    </target>
1177  
1178 <  <target name="jsr166e-test-tck"
1178 >  <target name="jsr166e-tck"
1179            description="Runs tck tests for jsr166e for multiple java versions">
1180  
1181   <!--     <antcall target="clean"/> -->
1182 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1182 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1183   <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1184   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1185   <!--     </antcall> -->
1186  
1187      <antcall target="clean"/>
1188 <    <antcall target="jsr166e-test-tck-one-java-version">
1188 >    <antcall target="jsr166e-tck-one-java-version">
1189        <param name="build.jsr166e.java.version" value="7"/>
1190        <param name="build.jsr166e.javac" value="${javac7}"/>
1191      </antcall>
1192  
1193      <antcall target="clean"/>
1194 <    <antcall target="jsr166e-test-tck-one-java-version">
1194 >    <antcall target="jsr166e-tck-one-java-version">
1195        <param name="build.jsr166e.java.version" value="6"/>
1196        <param name="build.jsr166e.javac" value="${javac6}"/>
1197      </antcall>
# Line 1164 | Line 1199
1199  
1200  
1201    <target name="jsr166e-test"
1202 <          depends="jsr166e-test-tck"
1202 >          depends="jsr166e-tck"
1203            description="Runs all tests for jsr166e">
1204    </target>
1205  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines