Merge jdk8-b21

Wed, 11 Jan 2012 16:12:55 -0800

author
katleman
date
Wed, 11 Jan 2012 16:12:55 -0800
changeset 269
c266cab0e3ff
parent 267
dc2ee8b87884
parent 268
e67d51254533
child 270
8d3df89b0f2d

Merge

     1.1 --- a/build-defs.xml	Thu Jan 05 08:42:37 2012 -0800
     1.2 +++ b/build-defs.xml	Wed Jan 11 16:12:55 2012 -0800
     1.3 @@ -96,6 +96,10 @@
     1.4          </replaceregexp>
     1.5  
     1.6          <mkdir dir="${build.classes.dir}/META-INF/services"/>
     1.7 +        <copy todir="${build.classes.dir}/META-INF"
     1.8 +              file="${secondary.src.dir}/META-INF/mailcap.default"/>
     1.9 +        <copy todir="${build.classes.dir}/META-INF"
    1.10 +              file="${secondary.src.dir}/META-INF/mimetypes.default"/>
    1.11          <copy todir="${build.classes.dir}/META-INF/services"
    1.12                file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
    1.13          <copy todir="${build.classes.dir}/META-INF/services"
    1.14 @@ -118,6 +122,7 @@
    1.15      <!-- Set up source to use drop.dir. -->
    1.16      <target name="-use-drop" depends="-set-props">
    1.17          <property name="primary.src.dir" value="${jaxws_src.src.dir}"/>
    1.18 +        <property name="secondary.src.dir" value="${jaf_src.src.dir}"/>
    1.19          <path id="src.dir.id">
    1.20              <pathelement path="${primary.src.dir}"/>
    1.21              <pathelement path="${jaf_src.src.dir}"/>

mercurial