[tbb-commits] [tor-browser] 51/73: Bug 28044: Integrate Tor Launcher into tor-browser
gitolite role
git at cupani.torproject.org
Thu Jul 21 10:28:08 UTC 2022
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-91.12.0esr-11.5-1
in repository tor-browser.
commit f9b2572faad1046011d7c48f32265644338579be
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 +-
toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++
4 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 339702b90a8a9..d76a9f93d9af7 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 d4068cabb4ae0..d46707ca87204 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
+ 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
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 8e16e236b238d..04d57a42348e7 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 at torproject.org") {
+ 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the tbb-commits
mailing list