Port bug 774572 - Define JAR_MANIFESTS in moz.build files - to fix bustage. rs=build-system-peer-port.
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 18 Dec 2013 09:12:38 +0000
changeset 20460 0792a3bf3a2677667be466419ca1c81423bc1820
parent 20446 2e48a9153f8dae51e537ae3873cd063b7c09c060
child 20461 d1042ffd0d764c5525daa52ba749fdc472adad28
push id1171
push userjosiah@programmer.net
push dateWed, 18 Dec 2013 19:03:14 +0000
treeherdertry-comm-central@57b59e5f5961 [default view] [failures only]
reviewersbuild-system-peer-port
bugs774572
Port bug 774572 - Define JAR_MANIFESTS in moz.build files - to fix bustage. rs=build-system-peer-port.
calendar/base/moz.build
calendar/import-export/moz.build
calendar/lightning/locales/moz.build
calendar/lightning/moz.build
calendar/locales/moz.build
calendar/providers/gdata/locales/moz.build
calendar/providers/gdata/moz.build
calendar/resources/moz.build
calendar/timezones/locales/moz.build
calendar/timezones/moz.build
chat/content/moz.build
chat/locales/moz.build
chat/protocols/facebook/moz.build
chat/protocols/gtalk/moz.build
chat/protocols/irc/moz.build
chat/protocols/odnoklassniki/moz.build
chat/protocols/twitter/moz.build
chat/protocols/vkontakte/moz.build
chat/protocols/xmpp/moz.build
chat/themes/moz.build
config/config.mk
config/rules.mk
editor/ui/locales/moz.build
editor/ui/moz.build
mail/base/moz.build
mail/branding/aurora/locales/moz.build
mail/branding/aurora/moz.build
mail/branding/nightly/locales/moz.build
mail/branding/nightly/moz.build
mail/components/about-support/moz.build
mail/components/activity/moz.build
mail/components/addrbook/moz.build
mail/components/cloudfile/moz.build
mail/components/compose/moz.build
mail/components/devtools/extension/moz.build
mail/components/devtools/moz.build
mail/components/im/moz.build
mail/components/migration/moz.build
mail/components/newmailaccount/moz.build
mail/components/preferences/moz.build
mail/components/search/moz.build
mail/extensions/mailviews/moz.build
mail/extensions/smime/moz.build
mail/jquery/moz.build
mail/locales/moz.build
mail/themes/linux/moz.build
mail/themes/osx/moz.build
mail/themes/windows/moz.build
mailnews/db/gloda/moz.build
mailnews/extensions/dsn/moz.build
mailnews/extensions/mdn/moz.build
mailnews/extensions/newsblog/moz.build
mailnews/extensions/smime/moz.build
mailnews/moz.build
other-licenses/branding/thunderbird/locales/moz.build
other-licenses/branding/thunderbird/moz.build
suite/branding/nightly/moz.build
suite/browser/moz.build
suite/common/moz.build
suite/debugQA/locales/moz.build
suite/debugQA/moz.build
suite/locales/moz.build
suite/mailnews/moz.build
suite/profile/moz.build
suite/security/moz.build
suite/themes/classic/moz.build
suite/themes/modern/moz.build
--- a/calendar/base/moz.build
+++ b/calendar/base/moz.build
@@ -5,8 +5,9 @@
 
 DIRS = [
     'public',
     'backend',
     'src',
     'modules',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/import-export/moz.build
+++ b/calendar/import-export/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'calImportExportModule.js',
     'calImportExportModule.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/lightning/locales/moz.build
+++ b/calendar/lightning/locales/moz.build
@@ -1,6 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['../../locales']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -12,8 +12,10 @@ DIRS += [
     'components',
     'locales',
 ]
 
 TEST_DIRS += ['../test']
 
 XPI_NAME = 'lightning'
 export('XPI_NAME')
+
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/locales/moz.build
+++ b/calendar/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/providers/gdata/locales/moz.build
+++ b/calendar/providers/gdata/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/providers/gdata/moz.build
+++ b/calendar/providers/gdata/moz.build
@@ -5,8 +5,10 @@
 
 DIRS += [
     'components',
     'locales',
     'public',
 ]
 
 XPI_NAME = 'gdata-provider'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/resources/moz.build
+++ b/calendar/resources/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'content/calendarService.js',
     'content/calendarService.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/timezones/locales/moz.build
+++ b/calendar/timezones/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/calendar/timezones/moz.build
+++ b/calendar/timezones/moz.build
@@ -2,8 +2,10 @@
 # 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/.
 
 DIRS += ['locales']
 
 XPI_NAME = 'calendar-timezones'
 export('XPI_NAME')
+
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/content/moz.build
+++ b/chat/content/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/locales/moz.build
+++ b/chat/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/protocols/facebook/moz.build
+++ b/chat/protocols/facebook/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'facebook.js',
     'facebook.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/protocols/gtalk/moz.build
+++ b/chat/protocols/gtalk/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'gtalk.js',
     'gtalk.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/protocols/irc/moz.build
+++ b/chat/protocols/irc/moz.build
@@ -21,8 +21,9 @@ EXTRA_JS_MODULES += [
     'ircMultiPrefix.jsm',
     'ircNonStandard.jsm',
     'ircSASL.jsm',
     'ircServices.jsm',
     'ircUtils.jsm',
     'ircWatchMonitor.jsm',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/protocols/odnoklassniki/moz.build
+++ b/chat/protocols/odnoklassniki/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'odnoklassniki.js',
     'odnoklassniki.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/protocols/twitter/moz.build
+++ b/chat/protocols/twitter/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'twitter.js',
     'twitter.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/protocols/vkontakte/moz.build
+++ b/chat/protocols/vkontakte/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'vkontakte.js',
     'vkontakte.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/protocols/xmpp/moz.build
+++ b/chat/protocols/xmpp/moz.build
@@ -10,8 +10,9 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'xmpp-authmechs.jsm',
     'xmpp-session.jsm',
     'xmpp-xml.jsm',
     'xmpp.jsm',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/themes/moz.build
+++ b/chat/themes/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/config/config.mk
+++ b/config/config.mk
@@ -45,16 +45,17 @@ endif
   FINAL_LIBRARY \
   FINAL_TARGET \
   GTEST_CMMSRCS \
   GTEST_CPPSRCS \
   GTEST_CSRCS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   IS_COMPONENT \
+  JAR_MANIFEST \
   JS_MODULES_PATH \
   LIBRARY_NAME \
   LIBXUL_LIBRARY \
   MODULE \
   MSVC_ENABLE_PGO \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
   SDK_HEADERS \
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1296,35 +1296,40 @@ libs:: $(SDK_BINARY) $(SDK_BIN_DIR)
 	$(call install_cmd,$(IFLAGS2) $^)
 endif
 
 endif # SDK_BINARY
 
 ################################################################################
 # CHROME PACKAGING
 
-JAR_MANIFEST := $(srcdir)/jar.mn
-
 chrome::
 	$(MAKE) realchrome
 	$(LOOP_OVER_PARALLEL_DIRS)
 	$(LOOP_OVER_DIRS)
 	$(LOOP_OVER_TOOL_DIRS)
 
 $(FINAL_TARGET)/chrome:
 	$(NSINSTALL) -D $@
 
 libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
-ifneq (,$(wildcard $(JAR_MANIFEST)))
+ifneq (,$(JAR_MANIFEST))
 ifndef NO_DIST_INSTALL
 	$(call py_action,jar_maker,\
 	  $(QUIET) -j $(FINAL_TARGET)/chrome \
 	  $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
 	  $(JAR_MANIFEST))
 endif
+
+# This is a temporary check to ensure patches relying on the old behavior
+# of silently picking up jar.mn files continue to work.
+else # No JAR_MANIFEST
+ifneq (,$(wildcard $(srcdir)/jar.mn))
+$(error $(srcdir) contains a jar.mn file but this file is not declared in a JAR_MANIFESTS variable in a moz.build file)
+endif
 endif
 
 ifneq ($(DIST_FILES),)
 DIST_FILES_PATH := $(FINAL_TARGET)
 DIST_FILES_FLAGS := $(XULAPP_DEFINES)
 PP_TARGETS += DIST_FILES
 endif
 
--- a/editor/ui/locales/moz.build
+++ b/editor/ui/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/editor/ui/moz.build
+++ b/editor/ui/moz.build
@@ -11,8 +11,9 @@ if not CONFIG['MOZ_STANDALONE_COMPOSER']
             'nsComposerCmdLineHandler.js',
             'nsComposerCmdLineHandler.manifest',
         ]
 
 EXTRA_JS_MODULES += [
     'editorUtilities.jsm',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/base/moz.build
+++ b/mail/base/moz.build
@@ -2,8 +2,9 @@
 # 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/.
 
 DIRS += ['modules']
 
 TEST_DIRS += ['test']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/branding/aurora/locales/moz.build
+++ b/mail/branding/aurora/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/branding/aurora/moz.build
+++ b/mail/branding/aurora/moz.build
@@ -1,7 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['locales']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/branding/nightly/locales/moz.build
+++ b/mail/branding/nightly/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/branding/nightly/moz.build
+++ b/mail/branding/nightly/moz.build
@@ -1,7 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['locales']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/about-support/moz.build
+++ b/mail/components/about-support/moz.build
@@ -9,8 +9,9 @@ EXTRA_JS_MODULES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXTRA_JS_MODULES += ['aboutSupportWin32.js']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXTRA_JS_MODULES += ['aboutSupportMac.js']
 else:
     EXTRA_JS_MODULES += ['aboutSupportUnix.js']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/activity/moz.build
+++ b/mail/components/activity/moz.build
@@ -25,8 +25,9 @@ EXTRA_JS_MODULES += [
     'modules/glodaIndexer.js',
     'modules/moveCopy.js',
     'modules/pop3Download.js',
     'modules/sendLater.js',
 ]
 
 JS_MODULES_PATH = 'modules/activity'
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/addrbook/moz.build
+++ b/mail/components/addrbook/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/cloudfile/moz.build
+++ b/mail/components/cloudfile/moz.build
@@ -15,8 +15,9 @@ EXTRA_COMPONENTS += [
     'nsUbuntuOne.js',
     'nsYouSendIt.js',
 ]
 
 EXTRA_JS_MODULES += [
     'cloudFileAccounts.js',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/compose/moz.build
+++ b/mail/components/compose/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/devtools/extension/moz.build
+++ b/mail/components/devtools/extension/moz.build
@@ -2,8 +2,10 @@
 # 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/.
 
 EXTRA_JS_MODULES += ["../modules/RemoteDebuggerServer.jsm",
                      "../modules/XULRootActor.js"]
 
 XPI_NAME = 'dbgserver'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/devtools/moz.build
+++ b/mail/components/devtools/moz.build
@@ -2,8 +2,10 @@
 # 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/.
 
 DIRS += ["extension"]
 
 EXTRA_JS_MODULES += ["modules/RemoteDebuggerServer.jsm",
                      "modules/XULRootActor.js"]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/im/moz.build
+++ b/mail/components/im/moz.build
@@ -10,8 +10,9 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_JS_MODULES += [
     'modules/chatHandler.jsm',
     'modules/index_im.js',
     'modules/search_im.js',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/migration/moz.build
+++ b/mail/components/migration/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 DIRS += [
     'public',
     'src',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/newmailaccount/moz.build
+++ b/mail/components/newmailaccount/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/preferences/moz.build
+++ b/mail/components/preferences/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -13,8 +13,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
     FINAL_LIBRARY = 'mailcomps'
 
 DIRS += ['public']
 
 EXTRA_PP_JS_MODULES += [
     'SearchIntegration.js',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/extensions/mailviews/moz.build
+++ b/mail/extensions/mailviews/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/extensions/smime/moz.build
+++ b/mail/extensions/smime/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/jquery/moz.build
+++ b/mail/jquery/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/locales/moz.build
+++ b/mail/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/themes/linux/moz.build
+++ b/mail/themes/linux/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/themes/osx/moz.build
+++ b/mail/themes/osx/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mail/themes/windows/moz.build
+++ b/mail/themes/windows/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mailnews/db/gloda/moz.build
+++ b/mailnews/db/gloda/moz.build
@@ -5,8 +5,9 @@
 
 DIRS += [
     'modules',
     'components',
 ]
 
 TEST_DIRS += ['test']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mailnews/extensions/dsn/moz.build
+++ b/mailnews/extensions/dsn/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'src/dsn-service.js',
     'src/dsn-service.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mailnews/extensions/mdn/moz.build
+++ b/mailnews/extensions/mdn/moz.build
@@ -1,8 +1,9 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['src']
 TEST_DIRS += ['test']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mailnews/extensions/newsblog/moz.build
+++ b/mailnews/extensions/newsblog/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'js/newsblog.js',
     'js/newsblog.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mailnews/extensions/smime/moz.build
+++ b/mailnews/extensions/smime/moz.build
@@ -3,8 +3,9 @@
 # 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/.
 
 PARALLEL_DIRS += [
     'public',
     'src',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -54,8 +54,10 @@ if CONFIG['MOZ_MAPI_SUPPORT']:
 
 DIRS += [
     'build',
     'import/build',
 ]
 
 DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
 DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/other-licenses/branding/thunderbird/locales/moz.build
+++ b/other-licenses/branding/thunderbird/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/other-licenses/branding/thunderbird/moz.build
+++ b/other-licenses/branding/thunderbird/moz.build
@@ -1,7 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['locales']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/branding/nightly/moz.build
+++ b/suite/branding/nightly/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/browser/moz.build
+++ b/suite/browser/moz.build
@@ -6,8 +6,9 @@
 TEST_DIRS += ['test']
 
 EXTRA_COMPONENTS += [
     'nsBrowserContentHandler.js',
     'nsTypeAheadFind.js',
     'SuiteBrowser.manifest',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/common/moz.build
+++ b/suite/common/moz.build
@@ -9,8 +9,10 @@ PARALLEL_DIRS += [
 ]
 
 TEST_DIRS += [
     'tests',
     'dataman/tests',
     'downloads/tests',
     'places/tests',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/debugQA/locales/moz.build
+++ b/suite/debugQA/locales/moz.build
@@ -1,6 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 XPI_NAME = 'debugQA'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/debugQA/moz.build
+++ b/suite/debugQA/moz.build
@@ -1,8 +1,10 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['locales']
 
 XPI_NAME = 'debugQA'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/locales/moz.build
+++ b/suite/locales/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/mailnews/moz.build
+++ b/suite/mailnews/moz.build
@@ -1,7 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['modules']
 
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@@ -9,8 +9,9 @@ PARALLEL_DIRS += [
 ]
 
 SOURCES += [
     'nsSuiteDirectoryProvider.cpp',
 ]
 
 FINAL_LIBRARY = 'suite'
 
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/security/moz.build
+++ b/suite/security/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/themes/classic/moz.build
+++ b/suite/themes/classic/moz.build
@@ -1,4 +1,6 @@
 # vim: set filetype=python:
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/suite/themes/modern/moz.build
+++ b/suite/themes/modern/moz.build
@@ -1,6 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 DIST_SUBDIR = 'extensions/modern@themes.mozilla.org'
+
+JAR_MANIFESTS += ['jar.mn']