wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-31 11:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Use MOZ_PHOENIX instead of checking for 'browser' in MOZ_BUILD_APP

Browse source
This commit is contained in:
NTD 2018-02-03 08:22:52 -05:00 • committed by Roy Tam
commit 28bbfef589
21 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
toolkit/components/passwordmgr/moz.build
View file

@ -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',
]

2
toolkit/components/search/moz.build
View file

@ -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',

2
toolkit/components/telemetry/TelemetryEnvironment.jsm
View file

@ -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());
}

9
toolkit/modules/AppConstants.jsm
View file

@ -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@",

2
toolkit/themes/linux/mozapps/jar.mn
View file

@ -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:

6
toolkit/themes/moz.build
View file

@ -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']

2
toolkit/themes/osx/global/jar.mn
View file

@ -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:

2
toolkit/themes/osx/mozapps/jar.mn
View file

@ -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:

2
toolkit/themes/shared/non-mac.jar.inc.mn
View file

@ -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:

2
toolkit/themes/windows/global/jar.mn
View file

@ -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:

2
toolkit/themes/windows/mozapps/jar.mn
View file

@ -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:

2
toolkit/xre/moz.build
View file

@ -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 += [