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
Update command used to extract version from tag
[src/xds/xds-cli.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
2d2586e
..
65dc031
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-16,13
+16,12
@@
# limitations under the License.
###########################################################################
# limitations under the License.
###########################################################################
-
# Application Name
TARGET=xds-cli
# Retrieve git tag/commit to set version & sub-version strings
# 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)))
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))
@@
-84,11
+83,13
@@
else
BUILD_MODE="Release mode"
endif
BUILD_MODE="Release mode"
endif
-
ifeq ($(SUB_VERSION), )
PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
else
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
endif
.PHONY: all
@@
-114,7
+115,7
@@
clean:
.PHONY: distclean
distclean: 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
.PHONY: scripts
@@
-165,7
+166,7
@@
tools/glide:
@test -f $(LOCAL_TOOLSDIR)/glide || { \
echo "Downloading glide"; \
mkdir -p $(LOCAL_TOOLSDIR); \
@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:
}
.PHONY:
@@
-176,12
+177,13
@@
checkgover:
.PHONY: help
help:
@echo "Main supported rules:"
.PHONY: help
help:
@echo "Main supported rules:"
- @echo " all (default)"
+ @echo " all
(default)"
@echo " build"
@echo " release"
@echo " build"
@echo " release"
- @echo " clean"
@echo " package"
@echo " package"
- @echo " install / uninstall"
+ @echo " install"
+ @echo " uninstall"
+ @echo " clean"
@echo " distclean"
@echo ""
@echo "Influential make variables:"
@echo " distclean"
@echo ""
@echo "Influential make variables:"