[pkg] several bundling fixes

5 files changed, 29 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 3b285a52..b7908c8f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ clean:
 dev-mail:
 	pip install -e '.[mail]'
 
+dev-gui:
+	pip install -e '.[gui]'
+
 dev-backend:
 	pip install -e '.[backend]'
 
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index daaa6393..5658a837 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -6,26 +6,36 @@
 ###########################################################
 virtualenv venv
 source venv/bin/activate
-$VIRTUAL_ENV/bin/pip install -U pyinstaller==3.1 packaging
+$VIRTUAL_ENV/bin/pip install appdirs packaging
+# $VIRTUAL_ENV/bin/pip install -U pyinstaller==3.1
+$VIRTUAL_ENV/bin/pip install -U pyinstaller
 $VIRTUAL_ENV/bin/pip install zope.interface zope.proxy
 
+# fix for #8789
+$VIRTUAL_ENV/bin/pip --no-cache-dir install pysqlcipher --install-option="--bundled"
+# FIXME pixelated needs chardet but doesn't declare it
+$VIRTUAL_ENV/bin/pip install chardet
+
+
 # For the Bitmask 0.9.5 bundles.
-#$VIRTUAL_ENV/bin/pip install -U leap.soledad.common==0.9.3
-#$VIRTUAL_ENV/bin/pip install -U leap.soledad.client==0.9.3
+$VIRTUAL_ENV/bin/pip install -U leap.soledad.common==0.9.3
+$VIRTUAL_ENV/bin/pip install -U leap.soledad.client==0.9.3
 
 # CHANGE THIS IF YOU WANT A DIFFERENT BRANCH CHECKED OUT FOR COMMON/SOLEDAD --------------------
-$VIRTUAL_ENV/bin/pip install -U leap.soledad.common --find-links https://devpi.net/kali/dev 
-$VIRTUAL_ENV/bin/pip install -U leap.soledad.client --find-links https://devpi.net/kali/dev 
+# $VIRTUAL_ENV/bin/pip install -U leap.soledad.common --find-links https://devpi.net/kali/dev 
+# $VIRTUAL_ENV/bin/pip install -U leap.soledad.client --find-links https://devpi.net/kali/dev 
 # ----------------------------------------------------------------------------------------------
 
 # XXX hack for the namespace package not being properly handled by pyinstaller
 touch $VIRTUAL_ENV/lib/python2.7/site-packages/zope/__init__.py
 touch $VIRTUAL_ENV/lib/python2.7/site-packages/leap/soledad/__init__.py
 
-make dev-all
+make dev-gui
+make dev-mail
 
-$VIRTUAL_ENV/bin/pip uninstall leap.bitmask
-$VIRTUAL_ENV/bin/pip install .
+$VIRTUAL_ENV/bin/pip uninstall --yes leap.bitmask
+$VIRTUAL_ENV/bin/python setup.py sdist bdist_wheel --universal
+$VIRTUAL_ENV/bin/pip install dist/*.whl
 
 # install pixelated from kali dev repo until assets get packaged.
 pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
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)
diff --git a/src/leap/bitmask/pix.py b/src/leap/bitmask/pix.py
index 043f7d01..09394d7e 100644
--- a/src/leap/bitmask/pix.py
+++ b/src/leap/bitmask/pix.py
@@ -40,7 +40,9 @@ try:
     from pixelated.resources.root_resource import RootResource
     import pixelated_www
     HAS_PIXELATED = True
-except ImportError:
+except ImportError as exc:
+    print "CANNOT LOAD PIXELATED!..............."
+    print exc
     HAS_PIXELATED = False