From e3bb756ea30fea6342a0f65ed46e262dcce22b75 Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Sat, 15 Jun 2013 21:07:22 +0200
Subject: [PATCH 1/4] Added OS X DS_Store files to git ignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 36fbec0d..f1e78ac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 **pyc
-**dat
\ No newline at end of file
+**dat
+**.DS_Store

From 1f622103ad15648a84e957b65b2a59437967b94c Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Sat, 15 Jun 2013 21:08:41 +0200
Subject: [PATCH 2/4] Added OS X Build directories to ignore file

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f1e78ac6..acfa0ca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 **pyc
 **dat
 **.DS_Store
+src/build
+src/dist

From 3475000902d423a12afd6b59a70ef149ccebd9bf Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Sat, 15 Jun 2013 21:09:15 +0200
Subject: [PATCH 3/4] Added OS X Build scripts

---
 osx.sh                     |  23 ++++++++++++
 src/build_osx.py           |  71 +++++++++++++++++++++++++++++++++++++
 src/images/bitmessage.icns | Bin 0 -> 39467 bytes
 3 files changed, 94 insertions(+)
 create mode 100755 osx.sh
 create mode 100644 src/build_osx.py
 create mode 100644 src/images/bitmessage.icns

diff --git a/osx.sh b/osx.sh
new file mode 100755
index 00000000..ca05ffde
--- /dev/null
+++ b/osx.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# OS X Build script wrapper around the py2app script.
+# These build can only be generated on OS X.
+# Requires all build dependencies for Bitmessage
+
+export ARCHFLAGS="-arch i386 -arch x86_64" 
+
+if [[ -z "$1" ]]; then
+  echo "Please supply a version number for this release as the first argument."
+  exit
+fi
+
+echo "Creating OS X packages for Bitmessage. This script will ask for sudo to create the dmg volume"
+
+cd src && python build_osx.py py2app
+
+if [[ $? = "0" ]]; then
+  sudo hdiutil create -fs HFS+ -volname "Bitmessage" -srcfolder dist/Bitmessage.app dist/bitmessage-v$1.dmg
+else
+  echo "Problem creating Bitmessage.app, stopping."
+  exit
+fi
diff --git a/src/build_osx.py b/src/build_osx.py
new file mode 100644
index 00000000..ded1be4a
--- /dev/null
+++ b/src/build_osx.py
@@ -0,0 +1,71 @@
+"""
+py2app/py2exe build script for Bitmessage
+
+Usage (Mac OS X):
+     python setup.py py2app
+
+Usage (Windows):
+     python setup.py py2exe
+"""
+
+import sys, os, shutil, re
+from setuptools import setup
+
+
+name = "Bitmessage"
+mainscript = 'bitmessagemain.py'
+version = "0.3.3"
+
+if sys.platform == 'darwin':
+    extra_options = dict(
+        setup_requires=['py2app'],
+        app=[mainscript],
+        options=dict(py2app=dict(argv_emulation=True,
+                                 includes = ['PyQt4.QtCore','PyQt4.QtGui', 'sip', 'sqlite'],
+                                 packages = ['bitmessageqt'],
+                                 iconfile='images/bitmessage.icns',
+                                 resources=["images"])),
+    )
+elif sys.platform == 'win32':
+    extra_options = dict(
+        setup_requires=['py2exe'],
+        app=[mainscript],
+    )
+else:
+    extra_options = dict(
+        # Normally unix-like platforms will use "setup.py install"
+        # and install the main script as such
+        scripts=[mainscript],
+    )
+
+setup(
+    name = name,
+    version = version,
+    **extra_options
+)
+from distutils import dir_util
+
+if sys.platform == 'darwin':
+    resource = "dist/" + name + ".app/Contents/Resources/"
+
+    # Try to locate qt_menu
+    # Let's try the port version first!
+    if os.path.isfile("/opt/local/lib/Resources/qt_menu.nib"):
+      qt_menu_location = "/opt/local/lib/Resources/qt_menu.nib"
+    else:
+      # No dice? Then let's try the brew version
+      qt_menu_location = os.popen("find /usr/local/Cellar -name qt_menu.nib | tail -n 1").read()
+      qt_menu_location = re.sub('\n','', qt_menu_location)
+
+    if(len(qt_menu_location) == 0):
+      print "Sorry couldn't find your qt_menu.nib this probably won't work"
+    else:
+      print "Found your qib: " + qt_menu_location
+
+    # Need to include a copy of qt_menu.nib
+    shutil.copytree(qt_menu_location, resource + "qt_menu.nib")
+    # Need to touch qt.conf to avoid loading 2 sets of Qt libraries
+    fname = resource + "qt.conf"
+    with file(fname, 'a'):
+        os.utime(fname, None)
+
diff --git a/src/images/bitmessage.icns b/src/images/bitmessage.icns
new file mode 100644
index 0000000000000000000000000000000000000000..a796f9d46a94f3562bf5a283857c7d943d3c78e4
GIT binary patch
literal 39467
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
BjV1s9

