Browse Source

Version tags now reflect mod/vendor build setup.
Switched 'make lint' to use golangci-lint as gometalinter is deprecated.

Signed-off-by: Russ Magee <rmagee@gmail.com>

Russ Magee 1 year ago
parent
commit
89b6e8bce7
4 changed files with 17 additions and 11 deletions
  1. 14 8
      Makefile
  2. 1 1
      xs/Makefile
  3. 1 1
      xsd/Makefile
  4. 1 1
      xspasswd/Makefile

+ 14 - 8
Makefile

@@ -1,22 +1,28 @@
 .PHONY: lint vis clean common client server passwd subpkgs install uninstall reinstall
 
-#ifeq ($(MAKEOPTS),)
-  MAKEOPTS = $(MAKEOPTS)
-#endif
-
-GIT_COMMIT := $(shell git rev-list -1 HEAD)
-VERSION := 0.8.12
+## Tag version of binaries with build info wrt.
+## GO111MODULE(=on) and vendor/ setup vs. $GOPATH pkg builds
+############################################################
+ifeq ($(shell go env GOMOD),)
+MTAG=
+else
+MTAG="-m"
+endif
 
 ifneq ($(VENDOR),)
 GOBUILDOPTS :=-v -mod vendor
-VTAG = "-vendor"
+VTAG = "-v"
 else
 GOBUILDOPTS=
 VTAG =
 endif
+############################################################
+
+GIT_COMMIT := $(shell git rev-list -1 HEAD)
+VERSION := 0.8.12
 
 #ifeq ($(BUILDOPTS),)
-BUILDOPTS :=$(BUILDOPTS)"$(GOBUILDOPTS) -ldflags \"-X main.version=$(VERSION)$(VTAG) -X main.gitCommit=$(GIT_COMMIT)\""
+BUILDOPTS :=$(BUILDOPTS)"$(GOBUILDOPTS) -ldflags \"-X main.version=$(VERSION)$(MTAG)$(VTAG) -X main.gitCommit=$(GIT_COMMIT)\""
 #endif
 
 SUBPKGS = logger spinsult xsnet

+ 1 - 1
xs/Makefile

@@ -15,4 +15,4 @@ vis:
 	../fixup-gv.sh xs.go && cat xs-vis.gv | dot -Tpng -oxs-vis-fixedup.png
 
 lint:
-	-gometalinter --deadline=60s | sort
+	-golangci-lint run

+ 1 - 1
xsd/Makefile

@@ -14,5 +14,5 @@ vis:
 	../fixup-gv.sh xsd.go && cat xsd-vis.gv | dot -Tpng -oxsd-vis-fixedup.png
 
 lint:
-	-gometalinter --deadline=60s | sort
+	-golangci-lint run
 

+ 1 - 1
xspasswd/Makefile

@@ -13,4 +13,4 @@ vis:
 	go-callvis -format png -file xspasswd-vis -ignore $(EXTPKGS) -group pkg,type .
 
 lint:
-	-gometalinter --deadline=60s | sort
+	-golangci-lint run