提交 d707f8b7 编写于 作者: A amurillo

Merge

...@@ -319,7 +319,6 @@ endif ...@@ -319,7 +319,6 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_FILES += awt_LoadLibrary.c LIBAWT_FILES += awt_LoadLibrary.c
LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
endif endif
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
...@@ -485,7 +484,6 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \ ...@@ -485,7 +484,6 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \ LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
-framework Cocoa \ -framework Cocoa \
-framework OpenGL \ -framework OpenGL \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-framework ApplicationServices \ -framework ApplicationServices \
...@@ -1120,12 +1118,6 @@ ifeq ($(BUILD_HEADLESS), true) ...@@ -1120,12 +1118,6 @@ ifeq ($(BUILD_HEADLESS), true)
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
$(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_HEADLESS_CFLAGS += \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
endif
LIBAWT_HEADLESS_FILES := \ LIBAWT_HEADLESS_FILES := \
awt_Font.c \ awt_Font.c \
HeadlessToolkit.c \ HeadlessToolkit.c \
...@@ -1217,8 +1209,7 @@ ifndef BUILD_HEADLESS_ONLY ...@@ -1217,8 +1209,7 @@ ifndef BUILD_HEADLESS_ONLY
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \ LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
$(LIBSPLASHSCREEN_CFLAGS) \ $(LIBSPLASHSCREEN_CFLAGS)
-F/System/Library/Frameworks/JavaVM.framework/Frameworks
LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
...@@ -1250,7 +1241,6 @@ ifndef BUILD_HEADLESS_ONLY ...@@ -1250,7 +1241,6 @@ ifndef BUILD_HEADLESS_ONLY
-framework ApplicationServices \ -framework ApplicationServices \
-framework Foundation \ -framework Foundation \
-framework Cocoa \ -framework Cocoa \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation -framework JavaNativeFoundation
else ifeq ($(OPENJDK_TARGET_OS), windows) else ifeq ($(OPENJDK_TARGET_OS), windows)
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
...@@ -1436,9 +1426,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -1436,9 +1426,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS := $(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \ LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
...@@ -1449,7 +1437,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -1449,7 +1437,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
-framework Cocoa \ -framework Cocoa \
-framework Security \ -framework Security \
-framework ExceptionHandling \ -framework ExceptionHandling \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-framework OpenGL \ -framework OpenGL \
...@@ -1482,8 +1469,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -1482,8 +1469,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
CFLAGS := $(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \ -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-I$(JDK_TOPDIR)/src/macosx/native/sun/awt \ -I$(JDK_TOPDIR)/src/macosx/native/sun/awt, \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
LDFLAGS := $(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN) \
-Xlinker -rpath -Xlinker @loader_path, \ -Xlinker -rpath -Xlinker @loader_path, \
...@@ -1491,7 +1477,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -1491,7 +1477,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
-framework Cocoa \ -framework Cocoa \
-framework Carbon \ -framework Carbon \
-framework ApplicationServices \ -framework ApplicationServices \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-ljava -ljvm, \ -ljava -ljvm, \
......
...@@ -32,14 +32,11 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -32,14 +32,11 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
LANG := C, \ LANG := C, \
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \ -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS := $(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX := -framework Cocoa \ LDFLAGS_SUFFIX := -framework Cocoa \
-framework Carbon \ -framework Carbon \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
$(LDFLAGS_JDKLIB_SUFFIX), \ $(LDFLAGS_JDKLIB_SUFFIX), \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
...@@ -63,9 +60,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -63,9 +60,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \ -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp, \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS := $(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_macosx := \ LDFLAGS_SUFFIX_macosx := \
...@@ -76,7 +71,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -76,7 +71,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
-framework Cocoa \ -framework Cocoa \
-framework Security \ -framework Security \
-framework ExceptionHandling \ -framework ExceptionHandling \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-framework OpenGL \ -framework OpenGL \
...@@ -108,16 +102,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -108,16 +102,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \ $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS := $(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_macosx := \ LDFLAGS_SUFFIX_macosx := \
-losxapp \ -losxapp \
-framework Cocoa \ -framework Cocoa \
-framework ApplicationServices \ -framework ApplicationServices \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-framework Security \ -framework Security \
......
...@@ -767,7 +767,7 @@ public final class ConnectorBootstrap { ...@@ -767,7 +767,7 @@ public final class ConnectorBootstrap {
JMXConnectorServerFactory.newJMXConnectorServer(url, env, mbs); JMXConnectorServerFactory.newJMXConnectorServer(url, env, mbs);
connServer.start(); connServer.start();
} catch (IOException e) { } catch (IOException e) {
if (connServer == null) { if (connServer == null || connServer.getAddress() == null) {
throw new AgentConfigurationError(CONNECTOR_SERVER_IO_ERROR, throw new AgentConfigurationError(CONNECTOR_SERVER_IO_ERROR,
e, url.toString()); e, url.toString());
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册