build from setuptools entry_point

build/cli.onefile.spec

@@ -2,13 +2,14 @@
 import platform
 import os
 
-
 dir = 'build';
 cwd = os.getcwd()
 if os.path.basename(cwd) != dir:
     raise Exception('pyinstaller build needs to be run from the ' + dir + ' directory')
 repo_base = os.path.abspath(os.path.join(cwd, '..'))
 
+execfile(os.path.join(cwd, "entrypoint.py")) # ghetto import
+
 
 system = platform.system()
 if system == 'Darwin':
@@ -21,28 +22,10 @@ else:
     print 'Warning: System {} has no icons'.format(system)
     icns = None
 
-block_cipher = None
 
+a = Entrypoint('lbrynet', 'console_scripts', 'lbrynet-cli', pathex=[cwd], datas=datas)
 
-a = Analysis(
-    ['cli.py'],
-    pathex=[cwd],
-    binaries=None,
-    datas=[],
-    hiddenimports=[],
-    hookspath=[],
-    runtime_hooks=[],
-    excludes=[],
-    win_no_prefer_redirects=False,
-    win_private_assemblies=False,
-    cipher=block_cipher
-)
-
-pyz = PYZ(
-    a.pure,
-    a.zipped_data,
-    cipher=block_cipher
-)
+pyz = PYZ(a.pure, a.zipped_data)
 
 exe = EXE(
     pyz,

build/cli.py

@@ -1,7 +0,0 @@
-from lbrynet.daemon import DaemonCLI
-import logging
-
-logging.basicConfig()
-
-if __name__ == '__main__':
-    DaemonCLI.main()

build/daemon.onefile.spec

@@ -4,13 +4,14 @@ import os
 
 import lbryum
 
-
 dir = 'build';
 cwd = os.getcwd()
 if os.path.basename(cwd) != dir:
     raise Exception('pyinstaller build needs to be run from the ' + dir + ' directory')
 repo_base = os.path.abspath(os.path.join(cwd, '..'))
 
+execfile(os.path.join(cwd, "entrypoint.py")) # ghetto import
+
 
 system = platform.system()
 if system == 'Darwin':
@@ -24,44 +25,15 @@ else:
     icns = None
 
 
-block_cipher = None
-
-
-languages = (
-    'chinese_simplified.txt', 'japanese.txt', 'spanish.txt',
-    'english.txt', 'portuguese.txt'
-)
-
-
 datas = [
-    (
-        os.path.join(os.path.dirname(lbryum.__file__), 'wordlist', language),
-        'lbryum/wordlist'
-    )
-    for language in languages
+    (os.path.join(os.path.dirname(lbryum.__file__), 'wordlist', language + '.txt'), 'lbryum/wordlist')
+    for language in ('chinese_simplified', 'japanese', 'spanish','english', 'portuguese')
 ]
 
 
-a = Analysis(
-    ['daemon.py'],
-    pathex=[cwd],
-    binaries=None,
-    datas=datas,
-    hiddenimports=[],
-    hookspath=[],
-    runtime_hooks=[],
-    excludes=[],
-    win_no_prefer_redirects=False,
-    win_private_assemblies=False,
-    cipher=block_cipher
-)
-
-
-pyz = PYZ(
-    a.pure, a.zipped_data,
-    cipher=block_cipher
-)
+a = Entrypoint('lbrynet', 'console_scripts', 'lbrynet-daemon', pathex=[cwd], datas=datas)
 
+pyz = PYZ(a.pure, a.zipped_data)
 
 exe = EXE(
     pyz,

build/daemon.py

@@ -1,4 +0,0 @@
-from lbrynet.daemon import DaemonControl
-
-if __name__ == '__main__':
-    DaemonControl.start()

build/entrypoint.py

@@ -0,0 +1,47 @@
+# https://github.com/pyinstaller/pyinstaller/wiki/Recipe-Setuptools-Entry-Point
+def Entrypoint(dist, group, name,
+               scripts=None, pathex=None, binaries=None, datas=None,
+               hiddenimports=None, hookspath=None, excludes=None, runtime_hooks=None,
+               cipher=None, win_no_prefer_redirects=False, win_private_assemblies=False):
+    import pkg_resources
+
+    # get toplevel packages of distribution from metadata
+    def get_toplevel(dist):
+        distribution = pkg_resources.get_distribution(dist)
+        if distribution.has_metadata('top_level.txt'):
+            return list(distribution.get_metadata('top_level.txt').split())
+        else:
+            return []
+
+    hiddenimports = hiddenimports or []
+    packages = []
+    for distribution in hiddenimports:
+        packages += get_toplevel(distribution)
+
+    scripts = scripts or []
+    pathex = pathex or []
+    # get the entry point
+    ep = pkg_resources.get_entry_info(dist, group, name)
+    # insert path of the egg at the verify front of the search path
+    pathex = [ep.dist.location] + pathex
+    # script name must not be a valid module name to avoid name clashes on import
+    script_path = os.path.join(workpath, name + '-script.py')
+    print "creating script for entry point", dist, group, name
+    with open(script_path, 'w') as fh:
+        fh.write("import {0}\n".format(ep.module_name))
+        fh.write("{0}.{1}()\n".format(ep.module_name, '.'.join(ep.attrs)))
+        for package in packages:
+            fh.write("import {0}\n".format(package))
+
+    return Analysis([script_path] + scripts,
+                    pathex=pathex,
+                    binaries=binaries,
+                    datas=datas,
+                    hiddenimports=hiddenimports,
+                    hookspath=hookspath,
+                    excludes=excludes,
+                    runtime_hooks=runtime_hooks,
+                    cipher=cipher,
+                    win_no_prefer_redirects=win_no_prefer_redirects,
+                    win_private_assemblies=win_private_assemblies
+                    )