Set main.version through ldflags for release builds

Author: csstaub

Diff for: Makefile.dist

@@ -23,6 +23,7 @@ PROJECT := $(CURRENT_DIR:$(GOPATH)/src/%=%)
 NAME := $(notdir $(PROJECT))
 GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
 VERSION ?= $(shell git describe --always)
+LD_FLAGS := -X main.version=${VERSION}
 
 # Create a cross-compile target for every os-arch pairing. This will generate
 # a make target for each os/arch like "make linux/amd64" as well as generate a
@@ -34,11 +35,11 @@ define make-xc-target
   else ifeq (${1},windows)
 		@printf "%s%20s %s\n" "-->" "${1}/${2}:" "${PROJECT} (-w -extldflags "-static" -extld ${WINDOWS_EXTLD_${2}})"
 		@xgo -go ${GOVERSION} -deps ${LIBTOOL_PATH} -targets '${1}-${WINDOWS_API_LEVEL}/${2}' \
-			-ldflags '-w -extldflags "-static" -extld ${WINDOWS_EXTLD_${2}}' .
+			-ldflags '${LD_FLAGS} -w -extldflags "-static" -extld ${WINDOWS_EXTLD_${2}}' .
 		@mv ghostunnel-${1}-${WINDOWS_API_LEVEL}-${2}.exe dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11.exe
   else
 		@printf "%s%20s %s\n" "-->" "${1}/${2}:" "${PROJECT}"
-		@xgo -go ${GOVERSION} -deps ${LIBTOOL_PATH} -targets '${1}/${2}' .
+		@xgo -go ${GOVERSION} -deps ${LIBTOOL_PATH} -ldflags "${LD_FLAGS}" -targets '${1}/${2}' .
 		@mv ghostunnel-${1}*-${2} dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11
   endif
   .PHONY: $1/$2

Diff for: main.go

@@ -42,7 +42,7 @@ import (
 )
 
 var (
-	version              = "v1.2.0-rc.2"
+	version              = "master"
 	defaultMetricsPrefix = "ghostunnel"
 )