diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-13 15:42:27 -0700 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-18 16:18:13 -0400 |
| commit | ec04bb1ec723f3f9a97ecc6d9daa00a5a8f86609 (patch) | |
| tree | 25ff33b386cb05b17bc10c297ea422e809e6171d | |
| parent | 354a0a3cc24545dda6c4ccaa04eb060fa269cdeb (diff) | |
[pkg] update pyinst makefile to pick our custom built gpg
| -rw-r--r-- | pkg/pyinst/pyinst-build.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk index 835c793c..4668d3f0 100644 --- a/pkg/pyinst/pyinst-build.mk +++ b/pkg/pyinst/pyinst-build.mk @@ -58,6 +58,7 @@ pyinst-helpers-linux: pyinst-helpers-osx: mkdir -p $(DIST_OSX_RES)bitmask-helper + mkdir $(DIST_OSX)Contents/MacOS/apps/mail cp pkg/osx/client.up.sh $(DIST_OSX_RES) cp pkg/osx/client.down.sh $(DIST_OSX_RES) cp pkg/osx/bitmask-helper $(DIST_OSX_RES)bitmask-helper/ @@ -66,10 +67,9 @@ pyinst-helpers-osx: cp pkg/osx/post-inst.sh $(DIST_OSX_RES)bitmask-helper/ cp pkg/osx/daemon.py $(DIST_OSX_RES)bitmask-helper/ cp /opt/homebrew-cask/Caskroom/tuntap/20150118/tuntap_20150118.pkg $(DIST_OSX_RES) - # TODO get from the path the build script places it - cp ~/leap/openvpn.leap.polarssl $(DIST_OSX_RES)openvpn.leap - # TODO this contains the gpg binary (brew), but we need to compile it statically from sources. - cp -r src/leap/bitmask/util/apps $(DIST_OSX)Contents/MacOS/ + # TODO make the build script put it there + cp ~/leap_thirdparty_build/openvpn.leap.polarssl $(DIST_OSX_RES)openvpn.leap + cp ~/leap_thirdparty_build/gpg $(DIST_OSX)Contents/MacOS/apps/mail/ pyinst-tar: cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION) |