summaryrefslogtreecommitdiff
path: root/pkg/pyinst
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-03-06 10:11:57 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-03-06 10:11:57 +0100
commit72d6835ff22ac926675c31789a332112ee73a2cf (patch)
tree5ea68100924051d8b661d4539ae0bfa0c09a91d3 /pkg/pyinst
parenta8c215ca65b8dde0d15973528eba5e765810bcd5 (diff)
[pkg] several bundling fixes
Diffstat (limited to 'pkg/pyinst')
-rw-r--r--pkg/pyinst/app.spec5
-rw-r--r--pkg/pyinst/build.mk2
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/pyinst/app.spec b/pkg/pyinst/app.spec
index d9243de8..90619cfa 100644
--- a/pkg/pyinst/app.spec
+++ b/pkg/pyinst/app.spec
@@ -4,13 +4,16 @@ import platform
block_cipher = None
hiddenimports = [
+ 'appdirs',
'scrypt', 'zope.interface', 'zope.proxy',
- 'pixelated_www', 'pixelated',
+ 'pixelated_www', 'pixelated', 'chardet',
'pysqlcipher', 'service_identity',
'leap.common', 'leap.bitmask',
'leap.bitmask.core.logs',
'leap.bitmask.gui.icons_rc',
+ 'leap.soledad.common',
'leap.soledad.common.document',
+ 'leap.soledad.common.l2db',
'leap.bitmask_js',
'packaging', 'packaging.version', 'packaging.specifiers',
'packaging.requirements']
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index 3fd9a6e5..554009dd 100644
--- a/pkg/pyinst/build.mk
+++ b/pkg/pyinst/build.mk
@@ -5,9 +5,9 @@ bundle: bundle_clean
cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/_scrypt.so $(DIST)
cp src/leap/bitmask/core/bitmaskd.tac $(DIST)
mkdir $(DIST)/leap
- mkdir -p $(DIST)/leap/soledad/common/l2db/backends
# if you find yourself puzzled becase the following files are not found in your
# virtualenv, make sure that you're installing the packages from wheels and not eggs.
+ mkdir -p $(DIST)/leap/soledad/common/l2db/backends
cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/soledad/common/l2db/backends/dbschema.sql $(DIST)/leap/soledad/common/l2db/backends/
cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/bitmask_js/ $(DIST)/leap
cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/pixelated_www/ $(DIST)