Commits:
-
a439540f
by Beatriz Rizental at 2026-11-16T10:29:37-03:00
fixup! MB 38: Mullvad Browser configuration
Bug 45396: Set Mullvad Browser's options as defaults.
Set the relative data directory, distribution ID, application basename
and user appdir in configure, so that they also apply to builds that do
not use our mozconfigs.
Also restore the upstream default for WebRTC, which Mullvad Browser
keeps enabled.
-
230e5555
by Beatriz Rizental at 2026-11-16T10:29:37-03:00
fixup! MB 1: Mullvad Browser branding
Bug 45396: Use the nightly branding by default.
Official builds always pass --with-branding, so this affects only
development builds.
6 changed files:
Changes:
browser/config/mozconfigs/mullvad-browser
|
1
|
|
-. $topsrcdir/browser/config/mozconfigs/base-browser
|
|
|
1
|
+# This file is deprecated and will be removed, see tor-browser#45396.
|
|
2
|
2
|
|
|
3
|
|
-export MOZ_APP_BASENAME=MullvadBrowser
|
|
4
|
|
-mk_add_options MOZ_APP_DISPLAYNAME="Mullvad Browser"
|
|
5
|
|
-
|
|
6
|
|
-ac_add_options --with-user-appdir=Mullvad
|
|
7
|
|
-
|
|
8
|
|
-ac_add_options --with-relative-data-dir=../Data
|
|
9
|
|
-
|
|
10
|
|
-ac_add_options --with-distribution-id=net.mullvad |
|
|
3
|
+echo "browser/config/mozconfigs/mullvad-browser has been removed, see tor-browser#45396." >&2
|
|
|
4
|
+echo "Your mozconfig no longer needs to source one from this repository." >&2
|
|
|
5
|
+echo "Run ./mach bootstrap to generate a mozconfig, or write one with this line:" >&2
|
|
|
6
|
+echo " ac_add_options --with-base-browser-version=dev-build" >&2
|
|
|
7
|
+exit 1 |
browser/confvars.sh
| ... |
... |
@@ -9,5 +9,7 @@ |
|
9
|
9
|
# For mozilla-beta, mozilla-release, or mozilla-central repositories, use
|
|
10
|
10
|
# "unofficial" branding.
|
|
11
|
11
|
# For the mozilla-aurora repository, use "aurora".
|
|
12
|
|
-MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
|
|
|
12
|
+# Mullvad Browser (tor-browser#45396): Use the nightly branding by default.
|
|
|
13
|
+# Official builds always pass --with-branding.
|
|
|
14
|
+MOZ_BRANDING_DIRECTORY=browser/branding/mb-nightly
|
|
13
|
15
|
MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official |
browser/moz.configure
| ... |
... |
@@ -14,6 +14,7 @@ imply_option("MOZ_PROFILE_MIGRATOR", False) |
|
14
|
14
|
|
|
15
|
15
|
|
|
16
|
16
|
imply_option("MOZ_APP_VENDOR", "Mullvad")
|
|
|
17
|
+imply_option("--with-user-appdir", "Mullvad", when=compile_environment)
|
|
17
|
18
|
imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
|
|
18
|
19
|
# Include the DevTools client, not just the server (which is the default)
|
|
19
|
20
|
imply_option("MOZ_DEVTOOLS", "all")
|
build/moz.configure/init.configure
| ... |
... |
@@ -1290,7 +1290,8 @@ def moz_app_basename(value, target_is_android): |
|
1290
|
1290
|
return value[0]
|
|
1291
|
1291
|
if target_is_android:
|
|
1292
|
1292
|
return "Fennec"
|
|
1293
|
|
- return "Firefox"
|
|
|
1293
|
+ # Mullvad Browser(tor-browser#45396): Use our basename by default.
|
|
|
1294
|
+ return "MullvadBrowser"
|
|
1294
|
1295
|
|
|
1295
|
1296
|
|
|
1296
|
1297
|
set_config(
|
moz.configure
| ... |
... |
@@ -996,7 +996,7 @@ with only_when(cross_compiling): |
|
996
|
996
|
def relative_data_dir_default(target):
|
|
997
|
997
|
if target.os in ("Android", "OSX"):
|
|
998
|
998
|
return None
|
|
999
|
|
- return "BaseBrowser/Data/Browser"
|
|
|
999
|
+ return "../Data"
|
|
1000
|
1000
|
|
|
1001
|
1001
|
|
|
1002
|
1002
|
option(
|
toolkit/moz.configure
| ... |
... |
@@ -87,7 +87,8 @@ set_config("MOZ_INCLUDE_SOURCE_INFO", True, when="MOZ_INCLUDE_SOURCE_INFO") |
|
87
|
87
|
option(
|
|
88
|
88
|
"--with-distribution-id",
|
|
89
|
89
|
nargs=1,
|
|
90
|
|
- default="org.mozilla",
|
|
|
90
|
+ # Mullvad Browser (tor-browser#45396): Use our distribution ID by default.
|
|
|
91
|
+ default="net.mullvad",
|
|
91
|
92
|
help="Set distribution-specific id",
|
|
92
|
93
|
)
|
|
93
|
94
|
set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
|
| ... |
... |
@@ -1488,11 +1489,9 @@ def webrtc_default(target): |
|
1488
|
1489
|
return os_match and cpu_match and target.endianness == "little"
|
|
1489
|
1490
|
|
|
1490
|
1491
|
|
|
1491
|
|
-# Base Browser: Disable WebRTC by default.
|
|
1492
|
|
-# Before enabling, please notice that WebRTC does not work on mingw (Bug 1393901)
|
|
1493
|
1492
|
option(
|
|
1494
|
1493
|
"--disable-webrtc",
|
|
1495
|
|
- default=False,
|
|
|
1494
|
+ default=webrtc_default,
|
|
1496
|
1495
|
help="{Enable|Disable} support for WebRTC",
|
|
1497
|
1496
|
)
|
|
1498
|
1497
|
|
|