diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-06-13 18:41:16 +0200 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-06-13 18:41:16 +0200 |
| commit | 9fd7129a2b616df701b13a6cf7df2f7d75011eff (patch) | |
| tree | b9e1936b25bf4477492940611833aecb0567d93e /pkg/pyinst | |
| parent | 40d540552848e08832a3d5bd9656c4e2f7e0a06e (diff) | |
[pkg] simplify osx/linux target
Diffstat (limited to 'pkg/pyinst')
| -rw-r--r-- | pkg/pyinst/build.mk | 16 |
1 files changed, 8 insertions, 8 deletions
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) |