kopia lustrzana https://github.com/weetmuts/wmbusmeters
Drop non-working ifeq.
rodzic
1924a50bc7
commit
9a6738e219
13
Makefile
13
Makefile
|
@ -58,7 +58,6 @@ 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 ' ')
|
|
||||||
|
|
||||||
ifeq ($(BRANCH),master)
|
ifeq ($(BRANCH),master)
|
||||||
BRANCH:=
|
BRANCH:=
|
||||||
|
@ -66,17 +65,11 @@ else
|
||||||
BRANCH:=$(BRANCH)_
|
BRANCH:=$(BRANCH)_
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(COMMIT),$(TAG_COMMIT))
|
VERSION:=$(BRANCH)$(TAG)
|
||||||
# Exactly on the tagged commit. The version is the tag!
|
DEBVERSION:=$(BRANCH)$(TAG)
|
||||||
VERSION:=$(BRANCH)$(TAG)
|
|
||||||
DEBVERSION:=$(BRANCH)$(TAG)
|
|
||||||
else
|
|
||||||
VERSION:=$(BRANCH)$(TAG)++
|
|
||||||
DEBVERSION:=$(BRANCH)$(TAG)++
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(strip $(CHANGES)),)
|
ifneq ($(strip $(CHANGES)),)
|
||||||
# There are changes, signify that with a +changes
|
# There are local un-committed changes.
|
||||||
VERSION:=$(VERSION) with local changes
|
VERSION:=$(VERSION) with local changes
|
||||||
COMMIT_HASH:=$(COMMIT_HASH) with local changes
|
COMMIT_HASH:=$(COMMIT_HASH) with local changes
|
||||||
DEBVERSION:=$(DEBVERSION)l
|
DEBVERSION:=$(DEBVERSION)l
|
||||||
|
|
Ładowanie…
Reference in New Issue