electrum

commit ed686f9e0543394b7583b50aa61c2751f6b3117c
parent 34080187ffb956ceb28100130c3f70716e7f4979
Author: Johann Bauer <bauerj@bauerj.eu>
Date:   Tue, 30 Jan 2018 14:41:35 +0100

Fix base directory for OS X spec file

Diffstat:
M
contrib/osx.spec
 | 
58
++++++++++++++++++++++++++++++----------------------------

1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/contrib/osx.spec b/contrib/osx.spec
@@ -3,6 +3,8 @@
 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]
@@ -10,7 +12,7 @@ for i, x in enumerate(sys.argv):
 else:
     raise BaseException('no version')
 
-home = '/Users/voegtlin/electrum/'
+electrum = "../"
 block_cipher=None
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
@@ -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,
@@ -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'
              }
-)
-
+)+
\ No newline at end of file