Bug 1464689 - Use gen_built_in_addons.py for Thunderbird builds. r=darktrojan
authorRob Lemley <rob@thunderbird.net>
Tue, 12 Nov 2019 19:22:57 -0500
changeset 28308 c272f21f60cef07fc06efcbcabc5880014c90bce
parent 28307 247abc27cb5243b3cc136046593c2bb5a62dad64
child 28309 825c14a55e122cec28b5e1f7d3ce83007d89f32c
push id16760
push usergeoff@darktrojan.net
push dateTue, 03 Dec 2019 22:37:52 +0000
treeherdercomm-central@c272f21f60ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1464689
Bug 1464689 - Use gen_built_in_addons.py for Thunderbird builds. r=darktrojan With the corresponding update to M-C, Thunderbird builds can generate built_in_addons.json the same way Firefox does, and there is no longer a need to maintain that file by hand.
mail/base/jar.mn
mail/extensions/built_in_addons.json
mail/extensions/jar.mn
mail/extensions/moz.build
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -127,8 +127,12 @@ messenger.jar:
 % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd
 % resource search-plugins chrome://messenger/locale/searchplugins/
 
 comm.jar:
 % content communicator %content/communicator/
    content/communicator/contentAreaClick.js         (content/contentAreaClick.js)
    content/communicator/labelsencodings.properties  (/@mozreltopsrcdir@/dom/encoding/labelsencodings.properties)
    content/communicator/utilityOverlay.js           (content/utilityOverlay.js)
+
+# This is needed for built_in_addons.json
+browser.jar:
+% content browser %content/
deleted file mode 100644
--- a/mail/extensions/built_in_addons.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "dictionaries": {
-    "en-US": "dictionaries/en-US.dic"
-  },
-  "system": [
-    "wetransfer@extensions.thunderbird.net"
-  ]
-}
deleted file mode 100644
--- a/mail/extensions/jar.mn
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-browser.jar:
-% content browser %content/
-  content/built_in_addons.json    (built_in_addons.json)
--- a/mail/extensions/moz.build
+++ b/mail/extensions/moz.build
@@ -7,10 +7,8 @@ DIRS += [
     'mailviews',
     'smime',
 ]
 
 if CONFIG['MOZ_OPENPGP']:
   DIRS += [
       'openpgp',
   ]
-
-JAR_MANIFESTS += ['jar.mn']