Bug 542297 - Port |
Bug 435923 - Remove BUILD_OFFICIAL in favor of MOZILLA_OFFICIAL| to comm-central; (Av1) Just remove it.
r=(Callek, kairo).
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -525,17 +525,16 @@ MOZ_PSM=@MOZ_PSM@
# Gssapi (krb5) libraries and headers for the Negotiate auth method
GSSAPI_INCLUDES = @GSSAPI_INCLUDES@
USE_GSSAPI = @USE_GSSAPI@
MAIL_PKG_SHARED = @MAIL_PKG_SHARED@
MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
-BUILD_OFFICIAL = @BUILD_OFFICIAL@
# Win32 options
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
MOZ_QUANTIFY = @MOZ_QUANTIFY@
MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
--- a/config/version.mk
+++ b/config/version.mk
@@ -42,17 +42,17 @@ INCLUDED_VERSION_MK=1
# PBI : Private build info. Not used currently.
# Guessing the best way would be to set an env var.
# BINARY : Binary name. Not used currently.
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
ifndef RESFILE
RCFILE=./module.rc
RESFILE=./module.res
_RC_STRING = -QUIET 1 -DEPTH $(MOZDEPTH) -TOPSRCDIR $(MOZILLA_SRCDIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION)
-ifneq ($(BUILD_OFFICIAL)_$(MOZILLA_OFFICIAL),_)
+ifdef MOZILLA_OFFICIAL
_RC_STRING += -OFFICIAL 1
endif
ifdef MOZ_DEBUG
_RC_STRING += -DEBUG 1
endif
ifdef MODULE
_RC_STRING += -MODNAME $(MODULE)
endif
--- a/configure.in
+++ b/configure.in
@@ -7132,17 +7132,16 @@ AC_SUBST(THUNDERBIRD_VERSION)
AC_SUBST(SUNBIRD_VERSION)
AC_SUBST(SEAMONKEY_VERSION)
AC_SUBST(MOZ_PKG_SPECIAL)
AC_SUBST(MAIL_PKG_SHARED)
AC_SUBST(MOZILLA_OFFICIAL)
-AC_SUBST(BUILD_OFFICIAL)
dnl win32 options
AC_SUBST(MOZ_DEBUG_SYMBOLS)
AC_SUBST(MOZ_MAPINFO)
AC_SUBST(MOZ_BROWSE_INFO)
AC_SUBST(MOZ_TOOLS_DIR)
AC_SUBST(CYGWIN_WRAPPER)
AC_SUBST(AS_PERL)
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -59,17 +59,17 @@ ifdef MOZ_SOURCE_STAMP
DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
endif
SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
ifdef SOURCE_REPO
DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
endif
-ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
+ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif
DIRS = profile
GARBAGE += \
$(FINAL_TARGET)/license.html \
$(NULL)
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@@ -45,17 +45,17 @@ include $(DEPTH)/config/autoconf.mk
DIRS = modules
PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py \
$(shell cat $(MOZ_APP_VERSION_TXT) ))
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
-ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
+ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif
ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
ifdef MOZ_UPDATER
--- a/mail/jquery/Makefile.in
+++ b/mail/jquery/Makefile.in
@@ -45,17 +45,17 @@ DIRS =
include $(DEPTH)/config/autoconf.mk
PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py \
$(shell cat $(MOZ_APP_VERSION_TXT) ))
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
-ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
+ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif
ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
ifdef MOZ_UPDATER
--- a/suite/browser/Makefile.in
+++ b/suite/browser/Makefile.in
@@ -59,13 +59,13 @@ PREF_JS_EXPORTS = $(srcdir)/browser-pref
$(srcdir)/channel-prefs.js \
$(NULL)
DEFINES += -DMOZ_APP_NAME="$(MOZ_APP_NAME)" \
-DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
-DMOZ_APP_VERSION="$(MOZ_APP_VERSION)" \
$(NULL)
-ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
+ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif
include $(topsrcdir)/config/rules.mk