source/data/Makefile.in - Issue 822213003: ICU upgrade to 54.1 step 2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/data/Makefile.in

Issue 822213003: ICU upgrade to 54.1 step 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master

Patch Set: readme: better wrapping, declspec patch dropped Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: source/data/Makefile.in

diff --git a/source/data/Makefile.in b/source/data/Makefile.in

index b1b3b3663926a6c359f3f64b287f0bbbb1f0400f..380cc1a1fc743cefe551ec5cc1158d2441e4a129 100644

--- a/source/data/Makefile.in

+++ b/source/data/Makefile.in

@@ -246,7 +246,8 @@ 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.

-DAT_FILES_SHORT=unames.icu cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm

+# 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=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)

## BRK files

@@ -277,7 +278,8 @@ CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT)

-include $(UCMSRCDIR)/ucmfiles.mk

-include $(UCMSRCDIR)/ucmebcdic.mk

-include $(UCMSRCDIR)/ucmlocal.mk

-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)

+# Chromium: Drop 2 ibm encodings not necessary.

+ALL_UCM_SOURCE=$(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)

@@ -529,7 +531,14 @@ $(BUILDDIR)/%.icu: $(SRCDATADIR)/in/%.icu

$(BUILDDIR)/%.nrm: $(SRCDATADIR)/in/%.nrm

$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@

-$(BUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-unihan.icu

+# 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

$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@

#################################################### SPP

« no previous file with comments | « source/configure ('k') | source/data/makedata.mak » ('j') | no next file with comments »