Bug 1042226 - move DEFINES += -DAB_CD=$(AB_CD) pattern into config.mk; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Fri, 01 Aug 2014 12:53:05 -0400
changeset 198205 43529d2194a0ada7256e0e6e940a8984883cfef2
parent 198204 968a007bad3fe61fc8905004a7c1271690b398cd
child 198206 dadbbe7b22f186faa9ae1738d4510df4ecf3bf55
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmshal
bugs1042226
milestone34.0a1
Bug 1042226 - move DEFINES += -DAB_CD=$(AB_CD) pattern into config.mk; r=mshal
b2g/branding/official/locales/Makefile.in
b2g/branding/unofficial/locales/Makefile.in
b2g/installer/Makefile.in
browser/app/Makefile.in
browser/branding/aurora/locales/Makefile.in
browser/branding/nightly/locales/Makefile.in
browser/branding/official/locales/Makefile.in
browser/branding/unofficial/locales/Makefile.in
browser/installer/Makefile.in
browser/installer/windows/Makefile.in
browser/metro/locales/Makefile.in
browser/metro/locales/import/Makefile.in
config/config.mk
dom/locales/Makefile.in
extensions/spellcheck/locales/Makefile.in
intl/locales/Makefile.in
mobile/android/base/locales/Makefile.in
mobile/android/branding/aurora/locales/Makefile.in
mobile/android/branding/beta/locales/Makefile.in
mobile/android/branding/nightly/locales/Makefile.in
mobile/android/branding/official/locales/Makefile.in
mobile/android/branding/unofficial/locales/Makefile.in
mobile/android/installer/Makefile.in
mobile/locales/Makefile.in
netwerk/locales/Makefile.in
security/manager/locales/Makefile.in
services/sync/locales/Makefile.in
toolkit/locales/Makefile.in
toolkit/mozapps/update/tests/Makefile.in
webapprt/locales/Makefile.in
xulrunner/app/Makefile.in
deleted file mode 100644
--- a/b2g/branding/official/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/b2g/branding/unofficial/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -6,17 +6,16 @@ STANDALONE_MAKEFILE := 1
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 
 DEFINES += \
-	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DPREF_DIR=$(PREF_DIR) \
 	$(NULL)
 
 DEFINES += -DJAREXT=
 
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -6,17 +6,16 @@ dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NA
 
 PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
 		  $(NULL)
 
 # hardcode en-US for the moment
 AB_CD = en-US
 
 DEFINES += \
-  -DAB_CD=$(AB_CD) \
   -DFIREFOX_ICO='"$(DIST)/branding/firefox.ico"' \
   -DDOCUMENT_ICO='"$(DIST)/branding/document.ico"' \
   -DNEWWINDOW_ICO='"$(DIST)/branding/newwindow.ico"' \
   -DNEWTAB_ICO='"$(DIST)/branding/newtab.ico"' \
   -DPBMODE_ICO='"$(DIST)/branding/pbmode.ico"' \
   $(NULL)
 
 ifdef LIBXUL_SDK #{
deleted file mode 100644
--- a/browser/branding/aurora/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/browser/branding/nightly/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/browser/branding/official/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/browser/branding/unofficial/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -15,17 +15,17 @@ ifdef MOZ_MULET
 MOZ_PKG_MANIFEST_P += $(topsrcdir)/b2g/installer/package-manifest.in
 endif
 
 # Some files have been already bundled with xulrunner
 ifndef MOZ_MULET
 MOZ_PKG_FATAL_WARNINGS = 1
 endif
 
-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 
 ifdef LIBXUL_SDK
 DEFINES += -DLIBXUL_SDK=1
 endif
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -33,17 +33,16 @@ BRANDING_FILES = \
 	pencil.bmp \
 	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
 	$(NULL)
 
 DEFINES += \
-	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME='${MOZ_APP_DISPLAYNAME}' \
 	-DMOZILLA_VERSION=${MOZILLA_VERSION} \
 	$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 ifdef LOCALE_MERGEDIR
--- a/browser/metro/locales/Makefile.in
+++ b/browser/metro/locales/Makefile.in
@@ -2,18 +2,16 @@
 # 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/.
 
 # metrofx specific resources - this defines LOCALE_SRCDIR
 relativesrcdir = browser/metro/locales
 
 include $(topsrcdir)/config/config.mk
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 include $(topsrcdir)/config/rules.mk
 
 #########################################
 # Branding
 
 # 'browser/branding/nightly' -> 'nightly'
 BRANDFOLDER = $(notdir $(MOZ_BRANDING_DIRECTORY))
 
--- a/browser/metro/locales/import/Makefile.in
+++ b/browser/metro/locales/import/Makefile.in
@@ -5,18 +5,16 @@
 # desktop specific resources - this defines LOCALE_SRCDIR
 relativesrcdir = browser/locales
 
 include $(topsrcdir)/config/config.mk
 
 #########################################
 # l10s prefs file
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 # copying firefox-l10n.js over from LOCALE_SRCDIR or browser
 PREF_JS_EXPORTS = $(firstword $(wildcard $(LOCALE_SRCDIR)/firefox-l10n.js) \
                     $(topsrcdir)/$(relativesrcdir)/en-US/firefox-l10n.js )
 
 include $(topsrcdir)/config/rules.mk
 
 #########################################
 # Search plugins
