summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-17 12:47:57 -0700
committerKali Kaneko <kali@leap.se>2016-04-18 16:19:42 -0400
commit2cb8887119ff1dade6e3a4d9368654a6b67576a4 (patch)
tree097ff636c9b4eb26250f8c265ebed325e83f2d68 /pkg
parentb91263cba4078a7c4d19de0c31060cb7564ae410 (diff)
[refactor] re-add wrapper, cd needed
Diffstat (limited to 'pkg')
-rwxr-xr-xpkg/osx/bitmask-wrapper3
-rw-r--r--pkg/pyinst/bitmask.spec7
-rw-r--r--pkg/pyinst/pyinst-build.mk3
3 files changed, 10 insertions, 3 deletions
diff --git a/pkg/osx/bitmask-wrapper b/pkg/osx/bitmask-wrapper
new file mode 100755
index 00000000..240fc186
--- /dev/null
+++ b/pkg/osx/bitmask-wrapper
@@ -0,0 +1,3 @@
+#!/bin/sh
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+exec $DIR/bitmask-app --debug --danger
diff --git a/pkg/pyinst/bitmask.spec b/pkg/pyinst/bitmask.spec
index 149093eb..afee9dd1 100644
--- a/pkg/pyinst/bitmask.spec
+++ b/pkg/pyinst/bitmask.spec
@@ -3,10 +3,11 @@ import sys
block_cipher = None
+# TODO remove QtWebKit for bundles that don't ship pixelated???
a = Analysis(['bitmask.py'],
hiddenimports=[
'zope.interface', 'zope.proxy',
- 'PySide.QtCore', 'PySide.QtGui',
+ 'PySide.QtCore', 'PySide.QtGui', 'PySide.QtWebKit',
'pysqlcipher', 'service_identity',
'leap.common', 'leap.bitmask'
],
@@ -50,6 +51,6 @@ if sys.platform.startswith("darwin"):
name=os.path.join(
'dist', 'Bitmask.app'),
appname='Bitmask',
- version='0.9.0rc4',
+ version='0.9.0.alpha7',
icon='pkg/osx/bitmask.icns',
- bundle_identifier='bitmask-0.9.0rc4')
+ bundle_identifier='bitmask-0.9.0alpha7')
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk
index a414bd4e..b96e5dab 100644
--- a/pkg/pyinst/pyinst-build.mk
+++ b/pkg/pyinst/pyinst-build.mk
@@ -25,7 +25,10 @@ pyinst-hacks-linux:
pyinst-hacks-osx:
# XXX this should be taken care of by pyinstaller data collector
+ cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)
cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST_OSX)Contents/MacOS/
+ mv $(DIST_OSX)Contents/MacOS/bitmask $(DIST_OSX)Contents/MacOS/bitmask-app
+ cp pkg/osx/bitmask-wrapper $(DIST_OSX)Contents/MacOS/bitmask
# XXX need the rest???
pyinst-trim: