Commit f1960dd2 authored by Kathleen Brade's avatar Kathleen Brade Committed by Mike Perry
Browse files

Bug 4234: Use the Firefox Update Process for TBB. 

New configure options:
  --with-tor-browser-version=VERSION   # Pass TBB version throughout build.
  --enable-tor-browser-update          # Enable bundle update behavior.
The following files are never updated:
  TorBrowser/Data/Browser/profiles.ini
  TorBrowser/Data/Browser/profile.default/bookmarks.html
  TorBrowser/Data/Tor/torrc
parent ede441b3

.mozconfig

+4 −1
Original line number Diff line number Diff line
@@ -9,12 +9,15 @@ mk_add_options BUILD_OFFICIAL=1 
ac_add_options --enable-optimize

#ac_add_options --disable-optimize

ac_add_options --enable-official-branding

ac_add_options --enable-tor-browser-update

ac_add_options --enable-update-packaging

# We do not use signed MAR files yet (Mozilla uses them on Windows only).

ac_add_options --disable-verify-mar

ac_add_options --disable-strip

ac_add_options --disable-install-strip

ac_add_options --disable-tests

ac_add_options --disable-debug

ac_add_options --disable-maintenance-service

ac_add_options --disable-updater

ac_add_options --disable-crashreporter

ac_add_options --disable-webrtc

#ac_add_options --disable-ctypes

.mozconfig-mac

+5 −1
Original line number Diff line number Diff line
@@ -38,7 +38,11 @@ ac_add_options --disable-debug 


# See above for a reason why this is currently disabled

# ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS

ac_add_options --disable-updater

#ac_add_options --disable-updater

ac_add_options --enable-tor-browser-update

ac_add_options --enable-update-packaging

# We do not use signed MAR files yet (Mozilla uses them on Windows only).

ac_add_options --disable-verify-mar

ac_add_options --disable-crashreporter

ac_add_options --disable-maintenance-service

ac_add_options --disable-webrtc

.mozconfig-mingw

+4 −1
Original line number Diff line number Diff line
@@ -14,8 +14,11 @@ ac_add_options --disable-debug 
ac_add_options --enable-optimize

ac_add_options --enable-strip

ac_add_options --enable-official-branding

ac_add_options --enable-tor-browser-update

ac_add_options --enable-update-packaging

# We do not use signed MAR files yet (Mozilla uses them on Windows only).

ac_add_options --disable-verify-mar



ac_add_options --disable-updater

ac_add_options --disable-crashreporter

ac_add_options --disable-maintenance-service

ac_add_options --disable-webrtc

accessible/src/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ A11Y_LOG = 0 
ifdef MOZ_DEBUG

  A11Y_LOG = 1

endif

ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))

ifeq (,$(filter aurora alpha beta release esr,$(MOZ_UPDATE_CHANNEL)))

  A11Y_LOG = 1

endif

export A11Y_LOG

accessible/src/shared.mozbuild

+1 −1
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@ a11y_log = 0 
if CONFIG['MOZ_DEBUG']:

    a11y_log = 1



if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'beta', 'release', 'esr'):

if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'release', 'esr'):

    a11y_log = 1