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

2009-07-07 20:24:45 -07:00 · 2009-07-07 20:24:45 -07:00 · 7143ca0eb9
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@ -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
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@ -83,7 +83,7 @@ endif

 DIRS += build

-ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
+ifdef MOZILLA_OFFICIAL
 DEFINES += -DOFFICIAL_BUILD=1
 endif

--- a/browser/components/safebrowsing/Makefile.in
+++ b/browser/components/safebrowsing/Makefile.in
@ -49,7 +49,7 @@ ifdef ENABLE_TESTS
 DIRS += content/test
 endif

-ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
+ifdef MOZILLA_OFFICIAL
 DEFINES += -DOFFICIAL_BUILD=1
 endif

--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -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@
--- a/config/mkdepend/Makefile.in
+++ b/config/mkdepend/Makefile.in
@ -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
--- a/config/version.mk
+++ b/config/version.mk
@ -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
--- a/configure.in
+++ b/configure.in
@ -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)
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@ -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@
--- a/js/src/config/mkdepend/Makefile.in
+++ b/js/src/config/mkdepend/Makefile.in
@ -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
--- a/js/src/config/version.mk
+++ b/js/src/config/version.mk
@ -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
--- a/js/src/configure.in
+++ b/js/src/configure.in
@ -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)
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@ -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