Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug...

Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug 942043) for ASAN build bustage and Windows test bustage

--HG--
extra : amend_source : f20d09aeff1c8b5cbd0f1d24c7ce04e86f3aed1d

accessible/public/ia2/Makefile.in

@@ -6,6 +6,8 @@ DEFFILE       = $(win_srcdir)/IA2Marshal.def
 
 IA2DIR        = $(topsrcdir)/other-licenses/ia2
 
+DEFINES       += -DREGISTER_PROXY_DLL
+
 GARBAGE       += $(MIDL_GENERATED_FILES)
 
 # Please keep this list in sync with the moz.build file until the rest of this

accessible/public/ia2/moz.build

@@ -7,5 +7,3 @@
 LIBRARY_NAME = 'IA2Marshal'
 
 FORCE_SHARED_LIB = True
-
-DEFINES['REGISTER_PROXY_DLL'] = True

accessible/public/msaa/Makefile.in

@@ -4,6 +4,8 @@
 
 DEFFILE = $(win_srcdir)/AccessibleMarshal.def
 
+DEFINES += -DREGISTER_PROXY_DLL
+
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
 
 MIDL_GENERATED_FILES = \

accessible/public/msaa/moz.build

@@ -17,5 +17,3 @@ GENERATED_SOURCES += [
 ]
 
 FORCE_SHARED_LIB = True
-
-DEFINES['REGISTER_PROXY_DLL'] = True

b2g/app/Makefile.in

@@ -7,6 +7,10 @@ include $(topsrcdir)/config/makefiles/rcs.mk
 
 PREF_JS_EXPORTS = $(srcdir)/b2g.js
 
+ifdef ENABLE_MARIONETTE
+DEFINES += -DENABLE_MARIONETTE=1
+endif
+
 ifndef LIBXUL_SDK
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
@@ -35,6 +39,7 @@ LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 LOCAL_INCLUDES += -I$(DEPTH)/build
 
+DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 LIBS += $(JEMALLOC_LIBS)
@@ -78,6 +83,12 @@ include $(topsrcdir)/config/rules.mk
 
 APP_ICON = b2g
 
+DEFINES += \
+  -DAPP_NAME=$(MOZ_APP_NAME) \
+  -DAPP_VERSION=$(MOZ_APP_VERSION) \
+  -DMOZ_UPDATER=$(MOZ_UPDATER) \
+  $(NULL)
+
 source_repo ?= $(call getSourceRepo,$(srcdir)/..)
 ifneq (,$(filter http%,$(source_repo)))
   DEFINES += -DMOZ_SOURCE_REPO="$(source_repo)"

b2g/app/moz.build

@@ -12,11 +12,3 @@ if not CONFIG['LIBXUL_SDK']:
     SOURCES += [
         'nsBrowserApp.cpp',
     ]
-
-if CONFIG['ENABLE_MARIONETTE']:
-    DEFINES['ENABLE_MARIONETTE'] = 1
-
-DEFINES['XPCOM_GLUE'] = True
-
-for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER'):
-    DEFINES[var] = CONFIG[var]

b2g/chrome/Makefile.in

+# 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=$(MOZ_UI_LOCALE) \
+           -DPACKAGE=browser \
+           -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+           $(NULL)

b2g/chrome/moz.build

@@ -4,6 +4,3 @@
 # 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['AB_CD'] = CONFIG['MOZ_UI_LOCALE']
-DEFINES['PACKAGE'] = 'browser'
-DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']

b2g/gaia/Makefile.in

@@ -4,6 +4,18 @@
 
 GAIA_PATH := gaia/profile
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES += \
+  -DB2G_NAME=L\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \
+  -DGAIA_PATH=L\"$(subst /,\\\\,$(GAIA_PATH))\" \
+  $(NULL)
+else # Non-windows machines use the same wrapper program
+DEFINES += \
+  -DB2G_NAME=\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \
+  -DGAIA_PATH=\"$(GAIA_PATH)\" \
+  $(NULL)
+endif
+
 ifdef .PYMAKE
 # For use of GNU make in pymake builds.
 GAIA_MAKE=$(GMAKE)

b2g/gaia/moz.build

@@ -10,11 +10,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'run-b2g.cpp',
     ]
