Mercurial > hg > openjdk > aarch64-port > jaxws
changeset 268:c266cab0e3ff jdk8-b21
Merge
author | katleman |
---|---|
date | Wed, 11 Jan 2012 16:12:55 -0800 |
parents | dc2ee8b87884 (current diff) e67d51254533 (diff) |
children | 8d3df89b0f2d |
files | |
diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/build-defs.xml Thu Jan 05 08:42:37 2012 -0800 +++ b/build-defs.xml Wed Jan 11 16:12:55 2012 -0800 @@ -96,6 +96,10 @@ </replaceregexp> <mkdir dir="${build.classes.dir}/META-INF/services"/> + <copy todir="${build.classes.dir}/META-INF" + file="${secondary.src.dir}/META-INF/mailcap.default"/> + <copy todir="${build.classes.dir}/META-INF" + file="${secondary.src.dir}/META-INF/mimetypes.default"/> <copy todir="${build.classes.dir}/META-INF/services" file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/> <copy todir="${build.classes.dir}/META-INF/services" @@ -118,6 +122,7 @@ <!-- Set up source to use drop.dir. --> <target name="-use-drop" depends="-set-props"> <property name="primary.src.dir" value="${jaxws_src.src.dir}"/> + <property name="secondary.src.dir" value="${jaf_src.src.dir}"/> <path id="src.dir.id"> <pathelement path="${primary.src.dir}"/> <pathelement path="${jaf_src.src.dir}"/>