From 48fc39f7e2e2778a4cf4c0cc16e8a5f5d455893f Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Sun, 5 Mar 2017 12:08:33 +0100
Subject: [pkg] ship pixelated packages

---
 pkg/pyinst/app.spec | 2 +-
 pkg/pyinst/build.mk | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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)
-- 
cgit v1.2.3