Merge pull request #438 from rspeed/master

Fix OS X package building

osx.sh

@@ -12,12 +12,12 @@ if [[ -z "$1" ]]; then
   exit
 fi
 
-echo "Creating OS X packages for Bitmessage. This script will ask for sudo to create the dmg volume"
+echo "Creating OS X packages for Bitmessage."
 
 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
+  hdiutil create -fs HFS+ -volname "Bitmessage" -srcfolder dist/Bitmessage.app dist/bitmessage-v$1.dmg
 else
   echo "Problem creating Bitmessage.app, stopping."
   exit

src/build_osx.py

@@ -5,12 +5,15 @@ version = "0.3.4"
 mainscript = ["bitmessagemain.py"]
 
 setup(
-     name = name,
+	name = name,
 	version = version,
 	app = mainscript,
 	setup_requires = ["py2app"],
-	options = dict(py2app=dict(
-		resources = ["images"],
-		iconfile = "images/bitmessage.icns"
-    ))
+	options = dict(
+		py2app = dict(
+			resources = ["images"],
+			includes = ['sip', 'PyQt4._qt'],
+			iconfile = "images/bitmessage.icns"
+		)
+	)
 )