Merge
This commit is contained in:
commit
089a361c63
@ -4365,7 +4365,7 @@ VS_SDK_PLATFORM_NAME_2013=
|
||||
#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
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
@ -151,9 +151,19 @@ java.desktop_EXCLUDE_FILES += \
|
||||
|
||||
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
|
||||
|
@ -133,7 +133,7 @@ my.build.targets.default= \
|
||||
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 @@ my.test.target.set= \
|
||||
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 @@ my.build.targets.hotspot= \
|
||||
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 @@ my.test.targets.hotspot.linux.x64= \
|
||||
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 @@ my.make.rule.test.targets.hotspot.servertests= \
|
||||
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 @@ my.make.rule.test.targets.hotspot.internalvmtests= \
|
||||
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 @@ my.make.rule.test.targets.hotspot.reg.group= \
|
||||
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, \
|
||||
|
Loading…
x
Reference in New Issue
Block a user