Skip to content

Commit 0ab5204

Browse files
committed
Use default fallback version if built outside of git repo (#92)
1 parent d6bf771 commit 0ab5204

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

configure.kafkacat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33

44
mkl_require good_cflags
5-
mkl_require gitversion as KAFKACAT_VERSION
5+
mkl_require gitversion as KAFKACAT_VERSION default 1.3.1
66

77

88
function checks {

mklove/modules/configure.gitversion

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,24 @@
66
# VARIABLE_NAME
77
#
88
# Example: Set version in variable named "MYVERSION":
9-
# mkl_require gitversion as MYVERSION
9+
# mkl_require gitversion as MYVERSION [default DEFVERSION]
1010

1111
if [[ $1 == "as" ]]; then
12-
__MKL_GITVERSION_VARNAME="$2"
12+
shift
13+
__MKL_GITVERSION_VARNAME="$1"
14+
shift
1315
else
1416
__MKL_GITVERSION_VARNAME="VERSION"
1517
fi
1618

19+
if [[ $1 == "default" ]]; then
20+
shift
21+
__MKL_GITVERSION_DEFAULT="$1"
22+
shift
23+
fi
24+
25+
1726
function checks {
18-
mkl_allvar_set "gitversion" "$__MKL_GITVERSION_VARNAME" "$(git describe --abbrev=6 --tags HEAD --always)"
27+
mkl_allvar_set "gitversion" "$__MKL_GITVERSION_VARNAME" \
28+
"$(git describe --abbrev=6 --tags HEAD --always 2>/dev/null || echo $__MKL_GITVERSION_DEFAULT)"
1929
}

0 commit comments

Comments
 (0)