From 471ed052ed826234a7704faf03a698f5dc8537e3 Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Mon, 21 Aug 2017 15:42:39 +0200 Subject: [PATCH] bug 1392256, hyphenation dicts don't depend on locale, drop from repacks, r=gps,m_kato The hyphenation dictionaries we ship as part of the build don't depend on the UI locale, let's stop treating them as localizable content during repacks. MozReview-Commit-ID: FTrw4KDtops --HG-- extra : rebase_source : f6ddb22154fc66da0a7cdc56a4cecb58c9e3d54b --- browser/locales/Makefile.in | 2 -- mobile/locales/Makefile.in | 1 - toolkit/mozapps/installer/l10n-repack.py | 1 - 3 files changed, 4 deletions(-) diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 4cc5be27e55f..a4a29beeb032 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -90,7 +90,6 @@ endif ifneq '$(or $(MOZ_DEV_EDITION),$(NIGHTLY_BUILD))' '' @$(MAKE) -C ../extensions/webcompat-reporter/locales AB_CD=$* XPI_NAME=locale-$* endif - @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* @@ -111,7 +110,6 @@ endif ifndef RELEASE_OR_BETA @$(MAKE) -C ../extensions/presentation/locale chrome AB_CD=$* endif - @$(MAKE) -C ../../intl/locales chrome AB_CD=$* @$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$* @$(MAKE) -C ../../devtools/shim/locales chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in index 4b4785e37e4c..d75be5c09ef6 100644 --- a/mobile/locales/Makefile.in +++ b/mobile/locales/Makefile.in @@ -126,7 +126,6 @@ libs-%: AB_CD=$* libs-%: $(libs-preqs) $(display-deps) @$(MAKE) -C $(DEPTH)/toolkit/locales libs-$* - @$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* diff --git a/toolkit/mozapps/installer/l10n-repack.py b/toolkit/mozapps/installer/l10n-repack.py index 783c00b71cb8..3f8b4662f387 100644 --- a/toolkit/mozapps/installer/l10n-repack.py +++ b/toolkit/mozapps/installer/l10n-repack.py @@ -17,7 +17,6 @@ NON_CHROME = set([ '**/crashreporter*.ini', 'searchplugins', 'dictionaries', - 'hyphenation', 'defaults/profile', 'defaults/pref*/*-l10n.js', 'update.locale',