upload cli binary, dont package languages for cli

This commit is contained in:
Alex Grintsvayg 2017-03-15 21:23:04 -04:00
parent 55cf3d5dc7
commit 8a8230d202
3 changed files with 9 additions and 28 deletions

View file

@ -59,7 +59,7 @@ npm install
####################
# lbrynet-daemon #
# daemon and cli #
####################
(
@ -67,7 +67,7 @@ npm install
pip install -r linux_macos.txt
pyinstaller -y daemon.onefile.spec
pyinstaller -y cli.onefile.spec
mv dist/lbrynet-daemon "$ROOT/app/dist/"
mv dist/lbrynet-daemon dist/lbrynet-cli "$ROOT/app/dist/"
)
python "$BUILD_DIR/zip_daemon.py"

View file

@ -9,11 +9,11 @@ def main():
tag = subprocess.check_output(['git', 'describe']).strip()
zipfilename = 'lbrynet-daemon-{}-{}.zip'.format(tag, get_system_label())
full_filename = os.path.join('dist', zipfilename)
executable = 'lbrynet-daemon'
if platform.system() == 'Windows':
executable += '.exe'
executables = ['lbrynet-daemon', 'lbrynet-cli']
ext = '.exe' if platform.system() == 'Windows' else ''
with zipfile.ZipFile(full_filename, 'w') as myzip:
myzip.write(os.path.join('app', 'dist', executable), executable)
for executable in executables:
myzip.write(os.path.join('app', 'dist', executable + ext), executable + ext)
def get_system_label():

View file

@ -2,8 +2,6 @@
import platform
import os
import lbryum
cwd = os.getcwd()
if os.path.basename(cwd) != 'daemon':
@ -22,30 +20,14 @@ else:
print 'Warning: System {} has no icons'.format(system)
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
]
a = Analysis(
['cli.py'],
pathex=[cwd],
binaries=None,
datas=datas,
datas=[],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
@ -55,13 +37,12 @@ a = Analysis(
cipher=block_cipher
)
pyz = PYZ(
a.pure, a.zipped_data,
a.pure,
a.zipped_data,
cipher=block_cipher
)
exe = EXE(
pyz,
a.scripts,