OLD | NEW |
1 --- source/data/Makefile.in 2009-05-20 23:03:54.000000000 -0700 | 1 --- source/data/Makefile.in 2009-05-20 23:03:54.000000000 -0700 |
2 +++ source/data/Makefile.in» 2009-10-21 15:43:18.235201000 -0700 | 2 +++ source/data/Makefile.in» 2009-11-18 11:03:35.699205000 -0800 |
3 @@ -207,7 +207,8 @@ | 3 @@ -207,7 +207,10 @@ |
4 # 2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.i
cu, ubidi.icu) | 4 # 2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.i
cu, ubidi.icu) |
5 # from data build. See Jitterbug 4497. (makedata.mak revision 1.117) | 5 # from data build. See Jitterbug 4497. (makedata.mak revision 1.117) |
6 # | 6 # |
7 -DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca
.icu | 7 -DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca
.icu |
8 +# CHROME: unames.icu are excluded from the icu data file | 8 +# CHROME: unames.icu and invuca.icu are excluded from the data file |
9 +DAT_FILES_SHORT=pnames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu | 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 |
10 DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%) | 12 DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%) |
11 | 13 |
12 ## BRK files | 14 ## BRK files |
13 @@ -234,11 +235,12 @@ | 15 @@ -234,11 +237,12 @@ |
14 CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT) | 16 CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT) |
15 | 17 |
16 ## UCM files | 18 ## UCM files |
17 +# CHROME : do not include ucmebcdic.mk and two IBM EBCDIC code pages | 19 +# CHROME : do not include ucmebcdic.mk and two IBM EBCDIC code pages |
18 -include $(UCMSRCDIR)/ucmcore.mk | 20 -include $(UCMSRCDIR)/ucmcore.mk |
19 -include $(UCMSRCDIR)/ucmfiles.mk | 21 -include $(UCMSRCDIR)/ucmfiles.mk |
20 --include $(UCMSRCDIR)/ucmebcdic.mk | 22 --include $(UCMSRCDIR)/ucmebcdic.mk |
21 +# -include $(UCMSRCDIR)/ucmebcdic.mk | 23 +# -include $(UCMSRCDIR)/ucmebcdic.mk |
22 -include $(UCMSRCDIR)/ucmlocal.mk | 24 -include $(UCMSRCDIR)/ucmlocal.mk |
23 -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) | 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) |
24 +ALL_UCM_SOURCE= $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(U
CM_SOURCE_LOCAL) | 26 +ALL_UCM_SOURCE= $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(U
CM_SOURCE_LOCAL) |
25 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%) | 27 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%) |
26 CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv) | 28 CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv) |
27 CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv) | 29 CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv) |
28 @@ -254,7 +256,7 @@ | 30 @@ -254,7 +258,7 @@ |
29 -include $(RBNFSRCDIR)/rbnflocal.mk | 31 -include $(RBNFSRCDIR)/rbnflocal.mk |
30 -include $(TRANSLITSRCDIR)/trnslocal.mk | 32 -include $(TRANSLITSRCDIR)/trnslocal.mk |
31 ifdef GENRB_SOURCE | 33 ifdef GENRB_SOURCE |
32 -RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) $
(GENRB_ALIAS_SOURCE_LOCAL) | 34 -RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) $
(GENRB_ALIAS_SOURCE_LOCAL) |
33 +RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) | 35 +RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) |
34 RES_SRC_FILES = $(RES_SRC:%=$(LOCSRCDIR)/%) | 36 RES_SRC_FILES = $(RES_SRC:%=$(LOCSRCDIR)/%) |
35 INSTALLED_RB_FILES = $(GENRB_SOURCE:%.txt=%) $(GENRB_SOURCE_LOCAL:%.txt=%) | 37 INSTALLED_RB_FILES = $(GENRB_SOURCE:%.txt=%) $(GENRB_SOURCE_LOCAL:%.txt=%) |
36 endif | 38 endif |
37 @@ -273,7 +275,8 @@ | 39 @@ -273,7 +277,8 @@ |
38 TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%) | 40 TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%) |
39 INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL:
%.txt=%) | 41 INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL:
%.txt=%) |
40 endif | 42 endif |
41 -GENRBOPTS=-k | 43 -GENRBOPTS=-k |
42 +# CHROME : To save space, use '-R' option | 44 +# CHROME : To save space, use '-R' option |
43 +GENRBOPTS=-k -R | 45 +GENRBOPTS=-k -R |
44 | 46 |
45 ## MISC files | 47 ## MISC files |
46 -include $(MISCSRCDIR)/miscfiles.mk | 48 -include $(MISCSRCDIR)/miscfiles.mk |
47 @@ -423,7 +426,8 @@ | 49 @@ -423,7 +428,8 @@ |
48 # ucadata.icu | 50 # ucadata.icu |
49 # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu | 51 # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu |
50 # see Jitterbug 4497 | 52 # see Jitterbug 4497 |
51 -$(COLBLDDIR)/ucadata.icu $(COLBLDDIR)/invuca.icu: $(UNICODEDATADIR)/FractionalU
CA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT) | 53 -$(COLBLDDIR)/ucadata.icu $(COLBLDDIR)/invuca.icu: $(UNICODEDATADIR)/FractionalU
CA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT) |
52 +# CHROME: We don't need invuca.icu | 54 +# CHROME: We don't need invuca.icu |
53 +$(COLBLDDIR)/ucadata.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/gen
uca$(TOOLEXEEXT) | 55 +$(COLBLDDIR)/ucadata.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/gen
uca$(TOOLEXEEXT) |
54 $(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $
(BUILDDIR) | 56 $(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $
(BUILDDIR) |
55 | 57 |
56 # unames.icu | 58 # unames.icu |
57 @@ -437,7 +441,9 @@ | 59 @@ -437,7 +443,9 @@ |
58 #################################################### SPP | 60 #################################################### SPP |
59 # SPP FILES | 61 # SPP FILES |
60 | 62 |
61 -$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(B
UILDDIR)/unames.icu $(BUILDDIR)/pnames.icu | 63 -$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(B
UILDDIR)/unames.icu $(BUILDDIR)/pnames.icu |
62 +# CHROME: We don't need unames.icu. | 64 +# CHROME: We don't need unames.icu. |
63 +# Do we need to have spp files other than uidna.spp? | 65 +# Do we need to have spp files other than uidna.spp? |
64 +$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(B
UILDDIR)/pnames.icu | 66 +$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(B
UILDDIR)/pnames.icu |
65 $(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPRE
PSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F) | 67 $(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPRE
PSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F) |
66 | 68 |
67 #################################################### BRK | |
68 @@ -452,8 +458,9 @@ | |
69 #################################################### CTD | |
70 # CTD FILES | |
71 | |
72 -$(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genctd$(TOOLEXEEXT) $(DAT_
FILES) | |
73 - $(INVOKE) $(TOOLBINDIR)/genctd -c -i $(BUILDDIR) -o $@ $< | |
74 +# .ctd file now generated regardless of whether dictionary file exists | |
75 +$(BRKBLDDIR)/%.ctd: $(TOOLBINDIR)/genctd$(TOOLEXEEXT) $(DAT_FILES) | |
76 + $(INVOKE) $(TOOLBINDIR)/genctd -c -i $(BUILDDIR) -o $@ $(BRKSRCDIR)/$(*F
).txt | |
77 | |
78 #################################################### CFU | |
79 # CFU FILES | |
80 @@ -636,4 +643,3 @@ | |
81 $(RMV) $(LIBICUUC) | |
82 (cd ../common && $(MAKE) RECURSIVE=YES) || exit; | |
83 endif | |
84 - | |
OLD | NEW |