diff options
| author | Vincent Sanders <vincent.sanders@collabora.co.uk> | 2013-04-19 14:27:32 +0100 |
|---|---|---|
| committer | Vincent Sanders <vincent.sanders@collabora.co.uk> | 2013-04-19 14:27:32 +0100 |
| commit | 526b03ad2ba260269f3741bfd59448a8b0f6de2f (patch) | |
| tree | b321bb79c044c2c2a4d28731f5e237137da99053 | |
| parent | 8791859821ea7c2bcb8aed44d5bbf8d1a4ae7f1d (diff) | |
| download | buildsystem-526b03ad2ba260269f3741bfd59448a8b0f6de2f.tar.gz buildsystem-526b03ad2ba260269f3741bfd59448a8b0f6de2f.tar.bz2 | |
fix tag pattern to release/* so we can match by git refspecrelease/1.0
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | makefiles/Makefile.top | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -42,8 +42,8 @@ install: # the Makefile component version matches the git tag version and the # tar is apropriately named for the component being generated dist: - $(eval GIT_TAG := $(shell git describe --abbrev=0 --match "v*")) - $(eval GIT_VER := $(shell x="$(GIT_TAG)"; echo "$${x#v}")) + $(eval GIT_TAG := $(shell git describe --abbrev=0 --match "release/*")) + $(eval GIT_VER := $(shell x="$(GIT_TAG)"; echo "$${x#release/}")) $(if $(subst $(GIT_VER),,$(COMPONENT_VERSION)), $(error Component Version "$(COMPONENT_VERSION)" and GIT tag version "$(GIT_VER)" do not match)) $(eval DIST_FILE := $(COMPONENT)-${GIT_VER}) $(Q)git archive --format=tar.gz --prefix=$(DIST_FILE)/ -o $(DIST_FILE).tar.gz $(GIT_TAG) diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index f9f21df..031a150 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -242,8 +242,8 @@ docs: $(BUILDDIR)/stamp # the Makefile component version matches the git tag version and the # tar is apropriately named for the component being generated dist: - $(eval GIT_TAG := $(shell git describe --abbrev=0 --match "v*")) - $(eval GIT_VER := $(shell x="$(GIT_TAG)"; echo "$${x#v}")) + $(eval GIT_TAG := $(shell git describe --abbrev=0 --match "release/*")) + $(eval GIT_VER := $(shell x="$(GIT_TAG)"; echo "$${x#release/}")) $(if $(subst $(GIT_VER),,$(COMPONENT_VERSION)), $(error Component Version "$(COMPONENT_VERSION)" and GIT tag version "$(GIT_VER)" do not match)) ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) $(eval DIST_FILE := lib$(COMPONENT)-${GIT_VER}) |