[pkg] utility targets on makefile, spec changes

2 files changed, 36 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index d0d68f2d..011e437c 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,7 @@ ifndef RESOURCE_TIME
 	export RESOURCE_TIME=10
 endif
 
+CURDIR = $(shell pwd)
 #
 
 all : resources ui
@@ -122,13 +123,13 @@ install_wheel:
 gather_deps:
 	pipdeptree | pkg/scripts/filter-bitmask-deps
 
-all_leap_develop:
-	cd ../keymanager && git checkout develop
-	cd ../leap_common && git checkout develop
-	cd ../leap_mail && git checkout develop
-	cd ../soledad && git checkout develop
+install_base_deps:
+	for repo in leap_common keymanager leap_mail soledad/common soledad/client; do cd $(CURDIR)/../$$repo && pkg/pip_install_requirements.sh; done
 
-all_leap_release_tags:
+checkout_leapdeps_develop:
+	for repo in leap_common keymanager leap_mail soledad; do cd $(CURDIR)/../$$repo && git checkout develop; done
+
+checkout_leapdeps_release:
 	pkg/scripts/checkout_leap_versions.sh
 
 sumo_tarball:
@@ -136,7 +137,13 @@ sumo_tarball:
 	git checkout -- src/leap/__init__.py
 	rm -rf src/leap/soledad
 pyinst:
-	pyinstaller pkg/pyinst/bitmask.spec
+	pyinstaller -y pkg/pyinst/bitmask.spec
+	mkdir -p dist/bitmask/cryptography/hazmat/bindings/openssl/src/
+	cp pkg/pyinst/cryptography/* dist/bitmask/cryptography/hazmat/bindings/openssl/src
+	cp -r dist/bitmask/cryptography dist/Bitmask.app/Contents/Resources/
+
+clean_pkg:
+	rm -rf build dist
 
 clean :
 	$(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)
diff --git a/pkg/pyinst/bitmask.spec b/pkg/pyinst/bitmask.spec
index efdbf167..2bc2f9d2 100644
--- a/pkg/pyinst/bitmask.spec
+++ b/pkg/pyinst/bitmask.spec
@@ -1,59 +1,38 @@
 # -*- mode: python -*-
-a = Analysis(['pkg/pyinst/bitmask.py'],
-             pathex=['/home/kali/Virtualenvs/leap-pyinst/lib/python2.7/site-packages/zope', '/home/kali/Virtualenvs/leap-pyinst/lib/python2.7/site-packages/zope/interface', '/home/kali/Virtualenvs/leap-pyinst/lib/python2.7/site-packages/zope/proxy', '/home/kali/leap/bitmask_client/src/leap/bitmask'],
+
+block_cipher = None
+
+
+a = Analysis([os.path.join('pkg', 'pyinst', 'bitmask.py')],
              hiddenimports=[
 	     	'zope.interface', 'zope.proxy',
-		'leap.common',
-		'leap.common.config',
-		'PySide.QtCore', 'PySide.QtGui',
-		# not needed with latest develop pyinstaller
-		'cryptography.hazmat.bindings.openssl',
-		'cryptography.hazmat.bindings.openssl.aes',
-		'cryptography.hazmat.bindings.openssl.asn1',
-		'cryptography.hazmat.bindings.openssl.bignum',
-		'cryptography.hazmat.bindings.openssl.bio',
-		'cryptography.hazmat.bindings.openssl.cmac',
-		'cryptography.hazmat.bindings.openssl.cms',
-		'cryptography.hazmat.bindings.openssl.conf',
-		'cryptography.hazmat.bindings.openssl.crypto',
-		'cryptography.hazmat.bindings.openssl.dh',
-		'cryptography.hazmat.bindings.openssl.dsa',
-		'cryptography.hazmat.bindings.openssl.ec',
-		'cryptography.hazmat.bindings.openssl.ecdh',
-		'cryptography.hazmat.bindings.openssl.ecdsa',
-		'cryptography.hazmat.bindings.openssl.engine',
-		'cryptography.hazmat.bindings.openssl.err',
-		'cryptography.hazmat.bindings.openssl.evp',
-		'cryptography.hazmat.bindings.openssl.hmac',
-		'cryptography.hazmat.bindings.openssl.nid',
-		'cryptography.hazmat.bindings.openssl.objects',
-		'cryptography.hazmat.bindings.openssl.opensslv',
-		'cryptography.hazmat.bindings.openssl.osrandom_engine',
-		'cryptography.hazmat.bindings.openssl.pem',
-		'cryptography.hazmat.bindings.openssl.pkcs12',
-		'cryptography.hazmat.bindings.openssl.pkcs7',
-		'cryptography.hazmat.bindings.openssl.rand',
-		'cryptography.hazmat.bindings.openssl.rsa',
-		'cryptography.hazmat.bindings.openssl.ssl',
-		'cryptography.hazmat.bindings.openssl.x509name',
-		'cryptography.hazmat.bindings.openssl.x509',
-		'cryptography.hazmat.bindings.openssl.x509v3',
-		'cryptography.hazmat.bindings.openssl.x509_vfy'],
+		'PySide.QtCore', 'PySide.QtGui'],
              hookspath=None,
-             runtime_hooks=None)
-pyz = PYZ(a.pure)
+             runtime_hooks=None,
+             excludes=None,
+             cipher=block_cipher)
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
           exclude_binaries=True,
           name='bitmask',
           debug=False,
-          strip=None,
+          strip=False,
           upx=True,
-          console=True )
+          console=False )
 coll = COLLECT(exe,
                a.binaries,
                a.zipfiles,
                a.datas,
-               strip=None,
+               strip=False,
                upx=True,
                name='bitmask')
+if sys.platform.startswith("darwin"):
+	app = BUNDLE(coll,
+		     name=os.path.join(
+		      'dist', 'Bitmask.app'),
+                     appname='Bitmask',
+                     version='0.9.0rc2',
+		     icon='pkg/osx/bitmask.icns',
+		     bundle_identifier='bitmask-0.9.0rc2')