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

Diff of /jsr166/build.xml

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

revision 1.175 by jsr166, Fri Sep 4 19:37:34 2015 UTC revision 1.180 by jsr166, Sun Sep 13 03:41: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 38  Line 39 
39      </java>      </java>
40    </target>    </target>
41    
42      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43    
44    <!-- User-specific settings -->    <!-- User-specific settings -->
45    <property file="user.properties"/>    <property file="user.properties"/>
# Line 93  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <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"/>      <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"/>      <local name="boot.jar.dir"/>
105      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}">
# Line 358  Line 365 
365    
366      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
367        <fileset dir="${build.classes.dir}"/>        <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>      </jar>
373    </target>    </target>
374    
# Line 416  Line 427 
427        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
429        <exclude name="**/SuperfluousAbstract.java"/>        <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>      </jar>
435    </target>    </target>
436    
# Line 514  Line 529 
529    
530    
531    <target name="configure-compiler">    <target name="configure-compiler">
532        <fail message="ant version too old">
533          <condition>
534            <not> <antversion atleast="1.9.1"/> </not>
535          </condition>
536        </fail>
537    
538      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
539    
# Line 653  Line 673 
673    
674      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
675        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
676          <manifest>
677            <attribute name="Built-By" value="${user.name}"/>
678            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
679          </manifest>
680      </jar>      </jar>
681    
682    </target>    </target>
# Line 670  Line 694 
694          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
695          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
696          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
697            <exclude name="*10Test.java"/>
698          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
699          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
700          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 677  Line 702 
702          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
703          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
704          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
705            <exclude name="SubmissionPublisherTest.java"/>
706        </javac-elements>        </javac-elements>
707      </run-tck-tests>      </run-tck-tests>
708    </target>    </target>
# Line 811  Line 837 
837    
838      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
839        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
840          <manifest>
841            <attribute name="Built-By" value="${user.name}"/>
842            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
843          </manifest>
844      </jar>      </jar>
845    
846    </target>    </target>
# Line 898  Line 928 
928    
929      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
930        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
931          <manifest>
932            <attribute name="Built-By" value="${user.name}"/>
933            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934          </manifest>
935      </jar>      </jar>
936    
937    </target>    </target>
# Line 986  Line 1020 
1020    
1021      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1022        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1023          <manifest>
1024            <attribute name="Built-By" value="${user.name}"/>
1025            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1026          </manifest>
1027      </jar>      </jar>
1028    
1029    </target>    </target>
# Line 1101  Line 1139 
1139    
1140      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1141        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1142          <manifest>
1143            <attribute name="Built-By" value="${user.name}"/>
1144            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1145          </manifest>
1146      </jar>      </jar>
1147    
1148    </target>    </target>

Legend:
Removed from v.1.175  
changed lines
  Added in v.1.180

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