[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-156.0a1-17.0-2] 7 commits: fixup! Base Browser's .mozconfigs.



Title: GitLab

brizental pushed to branch tor-browser-156.0a1-17.0-2 at The Tor Project / Applications / Tor Browser

Commits:

  • 7dd8e38e
    by Beatriz Rizental at 2026-11-12T16:38:59-03:00
    fixup! Base Browser's .mozconfigs.
    
    TB 45396: Move Base Browser options to moz.configure.
    
    Move the options that every Base Browser build needs from the mozconfigs
    to moz.configure, so that they also apply to builds that do not use our
    mozconfigs, such as development builds.
    
    Options that must never be changed are implied, and cause an error if a
    mozconfig tries to change them. The others become the default values.
    
    Also, CONFIG["BASE_BROWSER"] is now unconditionally True, since
    --with-base-browser-version is mandatory.
    
  • 9478b05d
    by Beatriz Rizental at 2026-11-12T16:39:00-03:00
    fixup! BB 9173: Change the default Firefox profile directory to be relative.
    
    TB 45396: Make the relative data directory a default.
    
    This way it applies also to builds that do not use our mozconfigs, but
    it can still be overridden or disabled with --without-relative-data-dir.
    
  • 134dfa72
    by Beatriz Rizental at 2026-11-12T16:39:00-03:00
    fixup! TB3: Tor Browser's official .mozconfigs.
    
    TB 45396: Set Tor Browser's relative data directory and distribution ID
    as defaults.
    
  • 62a4a0fa
    by Beatriz Rizental at 2026-11-12T16:39:01-03:00
    fixup! TB 2176: Rebrand Firefox to TorBrowser
    
    TB 45396: Use the nightly branding by default.
    
    Official builds always pass --with-branding, so this affects only
    development builds.
    
  • 68613414
    by Beatriz Rizental at 2026-11-12T16:39:02-03:00
    fixup! Base Browser's .mozconfigs.
    
    TB 45396: Remove Base Browser's mozconfigs.
    
    All the options shared by every build are now in moz.configure, and the
    options specific to official builds are set by tor-browser-build.
    
    Replace the root mozconfigs with stubs that fail with instructions, so
    that developers using them know what to do, and remove them later.
    
  • 23062acf
    by Beatriz Rizental at 2026-11-12T16:39:03-03:00
    fixup! TB3: Tor Browser's official .mozconfigs.
    
    TB 45396: Remove Tor Browser's mozconfigs.
    
  • 75c6be6d
    by Beatriz Rizental at 2026-11-12T16:39:04-03:00
    fixup! BB 43564: Modify ./mach bootstrap for Base Browser
    
    TB 45396: Add --with-base-browser-version to the suggested mozconfig.
    
    The version is mandatory, and it is the only option a developer build
    needs, so bootstrap can write a working mozconfig for every application.
    

25 changed files:

