From b9fa89ec19f867d6a91d8583293ce4d41d6da89c Mon Sep 17 00:00:00 2001
From: Johann Bauer <bauerj@bauerj.eu>
Date: Tue, 30 Jan 2018 21:14:28 +0100
Subject: [PATCH] Update macOS build

---
 README.rst                       | 12 ++---------
 contrib/build-osx/README.md      | 17 ++++++++++++++++
 contrib/build-osx/make_osx       | 34 ++++++++++++++++++++++++++++++++
 contrib/{ => build-osx}/osx.spec |  4 ++--
 contrib/make_osx                 |  6 ------
 5 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 contrib/build-osx/README.md
 create mode 100755 contrib/build-osx/make_osx
 rename contrib/{ => build-osx}/osx.spec (94%)
 delete mode 100755 contrib/make_osx

diff --git a/README.rst b/README.rst
index 43d3257f6..9b1832354 100644
--- a/README.rst
+++ b/README.rst
@@ -93,20 +93,12 @@ This directory contains the python dependencies used by Electrum.
 Mac OS X / macOS
 --------
 
-::
-
-    # On MacPorts installs: 
-    sudo python3 setup-release.py py2app
-    
-    # On Homebrew installs: 
-    ARCHFLAGS="-arch i386 -arch x86_64" sudo python3 setup-release.py py2app --includes sip
-    
-    sudo hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-VERSION-macosx.dmg
+See `contrib/build-osx/`.
 
 Windows
 -------
 
-See `contrib/build-wine/README` file.
+See `contrib/build-wine/`.
 
 
 Android
diff --git a/contrib/build-osx/README.md b/contrib/build-osx/README.md
new file mode 100644
index 000000000..48a271d46
--- /dev/null
+++ b/contrib/build-osx/README.md
@@ -0,0 +1,17 @@
+Building Mac OS binaries
+========================
+
+This guide explains how to build Electrum binaries for macOS systems.
+We build our binaries on El Capitan (10.11.6) as building it on High Sierra
+makes the binaries incompatible with older versions.
+
+
+## 1. Run the script
+
+
+
+    ./make_osx
+
+## 2. Done
+
+Hopefully it will be that simple.
\ No newline at end of file
diff --git a/contrib/build-osx/make_osx b/contrib/build-osx/make_osx
new file mode 100755
index 000000000..360b29968
--- /dev/null
+++ b/contrib/build-osx/make_osx
@@ -0,0 +1,34 @@
+#!/bin/bash
+build_dir=$(dirname "$0")
+test -n "$build_dir" -a -d "$build_dir" || exit
+cd $build_dir/../..
+
+export PYTHONHASHSEED=22
+VERSION=`git describe --tags`
+
+sw_vers
+python3 --version
+echo -n "Pyinstaller version "
+pyinstaller --version
+
+rm -rf ./dist
+
+
+rm  -rf /tmp/electrum-build > /dev/null 2>&1
+mkdir /tmp/electrum-build
+
+
+echo "Downloading icons and locale..."
+for repo in icons locale; do
+  git clone https://github.com/spesmilo/electrum-$repo /tmp/electrum-build/electrum-$repo
+done
+
+cp -R /tmp/electrum-build/electrum-locale/locale/ ./lib/locale/
+cp    /tmp/electrum-build/electrum-icons/icons_rc.py ./gui/qt/
+
+echo "Building Electrum..."
+python3 setup.py install --user > /dev/null
+python3 -m pip install pyqt5 --user
+
+pyinstaller --noconfirm --ascii --name $VERSION contrib/build-osx/osx.spec
+hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-$VERSION.dmg
diff --git a/contrib/osx.spec b/contrib/build-osx/osx.spec
similarity index 94%
rename from contrib/osx.spec
rename to contrib/build-osx/osx.spec
index 9dabf291c..bd3d8cf48 100644
--- a/contrib/osx.spec
+++ b/contrib/build-osx/osx.spec
@@ -12,8 +12,8 @@ for i, x in enumerate(sys.argv):
 else:
     raise BaseException('no version')
 
-electrum = "../"
-block_cipher=None
+electrum = os.path.abspath("../../")
+block_cipher = None
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
 hiddenimports = []
diff --git a/contrib/make_osx b/contrib/make_osx
deleted file mode 100755
index f354e331a..000000000
--- a/contrib/make_osx
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-rm -rf dist
-export PYTHONHASHSEED=22
-VERSION=`git describe --tags`
-pyinstaller --noconfirm --ascii --name $VERSION contrib/osx.spec
-hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-$VERSION.dmg