Bug 1210611 - Globally define MOZILLA_OFFICIAL. r=glandium, a=lizzard
authorJustin Dolske <dolske@mozilla.com>
Fri, 02 Oct 2015 15:56:00 +0200
changeset 284049 0cd19a713a9bd7ea3d0c4cda220adc98984258e2
parent 284048 b6718afe48bed9f00dec13183d4c45f0a71568f3
child 284050 477bd2274afe0034c83b447611cabb0742868836
push id113
push userryanvm@gmail.com
push dateThu, 05 Nov 2015 16:09:15 +0000
reviewersglandium, lizzard
bugs1210611
milestone43.0a2
Bug 1210611 - Globally define MOZILLA_OFFICIAL. r=glandium, a=lizzard
browser/app/moz.build
browser/modules/moz.build
configure.in
mobile/android/base/moz.build
toolkit/components/telemetry/moz.build
toolkit/modules/moz.build
toolkit/xre/moz.build
webapprt/moz.build
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -24,19 +24,18 @@ SOURCES += [
     'nsBrowserApp.cpp',
 ]
 
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
-for var in ('MOZILLA_OFFICIAL', 'LIBXUL_SDK'):
-    if CONFIG[var]:
-        DEFINES[var] = True
+if CONFIG['LIBXUL_SDK']:
+    DEFINES['LIBXUL_SDK'] = True
 
 GENERATED_INCLUDES += [
     '/build',
 ]
 
 LOCAL_INCLUDES += [
     '/toolkit/xre',
     '/xpcom/base',
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -56,11 +56,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 if CONFIG['NIGHTLY_BUILD']:
     EXTRA_JS_MODULES += [
         'SignInToWebsite.jsm',
     ]
 
 EXTRA_PP_COMPONENTS += [
     'browsermodules.manifest',
 ]
-
-if CONFIG['MOZILLA_OFFICIAL']:
-    DEFINES['MOZILLA_OFFICIAL'] = 1
--- a/configure.in
+++ b/configure.in
@@ -8782,19 +8782,19 @@ if test -n "$MOZ_UA_OS_AGNOSTIC"; then
 fi
 
 AC_SUBST(MOZ_APP_STATIC_INI)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME)
 
 AC_SUBST(MOZILLA_OFFICIAL)
-
-# Build revisions should always be present in official builds
 if test "$MOZILLA_OFFICIAL"; then
+    AC_DEFINE(MOZILLA_OFFICIAL)
+    # Build revisions should always be present in official builds
     MOZ_INCLUDE_SOURCE_INFO=1
 fi
 
 AC_SUBST(MOZ_INCLUDE_SOURCE_INFO)
 
 AC_DEFINE_UNQUOTED(MOZ_TELEMETRY_DISPLAY_REV, 2)
 AC_SUBST(MOZ_TELEMETRY_DISPLAY_REV)
 
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -797,17 +797,17 @@ ANDROID_GENERATED_RESFILES += [
 
 ANDROID_ASSETS_DIRS += [
     '/mobile/android/app/assets',
 ]
 
 # We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN here because that
 # would leak the value to build logs.  Instead we expose the token quietly where
 # appropriate in Makefile.in.
-for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
+for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
             'MOZ_ANDROID_TAB_QUEUE', 'MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
 for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL'):
     if CONFIG[var]:
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -69,19 +69,16 @@ histogram_files = [
 data = GENERATED_FILES['TelemetryHistogramData.inc']
 data.script = 'gen-histogram-data.py'
 data.inputs = histogram_files
 
 enums = GENERATED_FILES['TelemetryHistogramEnums.h']
 enums.script = 'gen-histogram-enum.py'
 enums.inputs = histogram_files
 
-if CONFIG['MOZILLA_OFFICIAL']:
-    DEFINES['MOZILLA_OFFICIAL'] = True
-
 DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']
 
 LOCAL_INCLUDES += [
     '/xpcom/build',
     '/xpcom/threads',
 ]
 
 SPHINX_TREES['telemetry'] = 'docs'
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -104,13 +104,12 @@ for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_APP_VERSION',
             'MOZ_APP_VERSION_DISPLAY',
             'MOZ_WIDGET_TOOLKIT',
             'DLL_PREFIX',
             'DLL_SUFFIX',
             'DEBUG_JS_MODULES'):
             DEFINES[var] = CONFIG[var]
 
-for var in ('MOZILLA_OFFICIAL',
-            'MOZ_TOOLKIT_SEARCH',
+for var in ('MOZ_TOOLKIT_SEARCH',
             'MOZ_UPDATER'):
     if CONFIG[var]:
         DEFINES[var] = True
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -140,19 +140,16 @@ if CONFIG['WRAP_SYSTEM_INCLUDES']:
 if CONFIG['OS_ARCH'] == 'Linux' and 'lib64' in CONFIG['libdir']:
     DEFINES['HAVE_USR_LIB64_DIR'] = True
 
 DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
 
 for var in ('APP_VERSION', 'APP_ID'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]
 
-if CONFIG['MOZILLA_OFFICIAL']:
-    DEFINES['MOZILLA_OFFICIAL'] = True
-
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
 LOCAL_INCLUDES += [
     '../profile',
     '/config',
     '/dom/base',
     '/dom/ipc',
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -44,19 +44,16 @@ MOCHITEST_WEBAPPRT_CONTENT_MANIFESTS += 
 
 # Place webapprt resources in a separate app dir
 DIST_SUBDIR = 'webapprt'
 export('DIST_SUBDIR')
 
 if CONFIG['MOZ_DEBUG']:
     DEFINES['MOZ_DEBUG'] = 1
 
-if CONFIG['MOZILLA_OFFICIAL']:
-    DEFINES['MOZILLA_OFFICIAL'] = True
-
 DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
 DEFINES['MOZ_APP_BASENAME'] = CONFIG['MOZ_APP_BASENAME']
 
 JAR_MANIFESTS += ['jar.mn']
 
 JS_PREFERENCE_FILES += [
     'prefs.js',
 ]