summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-06-13 18:41:16 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2017-06-13 18:41:16 +0200
commit9fd7129a2b616df701b13a6cf7df2f7d75011eff (patch)
treeb9e1936b25bf4477492940611833aecb0567d93e
parent40d540552848e08832a3d5bd9656c4e2f7e0a06e (diff)
[pkg] simplify osx/linux target
-rw-r--r--docs/hacking/osx.rst9
-rwxr-xr-xpkg/build_bundle_with_venv.sh3
-rw-r--r--pkg/pyinst/build.mk16
3 files changed, 12 insertions, 16 deletions
diff --git a/docs/hacking/osx.rst b/docs/hacking/osx.rst
index 57f7321..5b133f0 100644
--- a/docs/hacking/osx.rst
+++ b/docs/hacking/osx.rst
@@ -5,9 +5,7 @@ Setting up a development environment in OSX™
.. note: work in progress
-* Make sure you're using a new enough version of pip (1.8 or newest).
-This will make all the problems with ``cryptography`` going away, since it will
-install the statically built wheel.
+* Make sure you're using a new enough version of pip (1.8 or newest). This will make all the problems with ``cryptography`` going away, since it will install the statically built wheel.
* Use ``brew`` to install ``OpenSSL``.
@@ -21,11 +19,10 @@ workaround in an issue in qutebrowser's repo, works fine for me for now::
.. note: copy that into a makefile target
-* After those fixes, you should be able to build the bundle::
+After those fixes, you should be able to build the bundle::
- make bundle
+ make bundle_osx
-.. note: make a osx target!!!
Privileged helper
=================
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index 65c52c6..7900a9d 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -47,5 +47,4 @@ pip install pixelated-www pixelated-user-agent --find-links https://downloads.le
$VIRTUAL_ENV/bin/pip uninstall --yes pyzmq
$VIRTUAL_ENV/bin/pip install pyzmq --install-option="--zmq=bundled"
-make bundle
-make bundle_apps_linux
+make bundle_linux
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index ed27ff5..0c540d5 100644
--- a/pkg/pyinst/build.mk
+++ b/pkg/pyinst/build.mk
@@ -15,12 +15,6 @@ bundle: bundle_clean
cd pkg/launcher && make
cp pkg/launcher/bitmask $(DIST_VERSION)
-bundle_win:
- pyinstaller -y pkg/pyinst/app.spec
- cp ${VIRTUAL_ENV}/Lib/site-packages/_scrypt.pyd $(DIST)
- cp ${VIRTUAL_ENV}/Lib/site-packages/zmq/libzmq.pyd $(DIST)
- cp src/leap/bitmask/core/bitmaskd.tac $(DIST)
-
bundle_linux_gpg:
# TODO build it in a docker container!
mkdir -p $(DIST_VERSION)/apps/mail
@@ -48,9 +42,15 @@ bundle_osx_helpers:
cp -r pkg/osx/openvpn $(DIST_VERSION)/apps/helpers/
-bundle_apps_linux: bundle_linux_gpg bundle_linux_vpn bundle_linux_helpers
+bundle_linux: bundle bundle_linux_gpg bundle_linux_vpn bundle_linux_helpers
-bundle_apps_osx: bundle_osx_helpers
+bundle_osx: bundle bundle_osx_helpers
+
+bundle_win:
+ pyinstaller -y pkg/pyinst/app.spec
+ cp ${VIRTUAL_ENV}/Lib/site-packages/_scrypt.pyd $(DIST)
+ cp ${VIRTUAL_ENV}/Lib/site-packages/zmq/libzmq.pyd $(DIST)
+ cp src/leap/bitmask/core/bitmaskd.tac $(DIST)
bundle_tar:
cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION)