Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorddehaven
Tue, 31 Mar 2015 16:17:14 -0700
changeset 29674 457b3ae3cecc
parent 29668 a15171ab2650 (current diff)
parent 29673 a4e2dbd7c777 (diff)
child 29675 1d3f03251645
child 29852 d47c58140b41
child 30079 c36983f542c8
child 30082 0f1cf539954d
child 30084 7ca82a207896
Merge
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions 
--- a/common/autoconf/generated-configure.sh	Tue Mar 31 11:13:08 2015 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Mar 31 16:17:14 2015 -0700
@@ -4365,7 +4365,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1427461839
+DATE_WHEN_GENERATED=1427843803
 
 ###############################################################################
 #
--- a/make/CompileJavaModules.gmk	Tue Mar 31 11:13:08 2015 -0700
+++ b/make/CompileJavaModules.gmk	Tue Mar 31 16:17:14 2015 -0700
@@ -151,9 +151,19 @@
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   # exclude all X11 on Mac.
-  java.desktop_EXCLUDES += sun/awt/X11
+  java.desktop_EXCLUDES += \
+      sun/awt/X11 \
+      sun/java2d/x11 \
+      sun/java2d/jules \
+      sun/java2d/xr \
+      com/sun/java/swing/plaf/gtk \
+      #
   java.desktop_EXCLUDE_FILES += \
-      $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/motif/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
       #
 else
   # TBD: figure out how to eliminate this long list
--- a/make/jprt.properties	Tue Mar 31 11:13:08 2015 -0700
+++ b/make/jprt.properties	Tue Mar 31 16:17:14 2015 -0700
@@ -133,7 +133,7 @@
     solaris_x64_5.11-{product|fastdebug},				\
     linux_i586_2.6-{product|fastdebug},					\
     linux_x64_2.6-{product|fastdebug},					\
-    macosx_x64_10.7-{product|fastdebug},				\
+    macosx_x64_10.9-{product|fastdebug},				\
     windows_i586_6.1-{product|fastdebug},				\
     windows_x64_6.1-{product|fastdebug}
 
@@ -143,7 +143,7 @@
     solaris_x64_5.11-product-c2-TESTNAME,				\
     linux_i586_2.6-product-{c1|c2}-TESTNAME,				\
     linux_x64_2.6-product-c2-TESTNAME,					\
-    macosx_x64_10.7-product-c2-TESTNAME,				\
+    macosx_x64_10.9-product-c2-TESTNAME,				\
     windows_i586_6.1-product-c1-TESTNAME,				\
     windows_x64_6.1-product-c2-TESTNAME
 
@@ -255,7 +255,7 @@
     solaris_x64_5.11-{product|fastdebug},				\
     linux_i586_2.6-{product|fastdebug},					\
     linux_x64_2.6-{product|fastdebug},			\
-    macosx_x64_10.7-{product|fastdebug},				\
+    macosx_x64_10.9-{product|fastdebug},				\
     windows_i586_6.1-{product|fastdebug},				\
     windows_x64_6.1-{product|fastdebug},			\
     solaris_x64_5.11-{debugOpen},					\
@@ -332,18 +332,18 @@
     linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
 
 my.test.targets.hotspot.macosx.x64=					\
-    macosx_x64_10.7-{product|fastdebug}-c2-jvm98,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-jvm98_nontiered,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-scimark,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered,	\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParOldGC
+    macosx_x64_10.9-{product|fastdebug}-c2-jvm98,			\
+    macosx_x64_10.9-{product|fastdebug}-c2-jvm98_nontiered,		\
+    macosx_x64_10.9-{product|fastdebug}-c2-scimark,			\
+    macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_SerialGC,		\
+    macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
+    macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS,		\
+    macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1,			\
+    macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
+    macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered,	\
+    macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC,		\
+    macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1,			\
+    macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC
 
 my.test.targets.hotspot.windows.i586=					\
     windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98,			\
@@ -418,7 +418,7 @@
   solaris_x64_5.11-*-c2-hotspot_servertest,				\
   linux_i586_2.6-*-c2-hotspot_servertest,				\
   linux_x64_2.6-*-c2-hotspot_servertest,				\
-  macosx_x64_10.7-*-c2-hotspot_servertest,				\
+  macosx_x64_10.9-*-c2-hotspot_servertest,				\
   windows_i586_6.1-*-c2-hotspot_servertest,				\
   windows_x64_6.1-*-c2-hotspot_servertest
 
@@ -427,7 +427,7 @@
   solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests,		\
   linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests,			\
   linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests,			\
-  macosx_x64_10.7-fastdebug-c2-hotspot_internalvmtests,			\
+  macosx_x64_10.9-fastdebug-c2-hotspot_internalvmtests,			\
   windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests,		\
   windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
 
@@ -436,7 +436,7 @@
   solaris_x64_5.11-fastdebug-c2-GROUP,					\
   linux_i586_2.6-fastdebug-c2-GROUP,					\
   linux_x64_2.6-fastdebug-c2-GROUP,					\
-  macosx_x64_10.7-fastdebug-c2-GROUP,					\
+  macosx_x64_10.9-fastdebug-c2-GROUP,					\
   windows_i586_6.1-fastdebug-c2-GROUP,					\
   windows_x64_6.1-fastdebug-c2-GROUP,					\
   linux_i586_2.6-fastdebug-c1-GROUP,					\
jdk-sandbox