Rework zip package versioning

[src/xds/xds-cli.git] / Makefile

diff --git a/Makefile b/Makefile
index ef2644d..0e377e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,31 @@
-# Makefile used to build xds-cli commands
-
-# Application Version
+ ###########################################################################
+# Copyright 2017-2018 IoT.bzh
+#
+# author: Sebastien Douheret <sebastien@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+# Application Name
 TARGET=xds-cli
 
 
 # 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)))
-SUB_VERSION := $(wordlist 2,3,$(subst -, ,$(GIT_DESC)))
+ifeq (-,$(findstring -,$(GIT_DESC)))
+       SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
+endif
 ifeq ($(VERSION), )
        VERSION := unknown-dev
 endif
@@ -23,7 +41,7 @@ endif
 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)
@@ -32,7 +50,7 @@ endif
 
 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
@@ -40,6 +58,15 @@ PACKAGE_DIR := $(ROOT_SRCDIR)/package
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
 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'"
+
+
 VERBOSE_1 := -v
 VERBOSE_2 := -v -x
 
@@ -56,18 +83,19 @@ else
        BUILD_MODE="Release mode"
 endif
 
-
-ifeq ($(SUB_VERSION), )
-       PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-v$(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)-v$(VERSION)_$(SUB_VERSION).zip
+       NB_COMMIT=0
 endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
 .PHONY: all
 all: vendor build
 
 .PHONY: build
-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)" .
 
@@ -86,7 +114,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-       rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor
+       rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip)
 
 
 .PHONY: scripts
@@ -100,7 +128,9 @@ release:
 package: clean vendor build
        @mkdir -p $(PACKAGE_DIR)/$(TARGET)
        @cp -a $(LOCAL_BINDIR)/*cli$(EXT) $(PACKAGE_DIR)/$(TARGET)
+ifneq ($(GOOS), windows)
        @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/$(TARGET)
+endif
        cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./$(TARGET)
 
 .PHONY: package-all
@@ -126,26 +156,33 @@ vendor: tools/glide glide.yaml
        $(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
 vendor/debug: vendor
-       (cd vendor/github.com/iotbzh && \
-               rm -rf xds-common && ln -s ../../../../xds-common && \
-               rm -rf xds-agent && ln -s ../../../../xds-agent )
+       (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 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
+               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: help
 help:
        @echo "Main supported rules:"
-       @echo "  all               (default)"
+       @echo "  all                (default)"
        @echo "  build"
        @echo "  release"
-       @echo "  clean"
        @echo "  package"
-       @echo "  install / uninstall"
+       @echo "  install"
+       @echo "  uninstall"
+       @echo "  clean"
        @echo "  distclean"
        @echo ""
        @echo "Influential make variables:"