Fix Py2Exe / Py2App
Fixes the C PoW loading in frozen apps (Windows and OSX) Cleaner fallback in PoW if something goes wrong
This commit is contained in:
parent
03f709b70d
commit
12878af41f
|
@ -10,7 +10,12 @@ import openclpow
|
|||
import os
|
||||
import ctypes
|
||||
|
||||
curdir = os.path.dirname(__file__)
|
||||
if frozen == "macosx_app":
|
||||
curdir = os.environ.get("RESOURCEPATH")
|
||||
elif frozen: # windows
|
||||
curdir = sys._MEIPASS
|
||||
else:
|
||||
curdir = os.path.dirname(__file__)
|
||||
bitmsglib = 'bitmsghash.so'
|
||||
if "win32" == sys.platform:
|
||||
if ctypes.sizeof(ctypes.c_voidp) == 4:
|
||||
|
@ -128,13 +133,18 @@ def run(target, initialHash):
|
|||
try:
|
||||
return _doGPUPoW(target, initialHash)
|
||||
except:
|
||||
pass # fallback to normal PoW
|
||||
if frozen == "macosx_app" or not frozen:
|
||||
pass # fallback
|
||||
if bmpow:
|
||||
try:
|
||||
return _doCPoW(target, initialHash)
|
||||
except:
|
||||
pass # fallback to normal PoW
|
||||
pass # fallback
|
||||
if frozen == "macosx_app" or not frozen:
|
||||
# on my (Peter Surda) Windows 10, Windows Defender
|
||||
# does not like this and fights with PyBitmessage
|
||||
# over CPU, resulting in very slow PoW
|
||||
try:
|
||||
return _doFastPoW(target, initialHash)
|
||||
else:
|
||||
except:
|
||||
pass #fallback
|
||||
return _doSafePoW(target, initialHash)
|
||||
|
|
Reference in New Issue
Block a user