Skip to content

Include likelySubtags and more calendar data for mobile configurations #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 13, 2021
Merged

Include likelySubtags and more calendar data for mobile configurations #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2823fc2
Try to include more calendar data for mobile
Jul 12, 2021
08d6053
Include likelySubtags and more calendar data in for mobile configurat…
Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions eng/icu.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ $(HOST_OBJDIR)/.stamp-configure-host: | $(HOST_OBJDIR)

# Parameters:
# $(1): filter file name (without .json suffix)
# $(2): data output file name (without .dat suffix)
define TargetBuildTemplate

$(TARGET_OBJDIR)/$(1):
Expand All @@ -76,24 +77,28 @@ $(TARGET_OBJDIR)/$(1)/.stamp-configure: $(ICU_FILTER_PATH)/$(1).json $(HOST_OBJD
touch $$@

# run source build and copy outputs to bin dir
lib-$(1): data-$(1)
lib-$(2): data-$(2)
cd $(TARGET_OBJDIR)/$(1) && $(MAKE) -j8 all && $(MAKE) install
rm -rf $(TARGET_BINDIR)/lib
rm -rf $(TARGET_BINDIR)/include
cp -R $(TARGET_OBJDIR)/$(1)/install/lib $(TARGET_BINDIR)/lib
cp -R $(TARGET_OBJDIR)/$(1)/install/include $(TARGET_BINDIR)/include

# run data build and copy data file to bin dir
data-$(1): $(TARGET_OBJDIR)/$(1)/.stamp-configure | $(TARGET_OBJDIR)/$(1) $(TARGET_BINDIR)
data-$(2): $(TARGET_OBJDIR)/$(1)/.stamp-configure | $(TARGET_OBJDIR)/$(1) $(TARGET_BINDIR)
cd $(TARGET_OBJDIR)/$(1) && $(MAKE) -C data all && $(MAKE) -C data install
cp $(TARGET_OBJDIR)/$(1)/data/out/icudt*.dat $(TARGET_BINDIR)/$(1).dat
cp $(TARGET_OBJDIR)/$(1)/data/out/icudt*.dat $(TARGET_BINDIR)/$(2).dat

endef

$(eval $(call TargetBuildTemplate,icudt))
$(eval $(call TargetBuildTemplate,icudt_CJK))
$(eval $(call TargetBuildTemplate,icudt_no_CJK))
$(eval $(call TargetBuildTemplate,icudt_EFIGS))
ifeq ($(TARGET_OS),browser)
$(eval $(call TargetBuildTemplate,icudt_browser,icudt))
else
$(eval $(call TargetBuildTemplate,icudt_mobile,icudt))
endif
$(eval $(call TargetBuildTemplate,icudt_CJK,icudt_CJK))
$(eval $(call TargetBuildTemplate,icudt_no_CJK,icudt_no_CJK))
$(eval $(call TargetBuildTemplate,icudt_EFIGS,icudt_EFIGS))

# build source+data for the main "icudt" filter and only data for the other filters
all: lib-icudt data-icudt data-icudt_no_CJK data-icudt_EFIGS data-icudt_CJK
0 icu-filters/icudt.json → icu-filters/icudt_browser.json
View file
Open in desktop
File renamed without changes.
285 changes: 285 additions & 0 deletions icu-filters/icudt_mobile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,285 @@
{
"collationUCAData": "implicithan",
"localeFilter": {
"filterType": "locale",
"includeScripts": false,
"includeChildren": false,
"whitelist": [
"ar_SA",
"am_ET",
"bg_BG",
"bn_BD",
"bn_IN",
"ca_AD",
"ca_ES",
"cs_CZ",
"da_DK",
"de_AT",
"de_BE",
"de_CH",
"de_DE",
"de_IT",
"de_LI",
"de_LU",
"el_CY",
"el_GR",
"en_AE",
"en_AG",
"en_AI",
"en_AS",
"en_AT",
"en_AU",
"en_BB",
"en_BE",
"en_BI",
"en_BM",
"en_BS",
"en_BW",
"en_BZ",
"en_CA",
"en_CC",
"en_CH",
"en_CK",
"en_CM",
"en_CX",
"en_CY",
"en_DE",
"en_DK",
"en_DM",
"en_ER",
"en_FI",
"en_FJ",
"en_FK",
"en_FM",
"en_GB",
"en_GD",
"en_GG",
"en_GH",
"en_GI",
"en_GM",
"en_GU",
"en_GY",
"en_HK",
"en_IE",
"en_IL",
"en_IM",
"en_IN",
"en_IO",
"en_JE",
"en_JM",
"en_KE",
"en_KI",
"en_KN",
"en_KY",
"en_LC",
"en_LR",
"en_LS",
"en_MG",
"en_MH",
"en_MO",
"en_MP",
"en_MS",
"en_MT",
"en_MU",
"en_MW",
"en_MY",
"en_NA",
"en_NF",
"en_NG",
"en_NL",
"en_NR",
"en_NU",
"en_NZ",
"en_PG",
"en_PH",
"en_PK",
"en_PN",
"en_PR",
"en_PW",
"en_RW",
"en_SB",
"en_SC",
"en_SD",
"en_SE",
"en_SG",
"en_SH",
"en_SI",
"en_SL",
"en_SS",
"en_SX",
"en_SZ",
"en_TC",
"en_TK",
"en_TO",
"en_TT",
"en_TV",
"en_TZ",
"en_UG",
"en_UM",
"en_US",
"en_VC",
"en_VG",
"en_VI",
"en_VU",
"en_WS",
"en_ZA",
"en_ZM",
"en_ZW",
"en_US",
"es_419",
"es_ES",
"es_MX",
"et_EE",
"fa_IR",
"fi_FI",
"fil_PH",
"fr_BE",
"fr_CA",
"fr_CH",
"fr_FR",
"gu_IN",
"he_IL",
"hi_IN",
"hr_BA",
"hr_HR",
"hu_HU",
"id_ID",
"it_CH",
"it_IT",
"ja_JP",
"kn_IN",
"ko_KR",
"lt_LT",
"lv_LV",
"ml_IN",
"mr_IN",
"ms_BN",
"ms_MY",
"ms_SG",
"nl_AW",
"nl_BE",
"nl_NL",
"pl_PL",
"pt_BR",
"pt_PT",
"ro_RO",
"ru_RU",
"sk_SK",
"sl_SI",
"sr_Cyrl_RS",
"sr_Latn_RS",
"sv_AX",
"sv_SE",
"sw_CD",
"sw_KE",
"sw_TZ",
"sw_UG",
"ta_IN",
"ta_LK",
"ta_MY",
"ta_SG",
"te_IN",
"th_TH",
"tr_CY",
"tr_TR",
"uk_UA",
"vi_VN",
"zh_CN",
"zh_Hans_HK",
"zh_SG",
"zh_HK",
"zh_TW"
]
},
"featureFilters": {
"conversion_mappings": "exclude",
"confusables": "exclude",
"stringprep": "exclude",
"zone_tree": "exclude",
"zone_supplemental": "exclude",
"translit": "exclude",
"unames": "exclude",
"ulayout": "exclude",
"unit_tree": "exclude",
"rbnf_tree": "exclude",
"cnvalias": "exclude",
"lang_tree": "exclude",
"region_tree": "exclude",
"normalization": {
"blacklist": [
"nfkc_cf",
"nfkc"
]
},
"misc": {
"whitelist": [
"currencyNumericCodes",
"numberingSystems",
"icuver",
"likelySubtags",
"supplementalData",
"keyTypeData"
]
},
"curr_tree": {
"whitelist": ["root"]
},
"brkitr_dictionaries": "exclude",
"brkitr_rules": {
"whitelist": ["char"]
}
},
"resourceFilters": [
{
"categories": ["locales_tree"],
"rules": [
"-/characterLabel",
"-/measurementSystemNames",
"-/listPattern",
"-/fields",
"-/delimiters",
"-/Ellipsis",
"-/NumberElements/latn/miscPatterns",
"-/NumberElements/latn/patternsLong",
"-/NumberElements/latn/patternsShort",
"-/NumberElements/*/patternsLong",
"-/NumberElements/*/patternsShort",
"-/NumberElements/minimalPairs",
"-/parse",
"-/AuxExemplarCharacters",
"-/ExemplarCharacters",
"-/ExemplarCharactersIndex",
"-/ExemplarCharactersNumbers",
"-/ExemplarCharactersPunctuation",
"-/MoreInformation"
]
},
{
"categories": ["coll_tree"],
"rules": [
"-/*/*",
"+/collations/default",
"+/collations/standard",
"+/collations/private-kana",
"-/UCARules"
]
},
{
"categories": ["misc"],
"files": {
"whitelist": ["supplementalData"]
},
"rules": [
"-/*",
"+/calendarData",
"+/calendarPreferenceData",
"+/cldrVersion",
"+/measurementData",
"+/codeMappings",
"+/idValidity",
"+/timeData",
"+/weekData"
]
}
]
}