Verified Commit 6c3d68cd authored by Mike Perry's avatar Mike Perry Committed by Pier Angelo Vendrame
Browse files

TB3: Tor Browser's official .mozconfigs. 

Also:
Add an --enable-tor-browser-data-outside-app-dir configure option

Add --with-tor-browser-version configure option

Bug 31457: disable per-installation profiles

The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.

Bug 31935: Disable profile downgrade protection.

Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.

Add --enable-tor-browser-update build option

Bug 40793: moved Tor configuration options from old-configure.in to moz.configure

Bug 41584: Move some configuration options to base-browser level
parent 064dd5fe

browser/base/moz.build

+3 −0
Changes for browser/base/moz.build: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]: 
    # Impacts `/toolkit/content/license.html`.

    DEFINES["MOZ_DEFAULT_BROWSER_AGENT"] = True



if CONFIG["TOR_BROWSER_UPDATE"]:

    DEFINES["TOR_BROWSER_UPDATE"] = 1



JAR_MANIFESTS += ["jar.mn"]



GeneratedFile(

browser/config/mozconfigs/base-browser

+0 −5
Changes for browser/config/mozconfigs/base-browser: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ ac_add_options --enable-rust-simd 


ac_add_options --enable-bundled-fonts



# See bug #41587

ac_add_options --disable-updater



ac_add_options --disable-tests

ac_add_options --disable-debug
@@ -44,5 +41,3 @@ ac_add_options MOZ_TELEMETRY_REPORTING= 
if test -z "$WASI_SYSROOT"; then

    ac_add_options --without-wasm-sandboxed-libraries

fi
 


ac_add_options --with-relative-data-dir=BaseBrowser/Data/Browser

browser/config/mozconfigs/tor-browser

0 → 100644
+15 −0
Changes for browser/config/mozconfigs/tor-browser: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line 
. $topsrcdir/browser/config/mozconfigs/base-browser



mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"



ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser

# This is not needed with the relative data directory, but it is when you

# disable it, otherwise it is "Mozilla" (on Windows and macOS) or ".mozilla" on

# Unix systems.

# It is used, for example, for GetProductDirectory.

# ac_add_options --with-user-appdir=TorProject

# ac_add_options --with-user-appdir=.torproject



ac_add_options --enable-tor-browser-update



ac_add_options --with-distribution-id=org.torproject

browser/config/mozconfigs/tor-browser-android

0 → 100644
+10 −0
Changes for browser/config/mozconfigs/tor-browser-android: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line 
. $topsrcdir/browser/config/mozconfigs/base-browser-android



mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"



ac_add_options --disable-tor-browser-update

ac_add_options --disable-verify-mar



if test ! -z "$LOCAL_DEV_BUILD"; then

    ac_add_options --with-tor-browser-version=dev-build

fi

browser/installer/Makefile.in

+4 −0
Changes for browser/installer/Makefile.in: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ endif 
endif

endif



ifdef TOR_BROWSER_UPDATE

DEFINES += -DTOR_BROWSER_UPDATE

endif



ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))

DEFINES += -DMOZ_SHARED_MOZGLUE=1

endif