diff options
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1,6 +1,6 @@ -SYSTRAY := 0xacab.org/leap/bitmask-systray +SYSTRAY := 0xacab.org/leap/bitmask-vpn STAGING := staging -SYSTRAY_BIN := bitmask-systray +SYSTRAY_BIN := bitmask-vpn HELPER_BIN := bitmask_helper APP_NAME := RiseupVPN BUILD_RELEASE?=no @@ -44,10 +44,10 @@ openvpn_cross_win: cp $(STAGING)/openvpn/bin/*.dll $(STAGING) cp $(STAGING)/openvpn/lib/engines-1_1/*.dll $(STAGING) helper_win: - go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN).exe ./helper + go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN).exe $(SYSTRAY)/cmd/bitmask-helper systray_win: go get -u $(SYSTRAY) - powershell '$$gopath=go env GOPATH;$$version=git -C $$gopath/src/$(SYSTRAY) describe --tags; go build -ldflags "-H windowsgui -s -w -X main.version=$$version" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY)' + powershell '$$gopath=go env GOPATH;$$version=git -C $$gopath/src/$(SYSTRAY) describe --tags; go build -ldflags "-H windowsgui -s -w -X main.version=$$version" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY)/cmd/bitmask-vpn' build_win: staging\nssm.exe helper_win systray_win # since it's tedious, I assume you did bootstrap openvpn_win manually already. echo "[+] building windows" @@ -57,8 +57,8 @@ build_win: staging\nssm.exe helper_win systray_win build_cross_win: staging/nssm.exe echo "!define VERSION $(VERSION)" > $(STAGING)/version.nsh $(CROSS_FLAGS) $(MAKE) helper_win - $(CROSS_FLAGS) go get $(SYSTRAY) - $(CROSS_FLAGS) go build -ldflags "-H windowsgui -s -w -X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY) + $(CROSS_FLAGS) go get $(SYSTRAY)/cmd/bitmask-vpn + $(CROSS_FLAGS) go build -ldflags "-H windowsgui -s -w -X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY)/cmd/bitmask-vpn mkdir -p dist make -C win VERSION=$(VERSION) makensis win/RiseupVPN-installer.nsi @@ -75,11 +75,11 @@ openvpn_osx: wget -O $(STAGING)/openvpn https://downloads.leap.se/thirdparty/osx/openvpn/openvpn helper_osx: go get -u github.com/sevlyar/go-daemon - go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN) ./helper + go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN) $(SYSTRAY)/cmd/bitmask-helper upx $(STAGING)/$(HELPER_BIN) systray_osx: go get -u $(SYSTRAY) - go build -ldflags "-X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY) + go build -ldflags "-X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY)/cmd/bitmask-vpn upx $(STAGING)/$(SYSTRAY_BIN) bundle_osx: mkdir -p dist |