1 --- source/data/Makefile.in 2009-05-20 23:03:54.000000000 -0700 2 +++ source/data/Makefile.in 2009-11-18 11:03:35.699205000 -0800 3 @@ -207,7 +207,10 @@ 4 # 2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.icu, ubidi.icu) 5 # from data build. See Jitterbug 4497. (makedata.mak revision 1.117) 6 # 7 -DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu 8 +# CHROME: unames.icu and invuca.icu are excluded from the data file 9 +# We have to add invuca.icu back if Webkit begins to use it again 10 +# See https://bugs.webkit.org/show_bug.cgi?id=30437#c32 11 +DAT_FILES_SHORT=pnames.icu cnvalias.icu coll/ucadata.icu 12 DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%) 13 14 ## BRK files 15 @@ -234,11 +237,12 @@ 16 CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT) 17 18 ## UCM files 19 +# CHROME : do not include ucmebcdic.mk and two IBM EBCDIC code pages 20 -include $(UCMSRCDIR)/ucmcore.mk 21 -include $(UCMSRCDIR)/ucmfiles.mk 22 --include $(UCMSRCDIR)/ucmebcdic.mk 23 +# -include $(UCMSRCDIR)/ucmebcdic.mk 24 -include $(UCMSRCDIR)/ucmlocal.mk 25 -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) 26 +ALL_UCM_SOURCE= $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL) 27 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%) 28 CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv) 29 CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv) 30 @@ -254,7 +258,7 @@ 31 -include $(RBNFSRCDIR)/rbnflocal.mk 32 -include $(TRANSLITSRCDIR)/trnslocal.mk 33 ifdef GENRB_SOURCE 34 -RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) $(GENRB_ALIAS_SOURCE_LOCAL) 35 +RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) 36 RES_SRC_FILES = $(RES_SRC:%=$(LOCSRCDIR)/%) 37 INSTALLED_RB_FILES = $(GENRB_SOURCE:%.txt=%) $(GENRB_SOURCE_LOCAL:%.txt=%) 38 endif 39 @@ -273,7 +277,8 @@ 40 TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%) 41 INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL:%.txt=%) 42 endif 43 -GENRBOPTS=-k 44 +# CHROME : To save space, use '-R' option 45 +GENRBOPTS=-k -R 46 47 ## MISC files 48 -include $(MISCSRCDIR)/miscfiles.mk 49 @@ -423,7 +428,8 @@ 50 # ucadata.icu 51 # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu 52 # see Jitterbug 4497 53 -$(COLBLDDIR)/ucadata.icu $(COLBLDDIR)/invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT) 54 +# CHROME: We don't need invuca.icu 55 +$(COLBLDDIR)/ucadata.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT) 56 $(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $(BUILDDIR) 57 58 # unames.icu 59 @@ -437,7 +443,9 @@ 60 #################################################### SPP 61 # SPP FILES 62 63 -$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu 64 +# CHROME: We don't need unames.icu. 65 +# Do we need to have spp files other than uidna.spp? 66 +$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/pnames.icu 67 $(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F) 68 69
