| --- source/data/Makefile.in 2009-05-20 23:03:54.000000000 -0700 |
| +++ source/data/Makefile.in 2009-11-18 11:03:35.699205000 -0800 |
| @@ -207,7 +207,10 @@ |
| # 2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.icu, ubidi.icu) |
| # from data build. See Jitterbug 4497. (makedata.mak revision 1.117) |
| # |
| -DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu |
| +# CHROME: unames.icu and invuca.icu are excluded from the data file |
| +# We have to add invuca.icu back if Webkit begins to use it again |
| +# See https://bugs.webkit.org/show_bug.cgi?id=30437#c32 |
| +DAT_FILES_SHORT=pnames.icu cnvalias.icu coll/ucadata.icu |
| DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%) |
| |
| ## BRK files |
| @@ -234,11 +237,12 @@ |
| CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT) |
| |
| ## UCM files |
| +# CHROME : do not include ucmebcdic.mk and two IBM EBCDIC code pages |
| -include $(UCMSRCDIR)/ucmcore.mk |
| -include $(UCMSRCDIR)/ucmfiles.mk |
| --include $(UCMSRCDIR)/ucmebcdic.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) |
| +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) |
| @@ -254,7 +258,7 @@ |
| -include $(RBNFSRCDIR)/rbnflocal.mk |
| -include $(TRANSLITSRCDIR)/trnslocal.mk |
| ifdef GENRB_SOURCE |
| -RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) $(GENRB_ALIAS_SOURCE_LOCAL) |
| +RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) |
| RES_SRC_FILES = $(RES_SRC:%=$(LOCSRCDIR)/%) |
| INSTALLED_RB_FILES = $(GENRB_SOURCE:%.txt=%) $(GENRB_SOURCE_LOCAL:%.txt=%) |
| endif |
| @@ -273,7 +277,8 @@ |
| TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%) |
| INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL:%.txt=%) |
| endif |
| -GENRBOPTS=-k |
| +# CHROME : To save space, use '-R' option |
| +GENRBOPTS=-k -R |
| |
| ## MISC files |
| -include $(MISCSRCDIR)/miscfiles.mk |
| @@ -423,7 +428,8 @@ |
| # ucadata.icu |
| # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu |
| # see Jitterbug 4497 |
| -$(COLBLDDIR)/ucadata.icu $(COLBLDDIR)/invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT) |
| +# CHROME: We don't need invuca.icu |
| +$(COLBLDDIR)/ucadata.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT) |
| $(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $(BUILDDIR) |
| |
| # unames.icu |
| @@ -437,7 +443,9 @@ |
| #################################################### SPP |
| # SPP FILES |
| |
| -$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu |
| +# CHROME: We don't need unames.icu. |
| +# Do we need to have spp files other than uidna.spp? |
| +$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/pnames.icu |
| $(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F) |
| |