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

Bug 1898177 - Move MOZ_APP_VENDOR from confvars.sh to moz.configure r=glandium,geckoview-reviewers,m_kato

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D212338
This commit is contained in:
serge-sans-paille 2024-06-14 13:44:58 +00:00
parent 0f273d3908
commit fe9f27acb6
10 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/confvars.sh
View File

@ -3,8 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_VENDOR=Mozilla
if test "$OS_ARCH" = "WINNT"; then if test "$OS_ARCH" = "WINNT"; then
if ! test "$HAVE_64BIT_BUILD"; then if ! test "$HAVE_64BIT_BUILD"; then
if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \ if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \

1
browser/moz.configure
View File

@ -12,6 +12,7 @@ imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
imply_option("MOZ_NORMANDY", True) imply_option("MOZ_NORMANDY", True)
imply_option("MOZ_APP_VENDOR", "Mozilla")
imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
with only_when(target_has_linux_kernel & compile_environment): with only_when(target_has_linux_kernel & compile_environment):

2
mobile/android/confvars.sh
View File

@ -2,8 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_VENDOR=Mozilla
MOZ_APP_UA_NAME=Firefox MOZ_APP_UA_NAME=Firefox
BROWSER_CHROME_URL=chrome://geckoview/content/geckoview.xhtml BROWSER_CHROME_URL=chrome://geckoview/content/geckoview.xhtml

1
mobile/android/moz.configure
View File

@ -61,6 +61,7 @@ imply_option("MOZ_NORMANDY", False)
imply_option("MOZ_SERVICES_HEALTHREPORT", True) imply_option("MOZ_SERVICES_HEALTHREPORT", True)
imply_option("MOZ_GECKOVIEW_HISTORY", True) imply_option("MOZ_GECKOVIEW_HISTORY", True)
imply_option("MOZ_APP_VENDOR", "Mozilla")
imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}") imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}")

5
mobile/ios/confvars.sh
View File

@ -1,5 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
MOZ_APP_VENDOR=Mozilla

1
mobile/ios/moz.configure
View File

@ -6,6 +6,7 @@
imply_option("MOZ_PLACES", True) imply_option("MOZ_PLACES", True)
imply_option("MOZ_APP_VENDOR", "Mozilla")
imply_option("MOZ_APP_ID", "{8e3ba928-3798-4bcd-9b64-c788f2d954d3}") imply_option("MOZ_APP_ID", "{8e3ba928-3798-4bcd-9b64-c788f2d954d3}")

3
old-configure.in
View File

@ -718,8 +718,6 @@ AC_SUBST(MOZ_EME_PROCESS_BUNDLEID)
# The following variables are available to branding and application # The following variables are available to branding and application
# configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh): # configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh):
# - MOZ_APP_VENDOR: Used for application.ini's "Vendor" field, which also
# impacts profile location and user-visible fields.
# - MOZ_APP_DISPLAYNAME: Used in user-visible fields (DLL properties, # - MOZ_APP_DISPLAYNAME: Used in user-visible fields (DLL properties,
# Mac Bundle name, Updater, Installer), it is typically used for nightly # Mac Bundle name, Updater, Installer), it is typically used for nightly
# builds (e.g. Aurora for Firefox). # builds (e.g. Aurora for Firefox).
@ -755,7 +753,6 @@ else
fi fi
AC_SUBST(MOZ_APP_DISPLAYNAME) AC_SUBST(MOZ_APP_DISPLAYNAME)
AC_SUBST(MOZ_APP_VENDOR)
AC_SUBST(MOZ_APP_PROFILE) AC_SUBST(MOZ_APP_PROFILE)
AC_SUBST(MAR_CHANNEL_ID) AC_SUBST(MAR_CHANNEL_ID)
AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS) AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)

13
toolkit/moz.configure
View File

@ -20,6 +20,19 @@ def check_moz_app_id(moz_app_id, build_project):
die(f"No value for MOZ_APP_ID in project '{build_project}'") die(f"No value for MOZ_APP_ID in project '{build_project}'")
project_flag(
env="MOZ_APP_VENDOR",
nargs=1,
help='used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields',
)
@depends("MOZ_APP_VENDOR", build_project)
def check_moz_app_vendor(moz_app_vendor, build_project):
if not moz_app_vendor:
die(f"No value for MOZ_APP_VENDOR in project '{build_project}'")
# Set the MOZ_CONFIGURE_OPTIONS variable with all the options that # Set the MOZ_CONFIGURE_OPTIONS variable with all the options that
# were passed somehow (environment, command line, mozconfig) # were passed somehow (environment, command line, mozconfig)
@dependable @dependable

1
tools/rusttests/moz.configure
View File

@ -3,6 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
imply_option("MOZ_APP_ID", "{718caed9-c609-48bf-89df-6f0e538f84d1}") imply_option("MOZ_APP_ID", "{718caed9-c609-48bf-89df-6f0e538f84d1}")
imply_option("MOZ_APP_VENDOR", "Mozilla")
imply_option("MOZ_PLACES", True) imply_option("MOZ_PLACES", True)

2
tools/update-programs/confvars.sh
View File

@ -3,8 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_VENDOR=Mozilla
MOZ_BRANDING_DIRECTORY=browser/branding/unofficial MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
# Build the updater by default. Use --disable-updater to not. # Build the updater by default. Use --disable-updater to not.