--- a/config/config.mk
+++ b/config/config.mk
@@ -694,16 +694,18 @@ sysinstall_cmd = install_cmd
 #
 # Localization build automation
 #
 
 # Because you might wish to "make locales AB_CD=ab-CD", we don't hardcode
 # MOZ_UI_LOCALE directly, but use an intermediate variable that can be
 # overridden by the command line. (Besides, AB_CD is prettier).
 AB_CD = $(MOZ_UI_LOCALE)
+# Many locales directories want this definition.
+DEFINES += -DAB_CD=$(AB_CD)
 
 ifndef L10NBASEDIR
   L10NBASEDIR = $(error L10NBASEDIR not defined by configure)
 else
   IS_LANGUAGE_REPACK = 1
 endif
 
 EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/$(subst /locales,,$(1)))
deleted file mode 100644
--- a/dom/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
--- a/extensions/spellcheck/locales/Makefile.in
+++ b/extensions/spellcheck/locales/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 include $(topsrcdir)/config/rules.mk
 
 DICTIONARY_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/hunspell/*.dic) $(wildcard $(LOCALE_SRCDIR)/hunspell/*.aff))
 
 ifneq (,$(DICTIONARY_FILES))
 libs::
 	$(INSTALL)  $(DICTIONARY_FILES) $(FINAL_TARGET)/dictionaries
 endif
--- a/intl/locales/Makefile.in
+++ b/intl/locales/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 include $(topsrcdir)/config/rules.mk
 
 PATTERN_FILES = $(strip $(wildcard $(srcdir)/*/hyphenation/*.dic))
 
 ifneq (,$(PATTERN_FILES))
 libs::
 	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
 endif
--- a/mobile/android/base/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -17,18 +17,16 @@ SYNCSTRINGSPATH = $(abspath $(call MERGE
 STRINGSPATH = $(abspath $(call MERGE_FILE,android_strings.dtd))
 ifeq (,$(XPI_NAME))
 BRANDPATH = $(abspath $(DEPTH)/dist/bin/chrome/$(AB_CD)/locale/branding/brand.dtd)
 else
 BRANDPATH = $(abspath $(DIST)/xpi-stage/$(XPI_NAME)/chrome/$(AB_CD)/locale/branding/brand.dtd)
 endif
 $(warnIfEmpty,AB_CD) # todo: $(errorIfEmpty )
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 dir-res-values := ../res/values
 strings-xml    := $(dir-res-values)/strings.xml
 strings-xml-in := $(srcdir)/../strings.xml.in
 
 GARBAGE += $(strings-xml)
 
 dir-res-raw         := ../res/raw
 suggestedsites-json := $(dir-res-raw)/suggestedsites.json
deleted file mode 100644
--- a/mobile/android/branding/aurora/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/mobile/android/branding/beta/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/mobile/android/branding/nightly/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/mobile/android/branding/official/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/mobile/android/branding/unofficial/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -11,17 +11,16 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 
 DEFINES += \
-	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DPREF_DIR=$(PREF_DIR) \
 	$(NULL)
 
 DEFINES += -DJAREXT=
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 ifdef MOZ_DEBUG
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -31,21 +31,16 @@ vpath book%.inc @srcdir@/en-US/profile
 endif
 
 $(call errorIfEmpty,MOZ_BRANDING_DIRECTORY)
 SUBMAKEFILES += \
         $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
         $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
         $(NULL)
 
-DEFINES += \
-	-DAB_CD=$(AB_CD) \
-	$(NULL)
-
-
 ###########################################################################
 # Default target, preserve existing functionality for:
 #    gmake -C $obj/mobile/locales
 ###########################################################################
 search-jar-default: search-jar
 
 
 ###########################################################################
deleted file mode 100644
--- a/netwerk/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/security/manager/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
deleted file mode 100644
--- a/services/sync/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
--- a/toolkit/locales/Makefile.in
+++ b/toolkit/locales/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 XULPPFLAGS += -I$(LOCALE_SRCDIR)/defines.inc
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef LOCALE_MERGEDIR
 vpath crashreporter.% $(LOCALE_MERGEDIR)/toolkit/crashreporter
 endif
 vpath crashreporter.% $(LOCALE_SRCDIR)/crashreporter
--- a/toolkit/mozapps/update/tests/Makefile.in
+++ b/toolkit/mozapps/update/tests/Makefile.in
@@ -1,19 +1,15 @@
 # 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/.
 
 XPCSHELLTESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
 CHROMETESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/$(relativesrcdir)
 
-DEFINES += \
-  -DAB_CD=$(AB_CD) \
-  $(NULL)
-
 PP_TARGETS            += aus-update-head
 aus-update-head_FLAGS := -Fsubstitution $(DEFINES) $(ACDEFINES)
 aus-update-head       := $(srcdir)/unit_aus_update/head_update.js
 aus-update-head_PATH  := $(XPCSHELLTESTROOT)/unit_aus_update
 
 INSTALL_TARGETS       += xpcshell-data
 xpcshell-data_TARGET  := libs
 xpcshell-data_DEST    := $(XPCSHELLTESTROOT)/data
deleted file mode 100644
--- a/webapprt/locales/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -1,18 +1,16 @@
 # vim:set ts=8 sw=8 sts=8 et:
 # 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/.
 
 PREF_JS_EXPORTS = $(srcdir)/xulrunner.js
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
 endif
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else