diff options
| -rwxr-xr-x | Makefile | 12 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 3 |
2 files changed, 7 insertions, 8 deletions
@@ -36,8 +36,8 @@ helper_win: go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN).exe ./helper upx $(STAGING)/$(HELPER_BIN).exe systray_win: - go get -tags "standalone" -u $(SYSTRAY) - powershell '$$gopath=go env GOPATH;$$version=git -C $$gopath/src/$(SYSTRAY) describe --tags; go build -tags "standalone" -ldflags "-H windowsgui -s -w -X main.version=$$version" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY)' + 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)' upx $(STAGING)/$(SYSTRAY_BIN).exe build_win: staging\nssm.exe helper_win systray_win # since it's tedious, I assume you did bootstrap openvpn_win manually already. @@ -48,8 +48,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 -tags "standalone" $(SYSTRAY) - $(CROSS_FLAGS) go build -tags "standalone" -ldflags "-H windowsgui -s -w -X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY) + $(CROSS_FLAGS) go get $(SYSTRAY) + $(CROSS_FLAGS) go build -ldflags "-H windowsgui -s -w -X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY) upx $(STAGING)/$(SYSTRAY_BIN).exe mkdir -p dist make -C win VERSION=$(VERSION) @@ -69,8 +69,8 @@ helper_osx: go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN) ./helper upx $(STAGING)/$(HELPER_BIN) systray_osx: - go get -tags "standalone" -u $(SYSTRAY) - go build -tags "standalone" -ldflags "-X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY) + go get -u $(SYSTRAY) + go build -ldflags "-X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY) upx $(STAGING)/$(SYSTRAY_BIN) bundle_osx: mkdir -p dist diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 42e33dc..d531a2f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -46,8 +46,7 @@ parts: bitmask-systray: after: [desktop-gtk3] plugin: go - go-buildtags: [standalone] - go-packages: ["github.com/ProtonMail/go-autostart", "github.com/apparentlymart/go-openvpn-mgmt/openvpn", "0xacab.org/leap/bitmask-systray"] + source: https://0xacab.org/leap/bitmask-systray.git # prepare: XXX run systray tests here build-packages: - pkg-config |