Bug xxxxxx: Move PREF_JS_EXPORTS to moz.build (c-c locale MERGE_FILE hack) draft
authorBrian O'Keefe <bokeefe@alum.wpi.edu>
Mon, 19 Jan 2015 12:25:26 -0500
changeset 27825 c98ee716600749ae2f79a25571883ef98f931786
parent 27824 c5a864e8c648e3e7cc80b8d69347426c036decda
child 27826 068fb5067189b0e72f0b41bdea9d900f88b1338d
child 27848 731f02c329b9a61eba265244d8cacdd2b49a57d9
push id2113
push userbokeefe@alum.wpi.edu
push dateWed, 21 Jan 2015 03:27:13 +0000
treeherdertry-comm-central@4c2435a3a4ac [default view] [failures only]
Bug xxxxxx: Move PREF_JS_EXPORTS to moz.build (c-c locale MERGE_FILE hack)
im/locales/Makefile.in
im/locales/moz.build
mail/locales/Makefile.in
mail/locales/moz.build
suite/locales/Makefile.in
suite/locales/moz.build
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@@ -36,18 +36,16 @@ PWD := $(CURDIR)
 # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
 # work in that case.
 ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
 WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@addons.instantbird.org
 
-PREF_JS_EXPORTS = $(call MERGE_FILE,all-l10n.js)
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
 
 ifeq (WINNT,$(OS_ARCH))
--- a/im/locales/moz.build
+++ b/im/locales/moz.build
@@ -1,8 +1,12 @@
 # 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']
 
 DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
+
+JS_PREFERENCE_FILES += [
+    '$(call MERGE_FILE,all-l10n.js)',
+]
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -32,18 +32,16 @@ PWD := $(CURDIR)
 # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
 # work in that case.
 ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
 WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@thunderbird.mozilla.org
 
-PREF_JS_EXPORTS = $(call MERGE_FILE,all-l10n.js)
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
 endif
 
 ifeq (WINNT,$(OS_ARCH))
--- a/mail/locales/moz.build
+++ b/mail/locales/moz.build
@@ -1,8 +1,12 @@
 # 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']
 
 DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
+
+JS_PREFERENCE_FILES += [
+    '$(call MERGE_FILE,all-l10n.js)',
+]
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -31,18 +31,16 @@ PWD := $(CURDIR)
 # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
 # work in that case.
 ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
 WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@seamonkey.mozilla.org
 
-PREF_JS_EXPORTS = $(call MERGE_FILE,suite-l10n.js)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
 endif
 
 ifeq (WINNT,$(OS_ARCH))
--- a/suite/locales/moz.build
+++ b/suite/locales/moz.build
@@ -1,8 +1,12 @@
 # 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']
 
 DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
+
+JS_PREFERENCE_FILES += [
+    '$(call MERGE_FILE,suite-l10n.js)'
+]