From a60d942e4beaa4f86d5aa5b1b8dd036ca2dccc5e Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Wed, 3 Sep 2014 22:34:08 +0100
Subject: [PATCH] Bug 882968 - Clean up and move DEFINES and friends to
 moz.build in comm-central - Part 5: im/ files r=florian for a CLOSED TREE

---
 im/app/Makefile.in                            |  7 -----
 im/app/moz.build                              |  7 +++++
 im/app/profile/Makefile.in                    |  4 ---
 .../Makefile.in                               |  2 --
 .../moz.build                                 |  2 ++
 im/app/profile/moz.build                      |  3 ++
 im/branding/halloween/locales/Makefile.in     |  2 +-
 im/branding/halloween/locales/moz.build       |  2 ++
 im/branding/nightly/locales/Makefile.in       |  2 +-
 im/branding/nightly/locales/moz.build         |  2 ++
 im/content/Makefile.in                        | 30 -------------------
 im/content/moz.build                          | 12 ++++++++
 im/locales/Makefile.in                        |  2 --
 im/locales/moz.build                          |  2 ++
 .../branding/instantbird/locales/Makefile.in  |  2 +-
 .../branding/instantbird/locales/moz.build    |  2 ++
 16 files changed, 35 insertions(+), 48 deletions(-)
 delete mode 100644 im/content/Makefile.in

diff --git a/im/app/Makefile.in b/im/app/Makefile.in
index e2401340b6..7b2a8d21df 100644
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@@ -26,10 +26,6 @@ ifdef SOURCE_REPO
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
 
-ifdef MOZILLA_OFFICIAL
-DEFINES += -DMOZILLA_OFFICIAL
-endif
-
 PREF_JS_EXPORTS = \
     $(srcdir)/profile/all-instantbird.js \
     $(srcdir)/profile/channel-prefs.js \
@@ -37,7 +33,6 @@ PREF_JS_EXPORTS = \
 
 DEFINES += \
   -DAB_CD=$(AB_CD) \
-  -DAPP_VERSION="$(MOZ_APP_VERSION)" \
   -DINSTANTBIRD_ICO=\"$(DIST)/branding/instantbird.ico\" \
   -DGRE_MILESTONE=$(GRE_MILESTONE) \
   -DGRE_BUILDID=$(GRE_BUILDID) \
@@ -50,8 +45,6 @@ else
 
 DIST_FILES = application.ini
 
-DEFINES += -DXPCOM_GLUE
-
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
diff --git a/im/app/moz.build b/im/app/moz.build
index 2c30bf7d60..d85912b5cc 100644
--- a/im/app/moz.build
+++ b/im/app/moz.build
@@ -18,6 +18,8 @@ if not CONFIG['LIBXUL_SDK']:
         'xpcomglue',
     ]
 
+    DEFINES['XPCOM_GLUE'] = True
+
     if CONFIG['OS_ARCH'] == 'WINNT':
         RCINCLUDE = 'splash.rc'
         DEFINES['MOZ_INSTANTBIRD'] = True
@@ -41,4 +43,9 @@ if not CONFIG['LIBXUL_SDK']:
     if CONFIG['MOZ_LINKER']:
         OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 
+DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+
+if CONFIG['MOZILLA_OFFICIAL']:
+    DEFINES['MOZILLA_OFFICIAL'] = True
+
 DISABLE_STL_WRAPPING = True
diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in
index 8934537ebe..6de1a3de54 100644
--- a/im/app/profile/Makefile.in
+++ b/im/app/profile/Makefile.in
@@ -20,7 +20,3 @@ FILES := \
 libs:: $(FILES)
 	$(SYSINSTALL) $^ $(DIST)/bin/defaults/profile
 	$(SYSINSTALL) $^ $(DIST)/bin/defaults/profile/US
