# 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))
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
all: tools/syncthing build
.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 ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
webapp: webapp/install
ifneq ($(SKIP_WEBAPP_BUILD), true)
@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: tools/syncthing
.PHONY: help
help:
@echo "Main supported rules:"
- @echo " all (default)"
+ @echo " all (default)"
@echo " build"
@echo " package"
@echo " install"