Commit 5c9c5369 authored by Kathleen Brade's avatar Kathleen Brade Committed by Richard Pospesel
Browse files

Bug 28044: Integrate Tor Launcher into tor-browser 

Build and package Tor Launcher as part of the browser (similar to
how pdfjs is handled).

If a Tor Launcher extension is present in the user's profile, it is
removed.
parent 07ee3be7

browser/extensions/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -5,3 +5,6 @@ 
# file, You can obtain one at http://mozilla.org/MPL/2.0/.



DIRS += ["onboarding"]



if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:

    DIRS += ["tor-launcher"]

browser/installer/package-manifest.in

+5 −0
Original line number Diff line number Diff line
@@ -234,6 +234,11 @@ 
@RESPATH@/browser/chrome/browser.manifest

@RESPATH@/chrome/pdfjs.manifest

@RESPATH@/chrome/pdfjs/*

#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER

@RESPATH@/browser/chrome/torlauncher.manifest

@RESPATH@/browser/chrome/torlauncher/*

@RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js

#endif

@RESPATH@/chrome/torbutton.manifest

@RESPATH@/chrome/torbutton/*

@RESPATH@/chrome/toolkit@JAREXT@

mozconfig-linux-x86_64-dev

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 
ac_add_options --disable-strip

ac_add_options --disable-install-strip



ac_add_options --disable-tor-launcher

ac_add_options --enable-tor-launcher

ac_add_options --disable-tor-browser-update

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