Bug 435923 - Remove BUILD_OFFICIAL in favor of MOZILLA_OFFICIAL, r=ted

This commit is contained in:
Phil Ringnalda 2009-07-07 20:24:45 -07:00
parent b6c6fef600
commit a51763aea8
12 changed files with 6 additions and 16 deletions

View File

@ -92,6 +92,6 @@ DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1
endif
endif
ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif

View File

@ -83,7 +83,7 @@ endif
DIRS += build
ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif

View File

@ -49,7 +49,7 @@ ifdef ENABLE_TESTS
DIRS += content/test
endif
ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif

View File

@ -584,7 +584,6 @@ GSSAPI_INCLUDES = @GSSAPI_INCLUDES@
USE_GSSAPI = @USE_GSSAPI@
MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
BUILD_OFFICIAL = @BUILD_OFFICIAL@
# Win32 options
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@

View File

@ -44,9 +44,6 @@ include $(DEPTH)/config/autoconf.mk
USE_STATIC_LIBS = 1
# undefine (as best we can, thanks gmake!) so we don't need build_number
MOZILLA_OFFICIAL =
BUILD_OFFICIAL =
MODULE = mkdepend
HOST_PROGRAM = mkdepend$(BIN_SUFFIX)
ifdef GNU_CC

View File

@ -47,7 +47,7 @@ ifndef RESFILE
RCFILE=./module.rc
RESFILE=./module.res
_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -BITS $(MOZ_BITS) -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

View File

@ -8128,7 +8128,6 @@ AC_SUBST(FIREFOX_VERSION)
AC_SUBST(MOZ_PKG_SPECIAL)
AC_SUBST(MOZILLA_OFFICIAL)
AC_SUBST(BUILD_OFFICIAL)
dnl win32 options
AC_SUBST(MOZ_DEBUG_SYMBOLS)

View File

@ -322,7 +322,6 @@ MOZ_OS2_USE_DECLSPEC = @MOZ_OS2_USE_DECLSPEC@
MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMORY@
MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
BUILD_OFFICIAL = @BUILD_OFFICIAL@
# Win32 options
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@

View File

@ -44,9 +44,6 @@ include $(DEPTH)/config/autoconf.mk
USE_STATIC_LIBS = 1
# undefine (as best we can, thanks gmake!) so we don't need build_number
MOZILLA_OFFICIAL =
BUILD_OFFICIAL =
MODULE = mkdepend
HOST_PROGRAM = mkdepend$(BIN_SUFFIX)
ifdef GNU_CC

View File

@ -47,7 +47,7 @@ ifndef RESFILE
RCFILE=./module.rc
RESFILE=./module.res
_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -BITS $(MOZ_BITS) -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

View File

@ -5030,7 +5030,6 @@ AC_SUBST(MOZ_APP_VERSION)
AC_SUBST(MOZ_PKG_SPECIAL)
AC_SUBST(MOZILLA_OFFICIAL)
AC_SUBST(BUILD_OFFICIAL)
dnl win32 options
AC_SUBST(MOZ_DEBUG_SYMBOLS)

View File

@ -51,7 +51,7 @@ XPIDLSRCS = nsIBrowserSearchService.idl
EXTRA_PP_COMPONENTS = nsSearchService.js \
nsSearchSuggestions.js
ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif