Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1210611 - Globally define MOZILLA_OFFICIAL. r=glandium

Browse Source
This commit is contained in:
Justin Dolske 2015-10-02 15:18:04 -07:00
parent 7f1d2c0c8d
commit 90ec2cead9
8 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/app/moz.build
View File

@ -29,9 +29,8 @@ FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
for var in ('MOZILLA_OFFICIAL', 'LIBXUL_SDK'): if CONFIG['LIBXUL_SDK']:
if CONFIG[var]: DEFINES['LIBXUL_SDK'] = True
DEFINES[var] = True
GENERATED_INCLUDES += [ GENERATED_INCLUDES += [
'/build', '/build',

3
browser/modules/moz.build
View File

@ -62,6 +62,3 @@ if CONFIG['NIGHTLY_BUILD']:
EXTRA_PP_COMPONENTS += [ EXTRA_PP_COMPONENTS += [
'browsermodules.manifest', 'browsermodules.manifest',
] ]
if CONFIG['MOZILLA_OFFICIAL']:
DEFINES['MOZILLA_OFFICIAL'] = 1

4
configure.in
View File

@ -8816,9 +8816,9 @@ AC_SUBST(MOZ_PKG_SPECIAL)
AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME) AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME)
AC_SUBST(MOZILLA_OFFICIAL) AC_SUBST(MOZILLA_OFFICIAL)
# Build revisions should always be present in official builds
if test "$MOZILLA_OFFICIAL"; then if test "$MOZILLA_OFFICIAL"; then
AC_DEFINE(MOZILLA_OFFICIAL)
# Build revisions should always be present in official builds
MOZ_INCLUDE_SOURCE_INFO=1 MOZ_INCLUDE_SOURCE_INFO=1
fi fi

2
mobile/android/base/moz.build
View File

@ -821,7 +821,7 @@ ANDROID_ASSETS_DIRS += [
# We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN here because that # 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 # would leak the value to build logs. Instead we expose the token quietly where
# appropriate in Makefile.in. # 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_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING', 'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
'MOZ_ANDROID_TAB_QUEUE', 'MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES'): 'MOZ_ANDROID_TAB_QUEUE', 'MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES'):

3
toolkit/components/telemetry/moz.build
View File

@ -74,9 +74,6 @@ enums = GENERATED_FILES['TelemetryHistogramEnums.h']
enums.script = 'gen-histogram-enum.py' enums.script = 'gen-histogram-enum.py'
enums.inputs = histogram_files enums.inputs = histogram_files
if CONFIG['MOZILLA_OFFICIAL']:
DEFINES['MOZILLA_OFFICIAL'] = True
DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [

3
toolkit/modules/moz.build
View File

@ -109,8 +109,7 @@ for var in ('ANDROID_PACKAGE_NAME',
'DEBUG_JS_MODULES'): 'DEBUG_JS_MODULES'):
DEFINES[var] = CONFIG[var] DEFINES[var] = CONFIG[var]
for var in ('MOZILLA_OFFICIAL', for var in ('MOZ_TOOLKIT_SEARCH',
'MOZ_TOOLKIT_SEARCH',
'MOZ_UPDATER'): 'MOZ_UPDATER'):
if CONFIG[var]: if CONFIG[var]:
DEFINES[var] = True DEFINES[var] = True

3
toolkit/xre/moz.build
View File

@ -145,9 +145,6 @@ DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
for var in ('APP_VERSION', 'APP_ID'): for var in ('APP_VERSION', 'APP_ID'):
DEFINES[var] = CONFIG['MOZ_%s' % var] DEFINES[var] = CONFIG['MOZ_%s' % var]
if CONFIG['MOZILLA_OFFICIAL']:
DEFINES['MOZILLA_OFFICIAL'] = True
if CONFIG['MOZ_BUILD_APP'] == 'browser': if CONFIG['MOZ_BUILD_APP'] == 'browser':
DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True

3
webapprt/moz.build
View File

@ -46,9 +46,6 @@ MOCHITEST_WEBAPPRT_CONTENT_MANIFESTS += ['test/content/webapprt.ini']
DIST_SUBDIR = 'webapprt' DIST_SUBDIR = 'webapprt'
export('DIST_SUBDIR') export('DIST_SUBDIR')
if CONFIG['MOZILLA_OFFICIAL']:
DEFINES['MOZILLA_OFFICIAL'] = True
DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE'] DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
DEFINES['MOZ_APP_BASENAME'] = CONFIG['MOZ_APP_BASENAME'] DEFINES['MOZ_APP_BASENAME'] = CONFIG['MOZ_APP_BASENAME']