diff options
| author | xdono <none@none> | 2009-05-07 10:30:49 -0700 |
|---|---|---|
| committer | xdono <none@none> | 2009-05-07 10:30:49 -0700 |
| commit | a75c6cd9c34a1baf1c865f61afc0acea2c974088 (patch) | |
| tree | e882fb9700f029c6e9214e8e8a45d4b31f2e84fb /make | |
| parent | 04775dfa128f8c4330e726803e1d2fede835c488 (diff) | |
| parent | bdc62398b2f2ba28e3a55156b9b7d7c992afca68 (diff) | |
| download | jdk8u_jaxws-a75c6cd9c34a1baf1c865f61afc0acea2c974088.tar.gz | |
Merge
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 2 | ||||
| -rw-r--r-- | make/build.xml | 9 | ||||
| -rw-r--r-- | make/jprt.properties | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/make/Makefile b/make/Makefile index 4eb3f8b3..19e293b5 100644 --- a/make/Makefile +++ b/make/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/build.xml b/make/build.xml index ba0c8ce2..e27bca54 100644 --- a/make/build.xml +++ b/make/build.xml @@ -78,6 +78,15 @@ <mkdir dir="${build.classes.dir}/META-INF/services"/> <copy todir="${build.classes.dir}/META-INF/services" file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/> + <copy todir="${build.classes.dir}/META-INF/services" + file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/> + <!-- copy jaxb sources files required for jaxb tool time --> + <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/> + <copy todir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"> + <fileset dir="${src.classes.dir}/com/sun/tools/internal/xjc/runtime" + includes="**/*.java" + excludes="**/*.package.html"/> + </copy> </target> <target name="-defs-pstrip"> diff --git a/make/jprt.properties b/make/jprt.properties index 26ffd61a..f75871de 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -32,13 +32,13 @@ solaris_sparc_5.10,\ solaris_sparcv9_5.10,\ solaris_i586_5.10,\ solaris_x64_5.10,\ -linux_i586,\ -linux_x64,\ +linux_i586_2.6,\ +linux_x64_2.6,\ windows_i586,\ windows_x64 # The different build flavors we want -jprt.build.flavors=product +jprt.build.flavors=product,fastdebug # Explicitly designate what the 32bit match is for the 64bit build jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 |