forked from ohac/electrum
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
- Loading branch information
Showing
334 changed files
with
1,851 additions
and
1,565 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,98 +1,96 @@ | ||
| # -*- mode: python -*- | ||
|
|
||
| from PyInstaller.utils.hooks import collect_data_files, collect_submodules, collect_dynamic_libs | ||
|
|
||
| import sys | ||
| import os | ||
|
|
||
| PACKAGE='Electrum-mona' | ||
| PYPKG='electrum_mona' | ||
| MAIN_SCRIPT='electrum-mona' | ||
| ICONS_FILE='electrum.icns' | ||
|
|
||
| for i, x in enumerate(sys.argv): | ||
| if x == '--name': | ||
| VERSION = sys.argv[i+1] | ||
| break | ||
| else: | ||
| raise Exception('no version') | ||
|
|
||
| electrum = os.path.abspath(".") + "/" | ||
| block_cipher = None | ||
|
|
||
| # see https://github.com/pyinstaller/pyinstaller/issues/2005 | ||
| hiddenimports = [] | ||
| hiddenimports += collect_submodules('trezorlib') | ||
| hiddenimports += collect_submodules('btchip') | ||
| hiddenimports += collect_submodules('keepkeylib') | ||
| hiddenimports += collect_submodules('websocket') | ||
|
|
||
| datas = [ | ||
| (electrum+'lib/*.json', PYPKG), | ||
| (electrum+'lib/wordlist/english.txt', PYPKG + '/wordlist'), | ||
| (electrum+'lib/locale', PYPKG + '/locale'), | ||
| (electrum+'plugins', PYPKG + '_plugins'), | ||
| ] | ||
| datas += collect_data_files('trezorlib') | ||
| datas += collect_data_files('btchip') | ||
| datas += collect_data_files('keepkeylib') | ||
|
|
||
| # Add libusb so Trezor will work | ||
| binaries = [(electrum + "contrib/build-osx/libusb-1.0.dylib", ".")] | ||
| binaries += [(electrum + "contrib/build-osx/libsecp256k1.0.dylib", ".")] | ||
|
|
||
| # Workaround for "Retro Look": | ||
| binaries += [b for b in collect_dynamic_libs('PyQt5') if 'macstyle' in b[0]] | ||
|
|
||
| # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports | ||
| a = Analysis([electrum+MAIN_SCRIPT, | ||
| electrum+'gui/qt/main_window.py', | ||
| electrum+'gui/text.py', | ||
| electrum+'lib/util.py', | ||
| electrum+'lib/wallet.py', | ||
| electrum+'lib/simple_config.py', | ||
| electrum+'lib/bitcoin.py', | ||
| electrum+'lib/blockchain.py', | ||
| electrum+'lib/dnssec.py', | ||
| electrum+'lib/commands.py', | ||
| electrum+'plugins/cosigner_pool/qt.py', | ||
| electrum+'plugins/email_requests/qt.py', | ||
| electrum+'plugins/trezor/client.py', | ||
| electrum+'plugins/trezor/qt.py', | ||
| electrum+'plugins/keepkey/qt.py', | ||
| electrum+'plugins/ledger/qt.py', | ||
| ], | ||
| binaries=binaries, | ||
| datas=datas, | ||
| hiddenimports=hiddenimports, | ||
| hookspath=[]) | ||
|
|
||
| # http://stackoverflow.com/questions/19055089/pyinstaller-onefile-warning-pyconfig-h-when-importing-scipy-or-scipy-signal | ||
| for d in a.datas: | ||
| if 'pyconfig' in d[0]: | ||
| a.datas.remove(d) | ||
| break | ||
|
|
||
| pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) | ||
|
|
||
| exe = EXE(pyz, | ||
| a.scripts, | ||
| a.binaries, | ||
| a.datas, | ||
| name=PACKAGE, | ||
| debug=False, | ||
| strip=False, | ||
| upx=True, | ||
| icon=electrum+ICONS_FILE, | ||
| console=False) | ||
|
|
||
| app = BUNDLE(exe, | ||
| version = VERSION, | ||
| name=PACKAGE + '.app', | ||
| icon=electrum+ICONS_FILE, | ||
| bundle_identifier=None, | ||
| info_plist={ | ||
| 'NSHighResolutionCapable': 'True', | ||
| 'NSSupportsAutomaticGraphicsSwitching': 'True' | ||
| } | ||
| ) | ||
| # -*- mode: python -*- | ||
|
|
||
| from PyInstaller.utils.hooks import collect_data_files, collect_submodules, collect_dynamic_libs | ||
|
|
||
| import sys | ||
| import os | ||
|
|
||
| PACKAGE='Electrum-MONA' | ||
| PYPKG='electrum' | ||
| MAIN_SCRIPT='run_electrum' | ||
| ICONS_FILE='electrum.icns' | ||
|
|
||
| for i, x in enumerate(sys.argv): | ||
| if x == '--name': | ||
| VERSION = sys.argv[i+1] | ||
| break | ||
| else: | ||
| raise Exception('no version') | ||
|
|
||
| electrum = os.path.abspath(".") + "/" | ||
| block_cipher = None | ||
|
|
||
| # see https://github.com/pyinstaller/pyinstaller/issues/2005 | ||
| hiddenimports = [] | ||
| hiddenimports += collect_submodules('trezorlib') | ||
| hiddenimports += collect_submodules('btchip') | ||
| hiddenimports += collect_submodules('keepkeylib') | ||
| hiddenimports += collect_submodules('websocket') | ||
|
|
||
| datas = [ | ||
| (electrum+'electrum/*.json', PYPKG), | ||
| (electrum+'electrum/wordlist/english.txt', PYPKG + '/wordlist'), | ||
| (electrum+'electrum/locale', PYPKG + '/locale') | ||
| ] | ||
| datas += collect_data_files('trezorlib') | ||
| datas += collect_data_files('btchip') | ||
| datas += collect_data_files('keepkeylib') | ||
|
|
||
| # Add libusb so Trezor will work | ||
| binaries = [(electrum + "contrib/build-osx/libusb-1.0.dylib", ".")] | ||
| binaries += [(electrum + "contrib/build-osx/libsecp256k1.0.dylib", ".")] | ||
|
|
||
| # Workaround for "Retro Look": | ||
| binaries += [b for b in collect_dynamic_libs('PyQt5') if 'macstyle' in b[0]] | ||
|
|
||
| # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports | ||
| a = Analysis([electrum+ MAIN_SCRIPT, | ||
| electrum+'electrum/gui/qt/main_window.py', | ||
| electrum+'electrum/gui/text.py', | ||
| electrum+'electrum/util.py', | ||
| electrum+'electrum/wallet.py', | ||
| electrum+'electrum/simple_config.py', | ||
| electrum+'electrum/bitcoin.py', | ||
| electrum+'electrum/dnssec.py', | ||
| electrum+'electrum/commands.py', | ||
| electrum+'electrum/plugins/cosigner_pool/qt.py', | ||
| electrum+'electrum/plugins/email_requests/qt.py', | ||
| electrum+'electrum/plugins/trezor/client.py', | ||
| electrum+'electrum/plugins/trezor/qt.py', | ||
| electrum+'electrum/plugins/keepkey/qt.py', | ||
| electrum+'electrum/plugins/ledger/qt.py', | ||
| ], | ||
| binaries=binaries, | ||
| datas=datas, | ||
| hiddenimports=hiddenimports, | ||
| hookspath=[]) | ||
|
|
||
| # http://stackoverflow.com/questions/19055089/pyinstaller-onefile-warning-pyconfig-h-when-importing-scipy-or-scipy-signal | ||
| for d in a.datas: | ||
| if 'pyconfig' in d[0]: | ||
| a.datas.remove(d) | ||
| break | ||
|
|
||
| pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) | ||
|
|
||
| exe = EXE(pyz, | ||
| a.scripts, | ||
| a.binaries, | ||
| a.datas, | ||
| name=PACKAGE, | ||
| debug=False, | ||
| strip=False, | ||
| upx=True, | ||
| icon=electrum+ICONS_FILE, | ||
| console=False) | ||
|
|
||
| app = BUNDLE(exe, | ||
| version = VERSION, | ||
| name=PACKAGE + '.app', | ||
| icon=electrum+ICONS_FILE, | ||
| bundle_identifier=None, | ||
| info_plist={ | ||
| 'NSHighResolutionCapable': 'True', | ||
| 'NSSupportsAutomaticGraphicsSwitching': 'True' | ||
| } | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.