commit 48bbd95ee95ee5bea0871d62a387f83a97f75687
Author: Sebastian Hahn <sebastian(a)torproject.org>
Date: Fri Apr 27 15:06:17 2012 +0200
OSX: Fix branding to use TorBrowser in Dock, too
Otherwise the application would've been called "Firefox" in the Dock and
when alt-tabbing around
---
build-scripts/osx.mk | 18 +++++++++---------
.../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index a87cf9e..d7af26c 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -106,8 +106,8 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
touch $(STAMP_DIR)/build-firefox
copy-firefox:
- -rm -rf $(BUILD_DIR)/Firefox.app
- cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/Firefox.app
+ -rm -rf $(BUILD_DIR)/TorBrowser.app
+ cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app
build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox
echo "If we're here, we've done something right."
@@ -127,7 +127,7 @@ LIBEVENT=$(COMPILED_LIBS)
VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/
TOR=$(COMPILED_BINS)/tor
## Someday, this will be our custom Firefox
-FIREFOX=$(BUILD_DIR)/Firefox.app
+FIREFOX=$(BUILD_DIR)/TorBrowser.app
PIDGIN=$(COMPILED_BINS)/pidgin
## Location of utility applications
@@ -236,8 +236,8 @@ TB_TMPDIR=$(DEST)/Contents/SharedSupport
directory-structure:
rm -fr $(DEST)
mkdir -p $(APPDIR)
- mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile
- mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins
+ mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/profile
+ mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/plugins
mkdir -p $(DATADIR)/Tor
mkdir -p $(DATADIR)/Vidalia
mkdir -p $(DOCSDIR)
@@ -274,9 +274,9 @@ install-firefox:
configure-apps:
## Configure Firefox preferences
#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
- cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini
- cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
- cp config/prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+ cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profiles.ini
+ cp config/bookmarks.html $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile
+ cp config/prefs.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js
cp config/Info.plist $(DEST)/Contents
cp config/PkgInfo $(DEST)/Contents
cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources
@@ -387,7 +387,7 @@ patch-firefox-language:
## Fix prefs.js since extensions.checkCompatibility, false doesn't work
update-extension-pref:
sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
- sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+ sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js
print-version:
@echo $(RELEASE_VER)-$(BUILD_NUM)
diff --git a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch
index d546ae1..293a52e 100644
--- a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch
+++ b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch
@@ -16,7 +16,7 @@ index d170d47..6835b1e 100644
/* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */
QString browserExecutable =
- QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename);
-+ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/" + browserDirectoryFilename);
++ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/" + browserDirectoryFilename);
/* The profile is in <browserDirectory>/Data/profile */
QString profileDir =
- QDir::toNativeSeparators(browserDirectory + "/Data/profile");
@@ -31,7 +31,7 @@ index d170d47..6835b1e 100644
- copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile");
+ if (!browserDirObj.exists("Library/Application Support/Firefox/Profiles/profile")) {
+ browserDirObj.mkdir("Library/Application Support/Firefox/Profiles/profile");
-+ QString src = browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile";
++ QString src = browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/defaults/profile";
+ QString dst = profileDir;
+ vNotice("Copying '%1' to '%2'").arg(src).arg(dst);
+ copy_dir(src, dst);