X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-cli.git;a=blobdiff_plain;f=Makefile;h=fadc3fe21a07cd2305aeb4157172482389965615;hp=2d2586e23d12b54ece5a8029bf6ef3101d7667e7;hb=e0faa97416aee22fa0c09f75a4040bb2bb16e2dd;hpb=c8f5f5a7097254496b9dc8ddb458cf1fdb7169da diff --git a/Makefile b/Makefile index 2d2586e..fadc3fe 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ # limitations under the License. ########################################################################### - # Application Name TARGET=xds-cli @@ -84,11 +83,13 @@ else BUILD_MODE="Release mode" endif - ifeq ($(SUB_VERSION), ) PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip else - PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip + # 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 endif .PHONY: all @@ -114,7 +115,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 @@ -165,7 +166,7 @@ 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: @@ -176,12 +177,13 @@ checkgover: .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:"