diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2018-07-09 17:06:19 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2018-07-09 22:16:27 +0200 |
| commit | 27803ec1a4c2d9dba84865a8b538ac8385ee189b (patch) | |
| tree | a7eb895dc1fc58dd1d578d07928fd1483bb41379 /Makefile | |
| parent | ad175ba3a88b0add9688f402beefd6fdb9d7edde (diff) | |
[pkg] use the version string from the systray
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,11 +1,11 @@ -SYSTRAY := 0xacab.org/leap/bitmask-systray.git +SYSTRAY := 0xacab.org/leap/bitmask-systray STAGING := staging SYSTRAY_BIN := bitmask-systray HELPER_BIN := bitmask_helper APP_NAME := RiseupVPN BUILD_RELEASE?=no OSX_CERT = "Developer ID Installer: LEAP Encryption Access Project" -VERSION = $(shell cat version) +VERSION = $(shell git -C `go env GOPATH`/src/$(SYSTRAY) describe --tags) # ----------------------------------------------------------------------------- # Windows @@ -51,11 +51,11 @@ helper_osx: upx $(STAGING)/$(HELPER_BIN) systray_osx: go get -tags "standalone" -u $(SYSTRAY) - go build -tags "standalone" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY) + go build -tags "standalone" -ldflags "-X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY) upx $(STAGING)/$(SYSTRAY_BIN) bundle_osx: mkdir -p dist - make -C osx + make -C osx VERSION=$(VERSION) pkg_osx: osx/quickpkg --output dist/$(APP_NAME)-$(VERSION)_unsigned.pkg --scripts osx/scripts/ dist/$(APP_NAME).app/ @if [ $(BUILD_RELEASE) = no ]; then\ |