Changes:

  • browser/config/mozconfigs/base-browser
    1
    -# Shared build settings and settings to enhance security and privacy.
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -. $topsrcdir/browser/config/mozconfig
    
    4
    -
    
    5
    -if test -f "$topsrcdir/mozconfig-toolchain"; then
    
    6
    -    . $topsrcdir/mozconfig-toolchain
    
    7
    -fi
    
    8
    -
    
    9
    -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
    
    10
    -
    
    11
    -export MOZILLA_OFFICIAL=1
    
    12
    -
    
    13
    -ac_add_options --enable-optimize
    
    14
    -ac_add_options --enable-rust-simd
    
    15
    -ac_add_options --enable-lto=cross
    
    16
    -
    
    17
    -ac_add_options --disable-unverified-updates
    
    18
    -ac_add_options --enable-base-browser-update
    
    19
    -
    
    20
    -ac_add_options --enable-bundled-fonts
    
    21
    -
    
    22
    -ac_add_options --disable-tests
    
    23
    -ac_add_options --disable-debug
    
    24
    -
    
    25
    -ac_add_options --disable-crashreporter
    
    26
    -# Before removing, please notice that WebRTC does not work on mingw (Bug 1393901)
    
    27
    -ac_add_options --disable-webrtc
    
    28
    -ac_add_options --disable-parental-controls
    
    29
    -ac_add_options --enable-proxy-bypass-protection
    
    30
    -# tor-browser#45336
    
    31
    -ac_add_options --disable-proxy-direct-failover
    
    32
    -# See bugs #30575 and #32418: system policies are harmful either because they
    
    33
    -# could allow proxy bypass, and override a number of other preferences we set
    
    34
    -ac_add_options --disable-system-policies
    
    35
    -# tor-browser#44394
    
    36
    -ac_add_options --disable-system-preferences
    
    37
    -
    
    38
    -# See bug #41131
    
    39
    -ac_add_options --disable-backgroundtasks
    
    40
    -
    
    41
    -# Disable telemetry
    
    42
    -ac_add_options MOZ_TELEMETRY_REPORTING=
    
    43
    -
    
    44
    -# Disable the creation of a <something>.default that Firefox by default creates
    
    45
    -# for old version that could not use dedicated profiles. See tor-browser#41542.
    
    46
    -ac_add_options --disable-legacy-profile-creation
    
    47
    -
    
    48
    -if test -z "$WASI_SYSROOT"; then
    
    49
    -    ac_add_options --without-wasm-sandboxed-libraries
    
    50
    -fi
    3
    +echo "browser/config/mozconfigs/base-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/config/mozconfigs/base-browser-android
    1
    -# Changes on this file might need to be synchronized with mozconfig-android-all!
    
    2
    -# See also tor-browser#43151.
    
    3
    -
    
    4
    -export MOZILLA_OFFICIAL=1
    
    5
    -
    
    6
    -ac_add_options --enable-optimize
    
    7
    -ac_add_options --enable-rust-simd
    
    8
    -ac_add_options --enable-lto=cross
    
    9
    -
    
    10
    -ac_add_options --enable-application=mobile/android
    
    11
    -
    
    12
    -CC="clang"
    
    13
    -CXX="clang++"
    
    14
    -ac_add_options --enable-linker=lld
    
    15
    -
    
    16
    -ac_add_options --enable-strip
    
    17
    -ac_add_options --enable-install-strip
    
    18
    -ac_add_options --disable-tests
    
    19
    -ac_add_options --disable-debug
    
    20
    -ac_add_options --disable-rust-debug
    
    21
    -
    
    22
    -ac_add_options --disable-updater
    
    23
    -ac_add_options --disable-crashreporter
    
    24
    -ac_add_options --disable-webrtc
    
    25
    -ac_add_options --disable-parental-controls
    
    26
    -
    
    27
    -ac_add_options --enable-proxy-bypass-protection
    
    28
    -# tor-browser#45336
    
    29
    -ac_add_options --disable-proxy-direct-failover
    
    30
    -ac_add_options --disable-system-policies
    
    31
    -
    
    32
    -# See tor-browser#41131
    
    33
    -ac_add_options --disable-backgroundtasks
    
    34
    -
    
    35
    -ac_add_options --enable-minify=properties,js
    
    36
    -
    
    37
    -# Disable telemetry
    
    38
    -ac_add_options MOZ_TELEMETRY_REPORTING=
    
    39
    -
    
    40
    -if test -n "$LOCAL_DEV_BUILD"; then
    
    41
    -    # You must use the "default" bogus channel for dev builds
    
    42
    -    ac_add_options --enable-update-channel=default
    
    43
    -    ac_add_options --with-base-browser-version=dev-build
    
    44
    -    ac_add_options --disable-minify
    
    45
    -fi
    
    46
    -
    
    47
    -if test -z "$WASI_SYSROOT"; then
    
    48
    -    ac_add_options --without-wasm-sandboxed-libraries
    
    49
    -fi
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2
    +
    
    3
    +echo "browser/config/mozconfigs/base-browser-android 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --enable-project=mobile/android" >&2
    
    9
    +exit 1

  • browser/config/mozconfigs/tor-browser
    1
    -. $topsrcdir/browser/config/mozconfigs/base-browser
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -# If building outside tor-browser-build, you might want to customize this value.
    
    4
    -# On Linux, it influences the WM_CLASS value, which is shown on GNOME's ALT-TAB,
    
    5
    -# for example.
    
    6
    -# We customize it in tor-browser-build because we include the channel name, just
    
    7
    -# like Firefox does.
    
    8
    -# export MOZ_APP_REMOTINGNAME="Tor Browser"
    
    9
    -
    
    10
    -ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser
    
    11
    -# This is not needed with the relative data directory, but it is when you
    
    12
    -# disable it, otherwise it is "Mozilla" (on Windows and macOS) or ".mozilla" on
    
    13
    -# Unix systems.
    
    14
    -# It is used, for example, for GetProductDirectory.
    
    15
    -# ac_add_options --with-user-appdir=TorProject
    
    16
    -# ac_add_options --with-user-appdir=.torproject
    
    17
    -
    
    18
    -ac_add_options --with-distribution-id=org.torproject
    3
    +echo "browser/config/mozconfigs/tor-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/config/mozconfigs/tor-browser-android
    1
    -. $topsrcdir/browser/config/mozconfigs/base-browser-android
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
    
    4
    -
    
    5
    -if test -n "$LOCAL_DEV_BUILD"; then
    
    6
    -    ac_add_options --with-branding=mobile/android/branding/tb-nightly
    
    7
    -fi
    3
    +echo "browser/config/mozconfigs/tor-browser-android 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --enable-project=mobile/android" >&2
    
    9
    +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
    +# Tor Browser: Use the nightly branding by default. Official builds always
    
    13
    +# pass --with-branding. See tor-browser#45396.
    
    14
    +MOZ_BRANDING_DIRECTORY=browser/branding/tb-nightly
    
    13 15
     MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official

  • build/moz.configure/basebrowser.configure
    1
    +# Options that must not be changed in Base Browser and derived browsers.
    
    2
    +# Note: These options apply to both Android and Desktop.
    
    3
    +# -------------------------------------------------
    
    4
    +
    
    5
    +imply_option("MOZ_TELEMETRY_REPORTING", False)
    
    6
    +imply_option("--enable-crashreporter", False)
    
    7
    +imply_option("--enable-unverified-updates", False)
    
    8
    +imply_option("--enable-proxy-bypass-protection", True)
    
    9
    +
    
    10
    +# tor-browser#45336
    
    11
    +imply_option("--enable-proxy-direct-failover", False)
    
    12
    +
    
    13
    +# See tor-browser#30575 and tor-browser#32418: system policies are harmful either
    
    14
    +# because they could allow proxy bypass, and override a number of other preferences we set
    
    15
    +imply_option("--enable-system-policies", False)
    
    16
    +
    
    17
    +# tor-browser#44394
    
    18
    +imply_option(
    
    19
    +    "--enable-system-preferences",
    
    20
    +    False,
    
    21
    +    when=depends(build_project)(lambda p: p == "browser"),
    
    22
    +)
    
    23
    +
    
    24
    +# tor-browser#13379
    
    25
    +imply_option("--enable-nss-mar", True, when=target_is_windows | target_is_osx)
    
    26
    +
    
    27
    +# tor-browser#41131
    
    28
    +imply_option("--enable-update-agent", False, when=target_is_windows | target_is_osx)
    
    29
    +imply_option("--enable-bits-download", False, when=target_is_windows)
    
    30
    +imply_option("--enable-maintenance-service", False, when=target_is_windows)
    
    31
    +imply_option("--enable-default-browser-agent", False, when=target_is_windows)

  • mobile/android/confvars.sh
    ... ... @@ -2,6 +2,8 @@
    2 2
     # License, v. 2.0. If a copy of the MPL was not distributed with this
    
    3 3
     # file, You can obtain one at http://mozilla.org/MPL/2.0/.
    
    4 4
     
    
    5
    -MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
    
    5
    +# Tor Browser: Use the nightly branding by default. Official builds always
    
    6
    +# pass --with-branding. See tor-browser#45396.
    
    7
    +MOZ_BRANDING_DIRECTORY=mobile/android/branding/tb-nightly
    
    6 8
     MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
    
    7 9
     # MOZ_APP_DISPLAYNAME is set by branding/configure.sh

  • moz.configure
    ... ... @@ -246,6 +246,7 @@ def check_prog(*args, **kwargs):
    246 246
     
    
    247 247
     
    
    248 248
     include("build/moz.configure/toolchain.configure", when="--enable-compile-environment")
    
    249
    +include("build/moz.configure/basebrowser.configure")
    
    249 250
     include("build/moz.configure/basebrowser-resources.configure")
    
    250 251
     include("build/moz.configure/torbrowser-resources.configure")
    
    251 252
     
    
    ... ... @@ -989,9 +990,22 @@ with only_when(cross_compiling):
    989 990
         )
    
    990 991
         set_config("JS_BINARY", depends_if("JS_BINARY")(lambda value: value[0]))
    
    991 992
     
    
    993
    +
    
    994
    +# Base Browser: Make the data directory relative to the application by
    
    995
    +# default. See tor-browser#9173.
    
    996
    +@depends(target)
    
    997
    +def relative_data_dir_default(target):
    
    998
    +    if target.os == "Android":
    
    999
    +        return None
    
    1000
    +    if target.os == "OSX":
    
    1001
    +        return "../TorBrowser-Data/Browser"
    
    1002
    +    return "TorBrowser/Data/Browser"
    
    1003
    +
    
    1004
    +
    
    992 1005
     option(
    
    993 1006
         "--with-relative-data-dir",
    
    994 1007
         nargs=1,
    
    1008
    +    default=relative_data_dir_default,
    
    995 1009
         help="Sets the data directories to be relative to the application directory",
    
    996 1010
     )
    
    997 1011
     
    
    ... ... @@ -1035,9 +1049,7 @@ def base_browser_version_quoted(value):
    1035 1049
         return f'"{value[0]}"'
    
    1036 1050
     
    
    1037 1051
     
    
    1038
    -set_config(
    
    1039
    -    "BASE_BROWSER", depends(base_browser_version)(lambda v: True if v else False)
    
    1040
    -)
    
    1052
    +set_config("BASE_BROWSER", True)
    
    1041 1053
     set_define("BASE_BROWSER_VERSION", base_browser_version)
    
    1042 1054
     set_define("BASE_BROWSER_VERSION_QUOTED", base_browser_version_quoted)
    
    1043 1055
     
    

  • mozconfig-android-aarch64
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser-android
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android
    
    4
    -ac_add_options --target=aarch64-linux-android
    3
    +echo "mozconfig-android-aarch64 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --enable-project=mobile/android" >&2
    
    9
    +echo "    ac_add_options --target=aarch64-linux-android" >&2
    
    10
    +exit 1

  • mozconfig-android-all
    1
    -# Changes on this file might need to be synchronized with
    
    2
    -# browser/config/mozconfigs/base-browser-android!
    
    3
    -# See also tor-browser#43151.
    
    4
    -
    
    5
    -export MOZILLA_OFFICIAL=1
    
    6
    -
    
    7
    -ac_add_options --enable-application=mobile/android
    
    8
    -
    
    9
    -ac_add_options --disable-compile-environment
    
    10
    -
    
    11
    -ac_add_options --disable-tests
    
    12
    -ac_add_options --disable-debug
    
    13
    -
    
    14
    -ac_add_options --disable-updater
    
    15
    -ac_add_options --disable-crashreporter
    
    16
    -ac_add_options --disable-webrtc
    
    17
    -ac_add_options --disable-parental-controls
    
    18
    -
    
    19
    -ac_add_options --enable-proxy-bypass-protection
    
    20
    -ac_add_options --disable-system-policies
    
    21
    -
    
    22
    -# See tor-browser#41131
    
    23
    -ac_add_options --disable-backgroundtasks
    
    24
    -
    
    25
    -ac_add_options --enable-minify=properties,js
    
    26
    -
    
    27
    -# Disable telemetry
    
    28
    -ac_add_options MOZ_TELEMETRY_REPORTING=
    
    29
    -
    
    30
    -if test -n "$LOCAL_DEV_BUILD"; then
    
    31
    -    # You must use the "default" bogus channel for dev builds
    
    32
    -    ac_add_options --enable-update-channel=default
    
    33
    -    ac_add_options --with-base-browser-version=dev-build
    
    34
    -    ac_add_options --disable-minify
    
    35
    -fi
    
    36
    -
    
    37
    -if test -z "$WASI_SYSROOT"; then
    
    38
    -    ac_add_options --without-wasm-sandboxed-libraries
    
    39
    -fi
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2
    +
    
    3
    +echo "mozconfig-android-all 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --enable-project=mobile/android" >&2
    
    9
    +exit 1

  • mozconfig-android-armv7
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser-android
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
    
    4
    -ac_add_options --target=arm-linux-androideabi
    3
    +echo "mozconfig-android-armv7 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --enable-project=mobile/android" >&2
    
    9
    +echo "    ac_add_options --target=arm-linux-androideabi" >&2
    
    10
    +exit 1

  • mozconfig-android-x86
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser-android
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android
    
    4
    -ac_add_options --target=i686-linux-android
    3
    +echo "mozconfig-android-x86 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --enable-project=mobile/android" >&2
    
    9
    +echo "    ac_add_options --target=i686-linux-android" >&2
    
    10
    +exit 1

  • mozconfig-android-x86_64
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser-android
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android
    
    4
    -ac_add_options --target=x86_64-linux-android
    3
    +echo "mozconfig-android-x86_64 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --enable-project=mobile/android" >&2
    
    9
    +echo "    ac_add_options --target=x86_64-linux-android" >&2
    
    10
    +exit 1

  • mozconfig-linux-aarch64
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    2
    -
    
    3
    -ac_add_options --target=aarch64-unknown-linux-gnu
    
    4
    -
    
    5
    -# Moz switched to lld for all Linux targets in Bug 1839739.
    
    6
    -ac_add_options --enable-linker=lld
    
    7
    -
    
    8
    -ac_add_options --disable-strip
    
    9
    -ac_add_options --disable-install-strip
    
    10
    -
    
    11
    -ac_add_options --enable-default-toolkit=cairo-gtk3
    
    12
    -
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2
    +
    
    3
    +echo "mozconfig-linux-aarch64 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --target=aarch64-unknown-linux-gnu" >&2
    
    9
    +exit 1

  • mozconfig-linux-aarch64-dev
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    2
    -
    
    3
    -# This mozconfig file is not used in official builds.
    
    4
    -# It is only intended to be used when doing incremental Linux builds
    
    5
    -# during development.
    
    6
    -
    
    7
    -# Moz switched to lld for all Linux targets in Bug 1839739.
    
    8
    -ac_add_options --enable-linker=lld
    
    9
    -
    
    10
    -# Disable LTO for dev builds, even though other optimizations are enabled.
    
    11
    -ac_add_options --disable-lto
    
    12
    -
    
    13
    -export MOZILLA_OFFICIAL=
    
    14
    -export MOZ_APP_REMOTINGNAME="Tor Browser Dev"
    
    15
    -ac_add_options --with-branding=browser/branding/tb-nightly
    
    16
    -
    
    17
    -ac_add_options --enable-default-toolkit=cairo-gtk3
    
    18
    -
    
    19
    -ac_add_options --disable-strip
    
    20
    -ac_add_options --disable-install-strip
    
    21
    -
    
    22
    -ac_add_options --with-base-browser-version=dev-build
    
    23
    -ac_add_options --disable-base-browser-update
    
    24
    -
    
    25
    -ac_add_options --enable-tests
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2
    +
    
    3
    +echo "mozconfig-linux-aarch64-dev 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --target=aarch64-unknown-linux-gnu" >&2
    
    9
    +exit 1

  • mozconfig-linux-arm deleted
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    2
    -
    
    3
    -ac_add_options --target=arm-linux-gnueabihf
    
    4
    -
    
    5
    -ac_add_options --enable-default-toolkit=cairo-gtk3
    
    6
    -
    
    7
    -# Bug 31448: ld.gold fails if we don't disable debug-symbols.
    
    8
    -# Also, we keep strip enabled.
    
    9
    -ac_add_options --disable-debug-symbols
    
    10
    -
    
    11
    -# From Arch Linux ARM for Firefox 102.0.1
    
    12
    -# https://github.com/archlinuxarm/PKGBUILDs/blob/6da804f4020487c112f59ea067e6644a309c4338/extra/firefox/PKGBUILD
    
    13
    -ac_add_options --disable-elf-hack
    
    14
    -ac_add_options --disable-av1
    
    15
    -ac_add_options --enable-optimize="-g0 -O2"
    
    16
    -# One of the following two lines (not sure which) prevents "read-only segment has dynamic relocations" linker error.
    
    17
    -export MOZ_DEBUG_FLAGS=" "
    
    18
    -export RUSTFLAGS="-Cdebuginfo=0"

  • mozconfig-linux-x86_64
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -# Moz switched to lld for all Linux targets in Bug 1839739.
    
    4
    -ac_add_options --enable-linker=lld
    
    5
    -
    
    6
    -ac_add_options --disable-strip
    
    7
    -ac_add_options --disable-install-strip
    
    8
    -
    
    9
    -ac_add_options --enable-default-toolkit=cairo-gtk3
    
    10
    -
    
    11
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    
    12
    -ac_add_options --disable-eme
    
    13
    -
    
    14
    -# tor-browser#44067: geckodriver has become a host-only tool
    
    15
    -ac_add_options --enable-geckodriver
    3
    +echo "mozconfig-linux-x86_64 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

  • mozconfig-linux-x86_64-asan deleted
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    2
    -
    
    3
    -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
    
    4
    -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
    
    5
    -# We need to add -ldl explicitely due to bug 1213698
    
    6
    -export LDFLAGS="-fsanitize=address -ldl"
    
    7
    -
    
    8
    -# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
    
    9
    -# (which is part of mar-tools and is not distributed to end-users) with
    
    10
    -# ASan. See bug 17858.
    
    11
    -export HOST_CFLAGS=""
    
    12
    -export HOST_CXXFLAGS=""
    
    13
    -export HOST_LDFLAGS="-ldl"
    
    14
    -
    
    15
    -ac_add_options --enable-address-sanitizer
    
    16
    -ac_add_options --disable-jemalloc
    
    17
    -ac_add_options --disable-elf-hack
    
    18
    -
    
    19
    -ac_add_options --enable-default-toolkit=cairo-gtk3
    
    20
    -
    
    21
    -ac_add_options --disable-strip
    
    22
    -ac_add_options --disable-install-strip
    
    23
    -
    
    24
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    
    25
    -ac_add_options --disable-eme
    
    26
    -

  • mozconfig-linux-x86_64-dev
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -# This mozconfig file is not used in official builds.
    
    4
    -# It is only intended to be used when doing incremental Linux builds
    
    5
    -# during development.
    
    6
    -
    
    7
    -# Moz switched to lld for all Linux targets in Bug 1839739.
    
    8
    -ac_add_options --enable-linker=lld
    
    9
    -
    
    10
    -# Disable LTO for dev builds, even though other optimizations are enabled.
    
    11
    -ac_add_options --disable-lto
    
    12
    -
    
    13
    -export MOZILLA_OFFICIAL=
    
    14
    -export MOZ_APP_REMOTINGNAME="Tor Browser Dev"
    
    15
    -ac_add_options --with-branding=browser/branding/tb-nightly
    
    16
    -
    
    17
    -ac_add_options --enable-default-toolkit=cairo-gtk3
    
    18
    -
    
    19
    -ac_add_options --disable-strip
    
    20
    -ac_add_options --disable-install-strip
    
    21
    -
    
    22
    -ac_add_options --with-base-browser-version=dev-build
    
    23
    -ac_add_options --disable-base-browser-update
    
    24
    -
    
    25
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    
    26
    -ac_add_options --disable-eme
    
    27
    -
    
    28
    -ac_add_options --enable-tests
    3
    +echo "mozconfig-linux-x86_64-dev 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

  • mozconfig-macos
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -ac_add_options --enable-strip
    
    4
    -
    
    5
    -# See bug #13379
    
    6
    -ac_add_options --enable-nss-mar
    
    7
    -
    
    8
    -# See bug #41131
    
    9
    -ac_add_options --disable-update-agent
    
    10
    -
    
    11
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    
    12
    -ac_add_options --disable-eme
    
    13
    -
    
    14
    -ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser
    3
    +echo "mozconfig-macos 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

  • mozconfig-macos-dev
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2 2
     
    
    3
    -# This mozconfig file is not used in official builds.
    
    4
    -# It is only intended to be used when doing incremental macOS builds
    
    5
    -# during development.
    
    6
    -
    
    7
    -# Disable LTO for dev builds, even though other optimizations are enabled.
    
    8
    -ac_add_options --disable-lto
    
    9
    -
    
    10
    -export MOZILLA_OFFICIAL=
    
    11
    -
    
    12
    -ac_add_options --disable-strip
    
    13
    -ac_add_options --disable-install-strip
    
    14
    -
    
    15
    -ac_add_options --with-base-browser-version=dev-build
    
    16
    -
    
    17
    -ac_add_options --disable-base-browser-update
    
    18
    -# See bug #13379
    
    19
    -ac_add_options --enable-nss-mar
    
    20
    -# See bug #41131
    
    21
    -ac_add_options --disable-update-agent
    
    22
    -
    
    23
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    
    24
    -ac_add_options --disable-eme
    
    25
    -
    
    26
    -ac_add_options --enable-tests
    
    27
    -
    
    28
    -ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser
    
    29
    -
    
    30
    -#copied from the diff between mozconfig-linux-x86_64 and mozconfig-linux-x86_64-dev
    
    31
    -export MOZ_APP_REMOTINGNAME="Tor Browser Dev"
    
    32
    -ac_add_options --with-branding=browser/branding/tb-nightly
    3
    +echo "mozconfig-macos-dev 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

  • mozconfig-windows-i686
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    2
    -
    
    3
    -ac_add_options --target=i686-pc-windows-gnu
    
    4
    -ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
    
    5
    -
    
    6
    -ac_add_options --enable-strip
    
    7
    -
    
    8
    -# Bits is Background Intelligent Transfer Service
    
    9
    -ac_add_options --disable-bits-download
    
    10
    -ac_add_options --disable-maintenance-service
    
    11
    -ac_add_options --disable-default-browser-agent
    
    12
    -
    
    13
    -# See bug #13379
    
    14
    -ac_add_options --enable-nss-mar
    
    15
    -
    
    16
    -# See bug #41131
    
    17
    -ac_add_options --disable-update-agent
    
    18
    -
    
    19
    -# Bug 1782837: Not supported because Mozilla (and therefore also us) build
    
    20
    -# libc++ with LIBCXX_ENABLE_FILESYSTEM disabled.
    
    21
    -ac_add_options --disable-notification-server
    
    22
    -
    
    23
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    
    24
    -ac_add_options --disable-eme
    
    25
    -
    
    26
    -# tor-browser#44028: Disable zucchini for now, as it needs SEH.
    
    27
    -ac_add_options --disable-zucchini
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2
    +
    
    3
    +echo "mozconfig-windows-i686 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --target=i686-pc-windows-gnu" >&2
    
    9
    +exit 1

  • mozconfig-windows-x86_64
    1
    -. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    2
    -
    
    3
    -ac_add_options --target=x86_64-pc-windows-gnu
    
    4
    -ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-
    
    5
    -
    
    6
    -ac_add_options --enable-strip
    
    7
    -
    
    8
    -# Bits is Background Intelligent Transfer Service
    
    9
    -ac_add_options --disable-bits-download
    
    10
    -ac_add_options --disable-maintenance-service
    
    11
    -ac_add_options --disable-default-browser-agent
    
    12
    -
    
    13
    -# See bug #13379
    
    14
    -ac_add_options --enable-nss-mar
    
    15
    -
    
    16
    -# See bug #41131
    
    17
    -ac_add_options --disable-update-agent
    
    18
    -
    
    19
    -# Bug 1782837: Not supported because Mozilla (and therefore also us) build
    
    20
    -# libc++ with LIBCXX_ENABLE_FILESYSTEM disabled.
    
    21
    -ac_add_options --disable-notification-server
    
    22
    -
    
    23
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    
    24
    -ac_add_options --disable-eme
    
    25
    -
    
    26
    -# tor-browser#44028: Disable zucchini for now, as it needs SEH.
    
    27
    -ac_add_options --disable-zucchini
    1
    +# This file is deprecated and will be removed, see tor-browser#45396.
    
    2
    +
    
    3
    +echo "mozconfig-windows-x86_64 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
    +echo "and, for this platform:" >&2
    
    8
    +echo "    ac_add_options --target=x86_64-pc-windows-gnu" >&2
    
    9
    +exit 1

  • python/mozboot/mozboot/bootstrap.py
    ... ... @@ -724,6 +724,7 @@ class Bootstrapper:
    724 724
             self._write_default_mozconfig(expected_raw_mozconfig)
    
    725 725
     
    
    726 726
         def _output_mozconfig(self, application, mozconfig_builder):
    
    727
    +        mozconfig_builder.append("ac_add_options --with-base-browser-version=dev-build")
    
    727 728
             # Like 'generate_browser_mozconfig' or 'generate_mobile_android_mozconfig'.
    
    728 729
             additional_mozconfig = getattr(
    
    729 730
                 self.instance, "generate_%s_mozconfig" % application
    

  • toolkit/moz.configure
    ... ... @@ -87,7 +87,10 @@ 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
    +    # Tor Browser: Use our distribution ID by default on desktop.
    
    91
    +    default=depends(build_project)(
    
    92
    +        lambda p: "org.torproject" if p == "browser" else "org.mozilla"
    
    93
    +    ),
    
    91 94
         help="Set distribution-specific id",
    
    92 95
     )
    
    93 96
     set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
    
    ... ... @@ -947,11 +950,11 @@ def eme_choices(target, wmf):
    947 950
             return ("widevine",)
    
    948 951
     
    
    949 952
     
    
    950
    -# Widevine is enabled by default in desktop browser builds.
    
    953
    +# Base Browser: Disable EME by default, to make sure no preference is
    
    954
    +# enabling either Adobe's or Google's CDM.
    
    951 955
     @depends(build_project, eme_choices)
    
    952 956
     def eme_default(build_project, choices):
    
    953
    -    if build_project == "browser":
    
    954
    -        return choices
    
    957
    +    return None
    
    955 958
     
    
    956 959
     
    
    957 960
     option(
    
    ... ... @@ -1488,9 +1491,11 @@ def webrtc_default(target):
    1488 1491
         return os_match and cpu_match and target.endianness == "little"
    
    1489 1492
     
    
    1490 1493
     
    
    1494
    +# Base Browser: Disable WebRTC by default.
    
    1495
    +# Before enabling, please notice that WebRTC does not work on mingw (Bug 1393901)
    
    1491 1496
     option(
    
    1492 1497
         "--disable-webrtc",
    
    1493
    -    default=webrtc_default,
    
    1498
    +    default=False,
    
    1494 1499
         help="{Enable|Disable} support for WebRTC",
    
    1495 1500
     )
    
    1496 1501
     
    
    ... ... @@ -2207,7 +2212,8 @@ set_config(
    2207 2212
     
    
    2208 2213
     @depends(target)
    
    2209 2214
     def bundled_fonts_default(target):
    
    2210
    -    return target.os == "WINNT" or target.kernel == "Linux"
    
    2215
    +    # Base Browser: Enable bundled fonts on all desktop platforms.
    
    2216
    +    return True
    
    2211 2217
     
    
    2212 2218
     
    
    2213 2219
     @depends(build_project)
    
    ... ... @@ -3178,9 +3184,12 @@ include("../build/moz.configure/nss.configure")
    3178 3184
     # Enable or disable running in background task mode: headless for
    
    3179 3185
     # periodic, short-lived, maintenance tasks.
    
    3180 3186
     # ==============================================================================
    
    3187
    +# Base Browser: Disable background tasks by default.
    
    3188
    +# See tor-browser#41131.
    
    3181 3189
     option(
    
    3182 3190
         "--disable-backgroundtasks",
    
    3183
    -    help="Disable running in background task mode",
    
    3191
    +    default=False,
    
    3192
    +    help="{Enable|Disable} running in background task mode",
    
    3184 3193
     )
    
    3185 3194
     set_config("MOZ_BACKGROUNDTASKS", True, when="--enable-backgroundtasks")
    
    3186 3195
     set_define("MOZ_BACKGROUNDTASKS", True, when="--enable-backgroundtasks")
    
    ... ... @@ -3661,7 +3670,13 @@ set_define("MOZ_AUTH_EXTENSION", True, when="--enable-negotiateauth")
    3661 3670
     
    
    3662 3671
     # Parental control
    
    3663 3672
     # ==============================================================
    
    3664
    -option("--disable-parental-controls", help="Do not build parental controls")
    
    3673
    +# Base Browser: Do not build parental controls by default.
    
    3674
    +# See tor-browser#33851.
    
    3675
    +option(
    
    3676
    +    "--disable-parental-controls",
    
    3677
    +    default=False,
    
    3678
    +    help="{Build|Do not build} parental controls",
    
    3679
    +)
    
    3665 3680
     
    
    3666 3681
     set_config(
    
    3667 3682
         "MOZ_DISABLE_PARENTAL_CONTROLS",
    
    ... ... @@ -4341,10 +4356,13 @@ set_define("MOZ_SYSTEM_PREFERENCES", True, when="--enable-system-preferences")
    4341 4356
     # Allow disabling the creation a legacy profile
    
    4342 4357
     # ==============================================================
    
    4343 4358
     
    
    4359
    +# Base Browser: Do not create a legacy profile by default on desktop.
    
    4360
    +# See tor-browser#41542.
    
    4344 4361
     option(
    
    4345 4362
         "--disable-legacy-profile-creation",
    
    4346
    -    help="Disable the creation a legacy profile, to be used by old versions "
    
    4347
    -    "of Firefox, when no profiles exist",
    
    4363
    +    default=depends(build_project)(lambda p: p != "browser"),
    
    4364
    +    help="{Enable|Disable} the creation a legacy profile, to be used by old "
    
    4365
    +    "versions of Firefox, when no profiles exist",
    
    4348 4366
     )
    
    4349 4367
     
    
    4350 4368
     set_config("MOZ_CREATE_LEGACY_PROFILE", True, when="--enable-legacy-profile-creation")
    

  • _______________________________________________
    tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
    To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx