From 7239cc8c7e9c140be6858c659d942f6d71283531 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 3 Feb 2018 08:22:52 -0500 Subject: Use MOZ_PHOENIX instead of checking for 'browser' in MOZ_BUILD_APP --- toolkit/components/passwordmgr/moz.build | 4 ++-- toolkit/components/search/moz.build | 2 +- toolkit/components/telemetry/TelemetryEnvironment.jsm | 2 +- toolkit/modules/AppConstants.jsm | 9 ++++++++- toolkit/themes/linux/mozapps/jar.mn | 2 +- toolkit/themes/moz.build | 6 +++++- toolkit/themes/osx/global/jar.mn | 2 +- toolkit/themes/osx/mozapps/jar.mn | 2 +- toolkit/themes/shared/non-mac.jar.inc.mn | 2 +- toolkit/themes/windows/global/jar.mn | 2 +- toolkit/themes/windows/mozapps/jar.mn | 2 +- toolkit/xre/moz.build | 2 +- 12 files changed, 24 insertions(+), 13 deletions(-) (limited to 'toolkit') diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build index 72c8c70a47..e54e6ba2d3 100644 --- a/toolkit/components/passwordmgr/moz.build +++ b/toolkit/components/passwordmgr/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True MOCHITEST_MANIFESTS += ['test/mochitest.ini', 'test/mochitest/mochitest.ini'] @@ -67,7 +67,7 @@ if CONFIG['OS_TARGET'] == 'WINNT': 'OSCrypto_win.js', ] -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: EXTRA_JS_MODULES += [ 'LoginManagerContextMenu.jsm', ] diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 98ccf2b8d0..2dc1428826 100644 --- a/toolkit/components/search/moz.build +++ b/toolkit/components/search/moz.build @@ -11,7 +11,7 @@ EXTRA_COMPONENTS += [ 'nsSearchSuggestions.js', ] -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: DEFINES['HAVE_SIDEBAR'] = True EXTRA_COMPONENTS += [ 'nsSidebar.js', diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm index e2453649ce..2f4ac81baa 100644 --- a/toolkit/components/telemetry/TelemetryEnvironment.jsm +++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm @@ -784,7 +784,7 @@ function EnvironmentCache() { this._currentEnvironment.profile = {}; p.push(this._updateProfile()); - if (AppConstants.MOZ_BUILD_APP == "browser") { + if (AppConstants.MOZ_PHOENIX) { p.push(this._updateAttribution()); } diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 7ce8e1f09a..8d9fa103c3 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -308,7 +308,14 @@ this.AppConstants = Object.freeze({ MOZ_APP_NAME: "@MOZ_APP_NAME@", MOZ_APP_VERSION: "@MOZ_APP_VERSION@", MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@", - MOZ_BUILD_APP: "@MOZ_BUILD_APP@", + + MOZ_BUILD_APP: +#ifdef MOZ_PHOENIX + "browser", +#else + "@MOZ_BUILD_APP@", +#endif + MOZ_MACBUNDLE_NAME: "@MOZ_MACBUNDLE_NAME@", MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@", INSTALL_LOCALE: "@AB_CD@", diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn index 2070dd6fdb..8d1c12305d 100644 --- a/toolkit/themes/linux/mozapps/jar.mn +++ b/toolkit/themes/linux/mozapps/jar.mn @@ -28,7 +28,7 @@ toolkit.jar: skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/moz.build b/toolkit/themes/moz.build index 3d435ba71e..4031f36b8f 100644 --- a/toolkit/themes/moz.build +++ b/toolkit/themes/moz.build @@ -17,7 +17,11 @@ # mobile native UIs that do not use XUL for UI toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] -app = CONFIG['MOZ_BUILD_APP'] +if CONFIG['MOZ_PHOENIX']: + DEFINES['MOZ_PHOENIX'] = 1 + app = 'browser' +else: + app = CONFIG['MOZ_BUILD_APP'] if toolkit == 'cocoa': DIRS += ['osx'] diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index e979d4a8c3..79bb062ab9 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -145,7 +145,7 @@ toolkit.jar: skin/classic/global/tree/folder.png (tree/folder.png) skin/classic/global/tree/folder@2x.png (tree/folder@2x.png) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn index 3b58f1e4e5..3f57170734 100644 --- a/toolkit/themes/osx/mozapps/jar.mn +++ b/toolkit/themes/osx/mozapps/jar.mn @@ -51,7 +51,7 @@ toolkit.jar: skin/classic/mozapps/xpinstall/xpinstallConfirm.css (extensions/xpinstallConfirm.css) skin/classic/mozapps/handling/handling.css (handling/handling.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 151749f72f..859f1ba4a5 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -123,7 +123,7 @@ skin/classic/mozapps/update/downloadButtons.png (../../windows/mozapps/update/downloadButtons.png) * skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/extensions/xpinstallConfirm.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index 48613e7947..7f07710204 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -90,7 +90,7 @@ toolkit.jar: skin/classic/global/tree/twisty-XP.svg (tree/twisty-XP.svg) skin/classic/global/tree/twisty-Vista78.svg (tree/twisty-Vista78.svg) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn index 9cf4acda34..901e93e4e7 100644 --- a/toolkit/themes/windows/mozapps/jar.mn +++ b/toolkit/themes/windows/mozapps/jar.mn @@ -43,7 +43,7 @@ toolkit.jar: skin/classic/mozapps/profile/profileicon-XP.png (profile/profileicon-XP.png) skin/classic/mozapps/update/downloadButtons-XP.png (update/downloadButtons-XP.png) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index dd15dc0bd2..7ada19d41a 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -136,7 +136,7 @@ DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE'] for var in ('APP_VERSION', 'APP_ID'): DEFINES[var] = CONFIG['MOZ_%s' % var] -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True LOCAL_INCLUDES += [ -- cgit v1.2.3