###########################################################################
-# Copyright 2017 IoT.bzh
+# Copyright 2017-2019 IoT.bzh
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
# 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))
HOST_GOOS=$(shell go env GOOS)
HOST_GOARCH=$(shell go env GOARCH)
ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
-REPOPATH=github.com/iotbzh/$(TARGET)
+REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/$(TARGET)
EXT=
ifeq ($(HOST_GOOS), windows)
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
-ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
+ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../../../..)
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
+PACKAGE_LIST=./lib/... .
-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.)
-CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 8 \) ] && echo true)
-CHECKERRMSG := "ERROR: Go version 1.8.1 or higher is requested (current detected version: $(GOVERSION))."
+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
WEBAPP_BUILD_RULE=build:prod
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
- PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
+ NB_COMMIT=0
endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
-
+.PHONY: all
all: tools/syncthing build
.PHONY: build
-build: checkgover vendor xds webapp
+build: checkgover gomod xds webapp
xds: scripts tools/syncthing/copytobin
@echo "### Build XDS agent (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 clean -testcache
+ go test --race $(PACKAGE_LIST)
-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)
run: build/xds tools/syncthing/copytobin
$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_AGENT_RUN_ARGS)
.PHONY: distclean
distclean: clean
- cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/node_modules ./webapp/dist
+ (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
+ go clean -modcache
+
+.PHONY: clean-lock
+clean-lock: distclean
+ (cd $(ROOT_SRCDIR) && rm -f ./go.sum ./webapp/package-lock.json)
webapp: webapp/install
+ifneq ($(SKIP_WEBAPP_BUILD), true)
cd webapp && npm run $(WEBAPP_BUILD_RULE)
+else
+ @echo "Skipping webapp build (SKIP_WEBAPP_BUILD var is set)"
+endif
webapp/debug:
cd webapp && npm run watch
webapp/install:
+ifneq ($(SKIP_WEBAPP_BUILD), true)
(cd webapp && npm install)
+else
+ @echo "Skipping webapp install (SKIP_WEBAPP_BUILD var is set)"
+endif
@if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
.PHONY: install
@echo "# Build linux amd64..."
GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
@echo "# Build windows amd64..."
- GOOS=windows GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+ GOOS=windows GOARCH=amd64 RELEASE=1 SKIP_WEBAPP_BUILD=true make -f $(ROOT_SRCDIR)/Makefile package
@echo "# Build darwin amd64..."
- GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+ GOOS=darwin GOARCH=amd64 RELEASE=1 SKIP_WEBAPP_BUILD=true make -f $(ROOT_SRCDIR)/Makefile package
make -f $(ROOT_SRCDIR)/Makefile clean
-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-server.git => $(ROOT_SRCDIR)/../xds-server" >> $(ROOT_SRCDIR)/go.mod
+ @echo "Add replace in go.mod file - done."
+
+vendor: gomod
+ go mod vendor
vendor/debug: vendor
- (cd vendor/github.com/iotbzh && \
- rm -rf xds-common && ln -s ../../../../xds-common && \
- rm -rf xds-server && ln -s ../../../../xds-server )
-
-.PHONY: tools/glide
-tools/glide:
- @test -f $(LOCAL_TOOLSDIR)/glide || { \
- echo "Downloading glide"; \
- mkdir -p $(LOCAL_TOOLSDIR); \
- curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \
- }
+ (cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
+ rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \
+ rm -rf xds-server.git && ln -s ../../../../../../xds-server xds-server.git )
.PHONY: tools/syncthing
tools/syncthing:
checkgover:
@test "$(CHECKGOVER)" = "true" || { echo $(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:
@echo "Main supported rules:"
- @echo " all (default)"
+ @echo " all (default)"
@echo " build"
@echo " package"
@echo " install"