[tor-commits] [tor-browser/tor-browser-91.5.0esr-11.5-2] Bug 28044: Integrate Tor Launcher into tor-browser

[richard@xxxxxxxxxxxxxx]

commit 4290bdb7662f3b4970e1b5c0d3490976dd38ab7f
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   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.
---
 .mozconfig                                          |  2 +-
 browser/extensions/moz.build                        |  3 +++
 browser/installer/package-manifest.in               |  5 +++++
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.mozconfig b/.mozconfig
index 18cd1f9b6487..7fe8633a9ef4 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -34,6 +34,6 @@ ac_add_options --enable-proxy-bypass-protection
 # Disable telemetry
 ac_add_options MOZ_TELEMETRY_REPORTING=
 
-ac_add_options --disable-tor-launcher
+ac_add_options --enable-tor-launcher
 ac_add_options --with-tor-browser-version=dev-build
 ac_add_options --disable-tor-browser-update
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 339702b90a8a..d76a9f93d9af 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -10,3 +10,6 @@ if CONFIG["NIGHTLY_BUILD"]:
     DIRS += [
         "translations",
     ]
+
+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 d4068cabb4ae..d46707ca8720 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -239,6 +239,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@
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 8e16e236b238..04d57a42348e 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1485,6 +1485,16 @@ var XPIStates = {
           continue;
         }
 
+        // Since it is now part of the browser, uninstall the Tor Launcher
+        // extension. This will remove the Tor Launcher .xpi from user
+        // profiles on macOS.
+        if (id === "tor-launcher@xxxxxxxxxxxxxx") {
+          logger.debug("Uninstalling the Tor Launcher extension.");
+          loc.installer.uninstallAddon(id);
+          changed = true;
+          continue;
+        }
+
         let xpiState = loc.get(id);
         if (!xpiState) {
           // If the location is not supported for sideloading, skip new



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits