summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpkg/osx/bitmask-wrapper3
-rw-r--r--pkg/pyinst/app.spec9
-rw-r--r--pkg/pyinst/build.mk6
3 files changed, 17 insertions, 1 deletions
diff --git a/pkg/osx/bitmask-wrapper b/pkg/osx/bitmask-wrapper
new file mode 100755
index 0000000..e1d1d90
--- /dev/null
+++ b/pkg/osx/bitmask-wrapper
@@ -0,0 +1,3 @@
+#!/bin/sh
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+exec $DIR/bitmask-app
diff --git a/pkg/pyinst/app.spec b/pkg/pyinst/app.spec
index 4c9532b..f693432 100644
--- a/pkg/pyinst/app.spec
+++ b/pkg/pyinst/app.spec
@@ -4,7 +4,13 @@ import sys
block_cipher = None
+IS_MAC = sys.platform.startswith('darwin')
+
BITMASK_VERSION = open('pkg/next-version').read()
+if IS_MAC:
+ # launchd chokes because more digits are added to the version string,
+ # so let's skip the patch part of the version.
+ BITMASK_VERSION = '.'.join(BITMASK_VERSION.split('.')[:-1])
hiddenimports = [
'appdirs',
@@ -17,6 +23,7 @@ hiddenimports = [
'leap.soledad.common',
'leap.soledad.common.document',
'leap.soledad.common.l2db',
+ 'leap.soledad.client.events',
'leap.bitmask_js',
'packaging', 'packaging.version', 'packaging.specifiers',
'packaging.requirements']
@@ -75,7 +82,7 @@ coll = COLLECT(exe,
upx=True,
name='bitmask')
-if sys.platform.startswith('darwin'):
+if IS_MAC:
app = BUNDLE(
coll,
name=os.path.join(
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index 0c540d5..86f7c34 100644
--- a/pkg/pyinst/build.mk
+++ b/pkg/pyinst/build.mk
@@ -45,6 +45,12 @@ bundle_osx_helpers:
bundle_linux: bundle bundle_linux_gpg bundle_linux_vpn bundle_linux_helpers
bundle_osx: bundle bundle_osx_helpers
+ cp $(DIST_VERSION)/lib/_scrypt.so dist/Bitmask.app/Contents/MacOS/
+ cp $(DIST_VERSION)/lib/bitmaskd.tac dist/Bitmask.app/Contents/MacOS/
+ cp -r $(DIST_VERSION)/lib/leap dist/Bitmask.app/Contents/MacOS/
+ cp -r $(DIST_VERSION)/lib/pixelated_www dist/Bitmask.app/Contents/MacOS/
+ mv dist/Bitmask.app/Contents/MacOS/bitmask dist/Bitmask.app/Contents/MacOS/bitmask-app
+ cp pkg/osx/bitmask-wrapper dist/Bitmask.app/Contents/MacOS/bitmask
bundle_win:
pyinstaller -y pkg/pyinst/app.spec