]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e08b326)
Remove the dirty flag from the qc version string bones_was_here/makefile_dirty 954/head
authorbones_was_here <bones_was_here@xa.org.au>
Sat, 11 Dec 2021 06:56:06 +0000 (16:56 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Sat, 11 Dec 2021 07:01:31 +0000 (17:01 +1000)
This ends up in official releases "xonotic-v0.8.2~" as the build system needs to edit some files.

This flag is not very useful, so it's not worth the complexity to implement an exception for the build system.

qcsrc/Makefile patch | blob | history

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index f562bd4f69ea3b84651e6ae042fb27a9234b56e9..0ca36d6803150a34d8714c8ec1771819f7248d28 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -4,7 +4,7 @@ QCC ?= ../../../../gmqcc/gmqcc
 PROGS_OUT ?= ..
 WORKDIR ?= ../.tmp
 
-QCCFLAGS_WATERMARK ?= $(shell git describe --tags --dirty='~')
+QCCFLAGS_WATERMARK ?= $(shell git describe --tags)
 VER = $(subst *,\*,$(QCCFLAGS_WATERMARK))
 NDEBUG ?= 1
 XONOTIC ?= 1