commit 3805fff5a0fc9b2f6ad590a109ff27c842258436 Author: Erinn Clark <erinn@torproject.org> Date: Tue Jul 31 10:54:52 2012 +0100 OSX: fix vidalia.conf.ff-obsproxy-osx to use Vidalia 0.2.20 values and update Makefile paths --- .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 17 +++++++++-------- build-scripts/osx-alpha.mk | 5 ++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx index e2d857e..833fbe4 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx @@ -1,17 +1,18 @@ [General] -PluginPath=../../Library/Vidalia/plugins +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en [Tor] ControlPort=9051 -TorExecutable=../../Contents/MacOS/tor -Torrc=../../Library/Vidalia/torrc +TorExecutable=../../../tor +Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../Contents/Resources/Data/Tor - -[TBB] -BrowserDirectory=../../ -BrowserExecutable=firefox-bin +DataDirectory=../../../../Resources/Data/Tor/ [Network] ProxyType=none diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 9f1319d..377fba9 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -332,7 +332,7 @@ configure-apps: mkdir -p $(DEST)/Library/Vidalia ifeq ($(USE_OBFSPROXY),1) - cp config/vidalia.conf.ff-obfsproxy-osx $(DEST)/Library/Vidalia/vidalia.conf + cp config/alpha/vidalia.conf.ff-obfsproxy-osx $(DEST)/Library/Vidalia/vidalia.conf else ifeq ($(USE_SANDBOX),1) cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf @@ -378,6 +378,9 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app +ifeq ($(USE_OBFSPROXY),1) + zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).zip $(NAME)_$(LANGCODE).app +endif -rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp