Code Review
/
src
/
xds
/
xds-cli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add gitreview file for jellyfish branch
[src/xds/xds-cli.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
fadc3fe
..
362d97b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
###########################################################################
###########################################################################
-# Copyright 2017-201
8
IoT.bzh
+# Copyright 2017-201
9
IoT.bzh
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
@@
-21,7
+21,7
@@
TARGET=xds-cli
# Retrieve git tag/commit to set version & sub-version strings
# Retrieve git tag/commit to set version & sub-version strings
-GIT_DESC := $(shell git describe --always --tags)
+GIT_DESC := $(shell git describe --always --tags
--match "[0-9]*"
)
VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
ifeq (-,$(findstring -,$(GIT_DESC)))
SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
ifeq (-,$(findstring -,$(GIT_DESC)))
SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
@@
-54,17
+54,18
@@
ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../../../..)
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
+PACKAGE_LIST=.
-export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
+export GO111MODULE=on
+export GOPATH := $(ROOT_GOPRJ):$(shell go env GOPATH)
export PATH := $(PATH):$(LOCAL_TOOLSDIR)
# Check Go version
GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1)
GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.)
GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.)
export PATH := $(PATH):$(LOCAL_TOOLSDIR)
# Check Go version
GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1)
GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.)
GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.)
-CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 9 \) ] && echo true)
-CHECKERRMSG := "ERROR: Go version 1.9.0 or higher is requested (current detected version: $(GOVERSION)). \n\
-\t--> It may be necessary to clear glide cache with following command 'tools/linux/glide cc'"
+CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 12 \) ] && echo true)
+CHECKERRMSG := "ERROR: Go version 1.12 or higher is requested (current detected version: $(GOVERSION))."
VERBOSE_1 := -v
VERBOSE_1 := -v
@@
-83,40
+84,44
@@
else
BUILD_MODE="Release mode"
endif
BUILD_MODE="Release mode"
endif
-ifeq ($(SUB_VERSION), )
- PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
+# Build Package name (model: <target>_<arch>-<version>.<nb_commit_from_last_tag>.zip)
+ifeq (-g,$(findstring -g,$(GIT_DESC)))
+ NB_COMMIT=$(firstword $(subst -, ,$(SUB_VERSION)))
else
else
- # only use dot as separator to allow rpm packaging (see version .spec file)
- PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
- PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
- PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
+ NB_COMMIT=0
endif
endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
.PHONY: all
.PHONY: all
-all:
vendor
build
+all:
gomod
build
.PHONY: build
build: checkgover
@echo "### Build $(TARGET) (version $(VERSION), subversion $(SUB_VERSION) - $(BUILD_MODE))";
@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
.PHONY: build
build: checkgover
@echo "### Build $(TARGET) (version $(VERSION), subversion $(SUB_VERSION) - $(BUILD_MODE))";
@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
-test: tools/glide
- go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
+.PHONY: test
+test: checkgorace
+ go test --race . -v
-vet:
tools/glide
- go vet $(
shell $(LOCAL_TOOLSDIR)/glide novendor
)
+vet:
+ go vet $(
PACKAGE_LIST
)
-fmt:
tools/glide
- go fmt $(
shell $(LOCAL_TOOLSDIR)/glide novendor
)
+fmt:
+ go fmt $(
PACKAGE_LIST
)
.PHONY: clean
clean:
.PHONY: clean
clean:
- rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR)
+ rm -rf $(LOCAL_BINDIR)/*
$(ROOT_SRCDIR)/
debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR)
.PHONY: distclean
distclean: clean
.PHONY: distclean
distclean: clean
- rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip)
+ (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./vendor ./*.zip)
+ go clean -modcache
+.PHONY: clean-lock
+clean-lock: distclean
+ (cd $(ROOT_SRCDIR) && rm -f ./go.sum)
.PHONY: scripts
scripts:
.PHONY: scripts
scripts:
@@
-153,26
+158,30
@@
install:
uninstall:
export DESTDIR=$(DESTDIR) && $(ROOT_SRCDIR)/scripts/install.sh uninstall
uninstall:
export DESTDIR=$(DESTDIR) && $(ROOT_SRCDIR)/scripts/install.sh uninstall
-vendor: tools/glide glide.yaml
- $(LOCAL_TOOLSDIR)/glide install --strip-vendor
+.PHONY: gomod
+gomod:
+ go get
+
+gomod/debug:
+ @echo "replace gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git => $(ROOT_SRCDIR)/../xds-common" >> $(ROOT_SRCDIR)/go.mod
+ @echo "replace gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git => $(ROOT_SRCDIR)/../xds-agent" >> $(ROOT_SRCDIR)/go.mod
+ @echo "Add replace in go.mod file - done."
+
+vendor: gomod
+ go mod vendor
vendor/debug: vendor
(cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \
rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git)
vendor/debug: vendor
(cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \
rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git)
-.PHONY: tools/glide
-tools/glide:
- @test -f $(LOCAL_TOOLSDIR)/glide || { \
- echo "Downloading glide"; \
- mkdir -p $(LOCAL_TOOLSDIR); \
- curl --silent --connect-timeout 60 --retry 3 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \
- }
-
.PHONY:
checkgover:
@test "$(CHECKGOVER)" = "true" || { echo -e $(CHECKERRMSG); exit 1; }
.PHONY:
checkgover:
@test "$(CHECKGOVER)" = "true" || { echo -e $(CHECKERRMSG); exit 1; }
+.PHONY:
+checkgorace: checkgover
+ @ls $(shell go env GOROOT)/src/runtime/race/*.syso 1> /dev/null 2>&1 || { echo "ERROR: go-race package mandatory to run test. Please install it, for example: zypper install go-race"; exit 1; }
.PHONY: help
help:
.PHONY: help
help: