summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-03-05 12:08:33 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-03-05 15:24:08 +0100
commit48fc39f7e2e2778a4cf4c0cc16e8a5f5d455893f (patch)
tree087be414e263caaca3b40a961c26180534527101 /pkg
parent19e81f68b7cc730c7ec95b063b9169aeca9bf746 (diff)
[pkg] ship pixelated packages
Diffstat (limited to 'pkg')
-rw-r--r--pkg/pyinst/app.spec2
-rw-r--r--pkg/pyinst/build.mk3
2 files changed, 4 insertions, 1 deletions
diff --git a/pkg/pyinst/app.spec b/pkg/pyinst/app.spec
index 5a99a6c6..d9243de8 100644
--- a/pkg/pyinst/app.spec
+++ b/pkg/pyinst/app.spec
@@ -5,7 +5,7 @@ block_cipher = None
hiddenimports = [
'scrypt', 'zope.interface', 'zope.proxy',
- 'pixelated_www', 'pixelated_user_agent',
+ 'pixelated_www', 'pixelated',
'pysqlcipher', 'service_identity',
'leap.common', 'leap.bitmask',
'leap.bitmask.core.logs',
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index a834f4ed..3fd9a6e5 100644
--- a/pkg/pyinst/build.mk
+++ b/pkg/pyinst/build.mk
@@ -6,8 +6,11 @@ bundle: bundle_clean
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.
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)
mv $(DIST) _bundlelib && mkdir $(DIST_VERSION) && mv _bundlelib $(DIST_VERSION)/lib
cd pkg/launcher && make
cp pkg/launcher/bitmask $(DIST_VERSION)