[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser
commit 864170b5c1e0626dbfe3707d48037010596c42e5
Author: Kathy Brade
Date: Fri May 10 14:12:17 2019 -0400
Bug 28044: Integrate Tor Launcher into tor-browser
Update translations using our revised import-translations.sh script.
---
chrome.manifest| 170 +
jar.mn | 331 +
src/chrome/locale/ach/network-settings.dtd | 62 -
src/chrome/locale/ach/torlauncher.properties | 94 ---
src/chrome/locale/ast/network-settings.dtd | 62 -
src/chrome/locale/ast/torlauncher.properties | 94 ---
src/chrome/locale/ca-ES/torlauncher.properties | 49
src/chrome/locale/en-GB/network-settings.dtd | 62 -
src/chrome/locale/en-GB/torlauncher.properties | 94 ---
src/chrome/locale/ko/torlauncher.properties| 98
src/chrome/locale/oc/network-settings.dtd | 62 -
src/chrome/locale/oc/torlauncher.properties| 94 ---
src/chrome/locale/or/network-settings.dtd | 62 -
src/chrome/locale/or/torlauncher.properties| 94 ---
src/chrome/locale/pt-PT/network-settings.dtd | 62 +
src/chrome/locale/pt-PT/torlauncher.properties | 94 +++
src/chrome/locale/son/network-settings.dtd | 62 -
src/chrome/locale/son/torlauncher.properties | 94 ---
src/chrome/locale/ur/network-settings.dtd | 28 +--
19 files changed, 720 insertions(+), 1048 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
new file mode 100644
index 000..2f55271
--- /dev/null
+++ b/chrome.manifest
@@ -0,0 +1,170 @@
+### Copyright (c) 2019, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+content torlauncher chrome/content/
+
+skin torlauncher classic/1.0 chrome/skin/
+
+resource torlauncher ./
+
+# Firefox 4-style component registration
+component {4F476361-23FB-43EF-A427-B36A14D3208E} components/tl-protocol.js
+contract @torproject.org/torlauncher-protocol-service;1
{4F476361-23FB-43EF-A427-B36A14D3208E}
+
+component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} components/tl-process.js
+contract @torproject.org/torlauncher-process-service;1
{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}
+category profile-after-change TorProcessService
@torproject.org/torlauncher-process-service;1
+
+locale torlauncher en-US chrome/locale/en-US/
+locale torlauncher ady chrome/locale/ady/
+locale torlauncher af chrome/locale/af/
+locale torlauncher af-ZA chrome/locale/af-ZA/
+locale torlauncher ak chrome/locale/ak/
+locale torlauncher am chrome/locale/am/
+locale torlauncher am-ET chrome/locale/am-ET/
+locale torlauncher ar chrome/locale/ar/
+locale torlauncher arn chrome/locale/arn/
+locale torlauncher az chrome/locale/az/
+locale torlauncher be chrome/locale/be/
+locale torlauncher bg chrome/locale/bg/
+locale torlauncher bg-BG chrome/locale/bg-BG/
+locale torlauncher bn chrome/locale/bn/
+locale torlauncher bn-BD chrome/locale/bn-BD/
+locale torlauncher bn-IN chrome/locale/bn-IN/
+locale torlauncher bo chrome/locale/bo/
+locale torlauncher br chrome/locale/br/
+locale torlauncher bs chrome/locale/bs/
+locale torlauncher ca chrome/locale/ca/
+locale torlauncher ca@valencia chrome/locale/ca@valencia/
+locale torlauncher cs chrome/locale/cs/
+locale torlauncher cs-CZ chrome/locale/cs-CZ/
+locale torlauncher csb chrome/locale/csb/
+locale torlauncher cv chrome/locale/cv/
+locale torlauncher cy chrome/locale/cy/
+locale torlauncher da chrome/locale/da/
+locale torlauncher de chrome/locale/de/
+locale torlauncher dz chrome/locale/dz/
+locale torlauncher el chrome/locale/el/
+locale torlauncher el-GR chrome/locale/el-GR/
+locale torlauncher eo chrome/locale/eo/
+locale torlauncher es chrome/locale/es/
+locale torlauncher es-AR chrome/locale/es-AR/
+locale torlauncher es-CL chrome/locale/es-CL/
+locale torlauncher es-CO chrome/locale/es-CO/
+locale torlauncher es-MX chrome/locale/es-MX/
+locale torlauncher es-NI chrome/locale/es-NI/
+locale torlauncher et chrome/locale/et/
+locale torlauncher eu chrome/locale/eu/
+locale torlauncher fa chrome/locale/fa/
+locale torlauncher fi chrome/locale/fi/
+locale torlauncher fil chrome/locale/fil/
+locale torlauncher fo chrome/locale/fo/
+locale torlauncher fr chrome/locale/fr/
+locale torlauncher fr-CA chrome/locale/fr-CA/
+locale torlauncher fur chrome/locale/fur/
+locale torlauncher fy chrome/locale/fy/
+locale torlauncher ga chrome/locale/ga/
+locale torlauncher gl chrome/locale/gl/
+locale torlauncher gu chrome/locale/gu/
+locale torlauncher gu-IN chrome/locale/gu-IN/
+locale torlauncher gun chrome/locale/gun/
+locale torlauncher ha chrome/locale/ha/
+locale torlauncher he chrome/locale/he/
+locale torlauncher hi chrome/locale/hi/
+locale torlauncher hr chrome/locale/hr/
+locale torlauncher hr-HR chrome/locale/hr-HR/
+locale torlauncher ht chrome/locale/ht/
+locale torlauncher hu chrome/locale/hu/
+locale torlauncher hy chrome/locale/hy/
+locale torlauncher hy-AM chrome/locale/hy-AM/
[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser
commit ab7e47f4ab54626e8b7e6348aac25fc3436d166f
Author: Kathy Brade
Date: Fri Feb 8 14:42:05 2019 -0500
Bug 28044: Integrate Tor Launcher into tor-browser
To avoid potential conflicts with other preference files, rename
our default preferences file from pref.js to torlauncher-prefs.js.
Do not load default preferences if the browser has already done so.
---
.../preferences/{prefs.js => torlauncher-prefs.js} | 0
src/modules/tl-util.jsm| 26 +++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/defaults/preferences/prefs.js
b/src/defaults/preferences/torlauncher-prefs.js
similarity index 100%
rename from src/defaults/preferences/prefs.js
rename to src/defaults/preferences/torlauncher-prefs.js
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 8b59afb..bac5eae 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, The Tor Project, Inc.
+// Copyright (c) 2019, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -876,10 +876,30 @@ let TLUtilInternal = // Private
return this.mDefaultPreferencesLoaded;
}
+// Check whether default preferences have already been loaded, e.g.,
+// because Tor Launcher is integrated into the browser rather than
+// running as an extension. This code assumes that a default value is
+// defined for extensions.torlauncher.loglevel.
+let prefName = "extensions.torlauncher.loglevel";
+let val;
+try
+{
+ let defaultBranch = this._getPrefDefaultBranch(prefName);
+ val = defaultBranch.getIntPref("");
+} catch (e) {}
+if (val !== undefined)
+{
+ this.mDefaultPreferencesLoaded = true;
+ return true;
+}
+
+// Use the JS subscript loaded in conjunction with our pref() function
+// to load the default preferences.
+const kPrefsURL =
+ "resource://torlauncher/defaults/preferences/torlauncher-prefs.js";
var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Ci.mozIJSSubScriptLoader);
-loader.loadSubScript(
-"resource://torlauncher/defaults/preferences/prefs.js", this);
+loader.loadSubScript(kPrefsURL, this);
this.mDefaultPreferencesLoaded =
(this.mNumDefaultPrefsDefined == this.mNumDefaultPrefsLoaded);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser
commit b46c6039d1a5bf95aa9cbd777a51220d1df80aa0
Author: Kathy Brade
Date: Tue Feb 12 12:02:27 2019 -0500
Bug 28044: Integrate Tor Launcher into tor-browser
Fix locale-related issues.
Renamed en locale to en-US (previously done during packaging).
Added moz.build for integration with the Firefox build process.
Enhanced the import-translations.sh script to omit incomplete locales
and to generate jar.mn and chrome.manifest.
Removed checking for incomplete locales from the pkg-prepare make target.
Improved the output generated by import-translations.sh and pkg-prepare.
---
Makefile | 32 ++--
README | 20 +++
chrome.manifest.in | 4 +-
jar.mn.in | 27 ++
localization/import-translations.sh| 61 +++---
moz.build | 8 +++
.../locale/{en => en-US}/network-settings.dtd | 0
.../locale/{en => en-US}/torlauncher.properties| 0
8 files changed, 114 insertions(+), 38 deletions(-)
diff --git a/Makefile b/Makefile
index f629d52..44f9a2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2019, The Tor Project, Inc.
### See src/LICENSE for licensing information.
+# Makefile for packaging Tor Launcher outside of the browser build. The only
+# target in this file that is used by the Tor Browser build process is
+# import-translations.
+
EXT_NAME=tor-launcher
VERSION:=`grep em:version src/install.rdf | sed -e 's/[<>]//g' | cut -f3`
XPI_NAME:=$(shell echo "$(EXT_NAME)-$(VERSION).xpi")
STANDALONE_NAME=$(EXT_NAME)-standalone
STANDALONE_TARBALL=$(shell echo "$(STANDALONE_NAME)-$(VERSION).tar.gz")
-REQUIRED_TRANSLATION_FILES=$(shell ls -1 src/chrome/locale/en/)
AVAIL_TARGETS=help package standalone import-translations clean
@@ -36,23 +39,18 @@ pkg-prepare:clean
fi \
fi
@cp -a chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest
- @mv "$(TMP)/$(EXT_NAME)"/chrome/locale/en \
- "$(TMP)/$(EXT_NAME)"/chrome/locale/en-US
@for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \
- if [ "`basename "$${d}"`" = "en-US" ]; then \
+ locale="`basename $${d}`"; \
+ if [ "$${locale}" = "en-US" ]; then \
continue; \
fi; \
- for f in $(REQUIRED_TRANSLATION_FILES); do \
-if [ ! -e "$${d}/$${f}" ] || \
- ( \
- [ -n "$(BUNDLE_LOCALES)" ] && \
- ! echo $(BUNDLE_LOCALES) | grep -qw `basename "$${d}"` \
- ); then \
- echo "Removing locale $${d} (missing resource $${f})"; \
+ if [ -n "$(BUNDLE_LOCALES)" ]; then \
+if ! echo $(BUNDLE_LOCALES) | grep -qw "$${locale}"; then \
rm -rf "$${d}"; \
- break; \
+else \
+ echo "Including locale $${locale}"; \
fi \
- done \
+ fi \
done
@for l in $(BUNDLE_LOCALES); do \
if [ ! -d "$(TMP)/$(EXT_NAME)"/chrome/locale/"$${l}" ]; then \
@@ -62,8 +60,10 @@ pkg-prepare: clean
done
@for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \
locale="`basename $${d}`"; \
- echo "locale torlauncher $${locale} chrome/locale/$${locale}/" >> \
- "$(TMP)/$(EXT_NAME)"/chrome.manifest; \
+ if [ "$${locale}" != "en-US" ]; then \
+echo "locale torlauncher $${locale} chrome/locale/$${locale}/" >> \
+ "$(TMP)/$(EXT_NAME)"/chrome.manifest; \
+ fi; \
done
package: pkg-prepare
diff --git a/README b/README
index 568acc1..ac536a1 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
PLEASE NOTE:
- Tor Launcher is packaged with Tor Browser, Tor Messenger, and
- other Tor-enabled applications and is designed for those
- applications. You should not install and try to use it in
- Mozilla Firefox or another Firefox-based browser.
+ Tor Launcher is built into Tor Browser, and it may be built as a
+ XUL/XPCOM extension for use with TorBirdy. You should not install
+ and try to use it in Mozilla Firefox or another Firefox-based browser.
OVERVIEW
Tor Launcher is a browser extension that starts the tor process
@@ -32,18 +31,11 @@ for other product releases; e.g., maint-0.2.10 is a branch
that is
used for releases in the Tor Browser 6.5 series.
BUILDING TOR LAUNCHER
-Official builds of Tor Launcher are done as part of a larger
-application build process. For example, look here for information
-about the Tor Browser build process:
+Official builds that use the Tor Launcher code are done as part of
+a larger application build process. For example, look here for
+information about the Tor Browser
