diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2019-08-06 19:26:22 +0200 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2019-08-06 19:39:55 +0200 |
| commit | d64f45423e037b3506ce45fe94b2b29ce17cfa93 (patch) | |
| tree | 7756536361a660716283a754122793774ffce9db | |
| parent | 04c7f9b44ddb3840ab3ca58b9bcb8fce39a2a285 (diff) | |
[pkg] do not copy binaries for osx on prepare step
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | branding/templates/osx/generate.py | 7 | ||||
| -rw-r--r-- | pkg/config/config.go | 2 |
3 files changed, 9 insertions, 7 deletions
@@ -65,7 +65,7 @@ build_win: clean: - @rm -f build/${PROVIDER}/bin/bitmask-* + @rm -rf build/ @unlink branding/assets/default ######################################################################### @@ -99,7 +99,7 @@ tgz: @chmod +x $(TGZ_PATH)/helpers/bitmask-root @wget -O $(TGZ_PATH)/helpers/se.leap.bitmask.policy https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy @cd build/ && tar cvzf bitmask-vpn_$(VERSION).tgz ${TGZ_NAME} - @rm -f $(TGZ_PATH) + @rm -rf $(TGZ_PATH) gen_pkg_win: @mkdir -p build/${PROVIDER}/windows/ @@ -142,7 +142,8 @@ gen_pkg_deb: # packaging action ######################################################################### -packages: pkg_snap pkg_deb pkg_osx pkg_win +packages: package_deb package_osx package_win +# package_snap package_snap: @make -C build/${PROVIDER} pkg_snap diff --git a/branding/templates/osx/generate.py b/branding/templates/osx/generate.py index 440ee34..6ea15bd 100644 --- a/branding/templates/osx/generate.py +++ b/branding/templates/osx/generate.py @@ -98,9 +98,10 @@ with open(APP_PATH + "/Contents/PkgInfo", "w") as f: # 3. Copy the binary payloads # -------------------------------------------- -copy_payload(ENTRYPOINT) -copy_payload(HELPER) -copy_payload(OPENVPN, destfile='/Contents/Resources/openvpn.leap') +# TODO ------------------------ move this to makefile +# copy_payload(ENTRYPOINT) +# copy_payload(HELPER) +# copy_payload(OPENVPN, destfile='/Contents/Resources/openvpn.leap') # 4. Copy the app icon from the assets folder # ----------------------------------------------- diff --git a/pkg/config/config.go b/pkg/config/config.go index 70da70c..9af54a9 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by vendorize.py -// At 2019-08-06 17:57:48 +// At 2019-08-06 19:25:08 package config |