Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
d707f8b7
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
d707f8b7
编写于
1月 27, 2015
作者:
A
amurillo
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
ba0f1ebb
b1bb45d3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
31 deletion
+7
-31
make/lib/Awt2dLibraries.gmk
make/lib/Awt2dLibraries.gmk
+3
-18
make/lib/PlatformLibraries.gmk
make/lib/PlatformLibraries.gmk
+3
-12
src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
.../classes/sun/management/jmxremote/ConnectorBootstrap.java
+1
-1
未找到文件。
make/lib/Awt2dLibraries.gmk
浏览文件 @
d707f8b7
...
@@ -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, \
...
...
make/lib/PlatformLibraries.gmk
浏览文件 @
d707f8b7
...
@@ -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 \
...
...
src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
浏览文件 @
d707f8b7
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录