diff options
author | Matt A. Tobin <email@mattatobin.com> | 2020-03-05 19:30:38 -0500 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 13:03:21 +0200 |
commit | 5c7109182c5cbc6b3fa187b58ad9d1b5daeba23e (patch) | |
tree | f7714d8c4271197ce41822ec5576d560a94db13c | |
parent | 68e873ada7df399983072a1d67cf89f379fa0618 (diff) | |
download | UXP-5c7109182c5cbc6b3fa187b58ad9d1b5daeba23e.tar UXP-5c7109182c5cbc6b3fa187b58ad9d1b5daeba23e.tar.gz UXP-5c7109182c5cbc6b3fa187b58ad9d1b5daeba23e.tar.lz UXP-5c7109182c5cbc6b3fa187b58ad9d1b5daeba23e.tar.xz UXP-5c7109182c5cbc6b3fa187b58ad9d1b5daeba23e.zip |
Issue #1470 - Part 3: Remove now unused update.locale
This requires changes to package-manifest in all applications
-rw-r--r-- | python/mozbuild/mozpack/packager/formats.py | 1 | ||||
-rw-r--r-- | python/mozbuild/mozpack/test/test_packager_formats.py | 1 | ||||
-rw-r--r-- | toolkit/locales/Makefile.in | 3 | ||||
-rw-r--r-- | toolkit/locales/update.locale | 1 | ||||
-rw-r--r-- | toolkit/mozapps/installer/l10n-repack.py | 1 |
5 files changed, 0 insertions, 7 deletions
diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py index cedd1998b..235fc3e90 100644 --- a/python/mozbuild/mozpack/packager/formats.py +++ b/python/mozbuild/mozpack/packager/formats.py @@ -320,5 +320,4 @@ class OmniJarSubFormatter(PiecemealFormatter): 'modules', 'goanna.js', 'hyphenation', - 'update.locale', ] or path[0] in STARTUP_CACHE_PATHS diff --git a/python/mozbuild/mozpack/test/test_packager_formats.py b/python/mozbuild/mozpack/test/test_packager_formats.py index 66a7cc8e6..4ba61e880 100644 --- a/python/mozbuild/mozpack/test/test_packager_formats.py +++ b/python/mozbuild/mozpack/test/test_packager_formats.py @@ -407,7 +407,6 @@ class TestFormatters(unittest.TestCase): self.assertTrue(is_resource(base, 'modules/foo.jsm')) self.assertTrue(is_resource(base, 'goanna.js')) self.assertTrue(is_resource(base, 'hyphenation/foo')) - self.assertTrue(is_resource(base, 'update.locale')) self.assertTrue( is_resource(base, 'jsloader/resource/gre/modules/foo.jsm')) self.assertFalse(is_resource(base, 'foo')) diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in index 198d9aaa8..585c70986 100644 --- a/toolkit/locales/Makefile.in +++ b/toolkit/locales/Makefile.in @@ -29,6 +29,3 @@ chrome-%: @$(MAKE) -C $(DEPTH)/security/manager/locales/ chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* -libs:: update.locale - sed -e 's/%AB_CD%/$(AB_CD)/' $< > $(FINAL_TARGET)/update.locale - diff --git a/toolkit/locales/update.locale b/toolkit/locales/update.locale deleted file mode 100644 index 7c1f386ee..000000000 --- a/toolkit/locales/update.locale +++ /dev/null @@ -1 +0,0 @@ -%AB_CD% diff --git a/toolkit/mozapps/installer/l10n-repack.py b/toolkit/mozapps/installer/l10n-repack.py index 783c00b71..fcf3e773c 100644 --- a/toolkit/mozapps/installer/l10n-repack.py +++ b/toolkit/mozapps/installer/l10n-repack.py @@ -20,7 +20,6 @@ NON_CHROME = set([ 'hyphenation', 'defaults/profile', 'defaults/pref*/*-l10n.js', - 'update.locale', 'updater.ini', 'extensions/langpack-*@*', 'distribution/extensions/langpack-*@*', |