-    DEFINES['B2G_NAME'] = 'L"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
-    DEFINES['GAIA_PATH'] = 'L"gaia\\\\profile"'
 else:
     SOURCES += [
         'run-b2g.c',
     ]
-    DEFINES['B2G_NAME'] = '"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
-    DEFINES['GAIA_PATH'] = '"gaia/profile"'

browser/app/Makefile.in

@@ -4,6 +4,10 @@
 
 dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 
+ifdef ENABLE_MARIONETTE
+DEFINES += -DENABLE_MARIONETTE=1
+endif
+
 PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
 		  $(NULL)
 
@@ -13,6 +17,7 @@ AB_CD = en-US
 
 DEFINES += \
   -DAB_CD=$(AB_CD) \
+  -DAPP_VERSION="$(MOZ_APP_VERSION)" \
   -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" \
   -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" \
   -DNEWWINDOW_ICO=\"$(DIST)/branding/newwindow.ico\" \
@@ -20,8 +25,13 @@ DEFINES += \
   -DPBMODE_ICO=\"$(DIST)/branding/pbmode.ico\" \
   $(NULL)
 
+ifdef MOZILLA_OFFICIAL
+DEFINES += -DMOZILLA_OFFICIAL
+endif
+
 ifdef LIBXUL_SDK #{
 PREF_JS_EXPORTS += $(srcdir)/profile/channel-prefs.js
+DEFINES += -DLIBXUL_SDK
 endif #} LIBXUL_SDK
 
 # Build a binary bootstrapping with XRE_main
@@ -33,6 +43,7 @@ LOCAL_INCLUDES += \
   -I$(DEPTH)/build \
   $(NULL)
 
+DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 LIBS += \

browser/app/moz.build

@@ -11,14 +11,3 @@ PROGRAM = CONFIG['MOZ_APP_NAME']
 SOURCES += [
     'nsBrowserApp.cpp',
 ]
-
-if CONFIG['ENABLE_MARIONETTE']:
-    DEFINES['ENABLE_MARIONETTE'] = 1
-
-DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-
-for var in ('MOZILLA_OFFICIAL', 'LIBXUL_SDK'):
-    if CONFIG[var]:
-        DEFINES[var] = True
-
-DEFINES['XPCOM_GLUE'] = True

browser/base/Makefile.in

+#
+# 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/.
+
+include $(topsrcdir)/config/config.mk
+
+abs_srcdir = $(abspath $(srcdir))
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES += \
+	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+	-DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
+	$(NULL)
+
+ifneq (,$(filter windows gtk2 gtk3 cocoa, $(MOZ_WIDGET_TOOLKIT)))
+DEFINES += -DHAVE_SHELL_SERVICE=1
+endif
+
+ifneq (,$(filter windows cocoa gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
+DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1
+endif
+
+ifneq (,$(filter windows cocoa, $(MOZ_WIDGET_TOOLKIT)))
+DEFINES += -DCAN_DRAW_IN_TITLEBAR=1
+endif
+
+ifneq (,$(filter windows gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
+DEFINES += -DMENUBAR_CAN_AUTOHIDE=1
+endif

browser/base/moz.build

@@ -21,16 +21,3 @@ BROWSER_CHROME_MANIFESTS += [
     'content/test/newtab/browser.ini',
     'content/test/social/browser.ini',
 ]
-
-DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
-    DEFINES['HAVE_SHELL_SERVICE'] = 1
-    DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
-    DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
-    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

browser/branding/aurora/locales/Makefile.in

@@ -2,4 +2,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/.
 
-DEFINES += -DAB_CD=$(AB_CD)
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)

browser/branding/aurora/locales/moz.build

@@ -4,4 +4,3 @@
 # 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['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']

browser/branding/nightly/locales/Makefile.in

@@ -2,4 +2,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/.
 
-DEFINES += -DAB_CD=$(AB_CD)
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)

browser/branding/nightly/locales/moz.build

@@ -4,4 +4,3 @@
 # 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['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']

browser/branding/unofficial/locales/Makefile.in

@@ -2,4 +2,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/.
 
-DEFINES += -DAB_CD=$(AB_CD)
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)

browser/branding/unofficial/locales/moz.build

@@ -4,4 +4,3 @@
 # 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['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']