Index: source/data/Makefile.in |
diff --git a/source/data/Makefile.in b/source/data/Makefile.in |
index 88e3c350af04b78cc0f9d7f27a5c9239aab18fa2..9bc96cc7c045b7b1f97f5fe9bccd5308045100fb 100644 |
--- a/source/data/Makefile.in |
+++ b/source/data/Makefile.in |
@@ -1,5 +1,5 @@ |
## Makefile.in for ICU data |
-## Copyright (c) 1999-2014, International Business Machines Corporation and |
+## Copyright (c) 1999-2015, International Business Machines Corporation and |
## others. All Rights Reserved. |
## Source directory information |
@@ -152,7 +152,7 @@ cleanfiles: |
cleanpackage: |
$(RMV) $(OUTDIR) |
- $(RMV) $(LIBDIR)/$(LIB_ICUDATA_NAME)*.$(SO)* $(LIBDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A) |
+ $(RMV) $(LIBDIR)/*$(LIB_ICUDATA_NAME)*.$(SO)* $(LIBDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A) |
check-local: |
@@ -246,8 +246,7 @@ package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata |
# 2010-dec Removed pnames.icu. |
# These are now hardcoded in ICU4C and only loaded in ICU4J. |
# |
-# Chromium: Drop unames.icu because we don't need Unicode character names. |
-DAT_FILES_SHORT=cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm |
+DAT_FILES_SHORT=unames.icu cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm |
DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%) |
## BRK files |
@@ -278,8 +277,7 @@ CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT) |
-include $(UCMSRCDIR)/ucmfiles.mk |
-include $(UCMSRCDIR)/ucmebcdic.mk |
-include $(UCMSRCDIR)/ucmlocal.mk |
-# Chromium: Drop 2 ibm encodings not necessary. |
-ALL_UCM_SOURCE=$(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL) |
+ALL_UCM_SOURCE=ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL) |
UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%) |
CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv) |
CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv) |
@@ -353,9 +351,7 @@ TRANSLIT_SRC= $(TRANSLIT_SOURCE) $(TRANSLIT_ALIAS_SOURCE) $(TRANSLIT_SOURCE_LOCA |
TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%) |
INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL:%.txt=%) |
endif |
-# Chromium : To save space, use '-R' option (exclude collation rules. just |
-# include the compiled binary data.) |
-GENRBOPTS=-k -R |
+GENRBOPTS=-k |
## MISC files |
-include $(MISCSRCDIR)/miscfiles.mk |
@@ -533,14 +529,7 @@ $(BUILDDIR)/%.icu: $(SRCDATADIR)/in/%.icu |
$(BUILDDIR)/%.nrm: $(SRCDATADIR)/in/%.nrm |
$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@ |
-# Chromium: To cut down the data size by 280kB, |
-# use the code point order for CJK Ideographs in non-CJK locales instead |
-# of the UniHan radical-stroke order. The latter is better, but non-CJK |
-# locales do not have a great need for sorting CJK Ideographs. |
-# Moreover, the most common subset (the original CJK Ideograph block) will |
-# still be sorted correctly because the code point order is radical-stroke |
-# order. |
-$(BUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-implicithan.icu |
+$(BUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-unihan.icu |
$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@ |
#################################################### SPP |