From 87ae7c73ebe05f777e23087b1550d2cab42746ff Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Wed, 8 Aug 2018 21:55:02 +0100
Subject: Add version string

Add `lib.Version` to get updated at build time.
Add --version flags to cashier and cashierd
Send client version in the signing request
Send server version in http response headers and in signing response
Set version at build time
---
 Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 466d772..934c79d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
 CASHIER_CMD := ./cmd/cashier
-CASHIER_BIN := ./cashier
-CASHIERD_BIN := ./cashierd
 CASHIERD_CMD := ./cmd/cashierd
 SRC_FILES = $(shell find * -type f -name '*.go' -not -path 'vendor/*' -not -name 'a_*-packr.go')
+VERSION_PKG := "github.com/nsheridan/cashier/lib.Version"
+VERSION := $(shell git describe --tags --always --dirty)
+
+GOOS ?= $(shell go env GOOS)
+GOARCH ?= $(shell go env GOARCH)
+CGO_ENABLED ?= $(shell go env CGO_ENABLED)
 
 all: test build
 
@@ -20,11 +24,11 @@ build: cashier cashierd
 generate:
 	go generate -x ./...
 
-cashier:
-	go build -o cashier $(CASHIER_CMD)
+%-cmd:
+	CGO_ENABLED=$(CGO_ENABLED) GOARCH=$(GOARCH) GOOS=$(GOOS) go build -ldflags="-X $(VERSION_PKG)=$(VERSION)" -o $* ./cmd/$*
 
-cashierd: generate
-	go build -o cashierd $(CASHIERD_CMD)
+install-%: generate
+	CGO_ENABLED=$(CGO_ENABLED) GOARCH=$(GOARCH) GOOS=$(GOOS) go install -x -ldflags="-X $(VERSION_PKG)=$(VERSION)" ./cmd/$*
 
 clean:
 	rm -f cashier cashierd
@@ -37,4 +41,7 @@ dep:
 	go get -u golang.org/x/lint/golint
 	go get -u golang.org/x/tools/cmd/goimports
 
+version:
+	@echo $(VERSION)
+
 .PHONY: all build dep generate test cashier cashierd clean migration
-- 
cgit v1.2.3