Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk

changeset 7294:1fd682e7110b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Mon, 03 Jun 2013 16:09:43 -0700
parents f4e2a70260cf (current diff) 3c08c9ebd1fb (diff)
children 25cf25fb8c68
files
diffstat 22 files changed, 33 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 03 13:20:46 2013 -0700
+++ b/.hgtags	Mon Jun 03 16:09:43 2013 -0700
@@ -212,3 +212,5 @@
 8dbb4b159e04de3c447c9242c70505e71f8624c7 jdk8-b88
 845025546e35519fbb8970e79fc2a834063a5e19 jdk8-b89
 c63eda8f63008a4398d2c22ac8d72f7fef6f9238 jdk8-b90
+169451cf0cc53bde5af24f9820ea3f35ec4b4df4 jdk8-b91
+a2a2a91075ad85becbe10a39d7fd04ef9bea8df5 jdk8-b92
--- a/makefiles/CompileLaunchers.gmk	Mon Jun 03 13:20:46 2013 -0700
+++ b/makefiles/CompileLaunchers.gmk	Mon Jun 03 16:09:43 2013 -0700
@@ -472,6 +472,7 @@
 			  -D "JDK_FNAME=unpack200.exe" \
 			  -D "JDK_INTERNAL_NAME=unpack200" \
 			  -D "JDK_FTYPE=0x1L",\
+	        DEBUG_SYMBOLS:=true,\
 		MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
 
 ifeq ($(OPENJDK_TARGET_OS),windows)
@@ -555,6 +556,7 @@
 			 $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\
 		OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\
+		DEBUG_SYMBOLS:=true,\
 		PROGRAM:=jexec))
 
 	BUILD_LAUNCHERS += $(BUILD_JEXEC)
--- a/makefiles/GensrcSwing.gmk	Mon Jun 03 13:20:46 2013 -0700
+++ b/makefiles/GensrcSwing.gmk	Mon Jun 03 16:09:43 2013 -0700
@@ -68,10 +68,17 @@
 # Dummy variable so far, in the old build system it was false by default
 SWINGBEAN_DEBUG_FLAG = false
 # GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses
-$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS)
+# LocaleDataMetaInfo needs to be generated before running this to avoid confusing errors
+# in the build log.
+$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
+		$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java \
+		$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS) \
+		| $(GENSRC_LOCALEDATAMETAINFO)
 	$(ECHO) Generating beaninfo
 	$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
-	$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) -doclet GenDocletBeanInfo \
+	$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \
+	-sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \
+	 -doclet GenDocletBeanInfo \
 	-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
 	-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
 	-XDignore.symbol.file=true \
--- a/makefiles/Images.gmk	Mon Jun 03 13:20:46 2013 -0700
+++ b/makefiles/Images.gmk	Mon Jun 03 16:09:43 2013 -0700
@@ -352,11 +352,8 @@
         JDK_MAN_PAGES += jvisualvm.1
     endif
 
-    ifndef OPENJDK
-        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src/closed
-    else
-        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src
-    endif
+    # This variable is potentially overridden in the closed makefile.
+    MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
 
     ifeq ($(OPENJDK_TARGET_OS), linux)
         MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/linux/doc
--- a/test/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/MethodReferenceTestInstanceMethod.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/MethodReferenceTestInstanceMethod.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/MethodReferenceTestKinds.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/MethodReferenceTestKinds.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/MethodReferenceTestSueCase1.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/MethodReferenceTestSueCase1.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/MethodReferenceTestSueCase2.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/MethodReferenceTestSueCase2.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/MethodReferenceTestSueCase4.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/MethodReferenceTestSueCase4.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/AttributeInjector.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/AttributeInjector.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/ClassFile.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/ClassFile.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/ClassFilePreprocessor.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/ClassFilePreprocessor.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/ClassToInterfaceConverter.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/ClassToInterfaceConverter.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/Compiler.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/Compiler.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/DirectedClassLoader.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/DirectedClassLoader.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/SourceModel.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/SourceModel.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/separate/TestHarness.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/separate/TestHarness.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/vm/DefaultMethodRegressionTests.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/vm/DefaultMethodRegressionTests.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/vm/DefaultMethodsTest.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/vm/DefaultMethodsTest.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/jdk/lambda/vm/InterfaceAccessFlagsTest.java	Mon Jun 03 13:20:46 2013 -0700
+++ b/test/jdk/lambda/vm/InterfaceAccessFlagsTest.java	Mon Jun 03 16:09:43 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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