[tbb-commits] [tor-browser] 50/69: Bug 28044: Integrate Tor Launcher into tor-browser

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.2.0esr-12.0-3
in repository tor-browser.

commit e674b50b4bee376b14ed33f71ef4f8090717948e
Author: Kathy Brade <brade at pearlcrescent.com>
AuthorDate: Tue Feb 26 10:07:17 2019 -0500

    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.
---
 browser/extensions/moz.build          | 3 +++
 browser/installer/package-manifest.in | 5 +++++
 mozconfig-linux-x86_64-dev            | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 39bbc29372716..df3a43a07fd74 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -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"]
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 6c8c3eaf7caa1..84939f55d210d 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -234,6 +234,11 @@
 @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/chrome/pdfjs.manifest
 @RESPATH@/chrome/pdfjs/*
+#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER
+ at RESPATH@/browser/chrome/torlauncher.manifest
+ at RESPATH@/browser/chrome/torlauncher/*
+ at RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js
+#endif
 @RESPATH@/chrome/torbutton.manifest
 @RESPATH@/chrome/torbutton/*
 @RESPATH@/chrome/toolkit at JAREXT@
diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev
index 14488d870ddb0..ce66cd7cdc3ee 100644
--- a/mozconfig-linux-x86_64-dev
+++ b/mozconfig-linux-x86_64-dev
@@ -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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.