X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=blobdiff_plain;f=setup-release.py;h=62f9a8708c3d35be6f1974baaada142364213614;hp=a5b73d181624a82579b86b0fee51454c430ede52;hb=73ee95ec9aa815537c20f009ac2eef81ba2f9a47;hpb=55e1e4b4bc9344da9aac5b39676af3019f6de4c2 diff --git a/setup-release.py b/setup-release.py index a5b73d1..62f9a87 100644 --- a/setup-release.py +++ b/setup-release.py @@ -36,10 +36,10 @@ if sys.platform == 'darwin': setup_requires=['py2app'], app=[mainscript], options=dict(py2app=dict(argv_emulation=True, - includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'sip'], + includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtWebKit', 'PyQt4.QtNetwork', 'sip'], packages=['lib', 'gui', 'plugins'], iconfile='electrum.icns', - #plist=plist, + plist=plist, resources=["data", "icons"])), ) elif sys.platform == 'win32': @@ -73,7 +73,11 @@ if sys.platform == 'darwin': 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() + if os.path.exists("/usr/local/Cellar"): + qt_menu_location = os.popen("find /usr/local/Cellar -name qt_menu.nib | tail -n 1").read() + # no brew, check /opt/local + else: + qt_menu_location = os.popen("find /opt/local -name qt_menu.nib | tail -n 1").read() qt_menu_location = re.sub('\n', '', qt_menu_location) if (len(qt_menu_location) == 0):