From e396fc159d907387dcc1b1501c07cbc42b10210f Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Tue, 10 Dec 2013 16:18:11 +0900 Subject: [PATCH] Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium Every directory with a jar.mn now has JAR_MANIFESTS defined in its moz.build file. We also removed the may_skip special consideration of jar.mn files because this information is now available during tier traversal by the reader courtesy of the variables being present in moz.build files. --HG-- extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98 extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19 --- accessible/src/jsat/moz.build | 2 ++ b2g/branding/official/content/moz.build | 1 + b2g/branding/official/locales/moz.build | 1 + b2g/branding/unofficial/content/moz.build | 1 + b2g/branding/unofficial/locales/moz.build | 1 + b2g/chrome/moz.build | 2 ++ b2g/locales/moz.build | 1 + browser/base/moz.build | 2 ++ browser/branding/aurora/content/moz.build | 1 + browser/branding/aurora/locales/moz.build | 2 ++ browser/branding/nightly/content/moz.build | 1 + browser/branding/nightly/locales/moz.build | 2 ++ browser/branding/official/content/moz.build | 1 + browser/branding/official/locales/moz.build | 1 + browser/branding/unofficial/content/moz.build | 1 + browser/branding/unofficial/locales/moz.build | 2 ++ browser/components/certerror/moz.build | 2 ++ browser/components/customizableui/content/moz.build | 1 + browser/components/downloads/moz.build | 2 ++ browser/components/feeds/moz.build | 2 ++ browser/components/migration/moz.build | 2 ++ browser/components/places/moz.build | 2 ++ browser/components/preferences/in-content/moz.build | 2 ++ browser/components/preferences/moz.build | 2 ++ browser/components/privatebrowsing/moz.build | 2 ++ browser/components/search/moz.build | 2 ++ browser/components/sessionstore/moz.build | 2 ++ browser/components/shell/moz.build | 2 ++ browser/components/tabview/moz.build | 2 ++ browser/devtools/moz.build | 2 ++ browser/locales/moz.build | 1 + browser/metro/base/moz.build | 2 ++ browser/metro/locales/moz.build | 1 + browser/metro/theme/moz.build | 1 + browser/themes/linux/communicator/moz.build | 1 + browser/themes/linux/moz.build | 1 + browser/themes/osx/communicator/moz.build | 1 + browser/themes/osx/moz.build | 1 + browser/themes/windows/communicator/moz.build | 1 + browser/themes/windows/moz.build | 1 + config/config.mk | 1 + config/rules.mk | 11 ++++++++--- config/tests/src-simple/Makefile.in | 2 ++ config/tests/src-simple/moz.build | 1 + content/xbl/builtin/android/moz.build | 1 + content/xbl/builtin/emacs/moz.build | 1 + content/xbl/builtin/mac/moz.build | 1 + content/xbl/builtin/unix/moz.build | 1 + content/xbl/builtin/win/moz.build | 1 + content/xml/document/resources/moz.build | 1 + content/xslt/tests/buster/moz.build | 1 + docshell/resources/content/moz.build | 1 + dom/inputmethod/moz.build | 2 ++ dom/ipc/moz.build | 2 ++ dom/locales/moz.build | 1 + dom/src/moz.build | 2 ++ intl/uconv/src/moz.build | 2 ++ js/src/config/config.mk | 1 + js/src/config/rules.mk | 11 ++++++++--- layout/generic/moz.build | 2 ++ layout/ipc/moz.build | 2 ++ layout/mathml/moz.build | 2 ++ layout/style/moz.build | 2 ++ layout/style/xbl-marquee/moz.build | 1 + layout/tools/layout-debug/ui/moz.build | 1 + layout/tools/recording/moz.build | 2 ++ layout/tools/reftest/moz.build | 1 + mobile/android/branding/aurora/content/moz.build | 1 + mobile/android/branding/aurora/locales/moz.build | 1 + mobile/android/branding/beta/content/moz.build | 1 + mobile/android/branding/beta/locales/moz.build | 1 + mobile/android/branding/nightly/content/moz.build | 1 + mobile/android/branding/nightly/locales/moz.build | 1 + mobile/android/branding/official/content/moz.build | 1 + mobile/android/branding/official/locales/moz.build | 1 + mobile/android/branding/unofficial/content/moz.build | 1 + mobile/android/branding/unofficial/locales/moz.build | 1 + mobile/android/chrome/moz.build | 2 ++ mobile/android/locales/moz.build | 1 + mobile/android/themes/core/moz.build | 1 + mobile/locales/moz.build | 1 + netwerk/locales/moz.build | 1 + netwerk/test/httpserver/moz.build | 1 + python/mozbuild/mozbuild/backend/recursivemake.py | 5 ----- python/mozbuild/mozbuild/frontend/emitter.py | 11 +++++++++++ security/manager/locales/moz.build | 1 + security/manager/pki/resources/moz.build | 1 + services/sync/locales/moz.build | 1 + testing/marionette/atoms/moz.build | 1 + testing/marionette/moz.build | 2 ++ testing/mochitest/moz.build | 2 ++ testing/specialpowers/moz.build | 2 ++ toolkit/components/aboutmemory/moz.build | 2 ++ toolkit/components/alerts/moz.build | 2 ++ toolkit/components/apppicker/moz.build | 1 + toolkit/components/console/moz.build | 2 ++ toolkit/components/cookie/moz.build | 1 + toolkit/components/filepicker/moz.build | 2 ++ toolkit/components/help/moz.build | 1 + toolkit/components/passwordmgr/moz.build | 2 ++ toolkit/components/printing/moz.build | 1 + toolkit/components/prompts/moz.build | 2 ++ toolkit/components/satchel/moz.build | 2 ++ toolkit/components/thumbnails/moz.build | 2 ++ toolkit/components/typeaheadfind/moz.build | 2 ++ toolkit/components/url-classifier/tests/moz.build | 2 ++ toolkit/components/viewconfig/moz.build | 1 + toolkit/components/viewsource/moz.build | 2 ++ toolkit/content/moz.build | 2 ++ toolkit/crashreporter/moz.build | 2 ++ toolkit/locales/moz.build | 1 + toolkit/mozapps/downloads/moz.build | 1 + toolkit/mozapps/extensions/moz.build | 2 ++ toolkit/mozapps/handling/moz.build | 2 ++ toolkit/mozapps/plugins/moz.build | 2 ++ toolkit/mozapps/preferences/moz.build | 1 + toolkit/mozapps/update/moz.build | 2 ++ toolkit/obsolete/moz.build | 1 + toolkit/profile/moz.build | 2 ++ toolkit/themes/faststripe/global/moz.build | 1 + toolkit/themes/linux/global/moz.build | 1 + toolkit/themes/linux/help/moz.build | 1 + toolkit/themes/linux/mozapps/moz.build | 1 + toolkit/themes/os2/global/moz.build | 1 + toolkit/themes/osx/global/moz.build | 1 + toolkit/themes/osx/help/moz.build | 1 + toolkit/themes/osx/mozapps/moz.build | 1 + toolkit/themes/windows/global/moz.build | 1 + toolkit/themes/windows/help/moz.build | 1 + toolkit/themes/windows/mozapps/moz.build | 1 + tools/quitter/moz.build | 2 ++ webapprt/locales/moz.build | 2 ++ webapprt/moz.build | 2 ++ xpfe/components/autocomplete/moz.build | 2 ++ xulrunner/examples/simple/moz.build | 2 ++ 135 files changed, 215 insertions(+), 11 deletions(-) diff --git a/accessible/src/jsat/moz.build b/accessible/src/jsat/moz.build index a7871002320f..970ecc6de30e 100644 --- a/accessible/src/jsat/moz.build +++ b/accessible/src/jsat/moz.build @@ -16,3 +16,5 @@ EXTRA_JS_MODULES += [ 'TraversalRules.jsm', 'Utils.jsm' ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/b2g/branding/official/content/moz.build b/b2g/branding/official/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/b2g/branding/official/content/moz.build +++ b/b2g/branding/official/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/b2g/branding/official/locales/moz.build b/b2g/branding/official/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/b2g/branding/official/locales/moz.build +++ b/b2g/branding/official/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/b2g/branding/unofficial/content/moz.build b/b2g/branding/unofficial/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/b2g/branding/unofficial/content/moz.build +++ b/b2g/branding/unofficial/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/b2g/branding/unofficial/locales/moz.build b/b2g/branding/unofficial/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/b2g/branding/unofficial/locales/moz.build +++ b/b2g/branding/unofficial/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/b2g/chrome/moz.build b/b2g/chrome/moz.build index 27be5477130b..bea69e096ae5 100644 --- a/b2g/chrome/moz.build +++ b/b2g/chrome/moz.build @@ -7,3 +7,5 @@ DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE'] DEFINES['PACKAGE'] = 'browser' DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/b2g/locales/moz.build b/b2g/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/b2g/locales/moz.build +++ b/b2g/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/base/moz.build b/browser/base/moz.build index cb1a787f1996..0585edde034e 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -34,3 +34,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1 + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/aurora/content/moz.build b/browser/branding/aurora/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/branding/aurora/content/moz.build +++ b/browser/branding/aurora/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/branding/aurora/locales/moz.build b/browser/branding/aurora/locales/moz.build index 062fc309ba37..3a54c0cd24e9 100644 --- a/browser/branding/aurora/locales/moz.build +++ b/browser/branding/aurora/locales/moz.build @@ -5,3 +5,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/nightly/content/moz.build b/browser/branding/nightly/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/branding/nightly/content/moz.build +++ b/browser/branding/nightly/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/branding/nightly/locales/moz.build b/browser/branding/nightly/locales/moz.build index 062fc309ba37..3a54c0cd24e9 100644 --- a/browser/branding/nightly/locales/moz.build +++ b/browser/branding/nightly/locales/moz.build @@ -5,3 +5,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/official/content/moz.build b/browser/branding/official/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/branding/official/content/moz.build +++ b/browser/branding/official/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/branding/official/locales/moz.build b/browser/branding/official/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/branding/official/locales/moz.build +++ b/browser/branding/official/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/branding/unofficial/content/moz.build b/browser/branding/unofficial/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/branding/unofficial/content/moz.build +++ b/browser/branding/unofficial/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/branding/unofficial/locales/moz.build b/browser/branding/unofficial/locales/moz.build index 062fc309ba37..3a54c0cd24e9 100644 --- a/browser/branding/unofficial/locales/moz.build +++ b/browser/branding/unofficial/locales/moz.build @@ -5,3 +5,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/certerror/moz.build b/browser/components/certerror/moz.build index 110bf329320e..b5009e4d0914 100644 --- a/browser/components/certerror/moz.build +++ b/browser/components/certerror/moz.build @@ -7,3 +7,5 @@ BROWSER_CHROME_MANIFESTS += [ 'test/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/customizableui/content/moz.build b/browser/components/customizableui/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/components/customizableui/content/moz.build +++ b/browser/components/customizableui/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/components/downloads/moz.build b/browser/components/downloads/moz.build index bc34373f19f8..e43c5774c550 100644 --- a/browser/components/downloads/moz.build +++ b/browser/components/downloads/moz.build @@ -13,3 +13,5 @@ XPCSHELL_TESTS_MANIFESTS += [ BROWSER_CHROME_MANIFESTS += [ 'test/browser/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/feeds/moz.build b/browser/components/feeds/moz.build index 8db7850c183e..97ead0f9873d 100644 --- a/browser/components/feeds/moz.build +++ b/browser/components/feeds/moz.build @@ -17,3 +17,5 @@ MOCHITEST_CHROME_MANIFESTS += [ MOCHITEST_MANIFESTS += [ 'test/mochitest.ini' ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build index ae0d1e0bdc68..857759511dec 100644 --- a/browser/components/migration/moz.build +++ b/browser/components/migration/moz.build @@ -9,3 +9,5 @@ DIRS += ['public', 'src'] XPCSHELL_TESTS_MANIFESTS += [ 'tests/unit/xpcshell.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build index 473a3d65d954..68f83cd7e661 100644 --- a/browser/components/places/moz.build +++ b/browser/components/places/moz.build @@ -17,3 +17,5 @@ MOCHITEST_CHROME_MANIFESTS += [ BROWSER_CHROME_MANIFESTS += [ 'tests/browser/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/preferences/in-content/moz.build b/browser/components/preferences/in-content/moz.build index e6bdbaf44a72..c7a9847c6e0d 100644 --- a/browser/components/preferences/in-content/moz.build +++ b/browser/components/preferences/in-content/moz.build @@ -9,3 +9,5 @@ for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'cocoa'): DEFINES['HAVE_SHELL_SERVICE'] = 1 + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/preferences/moz.build b/browser/components/preferences/moz.build index e35d8f9bb25f..2f7f381feaaf 100644 --- a/browser/components/preferences/moz.build +++ b/browser/components/preferences/moz.build @@ -16,3 +16,5 @@ for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'): DEFINES['HAVE_SHELL_SERVICE'] = 1 + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/privatebrowsing/moz.build b/browser/components/privatebrowsing/moz.build index e371d5bf8159..db73a0265c5c 100644 --- a/browser/components/privatebrowsing/moz.build +++ b/browser/components/privatebrowsing/moz.build @@ -7,3 +7,5 @@ BROWSER_CHROME_MANIFESTS += [ 'test/browser/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/search/moz.build b/browser/components/search/moz.build index 110bf329320e..b5009e4d0914 100644 --- a/browser/components/search/moz.build +++ b/browser/components/search/moz.build @@ -7,3 +7,5 @@ BROWSER_CHROME_MANIFESTS += [ 'test/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/sessionstore/moz.build b/browser/components/sessionstore/moz.build index 59bb71ca6a4e..4a5e274ba014 100644 --- a/browser/components/sessionstore/moz.build +++ b/browser/components/sessionstore/moz.build @@ -20,3 +20,5 @@ XPCSHELL_TESTS_MANIFESTS += [ BROWSER_CHROME_MANIFESTS += [ 'test/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build index 67753eb1b9b4..3b401f4ec087 100644 --- a/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build @@ -13,3 +13,5 @@ XPCSHELL_TESTS_MANIFESTS += [ BROWSER_CHROME_MANIFESTS += [ 'test/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/components/tabview/moz.build b/browser/components/tabview/moz.build index f673b90973d2..7416c2d63214 100644 --- a/browser/components/tabview/moz.build +++ b/browser/components/tabview/moz.build @@ -10,3 +10,5 @@ JS_MODULES_PATH = 'modules/tabview' BROWSER_CHROME_MANIFESTS += [ 'test/browser.ini', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/devtools/moz.build b/browser/devtools/moz.build index 87b84bce02d4..3f19e867c901 100644 --- a/browser/devtools/moz.build +++ b/browser/devtools/moz.build @@ -30,3 +30,5 @@ EXTRA_COMPONENTS += [ 'devtools-clhandler.js', 'devtools-clhandler.manifest', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/locales/moz.build b/browser/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/locales/moz.build +++ b/browser/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/metro/base/moz.build b/browser/metro/base/moz.build index 1bba6b849a99..67c7887f3c94 100644 --- a/browser/metro/base/moz.build +++ b/browser/metro/base/moz.build @@ -12,3 +12,5 @@ DIST_SUBDIR = 'metro' DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE'] DEFINES['PACKAGE'] = 'browser' DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/metro/locales/moz.build b/browser/metro/locales/moz.build index 8a1454c9cd75..07c483373c01 100644 --- a/browser/metro/locales/moz.build +++ b/browser/metro/locales/moz.build @@ -7,3 +7,4 @@ # Process desktop related resource we reuse here. DIRS += ['import'] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/metro/theme/moz.build b/browser/metro/theme/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/metro/theme/moz.build +++ b/browser/metro/theme/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/themes/linux/communicator/moz.build b/browser/themes/linux/communicator/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/themes/linux/communicator/moz.build +++ b/browser/themes/linux/communicator/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/themes/linux/moz.build b/browser/themes/linux/moz.build index 4c7366cd5acf..6a7af20adda0 100644 --- a/browser/themes/linux/moz.build +++ b/browser/themes/linux/moz.build @@ -6,3 +6,4 @@ DIRS += ['communicator'] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/themes/osx/communicator/moz.build b/browser/themes/osx/communicator/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/themes/osx/communicator/moz.build +++ b/browser/themes/osx/communicator/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/themes/osx/moz.build b/browser/themes/osx/moz.build index 4c7366cd5acf..6a7af20adda0 100644 --- a/browser/themes/osx/moz.build +++ b/browser/themes/osx/moz.build @@ -6,3 +6,4 @@ DIRS += ['communicator'] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/themes/windows/communicator/moz.build b/browser/themes/windows/communicator/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/browser/themes/windows/communicator/moz.build +++ b/browser/themes/windows/communicator/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/browser/themes/windows/moz.build b/browser/themes/windows/moz.build index 4c7366cd5acf..6a7af20adda0 100644 --- a/browser/themes/windows/moz.build +++ b/browser/themes/windows/moz.build @@ -6,3 +6,4 @@ DIRS += ['communicator'] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/config/config.mk b/config/config.mk index 0f051c42a678..537e67040bc3 100644 --- a/config/config.mk +++ b/config/config.mk @@ -51,6 +51,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ HOST_PROGRAM \ HOST_SIMPLE_PROGRAMS \ IS_COMPONENT \ + JAR_MANIFEST \ JAVA_JAR_TARGETS \ JS_MODULES_PATH \ LIBRARY_NAME \ diff --git a/config/rules.mk b/config/rules.mk index 4db9adab9d7e..535fc7cc9cf5 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1284,8 +1284,6 @@ endif # SDK_BINARY ################################################################################ # CHROME PACKAGING -JAR_MANIFEST := $(srcdir)/jar.mn - chrome:: $(MAKE) realchrome $(LOOP_OVER_PARALLEL_DIRS) @@ -1294,7 +1292,7 @@ chrome:: $(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome) -ifneq (,$(wildcard $(JAR_MANIFEST))) +ifneq (,$(JAR_MANIFEST)) ifndef NO_DIST_INSTALL ifdef XPI_NAME @@ -1321,6 +1319,13 @@ libs realchrome:: $(FINAL_TARGET)/chrome $(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),) diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index 3a4d7a6e7577..aa5de0b0e115 100644 --- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -5,7 +5,9 @@ LOCALE_SRCDIR = $(srcdir)/l10n +EXTERNALLY_MANAGED_MAKE_FILE := 1 STANDALONE_MAKEFILE := 1 +JAR_MANIFEST := $(srcdir)/jar.mn include $(topsrcdir)/config/config.mk diff --git a/config/tests/src-simple/moz.build b/config/tests/src-simple/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/config/tests/src-simple/moz.build +++ b/config/tests/src-simple/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/content/xbl/builtin/android/moz.build b/content/xbl/builtin/android/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/content/xbl/builtin/android/moz.build +++ b/content/xbl/builtin/android/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/content/xbl/builtin/emacs/moz.build b/content/xbl/builtin/emacs/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/content/xbl/builtin/emacs/moz.build +++ b/content/xbl/builtin/emacs/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/content/xbl/builtin/mac/moz.build b/content/xbl/builtin/mac/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/content/xbl/builtin/mac/moz.build +++ b/content/xbl/builtin/mac/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/content/xbl/builtin/unix/moz.build b/content/xbl/builtin/unix/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/content/xbl/builtin/unix/moz.build +++ b/content/xbl/builtin/unix/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/content/xbl/builtin/win/moz.build b/content/xbl/builtin/win/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/content/xbl/builtin/win/moz.build +++ b/content/xbl/builtin/win/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/content/xml/document/resources/moz.build b/content/xml/document/resources/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/content/xml/document/resources/moz.build +++ b/content/xml/document/resources/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/content/xslt/tests/buster/moz.build b/content/xslt/tests/buster/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/content/xslt/tests/buster/moz.build +++ b/content/xslt/tests/buster/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/docshell/resources/content/moz.build b/docshell/resources/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/docshell/resources/content/moz.build +++ b/docshell/resources/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/dom/inputmethod/moz.build b/dom/inputmethod/moz.build index 651aa00abeae..e798c584285b 100644 --- a/dom/inputmethod/moz.build +++ b/dom/inputmethod/moz.build @@ -18,3 +18,5 @@ EXTRA_COMPONENTS += [ EXTRA_JS_MODULES += [ 'Keyboard.jsm', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index e1b4c5429d06..90cb298fb97e 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -116,3 +116,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gonk', 'qt'): for var in ('MOZ_PERMISSIONS', 'MOZ_CHILD_PERMISSIONS'): if CONFIG[var]: DEFINES[var] = True + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/dom/locales/moz.build b/dom/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/dom/locales/moz.build +++ b/dom/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/dom/src/moz.build b/dom/src/moz.build index 1250468ded51..23ec850386d8 100644 --- a/dom/src/moz.build +++ b/dom/src/moz.build @@ -13,3 +13,5 @@ DIRS += [ 'geolocation', 'notification', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/intl/uconv/src/moz.build b/intl/uconv/src/moz.build index 9e4726ebb2da..0e617dc7dfb8 100644 --- a/intl/uconv/src/moz.build +++ b/intl/uconv/src/moz.build @@ -233,3 +233,5 @@ LOCAL_INCLUDES += [ ] FINAL_LIBRARY = 'xul' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/js/src/config/config.mk b/js/src/config/config.mk index 0f051c42a678..537e67040bc3 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -51,6 +51,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ HOST_PROGRAM \ HOST_SIMPLE_PROGRAMS \ IS_COMPONENT \ + JAR_MANIFEST \ JAVA_JAR_TARGETS \ JS_MODULES_PATH \ LIBRARY_NAME \ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 4db9adab9d7e..535fc7cc9cf5 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1284,8 +1284,6 @@ endif # SDK_BINARY ################################################################################ # CHROME PACKAGING -JAR_MANIFEST := $(srcdir)/jar.mn - chrome:: $(MAKE) realchrome $(LOOP_OVER_PARALLEL_DIRS) @@ -1294,7 +1292,7 @@ chrome:: $(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome) -ifneq (,$(wildcard $(JAR_MANIFEST))) +ifneq (,$(JAR_MANIFEST)) ifndef NO_DIST_INSTALL ifdef XPI_NAME @@ -1321,6 +1319,13 @@ libs realchrome:: $(FINAL_TARGET)/chrome $(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),) diff --git a/layout/generic/moz.build b/layout/generic/moz.build index b4785819f4d4..78b43ed94061 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -121,3 +121,5 @@ LOCAL_INCLUDES += [ '../tables', '../xul', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index aebe290082b8..f727e3cdb684 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -31,3 +31,5 @@ LOCAL_INCLUDES += [ '/layout/generic', '/layout/xul', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index ef8a2cb7e698..2cccef5cb817 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -46,3 +46,5 @@ if CONFIG['ENABLE_TESTS']: PARALLEL_DIRS += [ 'tests', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/layout/style/moz.build b/layout/style/moz.build index 1bd54dcca070..0ff891b68052 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -154,3 +154,5 @@ LOCAL_INCLUDES += [ '../xul', '/dom/base', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/layout/style/xbl-marquee/moz.build b/layout/style/xbl-marquee/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/layout/style/xbl-marquee/moz.build +++ b/layout/style/xbl-marquee/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/layout/tools/layout-debug/ui/moz.build b/layout/tools/layout-debug/ui/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/layout/tools/layout-debug/ui/moz.build +++ b/layout/tools/layout-debug/ui/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/layout/tools/recording/moz.build b/layout/tools/recording/moz.build index 5cd83c56eab5..1f9a40813318 100644 --- a/layout/tools/recording/moz.build +++ b/layout/tools/recording/moz.build @@ -8,3 +8,5 @@ EXTRA_COMPONENTS += [ 'recording-cmdline.js', 'recording-cmdline.manifest', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/layout/tools/reftest/moz.build b/layout/tools/reftest/moz.build index 58edd5f35c66..e912bf1d7dd8 100644 --- a/layout/tools/reftest/moz.build +++ b/layout/tools/reftest/moz.build @@ -8,3 +8,4 @@ EXTRA_COMPONENTS += [ 'reftest-cmdline.js', ] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/mobile/android/branding/aurora/content/moz.build b/mobile/android/branding/aurora/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/aurora/content/moz.build +++ b/mobile/android/branding/aurora/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/aurora/locales/moz.build b/mobile/android/branding/aurora/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/aurora/locales/moz.build +++ b/mobile/android/branding/aurora/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/beta/content/moz.build b/mobile/android/branding/beta/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/beta/content/moz.build +++ b/mobile/android/branding/beta/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/beta/locales/moz.build b/mobile/android/branding/beta/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/beta/locales/moz.build +++ b/mobile/android/branding/beta/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/nightly/content/moz.build b/mobile/android/branding/nightly/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/nightly/content/moz.build +++ b/mobile/android/branding/nightly/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/nightly/locales/moz.build b/mobile/android/branding/nightly/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/nightly/locales/moz.build +++ b/mobile/android/branding/nightly/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/official/content/moz.build b/mobile/android/branding/official/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/official/content/moz.build +++ b/mobile/android/branding/official/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/official/locales/moz.build b/mobile/android/branding/official/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/official/locales/moz.build +++ b/mobile/android/branding/official/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/unofficial/content/moz.build b/mobile/android/branding/unofficial/content/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/unofficial/content/moz.build +++ b/mobile/android/branding/unofficial/content/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/branding/unofficial/locales/moz.build b/mobile/android/branding/unofficial/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/branding/unofficial/locales/moz.build +++ b/mobile/android/branding/unofficial/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/chrome/moz.build b/mobile/android/chrome/moz.build index e7e76e41e652..0761d1b2aa79 100644 --- a/mobile/android/chrome/moz.build +++ b/mobile/android/chrome/moz.build @@ -8,3 +8,5 @@ DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE'] DEFINES['PACKAGE'] = 'browser' DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/mobile/android/locales/moz.build b/mobile/android/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/locales/moz.build +++ b/mobile/android/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/android/themes/core/moz.build b/mobile/android/themes/core/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/android/themes/core/moz.build +++ b/mobile/android/themes/core/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/mobile/locales/moz.build b/mobile/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/mobile/locales/moz.build +++ b/mobile/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/netwerk/locales/moz.build b/netwerk/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/netwerk/locales/moz.build +++ b/netwerk/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/netwerk/test/httpserver/moz.build b/netwerk/test/httpserver/moz.build index a2e178b76dc5..4f88d7a18e40 100644 --- a/netwerk/test/httpserver/moz.build +++ b/netwerk/test/httpserver/moz.build @@ -16,3 +16,4 @@ EXTRA_COMPONENTS += [ 'httpd.js', ] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py index eba65f612684..4d7e47f87e5e 100644 --- a/python/mozbuild/mozbuild/backend/recursivemake.py +++ b/python/mozbuild/mozbuild/backend/recursivemake.py @@ -687,11 +687,6 @@ class RecursiveMakeBackend(CommonBackend): self.log(logging.DEBUG, 'stub_makefile', {'path': makefile}, 'Creating stub Makefile: {path}') - # Can't skip directories with a jar.mn for the 'libs' tier. - if bf.relobjdir in self._may_skip['libs'] and \ - os.path.exists(mozpath.join(srcdir, 'jar.mn')): - self._may_skip['libs'].remove(bf.relobjdir) - obj = self.Substitution() obj.output_path = makefile obj.input_path = makefile_in diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index ef9011bf2c91..b9e724ceb38d 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -390,6 +390,17 @@ class TreeMetadataEmitter(LoggingMixin): for path in jar_manifests: yield JARManifest(sandbox, mozpath.join(sandbox['SRCDIR'], path)) + # Temporary test to look for jar.mn files that creep in without using + # the new declaration. Before, we didn't require jar.mn files to + # declared anywhere (they were discovered). This will detect people + # relying on the old behavior. + if os.path.exists(os.path.join(sandbox['SRCDIR'], 'jar.mn')): + if 'jar.mn' not in jar_manifests: + raise SandboxValidationError('A jar.mn exists in %s but it ' + 'is not referenced in the corresponding moz.build file. ' + 'Please define JAR_MANIFESTS in the moz.build file.' % + sandbox['SRCDIR']) + for name, jar in sandbox.get('JAVA_JAR_TARGETS', {}).items(): yield SandboxWrapped(sandbox, jar) diff --git a/security/manager/locales/moz.build b/security/manager/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/security/manager/locales/moz.build +++ b/security/manager/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/security/manager/pki/resources/moz.build b/security/manager/pki/resources/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/security/manager/pki/resources/moz.build +++ b/security/manager/pki/resources/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/services/sync/locales/moz.build b/services/sync/locales/moz.build index 895d11993cfb..3bbe6729759c 100644 --- a/services/sync/locales/moz.build +++ b/services/sync/locales/moz.build @@ -4,3 +4,4 @@ # 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'] diff --git a/testing/marionette/atoms/moz.build b/testing/marionette/atoms/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/testing/marionette/atoms/moz.build +++ b/testing/marionette/atoms/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/testing/marionette/moz.build b/testing/marionette/moz.build index 7b4288f8a76c..91677ab04677 100644 --- a/testing/marionette/moz.build +++ b/testing/marionette/moz.build @@ -8,3 +8,5 @@ DIRS += ['components', 'atoms'] if CONFIG['ENABLE_TESTS']: DEFINES['ENABLE_TESTS'] = True + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build index 8e318e08c26b..65bea2ad415b 100644 --- a/testing/mochitest/moz.build +++ b/testing/mochitest/moz.build @@ -17,3 +17,5 @@ if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': DIRS += ['roboextender'] XPI_NAME = 'mochijar' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/testing/specialpowers/moz.build b/testing/specialpowers/moz.build index 8ed20aa5d67f..1e4e67014bdf 100644 --- a/testing/specialpowers/moz.build +++ b/testing/specialpowers/moz.build @@ -9,3 +9,5 @@ EXTRA_COMPONENTS += [ ] XPI_NAME = 'specialpowers' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/aboutmemory/moz.build b/toolkit/components/aboutmemory/moz.build index 0a6b67fd879f..908d5cd3828e 100644 --- a/toolkit/components/aboutmemory/moz.build +++ b/toolkit/components/aboutmemory/moz.build @@ -5,3 +5,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. TEST_DIRS += ['tests'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build index c773fd9f02b1..ab27295f6316 100644 --- a/toolkit/components/alerts/moz.build +++ b/toolkit/components/alerts/moz.build @@ -20,3 +20,5 @@ UNIFIED_SOURCES += [ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'toolkitcomps' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/apppicker/moz.build b/toolkit/components/apppicker/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/components/apppicker/moz.build +++ b/toolkit/components/apppicker/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/components/console/moz.build b/toolkit/components/console/moz.build index 20ddaf6c0ad2..aac6a8cb53c8 100644 --- a/toolkit/components/console/moz.build +++ b/toolkit/components/console/moz.build @@ -10,3 +10,5 @@ EXTRA_COMPONENTS += [ 'jsconsole-clhandler.js', 'jsconsole-clhandler.manifest', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/cookie/moz.build b/toolkit/components/cookie/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/components/cookie/moz.build +++ b/toolkit/components/cookie/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build index 1c139f37c504..dd6706982d97 100644 --- a/toolkit/components/filepicker/moz.build +++ b/toolkit/components/filepicker/moz.build @@ -23,3 +23,5 @@ if CONFIG['MOZ_XUL'] and \ 'test', ] FINAL_LIBRARY = 'xul' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/help/moz.build b/toolkit/components/help/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/components/help/moz.build +++ b/toolkit/components/help/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build index 88b5636d6b15..66803c626524 100644 --- a/toolkit/components/passwordmgr/moz.build +++ b/toolkit/components/passwordmgr/moz.build @@ -33,3 +33,5 @@ EXTRA_JS_MODULES += [ 'InsecurePasswordUtils.jsm', 'LoginManagerContent.jsm', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/printing/moz.build b/toolkit/components/printing/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/components/printing/moz.build +++ b/toolkit/components/printing/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/components/prompts/moz.build b/toolkit/components/prompts/moz.build index 6f65f014fa8f..9ace05c2eb10 100644 --- a/toolkit/components/prompts/moz.build +++ b/toolkit/components/prompts/moz.build @@ -6,3 +6,5 @@ DIRS += ['src'] TEST_DIRS += ['test'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build index 99fee77553e0..e893421f3750 100644 --- a/toolkit/components/satchel/moz.build +++ b/toolkit/components/satchel/moz.build @@ -44,3 +44,5 @@ EXTRA_PP_JS_MODULES += [ ] FINAL_LIBRARY = 'xul' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/thumbnails/moz.build b/toolkit/components/thumbnails/moz.build index 7593729dea85..d0606e1404bc 100644 --- a/toolkit/components/thumbnails/moz.build +++ b/toolkit/components/thumbnails/moz.build @@ -16,3 +16,5 @@ EXTRA_JS_MODULES += [ 'PageThumbs.jsm', 'PageThumbsWorker.js', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/typeaheadfind/moz.build b/toolkit/components/typeaheadfind/moz.build index 77997adf0636..044d8086cc2b 100644 --- a/toolkit/components/typeaheadfind/moz.build +++ b/toolkit/components/typeaheadfind/moz.build @@ -15,3 +15,5 @@ SOURCES += [ ] FINAL_LIBRARY = 'toolkitcomps' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/url-classifier/tests/moz.build b/toolkit/components/url-classifier/tests/moz.build index 58df6396b1ff..fffd1cbd6fdd 100644 --- a/toolkit/components/url-classifier/tests/moz.build +++ b/toolkit/components/url-classifier/tests/moz.build @@ -7,3 +7,5 @@ TEST_TOOL_DIRS += ['mochitest'] XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/components/viewconfig/moz.build b/toolkit/components/viewconfig/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/components/viewconfig/moz.build +++ b/toolkit/components/viewconfig/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/components/viewsource/moz.build b/toolkit/components/viewsource/moz.build index 86ec4674859a..405f43b8ec62 100644 --- a/toolkit/components/viewsource/moz.build +++ b/toolkit/components/viewsource/moz.build @@ -5,3 +5,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. TEST_DIRS += ['test'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build index 58bc41086cf9..78930ff71925 100644 --- a/toolkit/content/moz.build +++ b/toolkit/content/moz.build @@ -15,3 +15,5 @@ if CONFIG['OS_TARGET'] == 'Android': if 'stlport' in CONFIG['STLPORT_LIBS']: DEFINES['USE_STLPORT'] = True + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index 312a81d52a95..c849c7f3c1a5 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -94,3 +94,5 @@ if CONFIG['OS_ARCH'] == 'SunOS': DEFINES['UNICODE'] = True DEFINES['_UNICODE'] = True + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/locales/moz.build b/toolkit/locales/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/locales/moz.build +++ b/toolkit/locales/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/mozapps/downloads/moz.build b/toolkit/mozapps/downloads/moz.build index a85ceb3970f3..11d585198ece 100644 --- a/toolkit/mozapps/downloads/moz.build +++ b/toolkit/mozapps/downloads/moz.build @@ -24,3 +24,4 @@ EXTRA_PP_JS_MODULES += [ 'DownloadTaskbarProgress.jsm', ] +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build index 64c12d77dad0..db1becfbdf7a 100644 --- a/toolkit/mozapps/extensions/moz.build +++ b/toolkit/mozapps/extensions/moz.build @@ -55,3 +55,5 @@ DEFINES['MOZ_EXTENSIONS_DB_SCHEMA'] = 15 # Additional debugging info is exposed in debug builds if CONFIG['MOZ_DEBUG']: DEFINES['MOZ_EM_DEBUG'] = 1 + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/mozapps/handling/moz.build b/toolkit/mozapps/handling/moz.build index 37abb9b8de2c..2c861538fc30 100644 --- a/toolkit/mozapps/handling/moz.build +++ b/toolkit/mozapps/handling/moz.build @@ -8,3 +8,5 @@ EXTRA_COMPONENTS += [ 'nsContentDispatchChooser.js', 'nsContentDispatchChooser.manifest', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/mozapps/plugins/moz.build b/toolkit/mozapps/plugins/moz.build index ef1a7d1b8bea..34dbc7e9689b 100644 --- a/toolkit/mozapps/plugins/moz.build +++ b/toolkit/mozapps/plugins/moz.build @@ -9,3 +9,5 @@ TEST_DIRS += ['tests'] EXTRA_COMPONENTS += [ 'pluginGlue.manifest', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/mozapps/preferences/moz.build b/toolkit/mozapps/preferences/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/mozapps/preferences/moz.build +++ b/toolkit/mozapps/preferences/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/mozapps/update/moz.build b/toolkit/mozapps/update/moz.build index db2f19075428..2862c961a996 100644 --- a/toolkit/mozapps/update/moz.build +++ b/toolkit/mozapps/update/moz.build @@ -45,3 +45,5 @@ if CONFIG['MOZ_UPDATER']: 'nsUpdateService.js', 'nsUpdateServiceStub.js', ] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/obsolete/moz.build b/toolkit/obsolete/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/obsolete/moz.build +++ b/toolkit/obsolete/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build index 710afb595e0a..78e2c4e969e7 100644 --- a/toolkit/profile/moz.build +++ b/toolkit/profile/moz.build @@ -28,3 +28,5 @@ LOCAL_INCLUDES += [ FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xulapp_s' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/toolkit/themes/faststripe/global/moz.build b/toolkit/themes/faststripe/global/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/faststripe/global/moz.build +++ b/toolkit/themes/faststripe/global/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/linux/global/moz.build b/toolkit/themes/linux/global/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/linux/global/moz.build +++ b/toolkit/themes/linux/global/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/linux/help/moz.build b/toolkit/themes/linux/help/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/linux/help/moz.build +++ b/toolkit/themes/linux/help/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/linux/mozapps/moz.build b/toolkit/themes/linux/mozapps/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/linux/mozapps/moz.build +++ b/toolkit/themes/linux/mozapps/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/os2/global/moz.build b/toolkit/themes/os2/global/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/os2/global/moz.build +++ b/toolkit/themes/os2/global/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/osx/global/moz.build b/toolkit/themes/osx/global/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/osx/global/moz.build +++ b/toolkit/themes/osx/global/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/osx/help/moz.build b/toolkit/themes/osx/help/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/osx/help/moz.build +++ b/toolkit/themes/osx/help/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/osx/mozapps/moz.build b/toolkit/themes/osx/mozapps/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/osx/mozapps/moz.build +++ b/toolkit/themes/osx/mozapps/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/windows/global/moz.build b/toolkit/themes/windows/global/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/windows/global/moz.build +++ b/toolkit/themes/windows/global/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/windows/help/moz.build b/toolkit/themes/windows/help/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/windows/help/moz.build +++ b/toolkit/themes/windows/help/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/toolkit/themes/windows/mozapps/moz.build b/toolkit/themes/windows/mozapps/moz.build index 895d11993cfb..c97072bba2df 100644 --- a/toolkit/themes/windows/mozapps/moz.build +++ b/toolkit/themes/windows/mozapps/moz.build @@ -4,3 +4,4 @@ # 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'] \ No newline at end of file diff --git a/tools/quitter/moz.build b/tools/quitter/moz.build index d339926cfb1c..85c202ee6840 100644 --- a/tools/quitter/moz.build +++ b/tools/quitter/moz.build @@ -9,3 +9,5 @@ EXTRA_COMPONENTS += [ ] XPI_NAME = 'quitter' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/webapprt/locales/moz.build b/webapprt/locales/moz.build index 89251dc3962a..697e0cda1a26 100644 --- a/webapprt/locales/moz.build +++ b/webapprt/locales/moz.build @@ -2,3 +2,5 @@ # 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'] \ No newline at end of file diff --git a/webapprt/moz.build b/webapprt/moz.build index 0f298755d10a..057bd4f2df3f 100644 --- a/webapprt/moz.build +++ b/webapprt/moz.build @@ -44,3 +44,5 @@ if CONFIG['MOZILLA_OFFICIAL']: DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE'] DEFINES['MOZ_APP_BASENAME'] = CONFIG['MOZ_APP_BASENAME'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/xpfe/components/autocomplete/moz.build b/xpfe/components/autocomplete/moz.build index c271ec3908ce..c97072bba2df 100644 --- a/xpfe/components/autocomplete/moz.build +++ b/xpfe/components/autocomplete/moz.build @@ -3,3 +3,5 @@ # 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'] \ No newline at end of file diff --git a/xulrunner/examples/simple/moz.build b/xulrunner/examples/simple/moz.build index e169edea07ae..ea9eecd70a31 100644 --- a/xulrunner/examples/simple/moz.build +++ b/xulrunner/examples/simple/moz.build @@ -7,3 +7,5 @@ DIRS += ['components'] XPI_NAME = 'simple' + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file