summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-27 14:33:39 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-27 16:19:26 -0400
commit40debc7182d9a20cc2a1ec2b6a162a065a3183c0 (patch)
tree9f782637b691ae994be632f3f5f76fe8a93d5afd /pkg
parent4d8e63e890e88c58feb750dd56ecbf60bed9b462 (diff)
[pkg] some bundling hacks
Diffstat (limited to 'pkg')
-rw-r--r--pkg/pyinst/Makefile9
-rw-r--r--pkg/pyinst/app.spec5
2 files changed, 11 insertions, 3 deletions
diff --git a/pkg/pyinst/Makefile b/pkg/pyinst/Makefile
index 72d19ae..41599a4 100644
--- a/pkg/pyinst/Makefile
+++ b/pkg/pyinst/Makefile
@@ -1,5 +1,10 @@
+build: clean
+ pyinstaller -y app.spec
+ cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/_scrypt.so dist/bitmask/
+ cp ../../src/leap/bitmask/core/bitmaskd.tac dist/bitmask
+ mkdir dist/bitmask/leap
+ cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/bitmask_js/ dist/bitmask/leap
+
clean:
rm -rf dist build
-build: clean
- pyinstaller -y app.spec
diff --git a/pkg/pyinst/app.spec b/pkg/pyinst/app.spec
index bca9e43..e630439 100644
--- a/pkg/pyinst/app.spec
+++ b/pkg/pyinst/app.spec
@@ -9,10 +9,13 @@ a = Analysis(['../../src/leap/bitmask/gui/app.py'],
binaries=None,
datas=None,
hiddenimports=[
+ 'scrypt',
'zope.interface', 'zope.proxy',
'PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtWebKit',
'pysqlcipher', 'service_identity',
- 'leap.common', 'leap.bitmask'
+ 'leap.common', 'leap.bitmask',
+ 'leap.bitmask.core.logs',
+ 'leap.bitmask_js',
],
hookspath=[],
runtime_hooks=[],