summaryrefslogtreecommitdiff
path: root/pkg/pyinst
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-02-11 13:34:46 -0800
committerKali Kaneko <kali@leap.se>2016-04-18 16:17:26 -0400
commitd01772d0a83535bf45fa43786213a9a0fcb232bc (patch)
treec97764258125debe1e36071a5e893d297040ab02 /pkg/pyinst
parent9affaaacb18598fc98be669ef1c086b0afe4ad91 (diff)
[refactor] cleanup helper usage to adapt to new one
also cleanups build process
Diffstat (limited to 'pkg/pyinst')
-rw-r--r--pkg/pyinst/pyinst-build.mk34
1 files changed, 27 insertions, 7 deletions
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk
index 9595ad50..835c793c 100644
--- a/pkg/pyinst/pyinst-build.mk
+++ b/pkg/pyinst/pyinst-build.mk
@@ -12,8 +12,9 @@ pyinst: freeze-ver hash-binaries
reset-ver:
git checkout -- src/leap/bitmask/_version.py
-pyinst-hacks:
- cp ../leap_common/src/leap/common/cacert.pem $(DIST)
+pyinst-hacks-linux:
+ # XXX this should be taken care of by pyinstaller data collector
+ cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)
mkdir -p $(DIST)pysqlcipher
mkdir -p $(DIST)pixelated
mkdir -p $(DIST)twisted/web
@@ -22,15 +23,17 @@ pyinst-hacks:
cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/pixelated/assets/ $(DIST)pixelated
cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/twisted/web/failure.xhtml $(DIST)twisted/web/
+pyinst-hacks-osx:
+ # XXX this should be taken care of by pyinstaller data collector
+ cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST_OSX)Contents/MacOS/
+ # XXX need the rest???
+
pyinst-trim:
rm -f $(DIST)libQtOpenGL.so.4
rm -f $(DIST)libQtSql.so.4
rm -f $(DIST)libQt3Support.so.4
rm -f $(DIST)libaudio.so.2
rm -f $(DIST)libnvidia-*
- #rm -f dist/bitmask/libgstvideo-1.0.so.0
- #rm -f dist/bitmask/libgstaudio0.0.so.0
- #rm -f dist/bitmask/libgstreamer-1.0.so.0
pyinst-cleanup:
rm -rf $(DIST)config
@@ -44,7 +47,7 @@ pyinst-distribution-data:
cp pkg/PixelatedWebmail.README $(DIST_VERSION)
cp LICENSE $(DIST_VERSION)
-pyinst-linux-helpers:
+pyinst-helpers-linux:
mkdir -p $(DIST_VERSION)apps/eip/files
cp $(LEAP_BUILD_DIR)openvpn $(DIST_VERSION)apps/eip/files/leap-openvpn
cp pkg/linux/bitmask-root $(DIST_VERSION)apps/eip/files/
@@ -53,6 +56,21 @@ pyinst-linux-helpers:
mkdir -p $(DIST_VERSION)apps/mail
cp $(LEAP_BUILD_DIR)gpg $(DIST_VERSION)apps/mail
+pyinst-helpers-osx:
+ mkdir -p $(DIST_OSX_RES)bitmask-helper
+ 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/
+ cp pkg/osx/bitmask.pf.conf $(DIST_OSX_RES)bitmask-helper/
+ cp pkg/osx/se.leap.bitmask-helper.$(DIST_OSX_RES)bitmask-helper/
+ 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/
+
pyinst-tar:
cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION)
@@ -62,7 +80,9 @@ pyinst-sign:
pyinst-upload:
rsync --rsh='ssh' -avztlpog --progress --partial dist/Bitmask.$(NEXT_VERSION).* salmon.leap.se:./
-pyinst-linux: pyinst reset-ver pyinst-hacks pyinst-trim pyinst-cleanup pyinst-distribution-data pyinst-linux-helpers pyinst-tar
+pyinst-linux: pyinst reset-ver pyinst-hacks-linux pyinst-trim pyinst-cleanup pyinst-distribution-data pyinst-helpers-linux pyinst-tar
+
+pyinst-osx: pyinst reset-ver pyinst-hacks-osx pyinst-helpers-osx
clean_pkg:
rm -rf build dist