summaryrefslogtreecommitdiff
path: root/pkg/pyinst
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-06-13 14:47:57 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2017-06-13 14:48:05 +0200
commit9fb7b5ea0f24acfc101a58ffb28c75d949d0efb2 (patch)
treef8d7dfa509ed56b71eb175dd548e2488648673e7 /pkg/pyinst
parent77b33c49d004d72f58ebcf4cbb95eb87acccbea9 (diff)
[pkg] package osx helpers in bundle too
Diffstat (limited to 'pkg/pyinst')
-rw-r--r--pkg/pyinst/build.mk17
1 files changed, 14 insertions, 3 deletions
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index 8d8e8bc3..ed27ff50 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)