extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2024-12-04 22:11:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gracefully handle "git describe" failure in Makefile

Browse Source 
If the build environment does not have git or the git repo available,
we just leave out the git hash from the version information.
It would be missing anyway, but the empty parentheses
look awkward.
This commit is contained in:
Thomas Jensen 2021-04-21 22:16:59 +02:00
parent 7b7d4b4adf
commit 5d3bdfb9fa
No known key found for this signature in database
GPG Key ID: A4ACEE270D0FB7DB
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -20,7 +20,7 @@
# The following line (GLOBALCONF) is the only line you should need to edit!
GLOBALCONF = /usr/share/boxes
GIT_STATUS = ($(shell git describe --dirty --always))
GIT_STATUS = $(shell git describe --dirty --always 2>/dev/null || echo "n/a")
BVERSION = 2.1.0
ALL_FILES = LICENSE README.md boxes-config
@ -76,7 +76,8 @@ $(OUT_DIR):
replaceinfos: $(OUT_DIR)/boxes.h doc/boxes.1
$(OUT_DIR)/boxes.h: src/boxes.in.h Makefile | $(OUT_DIR)
sed -e 's/--BVERSION--/$(BVERSION) $(GIT_STATUS)/; s/--GLOBALCONF--/$(subst /,\/,$(GLOBALCONF))/' src/boxes.in.h > $(OUT_DIR)/boxes.h
$(eval VERSION_STRING := $(shell if [ "${GIT_STATUS}" = "n/a" ]; then echo "${BVERSION}"; else echo "${BVERSION} (${GIT_STATUS})"; fi))
sed -e 's/--BVERSION--/$(VERSION_STRING)/; s/--GLOBALCONF--/$(subst /,\/,$(GLOBALCONF))/' src/boxes.in.h > $(OUT_DIR)/boxes.h
doc/boxes.1: doc/boxes.1.in Makefile
sed -e 's/--BVERSION--/$(BVERSION)/; s/--GLOBALCONF--/$(subst /,\/,$(GLOBALCONF))/' doc/boxes.1.in > doc/boxes.1