Merge pull request #510 from tessus/master
fix #454, README update, minor setup-release.py change
This commit is contained in:
commit
ba19e5a12d
2
README
2
README
|
@ -26,7 +26,7 @@ https://en.bitcoin.it/wiki/Electrum
|
||||||
== HOW OFFICIAL PACKAGES ARE CREATED ==
|
== HOW OFFICIAL PACKAGES ARE CREATED ==
|
||||||
|
|
||||||
python mki18n.py
|
python mki18n.py
|
||||||
pyrcc4 icons.qrc -o gui/icons_rc.py
|
pyrcc4 icons.qrc -o gui/qt/icons_rc.py
|
||||||
python setup.py sdist --format=zip,gztar
|
python setup.py sdist --format=zip,gztar
|
||||||
|
|
||||||
On Mac OS X:
|
On Mac OS X:
|
||||||
|
|
|
@ -35,7 +35,7 @@ if sys.platform == 'darwin':
|
||||||
extra_options = dict(
|
extra_options = dict(
|
||||||
setup_requires=['py2app'],
|
setup_requires=['py2app'],
|
||||||
app=[mainscript],
|
app=[mainscript],
|
||||||
options=dict(py2app=dict(argv_emulation=False,
|
options=dict(py2app=dict(argv_emulation=True,
|
||||||
includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'sip'],
|
includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'sip'],
|
||||||
packages=['lib', 'gui', 'plugins'],
|
packages=['lib', 'gui', 'plugins'],
|
||||||
iconfile='electrum.icns',
|
iconfile='electrum.icns',
|
||||||
|
@ -73,7 +73,11 @@ if sys.platform == 'darwin':
|
||||||
qt_menu_location = "/opt/local/lib/Resources/qt_menu.nib"
|
qt_menu_location = "/opt/local/lib/Resources/qt_menu.nib"
|
||||||
else:
|
else:
|
||||||
# No dice? Then let's try the brew version
|
# 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)
|
qt_menu_location = re.sub('\n', '', qt_menu_location)
|
||||||
|
|
||||||
if (len(qt_menu_location) == 0):
|
if (len(qt_menu_location) == 0):
|
||||||
|
|
Loading…
Reference in New Issue