diff --git a/Makefile b/Makefile index 88f1572..8262052 100644 --- a/Makefile +++ b/Makefile @@ -7,26 +7,19 @@ GOFILES=$(shell find . \( -name \*.go ! -name version.go \) ) # for protoc-gen-go export PATH := $(GOPATH)/bin:$(PATH) -GOLDFLAGS=-ldflags '-r $${ORIGIN}/lib' +GOLDFLAGS=-ldflags '-r $${ORIGIN}/lib $(VERSION_LDFLAGS)' GO:=$(if $(shell go version |grep 'go1.5'),GO15VENDOREXPERIMENT=1,) go BUILD_DATE=$(shell date +%Y%m%d) BUILD_REV=$(shell git rev-parse --short HEAD) BUILD_VERSION=dev-$(BUILD_DATE)-$(BUILD_REV) +VERSION_LDFLAGS=-X github.com/omniscale/imposm3.buildVersion=$(BUILD_VERSION) all: build test -update_version: - @perl -p -i -e 's/buildVersion = ".*"/buildVersion = "$(BUILD_VERSION)"/' version.go - -revert_version: - @perl -p -i -e 's/buildVersion = ".*"/buildVersion = ""/' version.go - imposm3: $(PBGOFILES) $(GOFILES) - $(MAKE) update_version $(GO) build $(GOLDFLAGS) ./cmd/imposm3 - $(MAKE) revert_version build: imposm3 @@ -68,4 +61,4 @@ build-license-deps: (echo -e "========== $$dep ==========\n"; cat $$1; echo -e "\n\n") \ | fold -s -w 80 \ >> LICENSE.deps \ - ' _ {} \; \ No newline at end of file + ' _ {} \; diff --git a/version.go b/version.go index 9ff298c..6738fb3 100644 --- a/version.go +++ b/version.go @@ -2,9 +2,11 @@ package imposm3 var Version string +// buidVersion gets replaced while building with +// go build -ldflags "-X github.com/omniscale/imposm3.buildVersion 1234" +var buildVersion string + func init() { - // buidVersion gets replaced during build with make - var buildVersion = "" Version = "0.2.0" Version += buildVersion }