summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rwxr-xr-xpkg/build_bundle_with_venv.sh4
-rw-r--r--pkg/pyinst/build.mk17
2 files changed, 16 insertions, 5 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index 15b495c..65c52c6 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -1,6 +1,6 @@
#!/bin/bash
###########################################################
-# Build a Bitmask bundle inside a fresh virtualenv.
+# Build a Bitmask bundle inside a fresh virtualenv (LINUX).
# To be run by Gitlab Runner,
# will produce an artifact for each build.
###########################################################
@@ -48,4 +48,4 @@ $VIRTUAL_ENV/bin/pip uninstall --yes pyzmq
$VIRTUAL_ENV/bin/pip install pyzmq --install-option="--zmq=bundled"
make bundle
-make bundle_apps
+make bundle_apps_linux
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index 8d8e8bc..ed27ff5 100644
--- a/pkg/pyinst/build.mk
+++ b/pkg/pyinst/build.mk
@@ -21,7 +21,7 @@ bundle_win:
cp ${VIRTUAL_ENV}/Lib/site-packages/zmq/libzmq.pyd $(DIST)
cp src/leap/bitmask/core/bitmaskd.tac $(DIST)
-bundle_gpg:
+bundle_linux_gpg:
# TODO build it in a docker container!
mkdir -p $(DIST_VERSION)/apps/mail
cp /usr/bin/gpg $(DIST_VERSION)/apps/mail/
@@ -29,7 +29,7 @@ bundle_gpg:
patchelf --set-rpath '.' $(DIST_VERSION)/apps/mail/gpg
cp /lib/x86_64-linux-gnu/libusb-0.1.so.4 $(DIST_VERSION)/lib
-bundle_vpn:
+bundle_linux_vpn:
mkdir -p $(DIST_VERSION)/apps/vpn
# TODO verify signature
wget https://downloads.leap.se/thirdparty/linux/openvpn/openvpn -O $(DIST_VERSION)/apps/vpn/openvpn.leap
@@ -39,7 +39,18 @@ bundle_linux_helpers:
cp src/leap/bitmask/vpn/helpers/linux/bitmask-root $(DIST_VERSION)/apps/helpers/
cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy $(DIST_VERSION)/apps/helpers/
-bundle_apps: bundle_gpg bundle_vpn bundle_linux_helpers
+bundle_osx_helpers:
+ mkdir -p $(DIST_VERSION)/apps/helpers
+ cp src/leap/bitmask/vpn/helpers/osx/bitmask-helper $(DIST_VERSION)/apps/helpers/
+ cp src/leap/bitmask/vpn/helpers/osx/bitmask.pf.conf $(DIST_VERSION)/apps/helpers/
+ cp pkg/osx/se.leap.bitmask-helper.plist $(DIST_VERSION)/apps/helpers/
+ cp -r pkg/osx/daemon $(DIST_VERSION)/apps/helpers/
+ cp -r pkg/osx/openvpn $(DIST_VERSION)/apps/helpers/
+
+
+bundle_apps_linux: bundle_linux_gpg bundle_linux_vpn bundle_linux_helpers
+
+bundle_apps_osx: bundle_osx_helpers
bundle_tar:
cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION)