make: with strict tag rules it is possible to bail on missing tags

This commit is contained in:
Franco Fichtner 2021-02-08 19:31:24 +01:00
parent f054c5e112
commit 0c431a0f69
1 changed files with 5 additions and 3 deletions

View File

@ -52,7 +52,7 @@ _NEXTBETA!= ${GIT} tag -l ${CORE_NEXT}.b
_NEXTMATCH= --match=${CORE_NEXT}.b _NEXTMATCH= --match=${CORE_NEXT}.b
. else . else
_NEXTDEVEL!= ${GIT} tag -l ${CORE_NEXT}\* _NEXTDEVEL!= ${GIT} tag -l ${CORE_NEXT}\*
. if !empt(_NEXTDEVEL) . if !empty(_NEXTDEVEL)
_NEXTMATCH= --match=${CORE_NEXT}\* _NEXTMATCH= --match=${CORE_NEXT}\*
. endif . endif
. endif . endif
@ -62,11 +62,13 @@ _NEXTSTABLE!= ${GIT} tag -l ${CORE_ABI}\*
_NEXTMATCH= --match=${CORE_ABI}\* _NEXTMATCH= --match=${CORE_ABI}\*
. endif . endif
. endif . endif
. if empty(_NEXTMATCH)
. error Did not find appropriate tag for CORE_ABI=${CORE_ABI}
. endif
CORE_COMMIT!= ${GITVERSION} ${_NEXTMATCH} CORE_COMMIT!= ${GITVERSION} ${_NEXTMATCH}
.else
CORE_COMMIT= unknown 0 undefined
.endif .endif
CORE_COMMIT?= unknown 0 undefined
CORE_VERSION?= ${CORE_COMMIT:[1]} CORE_VERSION?= ${CORE_COMMIT:[1]}
CORE_REVISION?= ${CORE_COMMIT:[2]} CORE_REVISION?= ${CORE_COMMIT:[2]}
CORE_HASH?= ${CORE_COMMIT:[3]} CORE_HASH?= ${CORE_COMMIT:[3]}