kopia lustrzana https://github.com/xaelsouth/rtl-wmbus
Drop non-working ifeq.
rodzic
7717896a98
commit
9417c4d739
11
Makefile
11
Makefile
|
@ -17,21 +17,16 @@ COMMIT_HASH?=$(shell git log --pretty=format:'%H' -n 1)
|
||||||
TAG?=$(shell git describe --tags)
|
TAG?=$(shell git describe --tags)
|
||||||
BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
|
BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
|
||||||
CHANGES?=$(shell git status -s | grep -v '?? ')
|
CHANGES?=$(shell git status -s | grep -v '?? ')
|
||||||
TAG_COMMIT_HASH?=$(shell git show-ref --tags | grep $(TAG) | cut -f 1 -d ' ')
|
|
||||||
|
|
||||||
|
# Prefix with any development branch.
|
||||||
ifeq ($(BRANCH),master)
|
ifeq ($(BRANCH),master)
|
||||||
BRANCH:=
|
BRANCH:=
|
||||||
else
|
else
|
||||||
BRANCH:=$(BRANCH)_
|
BRANCH:=$(BRANCH)_
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(COMMIT),$(TAG_COMMIT))
|
# The version is the git tag or tag-N-hash if there are N commits after the tag.
|
||||||
# Exactly on the tagged commit. The version is the tag!
|
VERSION:=$(BRANCH)$(TAG)
|
||||||
VERSION:=$(BRANCH)$(TAG)
|
|
||||||
else
|
|
||||||
# We are on a commit after the tag!
|
|
||||||
VERSION:=$(BRANCH)$(TAG)++
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(strip $(CHANGES)),)
|
ifneq ($(strip $(CHANGES)),)
|
||||||
# There are local non-committed changes! Add this to the version string as well!
|
# There are local non-committed changes! Add this to the version string as well!
|
||||||
|
|
Ładowanie…
Reference in New Issue