Skip to content

Commit

Permalink
Merge commit 'e396fc159d907387dcc1b1501c07cbc42b10210f' into embedlit…
Browse files Browse the repository at this point in the history 
…e_upgrade
  • Loading branch information
@tmeshkova
tmeshkova committed Jan 14, 2014
2 parents 7bacd4a + e396fc1 commit 92445a0
Show file tree
Hide file tree
Showing 177 changed files with 508 additions and 231 deletions.
2 changes: 2 additions & 0 deletions accessible/src/jsat/moz.build
View file
Expand Up @@ -16,3 +16,5 @@ EXTRA_JS_MODULES += [
'TraversalRules.jsm',
'Utils.jsm'
]

JAR_MANIFESTS += ['jar.mn']
1 change: 1 addition & 0 deletions b2g/branding/official/content/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions b2g/branding/official/locales/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions b2g/branding/unofficial/content/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions b2g/branding/unofficial/locales/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions b2g/chrome/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions b2g/locales/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/base/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/branding/aurora/content/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/branding/aurora/locales/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/branding/nightly/content/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/branding/nightly/locales/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/branding/official/content/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/branding/official/locales/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/branding/unofficial/content/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/branding/unofficial/locales/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/components/certerror/moz.build
View file
Expand Up @@ -7,3 +7,5 @@
BROWSER_CHROME_MANIFESTS += [
'test/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
1 change: 1 addition & 0 deletions browser/components/customizableui/content/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/components/downloads/moz.build
View file
Expand Up @@ -13,3 +13,5 @@ XPCSHELL_TESTS_MANIFESTS += [
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/feeds/moz.build
View file
Expand Up @@ -17,3 +17,5 @@ MOCHITEST_CHROME_MANIFESTS += [
MOCHITEST_MANIFESTS += [
'test/mochitest.ini'
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/migration/moz.build
View file
Expand Up @@ -9,3 +9,5 @@ DIRS += ['public', 'src']
XPCSHELL_TESTS_MANIFESTS += [
'tests/unit/xpcshell.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/places/moz.build
View file
Expand Up @@ -17,3 +17,5 @@ MOCHITEST_CHROME_MANIFESTS += [
BROWSER_CHROME_MANIFESTS += [
'tests/browser/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/preferences/in-content/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/components/preferences/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/components/privatebrowsing/moz.build
View file
Expand Up @@ -7,3 +7,5 @@
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/search/moz.build
View file
Expand Up @@ -7,3 +7,5 @@
BROWSER_CHROME_MANIFESTS += [
'test/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/sessionstore/moz.build
View file
Expand Up @@ -20,3 +20,5 @@ XPCSHELL_TESTS_MANIFESTS += [
BROWSER_CHROME_MANIFESTS += [
'test/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/shell/moz.build
View file
Expand Up @@ -13,3 +13,5 @@ XPCSHELL_TESTS_MANIFESTS += [
BROWSER_CHROME_MANIFESTS += [
'test/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/components/tabview/moz.build
View file
Expand Up @@ -10,3 +10,5 @@ JS_MODULES_PATH = 'modules/tabview'
BROWSER_CHROME_MANIFESTS += [
'test/browser.ini',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions browser/devtools/moz.build
View file
Expand Up @@ -30,3 +30,5 @@ EXTRA_COMPONENTS += [
'devtools-clhandler.js',
'devtools-clhandler.manifest',
]

JAR_MANIFESTS += ['jar.mn']
1 change: 1 addition & 0 deletions browser/locales/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions browser/metro/base/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/metro/locales/moz.build
View file
Expand Up @@ -7,3 +7,4 @@
# Process desktop related resource we reuse here.
DIRS += ['import']

JAR_MANIFESTS += ['jar.mn']
1 change: 1 addition & 0 deletions browser/metro/theme/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/themes/linux/communicator/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/themes/linux/moz.build
View file
Expand Up @@ -6,3 +6,4 @@

DIRS += ['communicator']

JAR_MANIFESTS += ['jar.mn']
1 change: 1 addition & 0 deletions browser/themes/osx/communicator/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/themes/osx/moz.build
View file
Expand Up @@ -6,3 +6,4 @@

DIRS += ['communicator']

JAR_MANIFESTS += ['jar.mn']
1 change: 1 addition & 0 deletions browser/themes/windows/communicator/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions browser/themes/windows/moz.build
View file
Expand Up @@ -6,3 +6,4 @@

DIRS += ['communicator']

JAR_MANIFESTS += ['jar.mn']
3 changes: 2 additions & 1 deletion build/docs/jar-manifests.rst
View file
Expand Up @@ -7,7 +7,8 @@ JAR Manifests
JAR Manifests are plaintext files in the tree that are used to package chrome
files into the correct JARs, and create
`Chrome Registration <https://developer.mozilla.org/en-US/docs/Chrome_Registration>`_
manifests. JAR Manifests are named ``jar.mn``.
manifests. JAR Manifests are commonly named ``jar.mn``. They are
declared in ``moz.build`` files using the ``JAR_MANIFESTS`` variable.

``jar.mn`` files are automatically processed by the build system when building a
source directory that contains one. The ``jar``.mn is run through the
Expand Down
1 change: 1 addition & 0 deletions config/config.mk
View file
Expand Up @@ -51,6 +51,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
HOST_PROGRAM \
HOST_SIMPLE_PROGRAMS \
IS_COMPONENT \
JAR_MANIFEST \
JAVA_JAR_TARGETS \
JS_MODULES_PATH \
LIBRARY_NAME \
Expand Down
11 changes: 8 additions & 3 deletions config/rules.mk
View file
Expand Up @@ -1284,8 +1284,6 @@ endif # SDK_BINARY
################################################################################
# CHROME PACKAGING

JAR_MANIFEST := $(srcdir)/jar.mn

chrome::
$(MAKE) realchrome
$(LOOP_OVER_PARALLEL_DIRS)
Expand All @@ -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
Expand All @@ -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),)
Expand Down
2 changes: 2 additions & 0 deletions config/tests/src-simple/Makefile.in
View file
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions config/tests/src-simple/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions content/xbl/builtin/android/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions content/xbl/builtin/emacs/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions content/xbl/builtin/mac/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions content/xbl/builtin/unix/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions content/xbl/builtin/win/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions content/xml/document/resources/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions content/xslt/tests/buster/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions docshell/resources/content/moz.build
View file
Expand Up @@ -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']
2 changes: 2 additions & 0 deletions dom/inputmethod/moz.build
View file
Expand Up @@ -18,3 +18,5 @@ EXTRA_COMPONENTS += [
EXTRA_JS_MODULES += [
'Keyboard.jsm',
]

JAR_MANIFESTS += ['jar.mn']
2 changes: 2 additions & 0 deletions dom/ipc/moz.build
View file
Expand Up @@ -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']
1 change: 1 addition & 0 deletions dom/locales/moz.build
View file
Expand Up @@ -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']

0 comments on commit 92445a0

Please sign in to comment.