changeset 140:e7678aadc8e5

. Merge from main OpenJDK repository.
author glewis@misty.eyesbeyond.com
date Mon, 07 Sep 2009 10:52:10 -0700
parents 428565383a55 378f57273f09
children abcdb12e60a7
files
diffstat 7 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Jul 25 20:53:34 2009 -0700
+++ b/.hgtags	Mon Sep 07 10:52:10 2009 -0700
@@ -41,3 +41,8 @@
 269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
+c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
+e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
+82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
+175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
+4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
--- a/THIRD_PARTY_README	Sat Jul 25 20:53:34 2009 -0700
+++ b/THIRD_PARTY_README	Mon Sep 07 10:52:10 2009 -0700
@@ -32,7 +32,7 @@
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
--- a/make/Defs-internal.gmk	Sat Jul 25 20:53:34 2009 -0700
+++ b/make/Defs-internal.gmk	Mon Sep 07 10:52:10 2009 -0700
@@ -133,7 +133,11 @@
 
 # Do we build the source and openjdk binary plug bundles?
 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
-BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
+ifeq ($(SKIP_BUNDLES_BUILD), true)
+  BUNDLE_RULES_AVAILABLE := false
+else 
+  BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
+endif
 
 # Current things we do NOT build for OPENJDK
 ifdef OPENJDK
--- a/make/README.pre-components	Sat Jul 25 20:53:34 2009 -0700
+++ b/make/README.pre-components	Mon Sep 07 10:52:10 2009 -0700
@@ -18,7 +18,7 @@
   ALT_LANGTOOLS_DIST    The dist area from a langtools build to use, if provided
   ALT_OUTPUTDIR         Parent dir of build and dist directories, if provided
   VARIANT               If DBG, debug build, if OPT, optimized build
-  TARGET_CLASS_VERSION  The classfile version number (currently 5)
+  TARGET_CLASS_VERSION  The classfile version number (currently 7)
   ANT_HOME              Home of ant to use, if provided
   QUIET                 If defined, be quiet
   VERBOSE               If defined, be verbose
--- a/make/deploy-rules.gmk	Sat Jul 25 20:53:34 2009 -0700
+++ b/make/deploy-rules.gmk	Mon Sep 07 10:52:10 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2002-2009 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
--- a/make/jprt.properties	Sat Jul 25 20:53:34 2009 -0700
+++ b/make/jprt.properties	Mon Sep 07 10:52:10 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2009 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
--- a/make/sanity-rules.gmk	Sat Jul 25 20:53:34 2009 -0700
+++ b/make/sanity-rules.gmk	Mon Sep 07 10:52:10 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2001-2009 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