Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…43428"

This reverts commit a7e28ea.

This shouldn't be necessary anymore.
  • Loading branch information
simonster committed Mar 22, 2013
1 parent c745cf3 commit 08fb99e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,8 @@ if [ $BUILD_MAC == 1 ]; then
# Merge xulrunner and relevant assets
mkdir "$CONTENTSDIR/MacOS"
cp -a "$MAC_RUNTIME_PATH/Versions/Current"/* "$CONTENTSDIR/MacOS"
# Use xulrunner executable from XULRunner 18 on i386; see https://bugzilla.mozilla.org/show_bug.cgi?id=843428
# This should be tested with every XULRunner update to ensure the old executable still works
# The thin executable included here was created with lipo xulrunner -thin i386 -output xulrunner-18-i386
lipo "$CONTENTSDIR/MacOS/xulrunner" -replace i386 "$CALLDIR/mac/xulrunner-18-i386" -output "$CONTENTSDIR/MacOS/zotero-bin"
rm "$CONTENTSDIR/MacOS/xulrunner"
# Mozilla no longer builds xulrunner-stub on OS X
mv "$CONTENTSDIR/MacOS/xulrunner" "$CONTENTSDIR/MacOS/zotero-bin"
cp "$CALLDIR/mac/zotero" "$CONTENTSDIR/MacOS/zotero"
# Hack to get the updater to work
mv "$CONTENTSDIR/MacOS/updater.app/Contents/MacOS/updater" "$CONTENTSDIR/MacOS/updater.app/Contents/MacOS/updater-bin"
Expand Down
Binary file removed mac/xulrunner-18-i386
Binary file not shown.

0 comments on commit 08fb99e

Please sign in to comment.