literal 0
HcmV?d00001


From 5e66e81ab7ef5c15be162575ff261f0891fb3de3 Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Mon, 17 Jun 2013 00:25:03 +0200
Subject: [PATCH 4/4] Make sure libcrypto from brew is linked. In the resulting
 .app

---
 osx.sh                    |  1 +
 src/build_osx.py          | 11 ++++++++++-
 src/pyelliptic/openssl.py | 30 +++++++++++++++++-------------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/osx.sh b/osx.sh
index ca05ffde..e5d2e371 100755
--- a/osx.sh
+++ b/osx.sh
@@ -3,6 +3,7 @@
 # OS X Build script wrapper around the py2app script.
 # These build can only be generated on OS X.
 # Requires all build dependencies for Bitmessage
+# Especially important is openssl installed through brew
 
 export ARCHFLAGS="-arch i386 -arch x86_64" 
 
diff --git a/src/build_osx.py b/src/build_osx.py
index ded1be4a..de08da4c 100644
--- a/src/build_osx.py
+++ b/src/build_osx.py
@@ -21,8 +21,9 @@ if sys.platform == 'darwin':
         setup_requires=['py2app'],
         app=[mainscript],
         options=dict(py2app=dict(argv_emulation=True,
-                                 includes = ['PyQt4.QtCore','PyQt4.QtGui', 'sip', 'sqlite'],
+                                 includes = ['PyQt4.QtCore','PyQt4.QtGui', 'sip'],
                                  packages = ['bitmessageqt'],
+                                 frameworks = ['/usr/local/opt/openssl/lib/libcrypto.dylib'],
                                  iconfile='images/bitmessage.icns',
                                  resources=["images"])),
     )
@@ -44,9 +45,17 @@ setup(
     **extra_options
 )
 from distutils import dir_util
+import glob
 
 if sys.platform == 'darwin':
     resource = "dist/" + name + ".app/Contents/Resources/"
+    framework = "dist/" + name + ".app/Contents/Frameworks/"
+
+    # The pyElliptive module only works with hardcoded libcrypto paths so rename it so it can actually find it.
+    libs = glob.glob(framework + "libcrypto*.dylib")
+    for lib in libs:
+      os.rename(lib, framework + "libcrypto.dylib")
+      break
 
     # Try to locate qt_menu
     # Let's try the port version first!
diff --git a/src/pyelliptic/openssl.py b/src/pyelliptic/openssl.py
index 59a0d324..de073fab 100644
--- a/src/pyelliptic/openssl.py
+++ b/src/pyelliptic/openssl.py
@@ -419,17 +419,21 @@ except:
                 OpenSSL = _OpenSSL('/usr/local/opt/openssl/lib/libcrypto.dylib')
             except:
                 try:
-                    from os import path
-                    lib_path = path.join(sys._MEIPASS, "libeay32.dll")
-                    OpenSSL = _OpenSSL(lib_path)
+                  # Load it from an Bitmessage.app on OSX
+                  OpenSSL = _OpenSSL('./../Frameworks/libcrypto.dylib')
                 except:
-                    if 'linux' in sys.platform or 'darwin' in sys.platform:
-                        try:
-                            from ctypes.util import find_library
-                            OpenSSL = _OpenSSL(find_library('ssl'))
-                        except Exception, err:
-                            sys.stderr.write('(On Linux) Couldn\'t find and load the OpenSSL library. You must install it. If you believe that you already have it installed, this exception information might be of use:\n')
-                            from ctypes.util import find_library
-                            OpenSSL = _OpenSSL(find_library('ssl'))
-                    else:
-                        raise Exception("Couldn't find and load the OpenSSL library. You must install it.")
+                  try:
+                      from os import path
+                      lib_path = path.join(sys._MEIPASS, "libeay32.dll")
+                      OpenSSL = _OpenSSL(lib_path)
+                  except:
+                      if 'linux' in sys.platform or 'darwin' in sys.platform:
+                          try:
+                              from ctypes.util import find_library
+                              OpenSSL = _OpenSSL(find_library('ssl'))
+                          except Exception, err:
+                              sys.stderr.write('(On Linux) Couldn\'t find and load the OpenSSL library. You must install it. If you believe that you already have it installed, this exception information might be of use:\n')
+                              from ctypes.util import find_library
+                              OpenSSL = _OpenSSL(find_library('ssl'))
+                      else:
+                          raise Exception("Couldn't find and load the OpenSSL library. You must install it.")