Make where() work with OSX app bundles
MEIPASS is PythonInstaller specific and won't work for py2app modified: lib/util.py modified: .gitignore modified: lib/util.py modified: setup-release.py
This commit is contained in:
parent
2bf32880e8
commit
fd8a931608
|
@ -13,3 +13,4 @@ gui/qt/icons_rc.py
|
|||
locale/
|
||||
.devlocaltmp/
|
||||
*_trial_temp
|
||||
packages
|
||||
|
|
|
@ -66,8 +66,13 @@ def data_dir():
|
|||
if __builtin__.use_local_modules:
|
||||
return local_data_dir()
|
||||
else:
|
||||
if getattr(sys, 'frozen'):
|
||||
is_frozen = getattr(sys, 'frozen')
|
||||
if is_frozen:
|
||||
if is_frozen == "macosx_app":
|
||||
basedir = os.path.abspath(".")
|
||||
else:
|
||||
basedir = sys._MEIPASS
|
||||
|
||||
return os.path.join(basedir, 'data')
|
||||
else:
|
||||
return appdata_dir()
|
||||
|
|
|
@ -37,7 +37,7 @@ if sys.platform == 'darwin':
|
|||
app=[mainscript],
|
||||
options=dict(py2app=dict(argv_emulation=True,
|
||||
includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtWebKit', 'PyQt4.QtNetwork', 'sip'],
|
||||
packages=['lib', 'gui', 'plugins'],
|
||||
packages=['lib', 'gui', 'plugins', 'packages'],
|
||||
iconfile='electrum.icns',
|
||||
plist=plist,
|
||||
resources=["data", "icons"])),
|
||||
|
|
Loading…
Reference in New Issue