From 05cbd89f3ae07aa2783dbe3d43648d93f5bd7c58 Mon Sep 17 00:00:00 2001 From: Stanca Serban Date: Thu, 13 Jun 2024 00:06:03 +0300 Subject: [PATCH] Backed out 2 changesets (bug 1898060, bug 1898177) for causing build bustages. CLOSED TREE Backed out changeset ee58e772c50b (bug 1898177) Backed out changeset e073f86475fd (bug 1898060) --- browser/confvars.sh | 3 +++ browser/moz.configure | 4 ---- build/moz.configure/init.configure | 1 + mobile/android/confvars.sh | 4 ++++ mobile/android/moz.configure | 3 --- old-configure.in | 6 ++++++ toolkit/moz.configure | 16 ---------------- tools/update-programs/confvars.sh | 3 +++ tools/update-programs/moz.configure | 1 - 9 files changed, 17 insertions(+), 24 deletions(-) diff --git a/browser/confvars.sh b/browser/confvars.sh index 786fb417cba7..6fa324be930b 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -3,6 +3,8 @@ # 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 + if test "$OS_ARCH" = "WINNT"; then if ! test "$HAVE_64BIT_BUILD"; then 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". MOZ_BRANDING_DIRECTORY=browser/branding/unofficial MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official +MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} MOZ_PROFILE_MIGRATOR=1 diff --git a/browser/moz.configure b/browser/moz.configure index 069bdec2cfde..dbb5eb265022 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -11,10 +11,6 @@ imply_option("MOZ_DEDICATED_PROFILES", True) imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", 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): option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 67938003b634..97b9bab16739 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -1047,6 +1047,7 @@ set_config("MOZILLA_OFFICIAL", mozilla_official) set_define("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. option( "--with-version-file-path", diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index 7b9adf55cd01..f9118b6621d1 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -2,6 +2,8 @@ # 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 + MOZ_APP_UA_NAME=Firefox 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_RAW=1 + +MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110} diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 5ed8c5070414..26ea6f6f7e91 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -61,9 +61,6 @@ imply_option("MOZ_NORMANDY", False) imply_option("MOZ_SERVICES_HEALTHREPORT", 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) def check_target(target): diff --git a/old-configure.in b/old-configure.in index d47dc0a0f959..ee8467bc13a3 100644 --- a/old-configure.in +++ b/old-configure.in @@ -718,11 +718,15 @@ AC_SUBST(MOZ_EME_PROCESS_BUNDLEID) # The following variables are available to branding and application # 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, # Mac Bundle name, Updater, Installer), it is typically used for nightly # builds (e.g. Aurora for Firefox). # - MOZ_APP_PROFILE: When set, used for application.ini's # "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. # The following environment variables used to have an effect, but don't anymore: @@ -753,7 +757,9 @@ else fi AC_SUBST(MOZ_APP_DISPLAYNAME) +AC_SUBST(MOZ_APP_VENDOR) AC_SUBST(MOZ_APP_PROFILE) +AC_SUBST(MOZ_APP_ID) AC_SUBST(MAR_CHANNEL_ID) AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS) AC_SUBST(MOZ_PROFILE_MIGRATOR) diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 2b8cc812535a..a87b7d9ea4a8 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -4,22 +4,6 @@ # 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/. -# 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 # were passed somehow (environment, command line, mozconfig) diff --git a/tools/update-programs/confvars.sh b/tools/update-programs/confvars.sh index d45901b4c5e9..66e2a806058d 100644 --- a/tools/update-programs/confvars.sh +++ b/tools/update-programs/confvars.sh @@ -3,7 +3,10 @@ # 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 + MOZ_BRANDING_DIRECTORY=browser/branding/unofficial +MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} # Build the updater by default. Use --disable-updater to not. MOZ_UPDATER=1 diff --git a/tools/update-programs/moz.configure b/tools/update-programs/moz.configure index 89406abe707a..23192c8a2504 100644 --- a/tools/update-programs/moz.configure +++ b/tools/update-programs/moz.configure @@ -16,7 +16,6 @@ def fold_libs(target): set_config("MOZ_FOLD_LIBS", fold_libs) -imply_option("MOZ_APP_VENDOR", "Mozilla") include("../../build/moz.configure/rust.configure") include("../../build/moz.configure/nspr.configure")