diff options
| author | Kali Kaneko <kali@leap.se> | 2017-06-20 03:18:54 -0700 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-06-21 02:56:10 +0200 |
| commit | c82f23ccaf077dce350292c7f3b2948d61122bbe (patch) | |
| tree | f28e03a6c9fd3790782b4941cf8ffe38f3c1b834 /pkg/pyinst/build.mk | |
| parent | 51011053093c87ca7ff2e024734578a5dce0dbfa (diff) | |
[pkg] improve Packages script
- use relative paths
- there's still an absolute path (hardcoded, the REFERENCE FOLDER PATH).
This should be changed (sed!) if we want to automate this for CI or for
building in different environments: STILL NEEDS SOME MANUAL WORK.
- Avoid deleting the build folders by default
- Move the plist file to a subfolder
Diffstat (limited to 'pkg/pyinst/build.mk')
| -rw-r--r-- | pkg/pyinst/build.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk index 86f7c340..448f7e05 100644 --- a/pkg/pyinst/build.mk +++ b/pkg/pyinst/build.mk @@ -1,5 +1,8 @@ # This makefile should be called from the topmost bitmask folder -# + +default: + echo "enter 'make bundle or make bundle_osx'" + bundle: bundle_clean pyinstaller -y pkg/pyinst/app.spec cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/_scrypt.so $(DIST) @@ -37,7 +40,7 @@ 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 pkg/osx/installer/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/ @@ -51,6 +54,11 @@ bundle_osx: bundle bundle_osx_helpers cp -r $(DIST_VERSION)/lib/pixelated_www dist/Bitmask.app/Contents/MacOS/ mv dist/Bitmask.app/Contents/MacOS/bitmask dist/Bitmask.app/Contents/MacOS/bitmask-app cp pkg/osx/bitmask-wrapper dist/Bitmask.app/Contents/MacOS/bitmask + mkdir -p dist/Bitmask.app/Contents/Resources/bitmask-helper + cp -r $(DIST_VERSION)/apps/helpers/bitmask-helper dist/Bitmask.app/Contents/Resources/bitmask-helper/ + cp -r $(DIST_VERSION)/apps/helpers/bitmask.pf.conf dist/Bitmask.app/Contents/Resources/bitmask-helper/ + cp -r $(DIST_VERSION)/apps/helpers/daemon/daemon.py dist/Bitmask.app/Contents/Resources/ + cp -r $(DIST_VERSION)/apps/helpers/openvpn/* dist/Bitmask.app/Contents/Resources/ bundle_win: pyinstaller -y pkg/pyinst/app.spec @@ -69,4 +77,3 @@ bundle_upload: bundle_clean: rm -rf "dist" "build" - |