Skip to content

Commit

Permalink
Fix base directory for OS X spec file
Browse files Browse the repository at this point in the history
  • Loading branch information
bauerj committed Jan 30, 2018
1 parent 3408018 commit ed686f9
Showing 1 changed file with 29 additions and 28 deletions.
57 changes: 29 additions & 28 deletions contrib/osx.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
from PyInstaller.utils.hooks import collect_data_files, collect_submodules

import sys
import os

for i, x in enumerate(sys.argv):
if x == '--name':
VERSION = sys.argv[i+1]
break
else:
raise BaseException('no version')

home = '/Users/voegtlin/electrum/'
electrum = "../"
block_cipher=None

# see https://github.com/pyinstaller/pyinstaller/issues/2005
Expand All @@ -20,35 +22,35 @@ hiddenimports += collect_submodules('btchip')
hiddenimports += collect_submodules('keepkeylib')

datas = [
(home+'lib/currencies.json', 'electrum'),
(home+'lib/servers.json', 'electrum'),
(home+'lib/checkpoints.json', 'electrum'),
(home+'lib/servers_testnet.json', 'electrum'),
(home+'lib/checkpoints_testnet.json', 'electrum'),
(home+'lib/wordlist/english.txt', 'electrum/wordlist'),
(home+'lib/locale', 'electrum/locale'),
(home+'plugins', 'electrum_plugins'),
(electrum+'lib/currencies.json', 'electrum'),
(electrum+'lib/servers.json', 'electrum'),
(electrum+'lib/checkpoints.json', 'electrum'),
(electrum+'lib/servers_testnet.json', 'electrum'),
(electrum+'lib/checkpoints_testnet.json', 'electrum'),
(electrum+'lib/wordlist/english.txt', 'electrum/wordlist'),
(electrum+'lib/locale', 'electrum/locale'),
(electrum+'plugins', 'electrum_plugins'),
]
datas += collect_data_files('trezorlib')
datas += collect_data_files('btchip')
datas += collect_data_files('keepkeylib')

# 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([home+'electrum',
home+'gui/qt/main_window.py',
home+'gui/text.py',
home+'lib/util.py',
home+'lib/wallet.py',
home+'lib/simple_config.py',
home+'lib/bitcoin.py',
home+'lib/dnssec.py',
home+'lib/commands.py',
home+'plugins/cosigner_pool/qt.py',
home+'plugins/email_requests/qt.py',
home+'plugins/trezor/client.py',
home+'plugins/trezor/qt.py',
home+'plugins/keepkey/qt.py',
home+'plugins/ledger/qt.py',
a = Analysis([electrum+'electrum',
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/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',
],
datas=datas,
hiddenimports=hiddenimports,
Expand All @@ -70,16 +72,15 @@ exe = EXE(pyz,
debug=False,
strip=False,
upx=True,
icon=home+'electrum.icns',
icon=electrum+'electrum.icns',
console=False)

app = BUNDLE(exe,
version = VERSION,
name='Electrum.app',
icon=home+'electrum.icns',
icon=electrum+'electrum.icns',
bundle_identifier=None,
info_plist = {
'NSHighResolutionCapable':'True'
}
)

)

0 comments on commit ed686f9

Please sign in to comment.