From 40debc7182d9a20cc2a1ec2b6a162a065a3183c0 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 27 Sep 2016 14:33:39 -0400
Subject: [pkg] some bundling hacks

---
 pkg/pyinst/Makefile           | 9 +++++++--
 pkg/pyinst/app.spec           | 5 ++++-
 src/leap/bitmask/core/_web.py | 7 +++++--
 3 files changed, 16 insertions(+), 5 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=[],
diff --git a/src/leap/bitmask/core/_web.py b/src/leap/bitmask/core/_web.py
index 983b97e..ce30a40 100644
--- a/src/leap/bitmask/core/_web.py
+++ b/src/leap/bitmask/core/_web.py
@@ -29,7 +29,7 @@ from twisted.application import service
 from twisted.web.resource import Resource
 from twisted.web.server import Site, NOT_DONE_YET
 from twisted.web.static import File
-from twisted.python import log
+from twisted.logger import Logger
 
 from leap.bitmask.core.dispatcher import CommandDispatcher
 
@@ -39,6 +39,8 @@ try:
 except ImportError:
     HAS_WEB_UI = False
 
+log = Logger()
+
 
 class HTTPDispatcherService(service.Service):
 
@@ -55,8 +57,9 @@ class HTTPDispatcherService(service.Service):
         if HAS_WEB_UI:
             webdir = os.path.abspath(
                 pkg_resources.resource_filename('leap.bitmask_js', 'public'))
+            log.debug('webdir: %s' % webdir)
         else:
-            log.msg('bitmask_js not found, serving bitmask.core ui')
+            log.warning('bitmask_js not found, serving bitmask.core ui')
             webdir = os.path.abspath(
                 pkg_resources.resource_filename('leap.bitmask.core', 'web'))
         root = File(webdir)
-- 
cgit v1.2.3