[tbb-commits] [Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

[richard (@richard)]

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser


Commits:
bba964da by Pier Angelo Vendrame at 2023-09-07T22:19:02+00:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Allow customizing the updater URL with config options.

With this, we will not need sed hacks on tor-browser-build anymore.

- - - - -


3 changed files:

- build/application.ini.in
- build/moz.build
- build/moz.configure/update-programs.configure


Changes:

=====================================
build/application.ini.in
=====================================
@@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO
 
 #if MOZ_UPDATER
 [AppUpdate]
-URL=https://aus1.torproject.org/basebrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL
+URL=@BB_UPDATER_URL@/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL
 #endif


=====================================
build/moz.build
=====================================
@@ -75,6 +75,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
         "MAR_CHANNEL_ID",
         "MOZ_APP_REMOTINGNAME",
         "MOZ_CRASHREPORTER_URL",
+        "BB_UPDATER_URL",
     ):
         appini_defines[var] = CONFIG[var]
 


=====================================
build/moz.configure/update-programs.configure
=====================================
@@ -204,3 +204,19 @@ option(
 
 set_config("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update")
 set_define("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update")
+
+
+# Updater URL
+# ==============================================================
+
+option(
+    "--with-updater-url",
+    default="https://aus1.torproject.org/torbrowser/update_3/",
+    nargs=1,
+    help="Set the updater URL",
+)
+
+set_config(
+    "BB_UPDATER_URL",
+    depends("--with-updater-url")(lambda x: x[0].rstrip("/")),
+)



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964da2898a00c141aeef02d48807efc336436

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964da2898a00c141aeef02d48807efc336436
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20230907/cb10de65/attachment-0001.htm>