-
-ifneq (,$(filter gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
-DEFINES += -DHAVE_SHELL_SERVICE=1
-endif
diff --git a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
index cb4ae51f23..767a5d5a00 100644
--- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -11,8 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DINSTANTBIRD_VERSION=$(INSTANTBIRD_VERSION)
-
 FILES := \
 	install.rdf \
 	chrome.manifest \
diff --git a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build
index 89251dc396..2e011668df 100644
--- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build
+++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/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/.
+
+DEFINES['INSTANTBIRD_VERSION'] = CONFIG['INSTANTBIRD_VERSION']
diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build
index 463f043f6d..5dd638e35e 100644
--- a/im/app/profile/moz.build
+++ b/im/app/profile/moz.build
@@ -4,3 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['extensions']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'mac', 'cocoa'):
+    DEFINES['HAVE_SHELL_SERVICE'] = 1
diff --git a/im/branding/halloween/locales/Makefile.in b/im/branding/halloween/locales/Makefile.in
index d199ba2352..2839d474fe 100755
--- a/im/branding/halloween/locales/Makefile.in
+++ b/im/branding/halloween/locales/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
+DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/im/branding/halloween/locales/moz.build b/im/branding/halloween/locales/moz.build
index e0eb66aace..e59008d87f 100644
--- a/im/branding/halloween/locales/moz.build
+++ b/im/branding/halloween/locales/moz.build
@@ -4,3 +4,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
diff --git a/im/branding/nightly/locales/Makefile.in b/im/branding/nightly/locales/Makefile.in
index d199ba2352..2839d474fe 100755
--- a/im/branding/nightly/locales/Makefile.in
+++ b/im/branding/nightly/locales/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
+DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/im/branding/nightly/locales/moz.build b/im/branding/nightly/locales/moz.build
index e0eb66aace..e59008d87f 100644
--- a/im/branding/nightly/locales/moz.build
+++ b/im/branding/nightly/locales/moz.build
@@ -4,3 +4,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
diff --git a/im/content/Makefile.in b/im/content/Makefile.in
deleted file mode 100644
index 567a457854..0000000000
--- a/im/content/Makefile.in
+++ /dev/null
@@ -1,30 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-# defines used for preference window files
-DEFINES += \
-	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-	-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
-	$(NULL)
-
-# ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
-# DEFINES += -DHAVE_SHELL_SERVICE=1
-# endif
-
-ifdef MOZ_UPDATER
-DEFINES += -DMOZ_UPDATER=1
-endif
-
-abs_srcdir = $(abspath $(srcdir))
-CHROME_DEPS += $(abs_srcdir)/overrides/app-license.html
-DEFINES += -DAPP_LICENSE_BLOCK=$(abs_srcdir)/overrides/app-license.html
diff --git a/im/content/moz.build b/im/content/moz.build
index e0eb66aace..c196ba68e0 100644
--- a/im/content/moz.build
+++ b/im/content/moz.build
@@ -4,3 +4,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+# defines used for preference window files
+for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
+    DEFINES[var] = CONFIG[var]
+
+#if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'mac', 'cocoa'):
+#    DEFINES['HAVE_SHELL_SERVICE'] = 1
+
+if CONFIG['MOZ_UPDATER']:
+    DEFINES['MOZ_UPDATER'] = 1
+
+DEFINES['APP_LICENSE_BLOCK'] = '%s/overrides/app-license.html' % SRCDIR
diff --git a/im/locales/Makefile.in b/im/locales/Makefile.in
index aa1cc68cc5..53af3ff232 100644
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-DEFINES += -DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION)
-
 vpath %.xml @srcdir@/en-US/searchplugins
 vpath %.xml $(LOCALE_SRCDIR)/searchplugins
 
diff --git a/im/locales/moz.build b/im/locales/moz.build
index e0eb66aace..854fd40687 100644
--- a/im/locales/moz.build
+++ b/im/locales/moz.build
@@ -4,3 +4,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
diff --git a/other-licenses/branding/instantbird/locales/Makefile.in b/other-licenses/branding/instantbird/locales/Makefile.in
index d199ba2352..2839d474fe 100755
--- a/other-licenses/branding/instantbird/locales/Makefile.in
+++ b/other-licenses/branding/instantbird/locales/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
+DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/branding/instantbird/locales/moz.build b/other-licenses/branding/instantbird/locales/moz.build
index e0eb66aace..e59008d87f 100644
--- a/other-licenses/branding/instantbird/locales/moz.build
+++ b/other-licenses/branding/instantbird/locales/moz.build
@@ -4,3 +4,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']