bug 1409721 - move firefox-l10n.js to moz.build. r=nalexander
authorTed Mielczarek <ted@mielczarek.org>
Thu, 09 Nov 2017 15:34:21 -0800
changeset 437210 338963fe12d3b84dfd6105efa3982e7e34f8ec94
parent 437209 fb4ceaf30810fc04b3d0f9a46e2d077b5141af7f
child 437211 b7c381c2e7f951e36ba421478c6820319bea8caa
push id117
push userfmarier@mozilla.com
push dateTue, 28 Nov 2017 20:17:16 +0000
reviewersnalexander
bugs1409721
milestone59.0a1
bug 1409721 - move firefox-l10n.js to moz.build. r=nalexander This is a fairly straightforward application of LOCALIZED_PP_FILES. The extra layer of PREF_DIR can be removed because all of browser has DIST_SUBDIR set due to it being exported in browser/moz.build, and that means that PREF_DIR is always defaults/preferences here: https://dxr.mozilla.org/mozilla-central/rev/f41930a869a84af81df1a88d8e82323ff3a6509a/config/rules.mk#1205 Additionally, it turns out that PREF_PPFLAGS is not set anywhere in the tree, so I simply left it out of the translation. MozReview-Commit-ID: 874EeTZRdLI
browser/locales/Makefile.in
browser/locales/moz.build
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -23,21 +23,16 @@ WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_
 RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org
 # For Nightly, we know where to get the builds from to do local repacks
 ifdef NIGHTLY_BUILD
 export EN_US_BINARY_URL ?= https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central
 endif
 
-L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,firefox-l10n.js)
-L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)
-L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings
-PP_TARGETS += L10N_PREF_JS_EXPORTS
-
 ifneq (,$(filter 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
 
 MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
--- a/browser/locales/moz.build
+++ b/browser/locales/moz.build
@@ -1,16 +1,19 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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']
 
+# If DIST_SUBDIR ever gets unset in browser this path might be wrong due to PREF_DIR changing.
+LOCALIZED_PP_FILES.defaults.preferences += ['en-US/firefox-l10n.js']
+
 if CONFIG['MOZ_CRASHREPORTER']:
     LOCALIZED_FILES += ['en-US/crashreporter/crashreporter-override.ini']
 
 with Files("**"):
     BUG_COMPONENT = ("Toolkit", "Build Config")
 
 with Files("all-locales"):
     BUG_COMPONENT = ("Core", "Localization")