corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1898060, bug 1898177) for causing build bustages. CLOSED TREE

Browse Source 
Backed out changeset ee58e772c50b (bug 1898177)
Backed out changeset e073f86475fd (bug 1898060)
This commit is contained in:
Stanca Serban
2024-06-13 00:06:03 +03:00
parent 34e7d45ce5
commit 05cbd89f3a
9 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
browser/confvars.sh
View File

@@ -3,6 +3,8 @@
# 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 \
@@ -33,6 +35,7 @@ BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
# For the mozilla-aurora repository, use "aurora". # For the mozilla-aurora repository, use "aurora".
MOZ_BRANDING_DIRECTORY=browser/branding/unofficial MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
MOZ_PROFILE_MIGRATOR=1 MOZ_PROFILE_MIGRATOR=1

4
browser/moz.configure
View File

@@ -11,10 +11,6 @@ imply_option("MOZ_DEDICATED_PROFILES", True)
imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True) 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}")
with only_when(target_has_linux_kernel & compile_environment): with only_when(target_has_linux_kernel & compile_environment):
option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")

1
build/moz.configure/init.configure
View File

@@ -1047,6 +1047,7 @@ set_config("MOZILLA_OFFICIAL", mozilla_official)
set_define("MOZILLA_OFFICIAL", mozilla_official) set_define("MOZILLA_OFFICIAL", mozilla_official)
add_old_configure_assignment("MOZILLA_OFFICIAL", mozilla_official) add_old_configure_assignment("MOZILLA_OFFICIAL", mozilla_official)
# Allow specifying custom paths to the version files used by the milestone() function below. # Allow specifying custom paths to the version files used by the milestone() function below.
option( option(
"--with-version-file-path", "--with-version-file-path",

4
mobile/android/confvars.sh
View File

@@ -2,6 +2,8 @@
# 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
@@ -11,3 +13,5 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
# MOZ_APP_DISPLAYNAME is set by branding/configure.sh # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
MOZ_RAW=1 MOZ_RAW=1
MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}

3
mobile/android/moz.configure
View File

@@ -61,9 +61,6 @@ 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}")
@depends(target) @depends(target)
def check_target(target): def check_target(target):

6
old-configure.in
View File

@@ -718,11 +718,15 @@ 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).
# - MOZ_APP_PROFILE: When set, used for application.ini's # - MOZ_APP_PROFILE: When set, used for application.ini's
# "Profile" field, which controls profile location. # "Profile" field, which controls profile location.
# - MOZ_APP_ID: When set, used for application.ini's "ID" field, and
# crash reporter server url.
# - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator. # - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
# The following environment variables used to have an effect, but don't anymore: # The following environment variables used to have an effect, but don't anymore:
@@ -753,7 +757,9 @@ 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(MOZ_APP_ID)
AC_SUBST(MAR_CHANNEL_ID) AC_SUBST(MAR_CHANNEL_ID)
AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS) AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
AC_SUBST(MOZ_PROFILE_MIGRATOR) AC_SUBST(MOZ_PROFILE_MIGRATOR)

16
toolkit/moz.configure
View File

@@ -4,22 +4,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/.
# App-specific project settings
project_flag(
env="MOZ_APP_ID",
nargs=1,
help='used for application.ini\'s "ID" field, and crash reporter server url',
)
project_flag(
env="MOZ_APP_VENDOR",
default="",
nargs=1,
help='used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields',
)
# 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)

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

@@ -3,7 +3,10 @@
# 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
MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
# Build the updater by default. Use --disable-updater to not. # Build the updater by default. Use --disable-updater to not.
MOZ_UPDATER=1 MOZ_UPDATER=1

1
tools/update-programs/moz.configure
View File

@@ -16,7 +16,6 @@ def fold_libs(target):
set_config("MOZ_FOLD_LIBS", fold_libs) set_config("MOZ_FOLD_LIBS", fold_libs)
imply_option("MOZ_APP_VENDOR", "Mozilla")
include("../../build/moz.configure/rust.configure") include("../../build/moz.configure/rust.configure")
include("../../build/moz.configure/nspr.configure") include("../../build/moz.configure/nspr.configure")