Mercurial > hg > openjdk > jdk6 > jaxp
changeset 2:6f620e3fb4f8 jdk6-b00
6755277: All initial changes to jdk7 to create openjdk 6 build 0
Summary: Final b00 state (as defined by the source bundle)
Reviewed-by: darcy
author | ohair |
---|---|
date | Fri, 30 Jan 2009 16:10:58 -0800 |
parents | 9a56037f5348 |
children | d81fbeabba43 |
files | THIRD_PARTY_README make/jprt.properties |
diffstat | 2 files changed, 94 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/THIRD_PARTY_README Fri Jan 30 16:02:08 2009 -0800 +++ b/THIRD_PARTY_README Fri Jan 30 16:10:58 2009 -0800 @@ -1431,6 +1431,63 @@ END src/solaris/native/sun/awt/HPkeysym.h ****************************************************** +BEGIN src/solaris/native/sun/awt/Xinerama.c +/***************************************************************** +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. +******************************************************************/ +END src/solaris/native/sun/awt/Xinerama.c +****************************************************** +BEGIN src/solaris/native/sun/awt/Xinerama.h +/* +Copyright (C) 1994-2001 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Soft- +ware"), to deal in the Software without restriction, including without +limitation the rights to use, copy, modify, merge, publish, distribute, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, provided that the above copyright +notice(s) and this permission notice appear in all copies of the Soft- +ware and that both the above copyright notice(s) and this permission +notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- +ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY +RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN +THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE- +QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR- +MANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization of +the copyright holder. +*/ +END src/solaris/native/sun/awt/Xinerama.h ****************************************************** BEGIN src/solaris/native/sun/awt/Xrandr.h /* @@ -1562,6 +1619,33 @@ AND src/solaris/native/sun/awt/wsutils.h ***************************************************************** +BEGIN src/solaris/native/sun/awt/panoramiXext.h +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. + +END src/solaris/native/sun/awt/panoramiXext.h +****************************************************** + BEGIN src/solaris/native/sun/awt/randr.h *
--- a/make/jprt.properties Fri Jan 30 16:02:08 2009 -0800 +++ b/make/jprt.properties Fri Jan 30 16:10:58 2009 -0800 @@ -24,13 +24,13 @@ # # Properties for jprt -jprt.tools.default.release=jdk1.7.0 +jprt.tools.default.release=openjdk6 # Specific platform list jprt.build.platforms=\ -solaris_sparc_5.10,\ -solaris_sparcv9_5.10,\ -solaris_i586_5.10,\ +solaris_sparc_5.8,\ +solaris_sparcv9_5.8,\ +solaris_i586_5.8,\ solaris_x64_5.10,\ linux_i586,\ linux_x64,\ @@ -41,10 +41,12 @@ jprt.build.flavors=product # Explicitly designate what the 32bit match is for the 64bit build -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 -jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10 +jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_x64.build.platform.match32=solaris_i586_5.8 +jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8 +jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8 # Standard list of jprt test targets for this workspace jprt.test.targets=