Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
4a532e76
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看板
提交
4a532e76
编写于
8月 01, 2018
作者:
P
prr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8183979: Remove Kodak CMS (KCMS) code from Oracle JDK
Reviewed-by: serb, ihse
上级
5be5839a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
0 addition
and
115 deletion
+0
-115
make/CompileJavaClasses.gmk
make/CompileJavaClasses.gmk
+0
-4
make/CopyIntoClasses.gmk
make/CopyIntoClasses.gmk
+0
-10
make/lib/Awt2dLibraries.gmk
make/lib/Awt2dLibraries.gmk
+0
-53
make/mapfiles/libkcms/mapfile-vers
make/mapfiles/libkcms/mapfile-vers
+0
-47
make/profile-includes.txt
make/profile-includes.txt
+0
-1
未找到文件。
make/CompileJavaClasses.gmk
浏览文件 @
4a532e76
...
@@ -170,10 +170,6 @@ ifdef BUILD_HEADLESS_ONLY
...
@@ -170,10 +170,6 @@ ifdef BUILD_HEADLESS_ONLY
EXCLUDES += sun/applet
EXCLUDES += sun/applet
endif
endif
ifdef OPENJDK
EXCLUDES += sun/java2d/cmm/kcms
endif
# Used on windows and macosx
# Used on windows and macosx
ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
EXFILES += sun/awt/AWTCharset.java
EXFILES += sun/awt/AWTCharset.java
...
...
make/CopyIntoClasses.gmk
浏览文件 @
4a532e76
...
@@ -179,22 +179,12 @@ else
...
@@ -179,22 +179,12 @@ else
ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
endif
endif
ifndef OPENJDK
ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF
endif
SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
ifdef OPENJDK
ifdef OPENJDK
SRC_SERVICES_FILES := $(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
SRC_SERVICES_FILES := $(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
else
else
SRC_SERVICES_FILES := $(filter-out %sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
SRC_SERVICES_FILES := $(filter-out %sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), linux-sparc)
SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
else
SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
endif
endif
endif
# The number of services files are relatively few. If the increase in numbers, then
# The number of services files are relatively few. If the increase in numbers, then
...
...
make/lib/Awt2dLibraries.gmk
浏览文件 @
4a532e76
...
@@ -1088,59 +1088,6 @@ BUILD_LIBRARIES += $(BUILD_LIBJAWT)
...
@@ -1088,59 +1088,6 @@ BUILD_LIBRARIES += $(BUILD_LIBJAWT)
##########################################################################################
##########################################################################################
ifndef OPENJDK
BUILD_LIBKCMS_EXCLUDE_FILES :=
ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
else
BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
endif
BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
ifeq ($(OPENJDK_TARGET_OS), solaris)
# This particular library uses a feature called PIC_CODE_SMALL (on solaris)
# implement it like this...since it's only used here
BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
endif
$(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
LIBRARY := kcms, \
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
LANG := C, \
EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
OPTIMIZATION := LOW, \
CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
-DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
CFLAGS_linux := -Wno-missing-field-initializers, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux := -lc -lpthread, \
LDFLAGS_SUFFIX_solaris := -lc, \
LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=kcms.dll" \
-D "JDK_INTERNAL_NAME=kcms" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBKCMS)
endif
##########################################################################################
ifndef OPENJDK
ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), solaris)
ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64)
ifneq ($(OPENJDK_TARGET_CPU), x86_64)
...
...
make/mapfiles/libkcms/mapfile-vers
已删除
100644 → 0
浏览文件 @
5be5839a
#
# Copyright (c) 1997, 2013, 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
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# Define public interface.
SUNWprivate_1.1 {
global:
Java_sun_java2d_cmm_kcms_CMM_cmmGetTagSize;
Java_sun_java2d_cmm_kcms_CMM_cmmGetNumComponents;
Java_sun_java2d_cmm_kcms_CMM_cmmColorConvert;
Java_sun_java2d_cmm_kcms_CMM_cmmInit;
Java_sun_java2d_cmm_kcms_CMM_cmmCombineTransforms;
Java_sun_java2d_cmm_kcms_CMM_cmmGetTagData;
Java_sun_java2d_cmm_kcms_CMM_cmmSetTagData;
Java_sun_java2d_cmm_kcms_CMM_cmmGetProfileData;
Java_sun_java2d_cmm_kcms_CMM_cmmFreeProfile;
Java_sun_java2d_cmm_kcms_CMM_cmmTerminate;
Java_sun_java2d_cmm_kcms_CMM_cmmLoadProfile;
Java_sun_java2d_cmm_kcms_CMM_cmmGetTransform;
Java_sun_java2d_cmm_kcms_CMM_cmmFreeTransform;
Java_sun_java2d_cmm_kcms_CMM_cmmGetProfileSize;
local:
*;
};
make/profile-includes.txt
浏览文件 @
4a532e76
...
@@ -321,7 +321,6 @@ JRE_LIBRARIES := \
...
@@ -321,7 +321,6 @@ JRE_LIBRARIES := \
jpeg \
jpeg \
jsound \
jsound \
jsoundalsa \
jsoundalsa \
kcms \
mlib_image \
mlib_image \
splashscreen \
splashscreen \
t2k \
t2k \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录