Verified Commit 1d317d12 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 ea051646

browser/config/mozconfigs/base-browser

+0 −5
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ ac_add_options --enable-base-browser-update 


ac_add_options --enable-bundled-fonts



# See bug #41587

ac_add_options --disable-updater



ac_add_options --disable-tests

ac_add_options --disable-debug
@@ -50,5 +47,3 @@ fi 


# tor-browser#42337

ac_add_options --enable-geckodriver
 


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

browser/config/mozconfigs/tor-browser

0 → 100644
+18 −0
Original line number Diff line number Diff line 
. $topsrcdir/browser/config/mozconfigs/base-browser



# If building outside tor-browser-build, you might want to customize this value.

# On Linux, it influences the WM_CLASS value, which is shown on GNOME's ALT-TAB,

# for example.

# We customize it in tor-browser-build because we include the channel name, just

# like Firefox does.

# export MOZ_APP_REMOTINGNAME="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 --with-distribution-id=org.torproject

browser/config/mozconfigs/tor-browser-android

0 → 100644
+3 −0
Original line number Diff line number Diff line 
. $topsrcdir/browser/config/mozconfigs/base-browser-android



mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"

browser/moz.configure

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ imply_option("MOZ_PLACES", True) 
# tor-browser#32493

imply_option("MOZ_SERVICES_HEALTHREPORT", False)

imply_option("MOZ_SERVICES_SYNC", True)

imply_option("MOZ_DEDICATED_PROFILES", True)

imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)

imply_option("MOZ_DEDICATED_PROFILES", False)

imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False)

# tor-browser#33734

imply_option("MOZ_NORMANDY", False)

mobile/android/geckoview/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ android { 
        buildConfigField 'String', "MOZ_APP_DISPLAYNAME", "\"${mozconfig.substs.MOZ_APP_DISPLAYNAME}\"";

        buildConfigField 'String', "MOZ_APP_UA_NAME", "\"${mozconfig.substs.MOZ_APP_UA_NAME}\"";

        buildConfigField 'String', "MOZ_UPDATE_CHANNEL", "\"${mozconfig.substs.MOZ_UPDATE_CHANNEL}\"";

        buildConfigField 'boolean', "TOR_BROWSER", mozconfig.substs.TOR_BROWSER ? 'true' : 'false';



        // MOZILLA_VERSION is oddly quoted from autoconf, but we don't have to handle it specially in Gradle.

        buildConfigField 'String', "MOZILLA_VERSION", "\"${mozconfig.substs.MOZILLA_VERSION}\"";