From 4f20bc9ca0e6e1132d2691483058337228f0173c Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 5 Mar 2018 14:01:39 +0100
Subject: [pkg] add target for building riseupvpn in osx venv

---
 Makefile                                    |  3 +++
 pkg/build_osx_bundle_riseupvpn_with_venv.sh | 34 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100755 pkg/build_osx_bundle_riseupvpn_with_venv.sh

diff --git a/Makefile b/Makefile
index 1132732f..f6895358 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,9 @@ bundle_riseupvpn:
 	# to chown it first.
 	cat pkg/bundle_riseupvpn_from_docker | docker run -i -v /srv/bitmask-builds:/dist -w /dist -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-apt bash
 
+bundle_riseupvpn_osx_in_virtualenv:
+	pkg/build_osx_bundle_riseupvpn_with_venv.sh
+
 bundle_in_docker_virtualenv:
 	# this runs bundles inside a virtualenv. it is kind of slow because it compiles all python extensions in dependencies each time.
 	cat pkg/bundle_from_docker_venv | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-venv bash
diff --git a/pkg/build_osx_bundle_riseupvpn_with_venv.sh b/pkg/build_osx_bundle_riseupvpn_with_venv.sh
new file mode 100755
index 00000000..7f819849
--- /dev/null
+++ b/pkg/build_osx_bundle_riseupvpn_with_venv.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+###########################################################
+# Build a RiseupVPN bundle inside a fresh virtualenv (OSX).
+###########################################################
+
+# Stop bundling in case of errors
+set -e
+
+VENV=venv
+
+echo "[+] BUILDING RiseupVPN BUNDLE..."
+echo "[+] GIT VERSION" `git describe`
+
+if [ ! -d "$VENV" ]; then
+  echo "[+] creating virtualenv in venv"
+  virtualenv $VENV
+fi
+source "$VENV"/bin/activate
+echo "[+] Using venv in" $VIRTUAL_ENV
+
+$VIRTUAL_ENV/bin/pip install -U pyinstaller
+$VIRTUAL_ENV/bin/pip install zope.interface zope.proxy
+
+$VIRTUAL_ENV/bin/pip install -r pkg/requirements-osx.pip
+
+# Get the bundled libzmq
+$VIRTUAL_ENV/bin/pip install -I pyzmq --install-option="--zmq=bundled"
+
+# Install bitmask in development mode
+$VIRTUAL_ENV/bin/pip install -e .
+
+# Get latest tags from repo
+git fetch --tags
+make bundle_anonvpn_osx
-- 
cgit v1.2.3