commit 7fcb59762533c2900b7d9505044980ddc7228fda Author: Isis Lovecruft isis@torproject.org Date: Tue Nov 12 06:20:33 2013 +0000

Remove firefox-bin from mac build descriptors and start script.

* REMOVE non-stripped binary `firefox-bin` from built $INSTDIR/Browser/ directory. * CHANGE start-tor-browser script for mac to use `firefox` instead of `firefox-bin`. * FIXES #10126 for mac. --- RelativeLink/RelativeLinkOSX.sh | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RelativeLink/RelativeLinkOSX.sh b/RelativeLink/RelativeLinkOSX.sh index 29832d1..f30980b 100755 --- a/RelativeLink/RelativeLinkOSX.sh +++ b/RelativeLink/RelativeLinkOSX.sh @@ -53,7 +53,7 @@ if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Tor Browser now\n" cd "${HOME}" printf "\nLaunching Tor Browser from: `pwd`\n" - ./Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox-bin -jsconsole -no-remote -profile "${HOME}/Data/Browser/profile.default" + ./Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox -jsconsole -no-remote -profile "${HOME}/Data/Browser/profile.default" printf "\nTor Browser exited with the following return code: $?\n" exit fi diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 8a683aa..8230abc 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -78,6 +78,8 @@ script: | # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $INSTDIR/Browser/firefox-bin # cd $INSTDIR ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja