From 1db7635893aab21a92cd80fdce627d02dc230bff Mon Sep 17 00:00:00 2001 From: mailchuck Date: Sat, 14 Nov 2015 13:11:33 +0100 Subject: [PATCH] OSX build fixes - include bitmsghash so that it bundles the C library PoW - include sslkeys so that SSL works in the bundle - PyBitmessage version now propagated from the shell build script --- osx.sh | 2 ++ src/build_osx.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/osx.sh b/osx.sh index eaa33183..e58a49f4 100755 --- a/osx.sh +++ b/osx.sh @@ -14,6 +14,8 @@ fi echo "Creating OS X packages for Bitmessage." +export PYBITMESSAGEVERSION=$1 + cd src && python2.7 build_osx.py py2app if [[ $? = "0" ]]; then diff --git a/src/build_osx.py b/src/build_osx.py index ce70cd54..a5b004e6 100644 --- a/src/build_osx.py +++ b/src/build_osx.py @@ -1,7 +1,8 @@ +import os from setuptools import setup name = "Bitmessage" -version = "0.4.4" +version = os.getenv("PYBITMESSAGEVERSION", "custom") mainscript = ["bitmessagemain.py"] setup( @@ -11,7 +12,7 @@ setup( setup_requires = ["py2app"], options = dict( py2app = dict( - resources = ["images", "translations"], + resources = ["images", "translations", "bitmsghash", "sslkeys"], includes = ['sip', 'PyQt4._qt'], iconfile = "images/bitmessage.icns" )