summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-03-05 19:30:38 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-03-05 19:30:38 -0500
commit4d80ed3d51cf10109600ba3fd6352193b58d28c8 (patch)
treee29f0fb4ec055595f79ce40cb5a8e01987ce047d
parent8baaecd89c830d65aaeffe0b01931a7b0706ec47 (diff)
downloaduxp-4d80ed3d51cf10109600ba3fd6352193b58d28c8.tar.gz
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.py1
-rw-r--r--python/mozbuild/mozpack/test/test_packager_formats.py1
-rw-r--r--toolkit/locales/Makefile.in3
-rw-r--r--toolkit/locales/update.locale1
-rw-r--r--toolkit/mozapps/installer/l10n-repack.py1
5 files changed, 0 insertions, 7 deletions
diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py
index cedd1998bb..235fc3e90f 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 66a7cc8e6e..4ba61e880f 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 198d9aaa87..585c70986a 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 7c1f386ee0..0000000000
--- 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 783c00b71c..fcf3e773cd 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-*@*',