V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
2 changed files with 5 additions and 2 deletions
Showing only changes of commit 1db7635893 - Show all commits

2
osx.sh
View File

@ -14,6 +14,8 @@ fi
echo "Creating OS X packages for Bitmessage." echo "Creating OS X packages for Bitmessage."
export PYBITMESSAGEVERSION=$1
cd src && python2.7 build_osx.py py2app cd src && python2.7 build_osx.py py2app
if [[ $? = "0" ]]; then if [[ $? = "0" ]]; then

View File

@ -1,7 +1,8 @@
import os
from setuptools import setup from setuptools import setup
name = "Bitmessage" name = "Bitmessage"
version = "0.4.4" version = os.getenv("PYBITMESSAGEVERSION", "custom")
mainscript = ["bitmessagemain.py"] mainscript = ["bitmessagemain.py"]
setup( setup(
@ -11,7 +12,7 @@ setup(
setup_requires = ["py2app"], setup_requires = ["py2app"],
options = dict( options = dict(
py2app = dict( py2app = dict(
resources = ["images", "translations"], resources = ["images", "translations", "bitmsghash", "sslkeys"],
includes = ['sip', 'PyQt4._qt'], includes = ['sip', 'PyQt4._qt'],
iconfile = "images/bitmessage.icns" iconfile = "images/bitmessage.icns"
) )